From b54c21859be3590a319ceade1f58d0b89ac5ef32 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 19 Mar 2013 00:04:27 -0700 Subject: Tue Mar 19 00:04:27 PDT 2013 --- libre/cdfs-libre/PKGBUILD | 13 ++++++++----- libre/cdfs-libre/cdfs-3.8.patch | 42 ++++++++++++++++++++++++++++++++++++++++ libre/cdfs-libre/cdfs.install | 6 +++--- libre/cgminer-libre/PKGBUILD | 6 +++--- libre/rp-pppoe-libre/PKGBUILD | 12 ++++++++---- libre/rp-pppoe-libre/kmode.patch | 19 ++++++++++++++++++ libre/xulrunner-libre/PKGBUILD | 10 +++++----- 7 files changed, 88 insertions(+), 20 deletions(-) create mode 100644 libre/cdfs-libre/cdfs-3.8.patch create mode 100644 libre/rp-pppoe-libre/kmode.patch (limited to 'libre') diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 12e461519..290eff882 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 -pkgrel=36 +pkgrel=38 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" @@ -19,27 +19,30 @@ install=cdfs.install source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$_pkgname-$pkgver.tar.bz2" "cdfs-3.0.patch" "cdfs-3.2.patch" - "cdfs-3.4.patch") + "cdfs-3.4.patch" + "cdfs-3.8.patch") md5sums=('ac64c014a90e3c488394832ea29605b3' 'aba7da94a9dcbb8a93ea423cb6958fef' 'e934407b3460257a301822ffc4ab3933' - '9215e7bdac728bd2f889fb525e543454') + '9215e7bdac728bd2f889fb525e543454' + 'b036fd72b033294605bec2b60a73e3bd') _kernver=`pacman -Q linux-libre | cut -d . -f 2 | cut -f 1 -d -` _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-LIBRE/version` build() { - depends=("linux-libre>=3.${_kernver}" "linux-libre<3.`expr ${_kernver} + 1`") - cd $srcdir/$_pkgname-$pkgver patch -p1 <$srcdir/cdfs-3.0.patch patch -p1 <$srcdir/cdfs-3.2.patch patch -p1 <$srcdir/cdfs-3.4.patch + patch -p1 <$srcdir/cdfs-3.8.patch make KDIR=/usr/lib/modules/${_kernverfull}/build sed -i "s|extramodules-.*-LIBRE|extramodules-3.${_kernver}-LIBRE|" $startdir/cdfs.install } package() { + depends=("linux-libre>=3.${_kernver}" "linux-libre<3.`expr ${_kernver} + 1`") + cd $srcdir/$_pkgname-$pkgver install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-LIBRE/cdfs.ko } diff --git a/libre/cdfs-libre/cdfs-3.8.patch b/libre/cdfs-libre/cdfs-3.8.patch new file mode 100644 index 000000000..10d9c8b47 --- /dev/null +++ b/libre/cdfs-libre/cdfs-3.8.patch @@ -0,0 +1,42 @@ +diff -upr cdfs-2.6.27.orig/daemon.c cdfs-2.6.27/daemon.c +--- cdfs-2.6.27.orig/daemon.c 2009-12-21 16:02:50.000000000 +0200 ++++ cdfs-2.6.27/daemon.c 2013-02-21 06:14:45.000000000 +0200 +@@ -158,7 +158,6 @@ int kcdfsd_thread(void *unused){ + exit_files(current); /* daemonize doesn't do exit_files */ + daemonize(); + #else +- daemonize("k"FSNAME"d"); + + /* Allow SIGTERM to quit properly when removing module */ + /* By default with daemonize all signals are dropped */ +diff -upr cdfs-2.6.27.orig/root.c cdfs-2.6.27/root.c +--- cdfs-2.6.27.orig/root.c 2009-12-21 15:38:31.000000000 +0200 ++++ cdfs-2.6.27/root.c 2013-02-21 06:15:20.000000000 +0200 +@@ -25,6 +25,7 @@ + #include "cdfs.h" + + #include ++#include + + + /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++* +@@ -643,14 +644,15 @@ static int __init cdfs_init(void) { + cdfs_proc_cd=NULL; + + // start kernel thread +- if ((kcdfsd_pid = kernel_thread(kcdfsd_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND)) >0 ) { +- return 0; +- } else { +- printk(FSNAME" kernel_thread failed.\n"); ++ kcdfsd_pid = kthread_run(kcdfsd_thread, NULL, "kcdfsd_thread"); ++ if (IS_ERR(kcdfsd_pid)) { ++ printk(FSNAME" kthread_run failed.\n"); + if (cdfs_proc_entry) remove_proc_entry(FSNAME, NULL); + unregister_filesystem(&cdfs_fs_type); + return -1; + } ++ ++ return 0; + } + + /******************************************************************/ diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install index 3847b8b14..1e587cf72 100644 --- a/libre/cdfs-libre/cdfs.install +++ b/libre/cdfs-libre/cdfs.install @@ -1,14 +1,14 @@ post_install() { - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.7-LIBRE' + EXTRAMODULES='extramodules-3.8-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 55e7e1df8..e9ca63637 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -7,10 +7,10 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=2.11.2 +pkgver=2.11.3 _build= pkgrel=1 -pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendations." +pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, with free OpenCL support." url='http://forum.bitcoin.org/index.php?topic=28402.0' license=('GPL3') arch=('i686' 'x86_64' 'mips64el') @@ -52,6 +52,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -md5sums=('f3deb2205ff53318dd65f9dfd26b99aa' +md5sums=('fd2c69f943353fbc9723a5526d82c1b6' 'fe4a243fabe24608f5c05e40f0f118f6' 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index f418684b5..2158c2892 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166893 2012-09-20 23:56:51Z eric $ +# $Id: PKGBUILD 178747 2013-02-26 16:32:57Z tpowa $ # Maintainer: Daniel Isenmann # Contributor: orelien # Maintainer (Parabola): André Silva @@ -6,8 +6,8 @@ _pkgname=rp-pppoe pkgname=rp-pppoe-libre pkgver=3.11 -pkgrel=1 -pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client. Unfree software recommendation removed." +pkgrel=2 +pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client (without nonfree ServPoET recommendation)" arch=('i686' 'x86_64') url="http://www.roaringpenguin.com/pppoe/" license=('GPL') @@ -20,11 +20,12 @@ replaces=('rp-pppoe') conflicts=('rp-pppoe') install=rp-pppoe.install source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} - adsl adsl.service $pkgname.patch) + adsl adsl.service kmode.patch $pkgname.patch) md5sums=('13b5900c56bd602df6cc526e5e520722' '8fc724aa146dba52ef7b3fbe5b8784c6' 'adace1ad441aa88dcb3db52fb7f9c97f' 'af234125f956f3a356ab0d0fcaa9e8a2' + 'd38a903a247d689ff0323d7b6caa1c6b' '3c53d550ac408608abb0b6cd6b76b6c2') build() { @@ -35,6 +36,9 @@ build() { cd ./src + ## Adding support kernel mode + patch -Np2 -i ../../kmode.patch + ./configure --prefix=/usr --enable-plugin make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so } diff --git a/libre/rp-pppoe-libre/kmode.patch b/libre/rp-pppoe-libre/kmode.patch new file mode 100644 index 000000000..37eef58f7 --- /dev/null +++ b/libre/rp-pppoe-libre/kmode.patch @@ -0,0 +1,19 @@ +diff -up rp-pppoe-3.11/src/configure.orig rp-pppoe-3.11/src/configure +--- rp-pppoe-3.11/src/configure.orig 2012-08-17 12:31:25.000000000 -0600 ++++ rp-pppoe-3.11/src/configure 2013-02-11 14:23:05.000000000 -0700 +@@ -3679,6 +3679,7 @@ do : + #include + #include + #include ++#include + + " + if test "x$ac_cv_header_linux_if_pppox_h" = x""yes; then : +@@ -4525,6 +4526,7 @@ else + #include + #include + #include ++#include + #include + int main() + { diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index 66154fb0c..5b21529b4 100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 174912 2013-01-08 16:59:52Z heftig $ +# $Id: PKGBUILD 180163 2013-03-18 13:29:32Z jgc $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck @@ -6,7 +6,7 @@ # We're getting this from Debian Experimental _debname=iceweasel -_debver=19.0 +_debver=19.0.2 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -18,7 +18,7 @@ pkgrel=1 pkgdesc="Mozilla Runtime Environment (built from Debian Iceweasel source code)" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libvpx' 'python2') +depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2') makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'quilt') url="http://wiki.mozilla.org/XUL:Xul_Runner" source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" @@ -31,8 +31,8 @@ options=('!emptydirs') conflicts=('xulrunner') provides=("xulrunner=${_debver}") replaces=('xulrunner-oss' 'xulrunner') -md5sums=('b4c109e987f869f94220188a901d4425' - 'e1d6920cb49c9de88b8e00eb14b1b0e7' +md5sums=('ceda63e01012f9940542d862fd755a65' + '7fa6e0fb544d01516d3232f26023c570' '7f3317c25308a631ca31d8d280991bb4' '27271ce647a83906ef7a24605e840d61' '52e52f840a49eb1d14be1c0065b03a93' -- cgit v1.2.3-54-g00ecf