diff options
259 files changed, 7182 insertions, 536 deletions
diff --git a/community-testing/arm-elf-gcc-base/PKGBUILD b/community-testing/arm-elf-gcc-base/PKGBUILD new file mode 100644 index 000000000..4946b78ae --- /dev/null +++ b/community-testing/arm-elf-gcc-base/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 75111 2012-08-14 08:27:41Z allan $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=arm-elf-gcc-base +pkgver=4.7.0 +pkgrel=2 +pkgdesc="The GNU Compiler Collection" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +url="http://gcc.gnu.org" +depends=('arm-elf-binutils' 'libmpc' 'libelf') +options=(!libtool !emptydirs zipman docs !strip) +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) +md5sums=('2a0f1d99fda235c29d40b561f81d9a77') + +build() { + cd $srcdir/gcc-$pkgver + + export CFLAGS="-O2 -pipe" + export CXXFLAGS="-O2 -pipe" + + rm -rf build + mkdir build + cd build + + ../configure --prefix=/usr \ + --target=arm-elf \ + --enable-obsolete \ + --host=$CHOST \ + --build=$CHOST \ + --enable-shared --disable-nls --enable-languages=c --enable-multilib \ + --with-local-prefix=/usr/lib/arm-elf \ + --with-as=/usr/bin/arm-elf-as --with-ld=/usr/bin/arm-elf-ld \ + --enable-softfloat \ + --with-float=soft \ + --with-newlib \ + --with-sysroot=/usr/$CHOST/arm-elf + + make all-gcc all-target-libgcc +} + +package() { + cd $srcdir/gcc-$pkgver/build + + export CFLAGS="-O2 -pipe" + export CXXFLAGS="-O2 -pipe" + + make DESTDIR=$pkgdir install-gcc install-target-libgcc + + rm -f $pkgdir/usr/share/man/man7/fsf-funding.7* + rm -f $pkgdir/usr/share/man/man7/gfdl.7* + rm -f $pkgdir/usr/share/man/man7/gpl.7* + rm -rf $pkgdir/usr/share/info + + cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/ + rm -rf $pkgdir/usr/libexec + + # strip it manually + strip $pkgdir/usr/bin/* 2>/dev/null || true + find $pkgdir/usr/lib -type f -exec arm-elf-strip --strip-debug --strip-unneeded {} \; 2>/dev/null || true +} diff --git a/community-testing/avr-gcc/PKGBUILD b/community-testing/avr-gcc/PKGBUILD new file mode 100644 index 000000000..8e0e7cf79 --- /dev/null +++ b/community-testing/avr-gcc/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 75112 2012-08-14 08:28:11Z allan $ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> +# Contributor: danst0 <danst0@west.de> + +# Build order: avr-binutils -> avr-gcc -> avr-libc + +pkgname=avr-gcc +_pkgname=gcc +pkgver=4.7.1 +pkgrel=2 +pkgdesc="The GNU AVR Compiler Collection" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'custom') +url="http://gcc.gnu.org/" +depends=('avr-binutils>=2.22-3' 'cloog' 'ppl' 'gcc-libs>=4.7.0' 'libmpc') +provides=("gcc-avr=$pkgver") +replaces=('gcc-avr') +options=('!libtool' '!emptydirs' '!libtool' '!strip') +source=(http://ftp.gnu.org/gnu/gcc/${_pkgname}-${pkgver}/gcc-${pkgver}.tar.bz2) + +_basedir=${srcdir}/${_pkgname}-${pkgver} + +build() { + # default CFLAGS lead to issues later on when configure + # calls avr-gcc with -march set. + export CFLAGS="-O2 -pipe" + export CXXFLAGS="-O2 -pipe" + + cd ${_basedir} + + # Do not install libiberty + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + + echo ${pkgver} > gcc/BASE-VER + + cd ${srcdir} + mkdir gcc-build && cd gcc-build + + ${_basedir}/configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-languages=c,c++ \ + --disable-libssp \ + --disable-nls \ + --target=avr \ + --with-as=/usr/bin/avr-as \ + --with-ld=/usr/bin/avr-ld \ + --with-gnu-as \ + --with-gnu-ld + + make +} + +package() { + cd ${srcdir}/gcc-build + + make -j1 DESTDIR=${pkgdir} install + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION + + rm -rf ${pkgdir}/usr/share/man/man7 + rm -rf ${pkgdir}/usr/share/info +} + +md5sums=('933e6f15f51c031060af64a9e14149ff') diff --git a/community-testing/mingw32-gcc/PKGBUILD b/community-testing/mingw32-gcc/PKGBUILD new file mode 100644 index 000000000..f20bf03b5 --- /dev/null +++ b/community-testing/mingw32-gcc/PKGBUILD @@ -0,0 +1,78 @@ +# $Id: PKGBUILD 75113 2012-08-14 08:28:16Z allan $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Ondrej Jirman <megous@megous.com> + +pkgname=mingw32-gcc +pkgver=4.7.0 +pkgrel=2 +_uprel=1 +arch=(i686 x86_64) +pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux" +depends=('mingw32-pthreads' 'mingw32-runtime' 'mingw32-binutils' 'mingw32-w32api' + 'libmpc' 'elfutils' 'gmp') +replaces=('mingw32-gcc-base') +provides=('mingw32-gcc-base') +options=(!strip) +url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/" +license=(GPL LGPL) +source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma + gcc-1-mingw-float.patch) +md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d' + '2407123c35c0aa92ee5ffc27decca9a7') + +build() +{ + [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2 + + patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch + + mkdir -p $srcdir/build + cd $srcdir/build + + unset CFLAGS CXXFLAGS + + chmod ugo+x $srcdir/gcc-$pkgver/configure + chmod ugo+x $srcdir/gcc-$pkgver/move-if-change + + msg "gcc" + [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \ + --target=i486-mingw32 \ + --host=$CHOST \ + --build=$CHOST \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-languages=c,c++ \ + --enable-shared \ + --enable-sjlj-exceptions \ + --enable-hash-synchronization \ + --disable-nls \ + --disable-libssp \ + --enable-libgomp + + make + make install DESTDIR=$pkgdir + + msg "libgcc" + make -j1 -C i486-mingw32/libgcc DESTDIR=${pkgdir} libgcc_eh.a install + + msg "libstdc++" + make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install + + msg "fixes" + cd $pkgdir/usr/i486-mingw32/lib + mkdir -p $pkgdir/usr/i486-mingw32/bin/ + for i in `ls -1 *.dll`; do + ln -s ../lib/$i $pkgdir/usr/i486-mingw32/bin/$i + done + + cd $pkgdir + rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \ + usr/{include,lib/libiberty.a} \ + usr/share/{info,man} \ + usr/share/gcc-$pkgver/python + + strip usr/bin/* + strip usr/lib/gcc/i486-mingw32/$pkgver/{cc1*,collect2} + i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a +} diff --git a/community-testing/mingw32-gcc/gcc-1-mingw-float.patch b/community-testing/mingw32-gcc/gcc-1-mingw-float.patch new file mode 100644 index 000000000..365949ad7 --- /dev/null +++ b/community-testing/mingw32-gcc/gcc-1-mingw-float.patch @@ -0,0 +1,18 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html +http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 + +diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h +--- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200 ++++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200 +@@ -275,3 +275,7 @@ + #endif /* __STDC_WANT_DEC_FP__ */ + + #endif /* _FLOAT_H___ */ ++ ++#ifdef __MINGW32__ ++#include_next<float.h> ++#endif diff --git a/community/arm-elf-gcc-base/PKGBUILD b/community/arm-elf-gcc-base/PKGBUILD index c3847cddf..589519c3f 100644 --- a/community/arm-elf-gcc-base/PKGBUILD +++ b/community/arm-elf-gcc-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69206 2012-04-10 03:43:35Z spupykin $ +# $Id: PKGBUILD 75206 2012-08-16 01:56:31Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=arm-elf-gcc-base pkgver=4.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Compiler Collection" arch=(i686 x86_64) license=('GPL' 'LGPL') diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD index a588f3448..69c6234ab 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 66461 2012-02-25 03:07:56Z lfleischer $ +# $Id: PKGBUILD 75188 2012-08-15 18:36:09Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=autofs -pkgver=5.0.6 -pkgrel=3 +pkgver=5.0.7 +pkgrel=1 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://freshmeat.net/projects/autofs' license=('GPL2') -depends=('libldap' 'libxml2' 'krb5') +depends=('libxml2') +makedepends=('libldap' 'krb5') +optdepends=('krb5: for LDAP support') backup=('etc/autofs/auto.master' 'etc/autofs/auto.misc' 'etc/conf.d/autofs') options=(!makeflags) install='autofs.install' source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" - "http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/patches-5.0.7/${pkgname}-${pkgver}-fix-ipv6-name-for-lookup-fix.patch" 'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc') -md5sums=('44cea7f711e2290a0b50fddeda079705' - '221bf50d6e496b22014a9a7b234fe556' +md5sums=('bc46838dece83c02d800ff144ed9f431' 'e307bf6d2638e46eeb916cf42fe029b2' '47f597c870410055e0fdb66103daf928' 'a6cefb591e77b31b79dbb7243646c96b' @@ -36,10 +36,8 @@ build() { sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \ Makefile.rules - patch -p1 -i "../${pkgname}-${pkgver}-fix-ipv6-name-for-lookup-fix.patch" - ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \ - --enable-ignore-busy + --enable-ignore-busy --with-systemd make } @@ -52,4 +50,6 @@ package() { install -Dm0644 "${srcdir}/auto.misc" "${pkgdir}/etc/autofs/auto.misc" install -Dm0755 "${srcdir}/autofs" "${pkgdir}/etc/rc.d/autofs" install -Dm0644 "${srcdir}/autofs.conf.d" "${pkgdir}/etc/conf.d/autofs" + + install -Dm0644 "samples/autofs.service" "${pkgdir}/usr/lib/systemd/system/autofs.service" } diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD index eb2b80368..2b28e0904 100644 --- a/community/avr-gcc/PKGBUILD +++ b/community/avr-gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72946 2012-06-25 12:14:03Z schuay $ +# $Id: PKGBUILD 75204 2012-08-16 01:56:23Z allan $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -9,7 +9,7 @@ pkgname=avr-gcc _pkgname=gcc pkgver=4.7.1 -pkgrel=1.1 +pkgrel=2 pkgdesc="The GNU AVR Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'custom') diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD index dbe53d8f6..140834e21 100644 --- a/community/cdrtools/PKGBUILD +++ b/community/cdrtools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 72573 2012-06-16 18:43:00Z stativ $ +# $Id: PKGBUILD 75213 2012-08-16 09:19:22Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=cdrtools -pkgver=3.01a07 -pkgrel=4 +pkgver=3.01a08 +pkgrel=1 pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning" arch=('i686' 'x86_64') url="http://cdrecord.berlios.de/private/cdrecord.html" @@ -14,7 +14,7 @@ options=(!makeflags) backup=('etc/default/cdrecord' 'etc/default/rscsi') install=cdrtools.install source=(ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.gz) -md5sums=('b690d11ee6c9464b89d8684172807b51') +md5sums=('bed40540ef0dfc41d4b6e62c70012a01') build() { cd "$srcdir"/cdrtools-${pkgver%%a*} diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD index 92b791fd4..207f18023 100755 --- a/community/e-modules-extra-svn/PKGBUILD +++ b/community/e-modules-extra-svn/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-modules-extra-svn -pkgver=72689 +pkgver=75192 pkgrel=1 pkgdesc="Extra gadgets for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index c31e34f38..bb40f9079 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72779 2012-06-22 09:56:44Z rvanharen $ +# $Id: PKGBUILD 75145 2012-08-14 09:52:54Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-svn -pkgver=72689 +pkgver=75235 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ groups=('e17-svn') url="http://www.enlightenment.org" license=('BSD') depends=('e_dbus-svn' 'edje-svn' 'efreet-svn' 'alsa-lib' 'pm-utils' - 'pam' 'eeze-svn') + 'pam' 'eeze-svn' 'eio-svn') makedepends=('svn') conflicts=('e') provides=('e' 'notification-daemon') diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index a9cb530a5..2c8a27455 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72771 2012-06-22 09:49:33Z rvanharen $ +# $Id: PKGBUILD 75143 2012-08-14 09:52:21Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e_dbus-svn -pkgver=71548 +pkgver=75202 pkgrel=1 pkgdesc="dbus abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index 407c34e64..46ba8de11 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72757 2012-06-22 09:44:19Z rvanharen $ +# $Id: PKGBUILD 75125 2012-08-14 09:47:15Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ecore-svn -pkgver=72684 +pkgver=75234 pkgrel=1 pkgdesc="Ecore is an abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') @@ -52,6 +52,6 @@ package(){ install -Dm644 $srcdir/$_svnmod-build/COPYING \ $pkgdir/usr/share/licenses/$pkgname/COPYING - rm -r $startdir/src/$_svnmod-build + rm -r $srcdir/$_svnmod-build } diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index 96e78dbeb..5988cdb7f 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72764 2012-06-22 09:46:56Z rvanharen $ +# $Id: PKGBUILD 75134 2012-08-14 09:50:05Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=edje-svn -pkgver=72679 +pkgver=75185 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index 707429fa8..5812b00d0 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72752 2012-06-22 09:42:01Z rvanharen $ +# $Id: PKGBUILD 75120 2012-08-14 09:45:53Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet-svn -pkgver=72253 +pkgver=75190 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD index 685ecc633..0f9cd40c6 100644 --- a/community/eeze-svn/PKGBUILD +++ b/community/eeze-svn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72760 2012-06-22 09:45:39Z rvanharen $ +# $Id: PKGBUILD 75130 2012-08-14 09:48:59Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: bluebugs pkgname=eeze-svn -pkgver=72008 +pkgver=75095 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index e866e7a0d..1b4c31b14 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72769 2012-06-22 09:48:52Z rvanharen $ +# $Id: PKGBUILD 75141 2012-08-14 09:51:39Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=efreet-svn -pkgver=72387 +pkgver=75107 pkgrel=1 pkgdesc="freedesktop.org specifications for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 07781145b..79c8bce7d 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72750 2012-06-22 09:41:17Z rvanharen $ +# $Id: PKGBUILD 75118 2012-08-14 09:45:09Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina-svn -pkgver=72252 +pkgver=75110 pkgrel=1 pkgdesc="E17 file chunk reading/writing library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eio-svn/PKGBUILD b/community/eio-svn/PKGBUILD index 6992dc2aa..0a0b06cf8 100644 --- a/community/eio-svn/PKGBUILD +++ b/community/eio-svn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 72758 2012-06-22 09:44:59Z rvanharen $ +# $Id: PKGBUILD 75128 2012-08-14 09:48:06Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=eio-svn -pkgver=72607 +pkgver=75111 pkgrel=1 pkgdesc="Async IO library" arch=('i686' 'x86_64') diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD index 231f999f7..55bf6ec6a 100644 --- a/community/elementary-svn/PKGBUILD +++ b/community/elementary-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72775 2012-06-22 09:50:54Z rvanharen $ +# $Id: PKGBUILD 75150 2012-08-14 09:56:14Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=elementary-svn -pkgver=72678 +pkgver=75227 pkgrel=1 pkgdesc="Enlightenment's basic widget set" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD index 3bdd160e3..064ee25d1 100755 --- a/community/embryo-svn/PKGBUILD +++ b/community/embryo-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72762 2012-06-22 09:46:18Z rvanharen $ +# $Id: PKGBUILD 75132 2012-08-14 09:49:39Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo-svn -pkgver=72112 +pkgver=75095 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/emotion-svn/PKGBUILD b/community/emotion-svn/PKGBUILD index 4f39fda91..c9d82c17f 100644 --- a/community/emotion-svn/PKGBUILD +++ b/community/emotion-svn/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=emotion-svn -pkgver=72440 +pkgver=75111 pkgrel=1 pkgdesc="Library to easily integrate media playback into EFL applications" arch=('i686' 'x86_64') diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD index 7cfd507da..4ede6336a 100755 --- a/community/emprint-svn/PKGBUILD +++ b/community/emprint-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72773 2012-06-22 09:50:16Z rvanharen $ +# $Id: PKGBUILD 75148 2012-08-14 09:55:49Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=emprint-svn -pkgver=67364 +pkgver=74533 pkgrel=1 pkgdesc="screenshot module for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/ethumb-svn/PKGBUILD b/community/ethumb-svn/PKGBUILD index e8f8fb347..0f2a67fa5 100644 --- a/community/ethumb-svn/PKGBUILD +++ b/community/ethumb-svn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 72767 2012-06-22 09:48:11Z rvanharen $ +# $Id: PKGBUILD 75153 2012-08-14 09:58:33Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=ethumb-svn -pkgver=72603 +pkgver=75111 pkgrel=1 pkgdesc="Thumbnailing library" arch=('i686' 'x86_64') diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index 286b6ee40..e926c1516 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72754 2012-06-22 09:42:43Z rvanharen $ +# $Id: PKGBUILD 75159 2012-08-14 10:07:10Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas-svn -pkgver=72604 +pkgver=75236 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ groups=('e17-libs-svn' 'e17-svn') url="http://www.enlightenment.org" license=('BSD') depends=('giflib' 'librsvg' 'eet-svn' 'cairo' 'libjpeg' 'libxrender' 'mesa' - 'fribidi' 'fontconfig') + 'fribidi' 'fontconfig' 'evas_generic_loaders-svn') makedepends=('subversion') conflicts=('evas') provides=('evas') diff --git a/community/evas_generic_loaders-svn/PKGBUILD b/community/evas_generic_loaders-svn/PKGBUILD index 402a429f5..1eda842a0 100644 --- a/community/evas_generic_loaders-svn/PKGBUILD +++ b/community/evas_generic_loaders-svn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72970 2012-06-25 18:51:00Z foutrelis $ +# $Id: PKGBUILD 75123 2012-08-14 09:46:37Z rvanharen $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas_generic_loaders-svn -pkgver=72171 -pkgrel=2 +pkgver=75109 +pkgrel=1 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') groups=('e17-libs-svn' 'e17-svn') diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index 5392e5b05..f0b640ad8 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at> pkgname=fb-client -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64' 'mips64el') @@ -9,8 +9,8 @@ license=('GPL3') depends=('curl') optdepends=('xclip: for automatically copying the URL into the clipboard') source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig}) -md5sums=('5b96884795a568dd07d7af3856427ea0' - 'e42a87b7c564c127d528fb34d596eacb') +md5sums=('7e9a5436b138f67c6b75209034d8a729' + '816da30af8582407adf9701890257b8d') build() { cd "$srcdir/fb-$pkgver" diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD index fd487c44f..c3df5c8be 100644 --- a/community/fish/PKGBUILD +++ b/community/fish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74993 2012-08-11 09:42:41Z bpiotrowski $ +# $Id: PKGBUILD 75266 2012-08-17 10:28:57Z bpiotrowski $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> @@ -7,7 +7,7 @@ pkgname=fish pkgver=2.0b2 -pkgrel=2 +pkgrel=3 pkgdesc='Smart and user friendly shell intended mostly for interactive use' arch=('i686' 'x86_64' 'mips64el') url='http://ridiculousfish.com/shell/' diff --git a/community/fish/fish.install b/community/fish/fish.install index 765006f95..49a65ad82 100644 --- a/community/fish/fish.install +++ b/community/fish/fish.install @@ -1,5 +1,5 @@ post_install() { - grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells + grep -q '/usr/bin/fish' etc/shells || echo '/usr/bin/fish' >> etc/shells } post_upgrade() { diff --git a/community/icecast/PKGBUILD b/community/icecast/PKGBUILD index cf2130e4e..94fffe4e2 100644 --- a/community/icecast/PKGBUILD +++ b/community/icecast/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72696 2012-06-20 10:14:35Z lfleischer $ +# $Id: PKGBUILD 75222 2012-08-16 11:13:33Z lfleischer $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -6,7 +6,7 @@ pkgname=icecast pkgver=2.3.3 -pkgrel=1 +pkgrel=2 pkgdesc='Streaming audio over the Internet' arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -17,11 +17,13 @@ backup=('etc/icecast.xml' source=("http://downloads.us.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'icecastd' 'icecast.logrotate' - 'start-by-nobody.patch') + 'start-by-nobody.patch' + 'icecast.service') md5sums=('2b5d1b40778922e5f6431b7758c359ad' 'e823c1fdb080aae3d0c54ef8be95f7cb' '59c6552bcb1dd9fb542af8670dfabd3c' - 'd8e929d2214123a1954da4383bf16583') + 'd8e929d2214123a1954da4383bf16583' + 'ada6c389351af0487b5c62198adb4e2f') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -47,4 +49,7 @@ package() { # create log directory install -d -g99 -o99 "${pkgdir}/var/log/icecast" + + # install systemd unit + install -Dm0644 "${srcdir}/icecast.service" "${pkgdir}/usr/lib/systemd/system/icecast.service" } diff --git a/community/icecast/icecast.service b/community/icecast/icecast.service new file mode 100644 index 000000000..fb3900b45 --- /dev/null +++ b/community/icecast/icecast.service @@ -0,0 +1,9 @@ +[Unit] +Description=Icecast Network Audio Streaming Server +After=network.target + +[Service] +ExecStart=/usr/bin/icecast -b -c /etc/icecast.xml + +[Install] +WantedBy=multi-user.target diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index a818d85c4..ca83988f5 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74779 2012-08-04 01:16:35Z seblu $ +# $Id: PKGBUILD 75108 2012-08-14 06:07:46Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=keepalived -pkgver=1.2.4 +pkgver=1.2.5 pkgrel=1 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.rc' 'keepalived.service' 'keepalived.conf') -md5sums=('86d39fb62be4e2eef4417af4298dec48' +md5sums=('fce2b998cb3c81a4eb8eb960b1d8413f' '0d7ea6296bce403a5d24be305a0a9d73' '7a327df915700dcd45a049d099c9c42b' '9c8142da8730ad27a345587dea83ced7') diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index 834a79fa2..8011689e3 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75065 2012-08-13 13:28:06Z bpiotrowski $ +# $Id: PKGBUILD 75270 2012-08-17 10:52:47Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -6,7 +6,7 @@ pkgname=libfm pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library for file management" url="http://pcmanfm.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/libfm/libfm.install b/community/libfm/libfm.install index 1a6a34b9a..e83eccb55 100644 --- a/community/libfm/libfm.install +++ b/community/libfm/libfm.install @@ -1,7 +1,7 @@ post_install() { update-mime-database /usr/share/mime > /dev/null update-desktop-database -q - [ -d /usr/lib/gio/modules ] && gio-querymodules /usr/lib/gio/modules + #[ -d /usr/lib/gio/modules ] && gio-querymodules /usr/lib/gio/modules } post_upgrade() { diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD index a77b8a4e3..f34717346 100644 --- a/community/minbif/PKGBUILD +++ b/community/minbif/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66328 2012-02-23 15:30:58Z lfleischer $ +# $Id: PKGBUILD 75192 2012-08-15 19:32:50Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: AkiraYB <brunoyb!yahoo,com,br> pkgname=minbif pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc='An IRC gateway to IM networks that uses libpurple.' arch=('i686' 'x86_64' 'mips64el') url='http://minbif.im/' @@ -16,13 +16,22 @@ backup=('etc/minbif/minbif.conf' 'etc/minbif/minbif.motd') install='minbif.install' source=("http://minbif.im/attachments/download/148/${pkgname}-${pkgver}.tar.gz" - 'minbif') + 'minbif-gcc-4.7.patch' + 'minbif' + 'minbif.service' + 'minbif.tmpfiles.conf') md5sums=('00c5c1abbe2b8a9d900961832c7909a8' - '307a6fab42bcaeed11a55b5fb4589778') + '2235c45d5bdb01e9ef4b11d2a41d49bb' + '307a6fab42bcaeed11a55b5fb4589778' + 'b34876e339a37dfb1dc6cd0b9d8edf9d' + '3360f5d1bf9bc69fd9b7c9326f321dc3') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # build fixes + patch -p1 -i ../minbif-gcc-4.7.patch + make PREFIX=/usr CONF_PREFIX=/etc/minbif ENABLE_MINBIF=ON ENABLE_IMLIB=ON ENABLE_CACA=ON \ ENABLE_VIDEO=OFF ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF } @@ -36,4 +45,7 @@ package() { install -Dm0755 "${srcdir}/minbif" "${pkgdir}/etc/rc.d/minbif" make DESTDIR="${pkgdir}" install + + install -Dm0644 "${srcdir}/minbif.service" "${pkgdir}/usr/lib/systemd/system/minbif.service" + install -Dm0644 "${srcdir}/minbif.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/minbif.conf" } diff --git a/community/minbif/minbif-gcc-4.7.patch b/community/minbif/minbif-gcc-4.7.patch new file mode 100644 index 000000000..b6aceb57a --- /dev/null +++ b/community/minbif/minbif-gcc-4.7.patch @@ -0,0 +1,98 @@ +diff --git a/src/im/account.cpp b/src/im/account.cpp +index f155334..21baa5f 100644 +--- a/src/im/account.cpp ++++ b/src/im/account.cpp +@@ -18,6 +18,7 @@ + + #include <cassert> + #include <cstring> ++#include <unistd.h> + #ifdef HAVE_IMLIB + #include <Imlib2.h> + #endif /* HAVE_IMLIB */ +diff --git a/src/im/request.cpp b/src/im/request.cpp +index e72cbc9..a247e3b 100644 +--- a/src/im/request.cpp ++++ b/src/im/request.cpp +@@ -18,6 +18,7 @@ + + #include <errno.h> + #include <string.h> ++#include <unistd.h> + + #include "request.h" + #include "buddy.h" +diff --git a/src/irc/dcc.cpp b/src/irc/dcc.cpp +index 6d05034..231122c 100644 +--- a/src/irc/dcc.cpp ++++ b/src/irc/dcc.cpp +@@ -23,6 +23,7 @@ + #include <string.h> + #include <sys/types.h> + #include <netinet/in.h> ++#include <unistd.h> + + #include "dcc.h" + #include "nick.h" +diff --git a/src/irc/irc.cpp b/src/irc/irc.cpp +index 5d28acb..116d9db 100644 +--- a/src/irc/irc.cpp ++++ b/src/irc/irc.cpp +@@ -246,7 +246,7 @@ Nick* IRC::getNick(string nickname, bool case_sensitive) const + Buddy* IRC::getNick(const im::Buddy& buddy) const + { + map<string, Nick*>::const_iterator it; +- Buddy* nb; ++ Buddy* nb = NULL; + for(it = users.begin(); + it != users.end() && (!(nb = dynamic_cast<Buddy*>(it->second)) || nb->getBuddy() != buddy); + ++it) +@@ -261,7 +261,7 @@ Buddy* IRC::getNick(const im::Buddy& buddy) const + ConvNick* IRC::getNick(const im::Conversation& conv) const + { + map<string, Nick*>::const_iterator it; +- ConvNick* n; ++ ConvNick* n = NULL; + for(it = users.begin(); + it != users.end() && (!(n = dynamic_cast<ConvNick*>(it->second)) || n->getConversation() != conv); + ++it) +diff --git a/src/server_poll/daemon_fork.cpp b/src/server_poll/daemon_fork.cpp +index 53606a0..e205a61 100644 +--- a/src/server_poll/daemon_fork.cpp ++++ b/src/server_poll/daemon_fork.cpp +@@ -20,7 +20,7 @@ + #include <cassert> + #include <cstring> + #include <cerrno> +-#include <glib/gmain.h> ++#include <glib.h> + #include <sys/socket.h> + #include <sys/stat.h> + #include <arpa/inet.h> +diff --git a/src/server_poll/inetd.cpp b/src/server_poll/inetd.cpp +index 291c40f..f747e74 100644 +--- a/src/server_poll/inetd.cpp ++++ b/src/server_poll/inetd.cpp +@@ -17,7 +17,8 @@ + */ + + #include <cassert> +-#include <glib/gmain.h> ++#include <glib.h> ++#include <unistd.h> + + #include "inetd.h" + #include "irc/irc.h" +diff --git a/src/sockwrap/sockwrap.cpp b/src/sockwrap/sockwrap.cpp +index f10755c..478c616 100644 +--- a/src/sockwrap/sockwrap.cpp ++++ b/src/sockwrap/sockwrap.cpp +@@ -16,6 +16,8 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include <unistd.h> ++ + #include "sockwrap.h" + #include "sockwrap_plain.h" + #ifdef HAVE_TLS diff --git a/community/minbif/minbif.service b/community/minbif/minbif.service new file mode 100644 index 000000000..89ab2d4ca --- /dev/null +++ b/community/minbif/minbif.service @@ -0,0 +1,11 @@ +[Unit] +Description=minbif daemon + +[Service] +Type=forking +PIDFile=/run/minbif/minbif.pid +User=minbif +ExecStart=/usr/bin/minbif --pidfile /run/minbif/minbif.pid /etc/minbif/minbif.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/minbif/minbif.tmpfiles.conf b/community/minbif/minbif.tmpfiles.conf new file mode 100644 index 000000000..bf46cc25c --- /dev/null +++ b/community/minbif/minbif.tmpfiles.conf @@ -0,0 +1 @@ +d /run/minbif - minbif minbif - diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD index 4603b2af1..e782b7643 100644 --- a/community/mingw32-gcc/PKGBUILD +++ b/community/mingw32-gcc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72371 2012-06-13 10:02:07Z spupykin $ +# $Id: PKGBUILD 75205 2012-08-16 01:56:28Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> pkgname=mingw32-gcc pkgver=4.7.0 -pkgrel=1 +pkgrel=2 _uprel=1 arch=(i686 x86_64 mips64el) pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux" diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD index 7b84044d4..3cbac92fc 100644 --- a/community/multipath-tools/PKGBUILD +++ b/community/multipath-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73313 2012-07-06 07:32:23Z bpiotrowski $ +# $Id: PKGBUILD 75262 2012-08-17 10:00:23Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas S Hatch <thatch45 ar gmail dot com> # Contributor: Michael P <ptchinster@archlinux.us> @@ -6,7 +6,7 @@ pkgname=multipath-tools pkgver=0.4.9 -pkgrel=9 +pkgrel=10 pkgdesc='Multipath tools for Linux' arch=('i686' 'x86_64' 'mips64el') url="http://christophe.varoqui.free.fr/" @@ -16,13 +16,14 @@ backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') install=multipath-tools.install options=(!emptydirs) source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2 - multipath.conf multipath.conf.annotated multipathd.rc + rc.d service multipath.conf multipath.conf.annotated fix-build.patch buffer-overflows.patch log_enquery_overflow.patch blacklist-cciss-devices.patch explicitly-include-posix_types.h.patch) md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765' + '7c04ef96441363b0d43a2ebb13a87659' + '4843e91a83660e4b3acfb2d804fa344e' '9324ff0ba8330dcb21b2fcf64988026f' 'be11462922eeeb9fcd2ba5f3f137b7d9' - '7c04ef96441363b0d43a2ebb13a87659' '885c0ba9c90b73cc93aa3f78005f81d6' 'c5aab36777b0304a3525533cdd31bddc' '00eae05e02f1b85062e998574ab1b833' @@ -45,7 +46,8 @@ build() { package() { make LIB='usr/lib' DESTDIR="$pkgdir" bindir='/usr/bin' libudevdir='/usr/lib/udev' install - install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf - install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated - install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd + install -Dm644 multipath.conf "$pkgdir"/etc/multipath.conf + install -Dm644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated + install -Dm755 rc.d "$pkgdir"/etc/rc.d/multipathd + install -Dm644 service "$pkgdir"/usr/lib/systemd/system/multipathd.service } diff --git a/community/multipath-tools/rc.d b/community/multipath-tools/rc.d new file mode 100644 index 000000000..7f5ef5d6a --- /dev/null +++ b/community/multipath-tools/rc.d @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting multipathd" + /usr/bin/multipathd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon multipathd + stat_done + fi + ;; + stop) + stat_busy "Stopping multipathd" + [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon multipathd + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/multipath-tools/service b/community/multipath-tools/service new file mode 100644 index 000000000..a70d0ee1f --- /dev/null +++ b/community/multipath-tools/service @@ -0,0 +1,12 @@ +[Unit] +Description=Device-Mapper Multipath Device Controller +After=syslog.target + +[Service] +Type=forking +PIDFile=/var/run/multipathd.pid +ExecStart=/sbin/multipathd +ExecReload=/sbin/multipathd reconfigure + +[Install] +WantedBy=multi-user.target diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD index 10fcf8ede..99c551cc0 100644 --- a/community/ntop/PKGBUILD +++ b/community/ntop/PKGBUILD @@ -1,28 +1,35 @@ -# $Id: PKGBUILD 59714 2011-11-29 13:35:19Z stephane $ +# $Id: PKGBUILD 75281 2012-08-17 18:35:49Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=ntop -pkgver=4.1.0 +pkgver=5.0 pkgrel=2 pkgdesc='A network traffic probe that shows the network usage.' arch=('i686' 'x86_64' 'mips64el') url='http://www.ntop.org/' license=('GPL') -depends=('libevent' 'libpcap' 'gd' 'glib' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua') +depends=('libevent' 'libpcap' 'gd' 'glibc' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua') +makedepends=('subversion' 'ca-certificates') options=('!libtool' '!makeflags') install='ntop.install' source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz" 'ntop' - 'ntop.conf.d') -md5sums=('116df99cf548431393991ea15443c52f' + 'ntop.conf.d' + 'ntop.service') +md5sums=('e4115a6609fd2def2dce177772f9a789' '7b0d7bb57432e768ff387e9f7236f87c' - '6a9371de1dcf31d8ef13a4cf349c02b3') + '6a9371de1dcf31d8ef13a4cf349c02b3' + 'bcb2bcfb4b573babdee7d9321591e3e3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-snmp + echo 't' | svn export -r 5614 'https://svn.ntop.org/svn/ntop/trunk/nDPI/' + tar -czvf nDPI-svn5614.tar.gz nDPI + + ./autogen.sh --noconfig + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-snmp make } @@ -41,4 +48,6 @@ package() { _plug="$(basename ${_f})" ln -sf "../../lib${_plug}" "${_f}" done + + install -Dm0644 "${srcdir}/ntop.service" "${pkgdir}/usr/lib/systemd/system/ntop.service" } diff --git a/community/ntop/ntop.service b/community/ntop/ntop.service new file mode 100644 index 000000000..20a9c66f9 --- /dev/null +++ b/community/ntop/ntop.service @@ -0,0 +1,14 @@ +[Unit] +Description=A network traffic probe similar to the UNIX top command +Requires=network.target +ConditionPathExists=/var/lib/ntop/ntop_pw.db +After=syslog.target network.target + +[Service] +Environment=LANG=C +ExecStart=/usr/sbin/ntop -i eth0 -w 3000 +Type=simple +StandardError=syslog + +[Install] +WantedBy=multi-user.target diff --git a/community/oidentd/PKGBUILD b/community/oidentd/PKGBUILD index 175c402ea..5c3872a0f 100644 --- a/community/oidentd/PKGBUILD +++ b/community/oidentd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72791 2012-06-22 12:51:10Z dreisner $ +# $Id: PKGBUILD 75286 2012-08-17 22:22:42Z heftig $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: simo <simo@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> @@ -6,7 +6,7 @@ pkgname=oidentd pkgver=2.0.8 -pkgrel=6 +pkgrel=7 pkgdesc='An RFC1413 compliant ident daemon' arch=('i686' 'x86_64' 'mips64el') url="http://dev.ojnk.net/" @@ -18,7 +18,7 @@ md5sums=('c3d9a56255819ef8904b867284386911' '93cbf742cdd0b053f67482273d715f25' '603307525771724b0f55a2c34fbc3f3e' 'b215bee5764cdecb0939f44d5d2dccbe' - '651c2ef45d1d345d95056ef0787e29e6') + '4442fb9fc10754914568e6ffc3d5fc42') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/oidentd/socket b/community/oidentd/socket index 63df7036e..cf00b55b8 100644 --- a/community/oidentd/socket +++ b/community/oidentd/socket @@ -1,6 +1,5 @@ [Unit] Description=Ident (RFC 1413) socket -Conflicts=oidentd.service [Socket] ListenStream=113 diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD index 64051b066..800463c0e 100644 --- a/community/polipo/PKGBUILD +++ b/community/polipo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74295 2012-07-23 16:25:48Z ttopper $ +# $Id: PKGBUILD 75176 2012-08-14 19:38:14Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Jelle van der Waa <jelle vdwaa nl> # Contributor: Thomas Holmquist <thomas@vorget.com> @@ -7,7 +7,7 @@ pkgname=polipo pkgver=1.0.4.1 -pkgrel=6 +pkgrel=7 pkgdesc="A small and fast caching web proxy." arch=('i686' 'x86_64' 'mips64el') url="http://www.pps.jussieu.fr/~jch/software/polipo/" @@ -21,7 +21,7 @@ md5sums=('bfc5c85289519658280e093a270d6703' 'bac0e1a871964c931eb5f7a369b3243c' '7406aad26807fb3a4e5f7b01ecb97a59' '685aa0c6070dee11c701932d23afcc6a' - '109d0e8c15d669281ff14f8991ad0ed8') + 'e96b164de3488afc7ab28b2edbe90fd1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/polipo/polipo.service b/community/polipo/polipo.service index a1bdd9aa2..057d1c3c2 100644 --- a/community/polipo/polipo.service +++ b/community/polipo/polipo.service @@ -2,9 +2,10 @@ Description=Polipo Proxy Server [Service] -ExecStart=/usr/bin/polipo +Type=oneshot +ExecStart=/usr/bin/polipo daemonise=true logFile="/var/log/polipo.log" User=nobody -ExecReload=/bin/kill -USR1 $MAINPID +RemainAfterExit=yes [Install] WantedBy=multi-user.target diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index 6a7be7134..763fcb9ba 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 73458 2012-07-08 00:12:47Z seblu $ +# $Id: PKGBUILD 75268 2012-08-17 10:49:54Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') -pkgver=0.5.1 +pkgver=0.6.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/psutil/' license=('custom: BSD') makedepends=('python' 'python-distribute' 'python2' 'python2-distribute') source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") -sha1sums=('e4276dd11b5f03c4397490736f6c6445a7e64798') +sha1sums=('f7a76e201601d8e06a1fdf434422f884888aac86') build() { cd psutil-$pkgver diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD index 25aae3a04..4d40e1fec 100644 --- a/community/redshift/PKGBUILD +++ b/community/redshift/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66452 2012-02-25 01:45:00Z lfleischer $ +# $Id: PKGBUILD 75276 2012-08-17 13:33:29Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Geoffrey Teale <tealeg@stop-squark> # Contributor: Mark, Huo Mian <markhuomian[at]gmail[dot]com> @@ -6,13 +6,14 @@ pkgname=redshift pkgver=1.7 -pkgrel=3 +pkgrel=4 pkgdesc='Adjusts the color temperature of your screen according to your surroundings.' arch=('i686' 'x86_64' 'mips64el') url='http://jonls.dk/redshift/' license=('GPL3') depends=('gconf' 'libxxf86vm') -optdepends=('pyxdg: for gtk-redshift' +optdepends=('pygtk: for gtk-redshift' + 'pyxdg: for gtk-redshift' 'librsvg: for gtk-redshift') makedepends=('python2') install='redshift.install' diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index bcd90a3e3..43c6d6a60 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70396 2012-05-05 14:23:49Z arodseth $ +# $Id: PKGBUILD 75168 2012-08-14 11:22:21Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -7,18 +7,19 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=1.1.3 -pkgrel=2 +pkgver=1.1.4 +pkgrel=1 arch=('x86_64' 'i686' 'mips64el') url="http://ruby-gnome2.sourceforge.jp/" license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('ed7cbe7a51e73b815d83321e0359d62f98d1c1504845e112c57cb8ebc6f6e70b') +sha256sums=('31c5da239bd1cb25daca026e453106f29503195c445d73a9cf1aceb22379d100') build() { cd "$srcdir/ruby-gtk2-$pkgver" - LANG="en_US.UTF-8" ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --topdir="$pkgdir" --vendor + LANG="en_US.UTF-8" ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango \ + --topdir="$pkgdir" --vendor make } @@ -56,7 +57,8 @@ package_ruby-glib2() { package_ruby-gtk2() { pkgdesc="Ruby bindings for gtk2" - depends=('gtk2' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver") + depends=('gtk2' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver" + "ruby-gdkpixbuf2=$pkgver") cd "$srcdir/ruby-gtk2-$pkgver/gtk2" make DESTDIR="$pkgdir" install diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 1c19fbf44..e520c5f69 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75012 2012-08-11 18:46:02Z dwallace $ +# $Id: PKGBUILD 75207 2012-08-16 01:57:26Z allan $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -8,7 +8,7 @@ pkgname=sage-mathematics pkgver=5.2 -pkgrel=1 +pkgrel=2 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' arch=('i686' 'x86_64') diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index 912d15ee2..a87cc4df0 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74358 2012-07-25 19:18:50Z bpiotrowski $ +# $Id: PKGBUILD 75235 2012-08-16 20:04:22Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> pkgname=spacefm -pkgver=0.7.10 +pkgver=0.7.11 pkgrel=1 pkgdesc="A multi-panel tabbed file manager" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ optdepends=('lsof: device processes' 'udisks: mount as non-root user' 'udisks2: mount as non-root user') source=(https://raw.github.com/IgnorantGuru/spacefm/master/packages/${pkgver}/spacefm-${pkgver}.tar.xz) -md5sums=('16de3087b7225b89fad93a0710f2bbcf') +md5sums=('99719d34fd60ad9514c10a25f52d0bb3') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD index e9f6cde95..ab22feaba 100644 --- a/community/supercollider/PKGBUILD +++ b/community/supercollider/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73052 2012-06-29 16:50:17Z speps $ +# $Id: PKGBUILD 75278 2012-08-17 15:40:58Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: <farid at archlinux-br.org> _name=SuperCollider pkgname=supercollider -pkgver=3.5.3 +pkgver=3.5.4 pkgrel=1 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition" arch=('i686' 'x86_64') @@ -18,11 +18,15 @@ optdepends=('emacs: emacs interface' 'ruby: vim support') install="$pkgname.install" source=("http://download.sourceforge.net/project/$pkgname/Source/$pkgver/$_name-$pkgver-Source-linux.tar.bz2") -md5sums=('84fde920c32e9644902f989136a35b91') +md5sums=('8f0cd3a77e3adf0fd44cf6882ad39703') build() { cd "$srcdir/$_name-Source" + ## glibc 2.16 + boost 1.49 fix + # https://svn.boost.org/trac/boost/ticket/6940 + sed -i "s/TIME_UTC/&_/" `grep -rl TIME_UTC .` + [ -d bld ] || mkdir bld && cd bld cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index c06cff90c..379268477 100644 --- a/community/synergy/PKGBUILD +++ b/community/synergy/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Dale Blount <dale@archlinux.org> pkgname=synergy -pkgver=1.4.6 +pkgver=1.4.10 pkgrel=1 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org" @@ -12,7 +12,8 @@ depends=('gcc-libs' 'libxtst' 'libxinerama' ) license=('GPL2') makedepends=('libxt' 'cmake') # used by configure to test for libx11... backup=('etc/synergy.conf') -source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "${pkgname}s.rc" ) +source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" "${pkgname}s.rc" "synergys.socket" "synergys.service") + build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" @@ -24,7 +25,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}-Source/bin" -# make DESTDIR="$pkgdir" install # doesn't work atm + #make DESTDIR="$pkgdir" install # doesn't work atm # install binary install -d "$pkgdir/usr/bin/" @@ -35,6 +36,13 @@ package() { install -d "${pkgdir}/etc/rc.d" install -Dm644 $srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example "${pkgdir}/etc" install -Dm755 $srcdir/${pkgname}s.rc "${pkgdir}/etc/rc.d/${pkgname}s" + + # Install systemd service and socket + install -d "$pkgdir/usr/lib/systemd/system" + install -Dm644 "$srcdir/synergys.service" "$pkgdir/usr/lib/systemd/system/" + install -Dm644 "$srcdir/synergys.socket" "$pkgdir/usr/lib/systemd/system/" } -md5sums=('3e1ecc4fcbfe6b130ac0c86c674f6db3' - '8f8c01add9bf6e3ae9f37a36ca6345b6') +md5sums=('18aee04a7e232e4d821f46ff24da3364' + '8f8c01add9bf6e3ae9f37a36ca6345b6' + '58f48336836d6faf3d5eecbe4155b77e' + 'b95e4b83d8a19c0bd81a15280078fcd5') diff --git a/community/synergy/synergys.service b/community/synergy/synergys.service new file mode 100644 index 000000000..56c1ac061 --- /dev/null +++ b/community/synergy/synergys.service @@ -0,0 +1,10 @@ +[Unit] +Description=Synergy Server Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/synergys --config /etc/synergy.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/synergy/synergys.socket b/community/synergy/synergys.socket new file mode 100644 index 000000000..dda1537ca --- /dev/null +++ b/community/synergy/synergys.socket @@ -0,0 +1,9 @@ +[Unit] +Conflicts=synergys.service + +[Socket] +ListenStream=24800 +Accept=false + +[Install] +WantedBy=sockets.target diff --git a/community/tabbed/PKGBUILD b/community/tabbed/PKGBUILD index 142c68a81..c4941e3ec 100644 --- a/community/tabbed/PKGBUILD +++ b/community/tabbed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57841 2011-11-03 11:24:18Z lfleischer $ +# $Id: PKGBUILD 75190 2012-08-15 18:40:41Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: totoloco <totoloco at gmx> pkgname=tabbed -pkgver=0.3 -pkgrel=2 +pkgver=0.4 +pkgrel=1 pkgdesc='Simple generic tabbed fronted to xembed aware applications.' arch=('i686' 'x86_64' 'mips64el') url='http://tools.suckless.org/tabbed' @@ -13,7 +13,7 @@ depends=('libx11') install='tabbed.install' source=("http://dl.suckless.org/tools/${pkgname}-${pkgver}.tar.gz" 'config.h') -md5sums=('4a30458f9adc38db549f735b8fb6451b' +md5sums=('855ee1245386193a17af3fb3fedf1281' '5aa6c1fdc7971b21363704391bea6e1b') build() { diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD index afa986c0e..1887815e3 100644 --- a/community/udevil/PKGBUILD +++ b/community/udevil/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74360 2012-07-25 19:22:08Z bpiotrowski $ +# $Id: PKGBUILD 75211 2012-08-16 07:12:48Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ pkgname=udevil -pkgver=0.3.1 +pkgver=0.3.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Mount and unmount without password' @@ -24,7 +24,7 @@ provides=('devmon') backup=('etc/udevil/udevil.conf') install=$pkgname.install source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz) -md5sums=('f2541fe24c83cbc2cb63c5912fc417d9') +md5sums=('47b8f9334266d65020daa4679f71b504') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/zaz/PKGBUILD b/community/zaz/PKGBUILD index cdec7be9c..c3ce418d0 100644 --- a/community/zaz/PKGBUILD +++ b/community/zaz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 64723 2012-02-18 02:57:50Z svenstaro $ +# $Id: PKGBUILD 75255 2012-08-17 04:30:40Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Adrián Chaves Fernández (aka Gallaecio) <adriyetichaves@gmail.com> # Contributor: Todd Partridge (aka Gen2ly) <toddrpartridge@gmail.com> pkgname=zaz pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Puzzle game where the player has to arrange balls in triplets." arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/zaz/" @@ -18,7 +18,7 @@ install=zaz.install build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-splash make } diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 7874f1ee9..391389f5c 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163511 2012-07-14 13:06:56Z allan $ +# $Id: PKGBUILD 165342 2012-08-16 01:57:38Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils pkgver=2.22 -pkgrel=9 +pkgrel=10 _date=20120323 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'mips64el') diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 92a1c9ace..1726aa10c 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164359 2012-07-31 19:25:50Z tomegun $ +# $Id: PKGBUILD 165243 2012-08-14 08:44:57Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup pkgver=1.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -17,7 +17,7 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 build() { cd "${srcdir}"/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr --disable-static --enable-cryptsetup-reencrypt make } diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index 86ad9dc8a..debbe962a 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 155703 2012-04-05 10:02:36Z ronald $ +# $Id: PKGBUILD 165283 2012-08-14 20:43:47Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.5.6 +pkgver=5.6.0 pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" -url="http://roy.marples.name/dhcpcd/" +url="http://roy.marples.name/projects/dhcpcd/" arch=('i686' 'x86_64' 'mips64el') license=('BSD') groups=('base') @@ -15,9 +15,10 @@ depends=('glibc' 'sh') backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd.conf.d') -sha1sums=('7f9ca207bce051252c0acb6a6cae3de22babcb20' - 'b67b9ce6a2faaca75fea356966a16be2283b7db0') + 'dhcpcd.conf.d' 'dhcpcd.service') +sha1sums=('28ad6931393420a72da307ee173466a9e00cd952' + 'b67b9ce6a2faaca75fea356966a16be2283b7db0' + '3d0542eab1b89a88d56ca427128228ac72c40d1f') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -48,4 +49,7 @@ package() { # Set Options in /etc/dhcpcd.conf echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall + + # install systemd files + install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service } diff --git a/core/dhcpcd/dhcpcd.service b/core/dhcpcd/dhcpcd.service new file mode 100644 index 000000000..25a1923ac --- /dev/null +++ b/core/dhcpcd/dhcpcd.service @@ -0,0 +1,13 @@ +[Unit] +Description=dhcpcd on %I +Wants=network.target +Before=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpcd-%I.pid +ExecStart=/sbin/dhcpcd -A -q -w %I +ExecStop=/sbin/dhcpcd -k %I + +[Install] +Alias=multi-user.target.wants/dhcpcd@eth0.service diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index 8d2ea793c..f57ab6319 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162199 2012-06-23 12:13:06Z ronald $ +# $Id: PKGBUILD 165284 2012-08-14 20:43:58Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.42.4 +pkgver=1.42.5 pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('944002c1f8f1f87e7d2d53263346b001962bc1f9' +sha1sums=('41bc6d247238eac65864193e6de941956da493cb' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 058e752be..faf1112a2 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163961 2012-07-23 02:59:09Z allan $ +# $Id: PKGBUILD 165339 2012-08-16 01:57:21Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -10,9 +10,9 @@ else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi pkgver=4.7.1 -pkgrel=5 +pkgrel=6 _snapshot=4.7-20120721 -_libstdcppmanver=20120605 # Note: check source directory name when updating this +_libstdcppmanver=20120725 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -32,7 +32,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 gcc-4.7.1-libada-pic.patch gcc-4.7.1-libgo-write.patch) md5sums=('a1a53fda426bc6809cede8e85bbaf2a3' - '767c62f9a047c4434f2345decf1d0819' + '79c4381f983b71868c02da3379e1e8a2' 'ced48436c1b3c981d721a829f1094de1' '474b8f5a7dee6ddd96b95a7240bfb961' '2acbc9d35cc9d72329dc71d6b1f162ef' @@ -189,8 +189,7 @@ package_gcc() rm -f $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 rm -f $pkgdir/usr/share/man/man3/ffi* - # many packages require these symlinks - ln -s /usr/bin/cpp ${pkgdir}/usr/lib/cpp + # many packages expect this symlinks ln -s gcc ${pkgdir}/usr/bin/cc # POSIX conformance launcher scripts for c89 and c99 diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 2cef407e5..c7c99fcb7 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163512 2012-07-14 13:07:15Z allan $ +# $Id: PKGBUILD 165343 2012-08-16 01:57:59Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,13 +6,13 @@ pkgname=glibc pkgver=2.16.0 -pkgrel=2 +pkgrel=3 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=3.4' 'tzdata') +depends=('linux-api-headers>=3.5' 'tzdata') makedepends=('gcc>=4.7') backup=(etc/gai.conf etc/locale.gen @@ -23,6 +23,7 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} http://ftp.gnu.org/gnu/libc/${pkgname}-ports-${pkgver}.tar.xz{,.sig} glibc-2.15-fix-res_query-assert.patch glibc-2.15-revert-c5a0802a.patch + glibc-2.16-rpcgen-cpp-path.patch nscd.rcd nscd.service nscd.tmpfiles @@ -40,12 +41,19 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=552960 patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch +<<<<<<< HEAD if [ "${CARCH}" = "mips64el" ]; then ln -s ../glibc-ports-${pkgver} ports # Fix typo making util-linux build fail. sed -i "s/_MIPS_SIM_ABIN32/_MIPS_SIM_NABI32/" ports/sysdeps/unix/sysv/linux/mips/Makefile fi +======= + # prevent need for /lib/cpp symlink + # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a + patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch + +>>>>>>> 07455ea1de16867b168628e8a9f7f5bffc169a5f cd ${srcdir} mkdir glibc-build cd glibc-build @@ -152,15 +160,3 @@ package() { usr/lib/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib/{pt_chown,{audit,gconv}/*.so} } - -md5sums=('80b181b02ab249524ec92822c0174cf7' - '2a1221a15575820751c325ef4d2fbb90' - '9a2439641be7ca8b01a3175324013031' - '218fc97a9f8777ac2688174d431e7722' - '31f415b41197d85d3bbee3d1eecd06a3' - '0a0383d50d63f1c02919fe9943b82014' - '589d79041aa767a5179eaa4e2737dd3f' - 'ad8a9af15ab7eeaa23dc7ee85024af9f' - 'bccbe5619e75cf1d97312ec3681c605c' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') diff --git a/core/glibc/glibc-2.16-rpcgen-cpp-path.patch b/core/glibc/glibc-2.16-rpcgen-cpp-path.patch new file mode 100644 index 000000000..822b57294 --- /dev/null +++ b/core/glibc/glibc-2.16-rpcgen-cpp-path.patch @@ -0,0 +1,68 @@ +diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c +index 06d951a..2103b10 100644 +--- a/sunrpc/rpc_main.c ++++ b/sunrpc/rpc_main.c +@@ -75,12 +75,9 @@ struct commandline + + static const char *cmdname; + +-#define SVR4_CPP "/usr/ccs/lib/cpp" +-#define SUNOS_CPP "/lib/cpp" +- + static const char *svcclosetime = "120"; + static int cppDefined; /* explicit path for C preprocessor */ +-static const char *CPP = SUNOS_CPP; ++static const char *CPP = "/lib/cpp"; + static const char CPPFLAGS[] = "-C"; + static char *pathbuf; + static int cpp_pid; +@@ -327,23 +324,17 @@ find_cpp (void) + { + struct stat buf; + +- if (stat (CPP, &buf) < 0) +- { /* /lib/cpp or explicit cpp does not exist */ +- if (cppDefined) +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); +- crash (); +- } +- else +- { /* try the other one */ +- CPP = SVR4_CPP; +- if (stat (CPP, &buf) < 0) +- { /* can't find any cpp */ +- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); +- crash (); +- } +- } ++ if (stat (CPP, &buf) == 0) ++ return; ++ ++ if (cppDefined) /* user specified cpp but it does not exist */ ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ crash (); + } ++ ++ /* fall back to system CPP */ ++ CPP = "cpp"; + } + + /* +@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define) + close (1); + dup2 (pd[1], 1); + close (pd[0]); +- execv (arglist[0], (char **) arglist); +- perror ("execv"); ++ execvp (arglist[0], (char **) arglist); ++ if (errno == ENOENT) ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ exit (1); ++ } ++ perror ("execvp"); + exit (1); + case -1: + perror ("fork"); diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 490886f6e..6b77e6817 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164210 2012-07-27 14:54:09Z ibiru $ +# $Id: PKGBUILD 165282 2012-08-14 20:43:06Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.14 -pkgrel=3 +pkgver=1.4.15 +pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -24,12 +24,11 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-raw.rules empty-security.rules 0503-extension_cppflags.patch - iptables-1.4.12-fixresore.patch iptables.service ip6tables.service iptables-flush) backup=(etc/conf.d/iptables) -sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' +sha1sums=('56ab3b143af2ad443c9652db3a38ef8869cd2207' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -41,7 +40,6 @@ sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' '44626980a52e49f345a0b1e1ca03060f3a35763c' - '7c018d48445ae41c0b9f345747e54b94cb0997b3' '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9' 'f1f16f44c6a5547b6f251d13007fe6585761e8b0' 'e7abda09c61142121b6695928d3b71ccd8fdf73a') @@ -54,11 +52,6 @@ build() { patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch - # Fix scope issue exposed by gcc 4.7 (patch by fryasu) - # http://bugzilla.netfilter.org/show_bug.cgi?id=774 - # (This will most likely be fixed in iptables 1.4.15) - patch -Np1 -i ${srcdir}/iptables-1.4.12-fixresore.patch - ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ diff --git a/core/libmpc/PKGBUILD b/core/libmpc/PKGBUILD index df2984082..0970274b5 100644 --- a/core/libmpc/PKGBUILD +++ b/core/libmpc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135910 2011-08-20 07:14:03Z allan $ +# $Id: PKGBUILD 165341 2012-08-16 01:57:32Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=libmpc -pkgver=0.9 -pkgrel=2 +pkgver=1.0 +pkgrel=1 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" arch=('i686' 'x86_64' 'mips64el') url="http://www.multiprecision.org/" @@ -11,18 +11,11 @@ license=('LGPL') depends=('mpfr>=3.0.0') options=('!libtool') install=libmpc.install -source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz - libmpc-0.9-configure_cflags_egrep_issue.patch) -md5sums=('0d6acab8d214bd7d1fbbc593e83dd00d' - '35d5bb02dc6c1153e581b7c34a738a08') +source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz) +md5sums=('13370ceb2e266c5eeb2f7e78c24b7858') build() { cd "${srcdir}/mpc-${pkgver}" - - # http://lists.gforge.inria.fr/pipermail/mpc-discuss/2011-February/000805.html - patch -Np1 -i $srcdir/libmpc-0.9-configure_cflags_egrep_issue.patch - autoreconf - ./configure --prefix=/usr make } diff --git a/core/net-tools/Makefile.patch b/core/net-tools/Makefile.patch new file mode 100644 index 000000000..aaacd6b78 --- /dev/null +++ b/core/net-tools/Makefile.patch @@ -0,0 +1,17 @@ +--- Makefile.old 2012-08-07 22:07:58.235437087 +0200 ++++ Makefile 2012-08-07 22:10:21.192104345 +0200 +@@ -239,12 +239,12 @@ + install -m 0755 -d ${BASEDIR}/bin + install -m 0755 arp ${BASEDIR}/sbin + install -m 0755 hostname ${BASEDIR}/bin +- install -m 0755 ifconfig ${BASEDIR}/bin ++ install -m 0755 ifconfig ${BASEDIR}/sbin + install -m 0755 nameif ${BASEDIR}/sbin + install -m 0755 netstat ${BASEDIR}/bin + install -m 0755 plipconfig $(BASEDIR)/sbin + install -m 0755 rarp ${BASEDIR}/sbin +- install -m 0755 route ${BASEDIR}/bin ++ install -m 0755 route ${BASEDIR}/sbin + install -m 0755 slattach $(BASEDIR)/sbin + ifeq ($(HAVE_IP_TOOLS),1) + install -m 0755 ipmaddr $(BASEDIR)/sbin diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD index fd9b0d216..f9203aac7 100644 --- a/core/net-tools/PKGBUILD +++ b/core/net-tools/PKGBUILD @@ -1,37 +1,33 @@ -# $Id: PKGBUILD 142384 2011-11-08 22:05:28Z ronald $ +# $Id: PKGBUILD 165285 2012-08-14 20:44:40Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=net-tools -pkgver=1.60.20110819cvs -pkgrel=3.1 +pkgver=1.60.20120804git +pkgrel=2 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64 'mips64el') license=('GPL2') -url="http://www.tazenda.demon.co.uk/phil/net-tools" +url="http://net-tools.sourceforge.net/" depends=('glibc') # http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 -# use cvs checkout instead -source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2 - net-tools-1.60-miiioctl.patch - net-tools-1.60-nameif_strncpy.patch) +# use git checkout instead +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz + Makefile.patch) options=(!makeflags) install=net-tools.install -sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf' - '654a96bc6575efb4a2e04b49de45d448d240eb6e' - '7888000d8fe867e58b5b00fe2bcf6c3041d716b4') - +sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82' + '4191ca56dc01d6aebe26c36c7cc060c638d5ebca') build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../net-tools-1.60-miiioctl.patch - patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np0 -i ${srcdir}/Makefile.patch yes "" | make } package() { - cd $srcdir/$pkgname-$pkgver - make BASEDIR=$pkgdir update + cd ${srcdir}/${pkgname}-${pkgver} + make BASEDIR=${pkgdir} update # the following is provided by yp-tools rm "${pkgdir}"/bin/{nis,yp}domainname diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index 4998ef636..0616f20c8 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160450 2012-06-02 03:17:41Z allan $ +# $Id: PKGBUILD 165376 2012-08-17 00:20:05Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_ver=1.8.5p2 +_ver=1.8.5p3 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool' '!makeflags') source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} sudo.pam) -md5sums=('dc42ed9f0946d92273762d0ae7314d59' - '756d80fc1c996d4f5458deec5a69b5c4' +md5sums=('aa50e0a9ca02ac35d1020881bd3a221f' + 'aceea97d5f4fe063d6803bead339364d' '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') build() { diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index a744ec262..510062cc1 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 163143 2012-07-08 09:30:39Z ibiru $ +# $Id: PKGBUILD 165272 2012-08-14 19:57:06Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.5.0 -pkgrel=5 +pkgver=2.6.0 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org" @@ -21,25 +21,12 @@ optdepends=("libgpod: support for Apple iPod audio devices" "ifuse: support for Apple iPod Touch and iPhone" "libmygpo-qt: gpodder.net Internet Service") install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - "toolbarfix.patch" - "amarok-2.5.0-ffmpeg-fixes.patch" - "contextviewfix.patch") -sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2' - 'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f' - '61193ccc48e9f99b4856eef27fe7a4aaf465feec' - 'a95e3bfb177adacc268552ae479dd88b70f5f9e1') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('2cfcdabb67436418ba0012075ba105bbb630b48d') build() { cd "${srcdir}" - patch -Np0 -i "${srcdir}"/toolbarfix.patch - patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch - - pushd ${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}"/contextviewfix.patch # FS#30448 - popd - mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 4f4580f7b..be2512277 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 165181 2012-08-12 16:18:01Z andyrtr $ +# $Id: PKGBUILD 165274 2012-08-14 20:33:11Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.6.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" -makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' +makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd') source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-no-export-ssllibs.patch @@ -123,7 +123,7 @@ backup=(etc/cups/cupsd.conf etc/logrotate.d/cups etc/pam.d/cups etc/xinetd.d/cups-lpd) -depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme') +depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme') optdepends=('xdg-utils: xdg .desktop file support') cd ${srcdir}/${pkgbase}-${pkgver} diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index dc7d127d2..a5dbb427c 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 163499 2012-07-13 14:44:33Z dan $ +# $Id: PKGBUILD 165316 2012-08-15 13:47:42Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.8.1.2 +pkgver=1.8.2 pkgrel=1 license=('GPL') arch=(i686 x86_64 'mips64el') url="http://www.doxygen.org/" makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra') source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('9c62259c34d51d839dafd1f0d5d85f17') -sha1sums=('a11e65a597019510051290d2af0e6f379838b9c5') +md5sums=('6fa7baf995fa3f71cfc09e264ba88a83') +sha1sums=('7b88ade3989ce0f43f0fb2b2574436c4f1fa1c5a') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index fb5362252..fa2f13408 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156774 2012-04-23 09:05:18Z ibiru $ +# $Id: PKGBUILD 165244 2012-08-14 15:06:13Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 -pkgver=2.26.1 +pkgver=2.26.2 pkgrel=1 pkgdesc="An image loading library" arch=('i686' 'x86_64' 'mips64el') @@ -13,10 +13,10 @@ makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') install=gdk-pixbuf2.install source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba') +sha256sums=('3555521050e30e2fa090bfe650910c14649b6ab0acb35a5a7eaf90fe694f1403') build() { - cd "gdk-pixbuf-$pkgver" + cd gdk-pixbuf-$pkgver ./configure --prefix=/usr \ --without-libjasper \ @@ -26,7 +26,7 @@ build() { } package() { - cd "gdk-pixbuf-$pkgver" + cd gdk-pixbuf-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 9e61fe9f9..1e41925c6 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164342 2012-07-31 00:52:22Z dan $ +# $Id: PKGBUILD 165345 2012-08-16 02:47:11Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.11.4 +pkgver=1.7.11.5 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -100,7 +100,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('21c7100cddee8579233a924111e829ab' - '397af842126a5099968238ab946580a5' +md5sums=('9985d35c11531d546426ebefb327c847' + 'f08a5a60e57f00399bbd384cfd7791f3' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD index bdbf2f516..92bade7d3 100644 --- a/extra/gnome-applets/PKGBUILD +++ b/extra/gnome-applets/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 156798 2012-04-23 09:05:53Z ibiru $ +# $Id: PKGBUILD 165330 2012-08-15 21:16:25Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-applets pkgver=3.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Applets" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify' 'cpufrequtils') +depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify') makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager') options=(!emptydirs) url="http://www.gnome.org" -groups=(gnome) install=gnome-applets.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) sha256sums=('ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e') diff --git a/extra/libcap-ng/PKGBUILD b/extra/libcap-ng/PKGBUILD index 43dd4017f..2886b817d 100644 --- a/extra/libcap-ng/PKGBUILD +++ b/extra/libcap-ng/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139367 2011-10-01 18:59:37Z ibiru $ +# $Id: PKGBUILD 165245 2012-08-14 15:06:17Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=libcap-ng -pkgver=0.6.6 +pkgver=0.7 pkgrel=1 pkgdesc="A library intended to make programming with POSIX capabilities much easier than the traditional libcap" arch=('i686' 'x86_64' 'mips64el') @@ -12,17 +12,17 @@ license=('GPL2' 'LGPL2.1') depends=('glibc') options=('!libtool') source=(http://people.redhat.com/sgrubb/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('eb71f967cecb44b4342baac98ef8cb0f') +md5sums=('85c14a2442a3721383a1e2284e254846') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr --enable-static=no --with-python=no make } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 2848e7dce..70130c1a1 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162833 2012-07-01 07:57:51Z andyrtr $ +# $Id: PKGBUILD 165281 2012-08-14 20:41:57Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.37 +pkgver=2.4.38 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) -sha256sums=('e4ea39a901d4a8e59064f10f413bb037dad7790f7c16a5986e7cc1453b36488f' +sha256sums=('3e5a2f318edaf1eef41e7e6c85aa9596d6f9f8b083ec4d7d6710ffbb8921e7e9' 'f7a587357ea29cab9c06a4889f09e30d63eae76e9b9654666c53020d15ea52d7' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD index a47c47a03..6bf521ec7 100644 --- a/extra/libotr/PKGBUILD +++ b/extra/libotr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149079 2012-02-05 16:55:15Z bisson $ +# $Id: PKGBUILD 165291 2012-08-14 23:10:37Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Bug <Bug2000@gmail.com> pkgname=libotr -pkgver=3.2.0 -pkgrel=3 +pkgver=3.2.1 +pkgrel=1 pkgdesc='Off-the-Record Messaging Library and Toolkit' url='http://www.cypherpunks.ca/otr/' license=('GPL' 'LGPL') @@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('libgcrypt') options=('!libtool') source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz") -sha1sums=('e5e10b8ddaf59b0ada6046d156d0431cd2790db9') +sha1sums=('898bf00d019f49ca34cd0116dd2e22685c67c394') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 64ff33ff5..99de5523b 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160970 2012-06-07 18:26:20Z juergen $ +# $Id: PKGBUILD 165312 2012-08-15 11:35:19Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.27.0 -pkgrel=2 +pkgrel=3 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.0.57' 'texinfo' 'sh') + depends=('sbcl=1.0.58' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD index efa432755..24f0a2900 100644 --- a/extra/nmap/PKGBUILD +++ b/extra/nmap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 161987 2012-06-17 23:52:34Z bisson $ +# $Id: PKGBUILD 165381 2012-08-17 08:46:12Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=nmap pkgver=6.01 -pkgrel=1 +pkgrel=2 pkgdesc='Utility for network discovery and security auditing' url='http://nmap.org/' arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,10 @@ license=('GPL') makedepends=('pygtk') optdepends=('pygtk: zenmap') depends=('pcre' 'openssl' 'libpcap' 'lua') -source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a') +source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'kdesu.patch') +sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a' + '159bc1243564d3a9dee820291bf07168870cbaf6') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,6 +25,8 @@ build() { echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap.desktop echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap-root.desktop + patch -p1 -i ../kdesu.patch # FS#31158 + ./configure \ --prefix=/usr \ --libexecdir=/usr/lib \ diff --git a/extra/nmap/kdesu.patch b/extra/nmap/kdesu.patch new file mode 100644 index 000000000..daed631d6 --- /dev/null +++ b/extra/nmap/kdesu.patch @@ -0,0 +1,14 @@ +diff -Naur old/zenmap/install_scripts/unix/su-to-zenmap.sh new/zenmap/install_scripts/unix/su-to-zenmap.sh +--- old/zenmap/install_scripts/unix/su-to-zenmap.sh 2012-08-17 18:34:05.863827354 +1000 ++++ new/zenmap/install_scripts/unix/su-to-zenmap.sh 2012-08-17 18:35:53.872952226 +1000 +@@ -40,8 +40,8 @@ + fi + case $SU_TO_ROOT_X in + gksu) gksu -u "$PRIV" "$COMMAND";; +- kdesu) kdesu -u "$PRIV" "$COMMAND";; +- kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";; ++ kdesu) kdesu -u "$PRIV" -c "$COMMAND";; ++ kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" -c "$COMMAND";; + ktsuss) ktsuss -u "$PRIV" "$COMMAND";; + # As a last resort, open a new xterm use sudo/su + sdterm) xterm -e "sudo -u $PRIV $COMMAND";; diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD index de9291836..9c2b9cd4a 100644 --- a/extra/openslp/PKGBUILD +++ b/extra/openslp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150461 2012-02-18 00:02:24Z allan $ +# $Id: PKGBUILD 165260 2012-08-14 16:48:24Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=openslp pkgver=1.2.1 -pkgrel=4 +pkgrel=5 pkgdesc="Open-source implementation of Service Location Protocol" arch=('i686' 'x86_64' 'mips64el') url="http://www.openslp.org" @@ -11,12 +11,19 @@ license=('BSD') depends=('bash' 'openssl') backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd) -md5sums=('ff9999d1b44017281dd00ed2c4d32330' '4f6889a5944894b8be2c01404a9566d2') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd + #https://github.com/lunar-linux/moonbase-other/commit/ae74b5873e639d50db0a563d2424114a530c01ae + openslp.service) +md5sums=('ff9999d1b44017281dd00ed2c4d32330' + '4f6889a5944894b8be2c01404a9566d2' + '296dc3c8f75e7a1823fcb9dd97ea0971') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --disable-static \ + --enable-slpv1 \ + --enable-slpv2-security # service would fail to start without this make } @@ -25,4 +32,5 @@ package() { make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE install -D -m755 $srcdir/rc.slpd ${pkgdir}/etc/rc.d/slpd + install -D -m644 $srcdir/openslp.service ${pkgdir}/usr/lib/systemd/system/openslp.service } diff --git a/extra/openslp/openslp.service b/extra/openslp/openslp.service new file mode 100644 index 000000000..e17eb3b1d --- /dev/null +++ b/extra/openslp/openslp.service @@ -0,0 +1,11 @@ +[Unit] +Description=Service Location Protocol +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=network.target diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD index 7ad40468d..9acfa4d99 100644 --- a/extra/p11-kit/PKGBUILD +++ b/extra/p11-kit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154982 2012-04-01 07:46:19Z ibiru $ +# $Id: PKGBUILD 165246 2012-08-14 15:06:21Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=p11-kit -pkgver=0.12 +pkgver=0.13 pkgrel=1 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64 mips64el) @@ -11,17 +11,17 @@ license=('BSD') depends=(glibc) options=(!libtool) source=($url/releases/$pkgname-$pkgver.tar.gz) -md5sums=('66baf7ddde982d1b7294d3bd63be7446') +md5sums=('3892bc07ff54b1b391aad4628911801d') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --with-module-path=/usr/lib/pkcs11 make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING } diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD index 1b5e921cf..c72063e03 100644 --- a/extra/php-apc/PKGBUILD +++ b/extra/php-apc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 163778 2012-07-19 22:22:31Z pierre $ +# $Id: PKGBUILD 165375 2012-08-16 20:55:01Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-apc -pkgver=3.1.11 +pkgver=3.1.12 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' @@ -11,7 +11,7 @@ depends=('php') license=('PHP') source=("http://pecl.php.net/get/APC-${pkgver}.tgz") backup=('etc/php/conf.d/apc.ini') -md5sums=('199b69ed1423aa869acafff485ef5f06') +md5sums=('b0ab91726717f410dfa284d5d1723b60') build() { cd $srcdir/APC-$pkgver diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 5ceae2e78..6ace812ff 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163752 2012-07-19 05:20:23Z pierre $ +# $Id: PKGBUILD 165374 2012-08-16 20:54:57Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.5 +pkgver=5.4.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -33,11 +33,11 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('ffcc7f4dcf2b79d667fe0c110e6cb724' +md5sums=('c9aa0f4996d1b91ee9e45afcfaeb5d2e' '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '6d46667e00d65933ec0c958279c0a803' - '825e580dd5708d959b50944afa1b12b6' + '5c1f4c967b66ce3eaf819b46951dcbf5' 'f56b5bb7e93c802ae8519182fbea3387' '86c73d481f3099e740e602869bacf637' 'c60343df74f8e1afb13b084d5c0e47ed') diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch index 0b17182fd..d618fca4e 100644 --- a/extra/php/php-fpm.conf.in.patch +++ b/extra/php/php-fpm.conf.in.patch @@ -1,5 +1,5 @@ ---- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200 -+++ sapi/fpm/php-fpm.conf.in 2012-03-01 19:50:48.549947258 +0100 +--- sapi/fpm/php-fpm.conf.in 2012-08-15 06:26:05.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2012-08-16 14:17:41.809663595 +0200 @@ -12,7 +12,7 @@ ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p arguement) @@ -18,7 +18,7 @@ ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written -@@ -140,7 +140,8 @@ +@@ -148,7 +148,8 @@ ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. @@ -28,7 +28,7 @@ ; Set listen(2) backlog. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) -@@ -151,9 +152,9 @@ +@@ -159,9 +160,9 @@ ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user ; mode is set to 0666 @@ -41,7 +41,7 @@ ; List of ipv4 addresses of FastCGI clients which are allowed to connect. ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -@@ -442,7 +443,7 @@ +@@ -458,7 +459,7 @@ ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD index dbe19cdb7..97de68332 100644 --- a/extra/rsync/PKGBUILD +++ b/extra/rsync/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160933 2012-06-07 05:56:33Z pierre $ +# $Id: PKGBUILD 165402 2012-08-18 01:22:52Z heftig $ pkgname=rsync pkgver=3.0.9 -pkgrel=3 +pkgrel=4 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64' 'mips64el') url="http://samba.anu.edu.au/rsync/" @@ -10,12 +10,15 @@ license=('GPL3') depends=('perl') backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz" - 'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service') + 'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service' + 'rsyncd.socket' 'rsyncd@.service') md5sums=('5ee72266fe2c1822333c407e1761b92b' 'bce64d122a8e0f86872a4a21a03bc7f3' 'ba413da4ebca05c57860151fda21efbc' 'ea3e9277dc908bc51f9eddc0f6b935c1' - 'ec96f9089d71109557cdcaa3f0633ed6') + 'ec96f9089d71109557cdcaa3f0633ed6' + 'af4eabd94380050191b20ab03e6f6076' + '53f94e613e0bc502d38dd61bd2cd7636') build() { cd "$srcdir/$pkgname-$pkgver" @@ -35,5 +38,7 @@ package() { install -Dm644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf" install -Dm644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync" install -Dm644 ../rsyncd.service "$pkgdir/usr/lib/systemd/system/rsyncd.service" + install -m644 ../rsyncd.socket "$pkgdir/usr/lib/systemd/system/rsyncd.socket" + install -m644 ../rsyncd@.service "$pkgdir/usr/lib/systemd/system/rsyncd@.service" install -Dm755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync" } diff --git a/extra/rsync/rsyncd.socket b/extra/rsync/rsyncd.socket new file mode 100644 index 000000000..83724159f --- /dev/null +++ b/extra/rsync/rsyncd.socket @@ -0,0 +1,11 @@ +[Unit] +Description=Rsync Socket +After=network.target +Conflicts=rsyncd.service + +[Socket] +ListenStream=873 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/extra/rsync/rsyncd@.service b/extra/rsync/rsyncd@.service new file mode 100644 index 000000000..33db95c4c --- /dev/null +++ b/extra/rsync/rsyncd@.service @@ -0,0 +1,11 @@ +[Unit] +Description=A file transfer program to keep remote files in sync +After=network.target + +[Service] +ExecStart=-/usr/bin/rsync --daemon +StandardInput=socket +StandardOutput=inherit +StandardError=journal +User=nobody +Group=nobody diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 641dba58f..cb17c8c36 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160967 2012-06-07 17:45:43Z juergen $ +# $Id: PKGBUILD 165308 2012-08-15 11:11:17Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.0.57 +pkgver=1.0.58 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -19,7 +19,7 @@ makedepends=('clisp' 'texinfo') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp") -md5sums=('bb0e4f5c2dad3491802197525283f6b0' +md5sums=('341952949dc90af6f83a89f685da5dde' '7ac0c1936547f4278198b8bf7725204d') build() { diff --git a/extra/scim-hangul/2012.patch b/extra/scim-hangul/2012.patch new file mode 100644 index 000000000..cc837fa51 --- /dev/null +++ b/extra/scim-hangul/2012.patch @@ -0,0 +1,23 @@ +diff -aur old/src/scim_hangul_imengine.cpp new/src/scim_hangul_imengine.cpp +--- old/src/scim_hangul_imengine.cpp 2012-08-16 01:33:25.996258740 +1000 ++++ new/src/scim_hangul_imengine.cpp 2012-08-16 01:33:41.932950046 +1000 +@@ -33,6 +33,7 @@ + #include <config.h> + #endif + ++#include <unistd.h> + #include <cstring> + #include <scim.h> + #include "scim_hangul_imengine.h" +diff -aur old/src/scim_hangul_imengine_setup.cpp new/src/scim_hangul_imengine_setup.cpp +--- old/src/scim_hangul_imengine_setup.cpp 2012-08-16 01:33:25.996258740 +1000 ++++ new/src/scim_hangul_imengine_setup.cpp 2012-08-16 01:43:39.823860324 +1000 +@@ -346,7 +346,7 @@ + for (i = 0; i < n; i++) { + const char* name = hangul_ic_get_keyboard_name(i); + #if GTK_CHECK_VERSION(2, 24, 0) +- gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combo_box), NULL, name); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), name); + #else + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), name); + #endif diff --git a/extra/scim-hangul/PKGBUILD b/extra/scim-hangul/PKGBUILD index 3f0ceaf22..7b7631e83 100644 --- a/extra/scim-hangul/PKGBUILD +++ b/extra/scim-hangul/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 140551 2011-10-17 07:24:46Z bisson $ +# $Id: PKGBUILD 165326 2012-08-15 15:47:04Z bisson $ # Contributor: damir <damir@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=scim-hangul -pkgver=0.3.2 -pkgrel=4 +pkgver=0.4.0 +pkgrel=1 pkgdesc='Korean input method module for SCIM' -arch=('i686' 'x86_64' 'mips64el') url='http://www.scim-im.org/' license=('GPL') +arch=('i686' 'x86_64' 'mips64el') depends=('libhangul' 'scim') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz" - 'gcc43.patch' - 'unistd.patch') -sha1sums=('d1f4a2114d284c926d64fbfe8ea83307b8d8e2ec' - '956bb2b6bd75b3d2756895f8ade429f95bacc0ff' - '1cfce9a7d5240f6d19aea008edcd9c6989e94e62') +source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz" + '2012.patch') +sha1sums=('2ba06a6d851a1d86c5a9b659c573bfd87e6a7555' + 'a046c40b78521f85418b8ad2138b51815d47abec') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../gcc43.patch - patch -p1 -i "$srcdir/unistd.patch" - ./bootstrap # skim complains; it's alright + patch -p1 -i ../2012.patch ./configure --prefix=/usr --enable-skim-support make } diff --git a/extra/scim-pinyin/PKGBUILD b/extra/scim-pinyin/PKGBUILD index 5f4f4220d..905db2a4c 100644 --- a/extra/scim-pinyin/PKGBUILD +++ b/extra/scim-pinyin/PKGBUILD @@ -1,26 +1,22 @@ -# $Id: PKGBUILD 149097 2012-02-05 17:19:20Z bisson $ +# $Id: PKGBUILD 165322 2012-08-15 15:28:33Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributer: Gan Lu <rhythm.gan@gmail.com> pkgname=scim-pinyin -pkgver=0.5.91 -pkgrel=6 +pkgver=0.5.92 +pkgrel=1 pkgdesc='Chinese pinyin input for SCIM' url='http://www.scim-im.org/' arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('scim') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz" - 'gcc43.patch') -sha1sums=('58bea437a211b7af8420057541a38933a41841c7' - 'b78ecec237ee0e04ec43604fcc344ff43ccfb7b3') +source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz") +sha1sums=('d7c2d52a5712753af241a5301db23527ba438ea1') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../gcc43.patch - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD index 26f611328..91591a9c5 100644 --- a/extra/scim-tables/PKGBUILD +++ b/extra/scim-tables/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 148920 2012-02-05 11:55:57Z ibiru $ +# $Id: PKGBUILD 165324 2012-08-15 15:29:35Z bisson $ # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=scim-tables -pkgver=0.5.10 -pkgrel=2 +pkgver=0.5.11 +pkgrel=1 pkgdesc='Generic table input method module for SCIM' url='http://www.scim-im.org/' arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('scim') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz") -sha1sums=('c6e6fbd9999ceba5cb982349fee8391e16a9c2fe') +source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz") +sha1sums=('25dd1fcc809f57671e7df369f4011c14ba225b6b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD index 4743486d2..053b65878 100644 --- a/extra/speech-dispatcher/PKGBUILD +++ b/extra/speech-dispatcher/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 150548 2012-02-18 12:43:30Z pierre $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 165252 2012-08-14 16:20:06Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Steve Holmes <steve.holmes88@gmail.com> # Contributor: Alexander Jenisch <nt@divzero.at> # Contributor: Chris Brannon <cmbrannon@cox.net> @@ -7,7 +8,7 @@ pkgname=speech-dispatcher pkgver=0.7.1 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') pkgdesc="High-level device independent layer for speech synthesis interface" url="http://www.freebsoft.org/speechd" @@ -36,9 +37,10 @@ backup=(etc/speech-dispatcher/clients/gnome-speech.conf etc/speech-dispatcher/speechd.conf) install="${pkgname}.install" source=("http://www.freebsoft.org/pub/projects/speechd/$pkgname-$pkgver.tar.gz" - 'speechd.sh') + 'speechd.sh' 'speech-dispatcherd.service') md5sums=('ccfc30ac006673d36b4223eb760ed696' - '858293f464b83f03f3b6bb796291c71d') + '858293f464b83f03f3b6bb796291c71d' + 'd26f52e2e95a30eaa83560f0e63faca5') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -54,6 +56,8 @@ package() { make DESTDIR=${pkgdir} install install -Dm755 ${srcdir}/speechd.sh ${pkgdir}/etc/rc.d/speechd + install -d "${pkgdir}/usr/lib/systemd/system/" + install -m644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/" install -d ${pkgdir}/var/log/speech-dispatcher # Fix spd-conf to use python 2.7 diff --git a/extra/speech-dispatcher/speech-dispatcher.install b/extra/speech-dispatcher/speech-dispatcher.install index 17e273bed..93f4f9363 100644 --- a/extra/speech-dispatcher/speech-dispatcher.install +++ b/extra/speech-dispatcher/speech-dispatcher.install @@ -1,4 +1,4 @@ -info_dir=/usr/share/info +info_dir=usr/share/info info_files=('speech-dispatcher.info' 'speech-dispatcher-cs.info' 'ssip.info' diff --git a/extra/speech-dispatcher/speech-dispatcherd.service b/extra/speech-dispatcher/speech-dispatcherd.service new file mode 100644 index 000000000..ce21c5650 --- /dev/null +++ b/extra/speech-dispatcher/speech-dispatcherd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Speech-Dispatcher an high-level device independent layer for speech synthesis. +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/bin/speech-dispatcher -d + +[Install] +WantedBy=multi-user.target diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 56981ccf4..b38400de2 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 160577 2012-06-02 10:29:00Z bluewind $ +# $Id: PKGBUILD 165382 2012-08-17 10:46:53Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.7.5 -pkgrel=2 +pkgver=1.7.6 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') depends=('neon' 'apr-util' 'sqlite' 'file') optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts') # 'ruby: for some hook scripts' 'java-environment') + 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') [ "$CARCH" = "mips64el" ] && \ @@ -22,12 +22,21 @@ url="http://subversion.apache.org/" provides=('svn') options=('!makeflags' '!libtool' '!emptydirs') source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} - svnserve svn svnserve.conf subversion.rpath.fix.patch) -sha1sums=('05c079762690d5ac1ccd2549742e7ef70fa45cf1' - 'b267cba19b4f56360657a5bf5b231950e027a45a' + svnserve + svn + svnserve.conf + svnserve.tmpfiles + svnserve.service + subversion-1.7.6-kwallet-gcc47.patch + subversion.rpath.fix.patch) +sha1sums=('5b76a9f49e2c4bf064041a7d6b1bfcc3aa4ed068' + 'd8d99c01c49b189047389816b720923f1d9dbf2a' '64ba3e6ebafc08ac62f59d788f7a825fdce69573' '73b36c046c09cec2093354911c89e3ba8056af6c' 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' + '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' + '9f6790d842cf3e0228b007483a43e39a42724068' + 'aa0d01e606de2ebc5eed9c533d218d37a217c50c' '3d1e28408a9abb42af2e531adc0d01ce21acfad6') build() { @@ -36,9 +45,8 @@ build() { patch -p0 -i ../subversion.rpath.fix.patch sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py + patch -Np1 -i ../subversion-1.7.6-kwallet-gcc47.patch - # configure - autoreconf if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ --with-zlib=/usr --with-neon=/usr --with-apxs \ @@ -54,7 +62,7 @@ build() { make external-all make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb + swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl #swig-rb } #check() { @@ -70,17 +78,26 @@ package() { make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ - install install-swig-py install-swig-pl install-javahl # install-swig-rb + install install-swig-py install-swig-pl install-javahl #install-swig-rb - install -d "${pkgdir}"/usr/share/subversion + install -dm755 "${pkgdir}"/usr/share/subversion cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist rm -r "${pkgdir}"/usr/lib/perl5/core_perl + ## svnserve ... + + # ... iniscript/xinetd install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn + + # ... systemd + install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service + install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf + + # ... common config install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve install -Dm 644 tools/client-side/bash_completion \ diff --git a/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch b/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch new file mode 100644 index 000000000..a571c3c3c --- /dev/null +++ b/extra/subversion/subversion-1.7.5-kwallet-gcc47.patch @@ -0,0 +1,56 @@ +diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp +--- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500 ++++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400 +@@ -60,6 +60,9 @@ + /* KWallet simple provider, puts passwords in KWallet */ + /*-----------------------------------------------------------------------*/ + ++static int q_argc = 1; ++static char q_argv0[] = "svn"; // Build non-const char * from string constant ++static char *q_argv[] = { q_argv0 }; + + static const char * + get_application_name(apr_hash_t *parameters, +@@ -175,6 +178,10 @@ + "kwallet-initialized", + APR_HASH_KEY_STRING, + NULL); ++ apr_hash_set(parameters, ++ "kwallet-wallet", ++ APR_HASH_KEY_STRING, ++ NULL); + } + return APR_SUCCESS; + } +@@ -203,12 +210,11 @@ + QCoreApplication *app; + if (! qApp) + { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); ++ int argc = q_argc; ++ app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(1, +- (char *[1]) {(char *) "svn"}, ++ KCmdLineArgs::init(q_argc, q_argv, + get_application_name(parameters, pool), + "subversion", + ki18n(get_application_name(parameters, pool)), +@@ -273,12 +279,11 @@ + QCoreApplication *app; + if (! qApp) + { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); ++ int argc = q_argc; ++ app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(1, +- (char *[1]) {(char *) "svn"}, ++ KCmdLineArgs::init(q_argc, q_argv, + get_application_name(parameters, pool), + "subversion", + ki18n(get_application_name(parameters, pool)), diff --git a/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch b/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch new file mode 100644 index 000000000..a571c3c3c --- /dev/null +++ b/extra/subversion/subversion-1.7.6-kwallet-gcc47.patch @@ -0,0 +1,56 @@ +diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp +--- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500 ++++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400 +@@ -60,6 +60,9 @@ + /* KWallet simple provider, puts passwords in KWallet */ + /*-----------------------------------------------------------------------*/ + ++static int q_argc = 1; ++static char q_argv0[] = "svn"; // Build non-const char * from string constant ++static char *q_argv[] = { q_argv0 }; + + static const char * + get_application_name(apr_hash_t *parameters, +@@ -175,6 +178,10 @@ + "kwallet-initialized", + APR_HASH_KEY_STRING, + NULL); ++ apr_hash_set(parameters, ++ "kwallet-wallet", ++ APR_HASH_KEY_STRING, ++ NULL); + } + return APR_SUCCESS; + } +@@ -203,12 +210,11 @@ + QCoreApplication *app; + if (! qApp) + { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); ++ int argc = q_argc; ++ app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(1, +- (char *[1]) {(char *) "svn"}, ++ KCmdLineArgs::init(q_argc, q_argv, + get_application_name(parameters, pool), + "subversion", + ki18n(get_application_name(parameters, pool)), +@@ -273,12 +279,11 @@ + QCoreApplication *app; + if (! qApp) + { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); ++ int argc = q_argc; ++ app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(1, +- (char *[1]) {(char *) "svn"}, ++ KCmdLineArgs::init(q_argc, q_argv, + get_application_name(parameters, pool), + "subversion", + ki18n(get_application_name(parameters, pool)), diff --git a/extra/subversion/svnserve.service b/extra/subversion/svnserve.service new file mode 100644 index 000000000..d8a8e10c1 --- /dev/null +++ b/extra/subversion/svnserve.service @@ -0,0 +1,11 @@ +[Unit] +Description=Subversion protocol daemon +After=syslog.target network.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/svnserve +ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS + +[Install] +WantedBy=multi-user.target diff --git a/extra/subversion/svnserve.tmpfiles b/extra/subversion/svnserve.tmpfiles new file mode 100644 index 000000000..e8487d373 --- /dev/null +++ b/extra/subversion/svnserve.tmpfiles @@ -0,0 +1 @@ +D /run/svnserve 0700 root root - diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index c1cec70f7..d871e6679 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162120 2012-06-21 01:49:02Z ibiru $ +# $Id: PKGBUILD 165360 2012-08-16 12:35:13Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble -pkgver=0.16.1 +pkgver=0.16.2 pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2') options=('!libtool' '!emptydirs') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) install=telepathy-gabble.install -md5sums=('f4e6ca551cc4603276f9acdc2b5d4db4') +md5sums=('d79fc12524e9b68e9a1a833960f97d01') build() { cd $pkgname-$pkgver diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index 8f71df019..efbd46530 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156974 2012-04-23 09:10:23Z ibiru $ +# $Id: PKGBUILD 165356 2012-08-16 11:08:48Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.18.1 +pkgver=0.18.2 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +14,10 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('461732739e3fbf8467991bbe661fb29a') +md5sums=('034ec8e4c3a60d4ba1da67952ef3ee2f') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ --enable-vala-bindings \ @@ -26,6 +26,6 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD index 93f9dd16f..b49458f7f 100644 --- a/extra/telepathy-idle/PKGBUILD +++ b/extra/telepathy-idle/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141602 2011-10-31 15:52:30Z ibiru $ +# $Id: PKGBUILD 165358 2012-08-16 11:39:38Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Samuel Mendes <heka.lok@gmail.com> pkgname=telepathy-idle -pkgver=0.1.11 -pkgrel=1.1 +pkgver=0.1.12 +pkgrel=1 pkgdesc="An IRC connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org" @@ -14,17 +14,18 @@ license=('LGPL') depends=('telepathy-glib' 'openssl') makedepends=('libxslt' 'python2') install=telepathy-idle.install -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('be277e8f0bd32ae56af799f0ff4ec72e') +options=(!makeflags) +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('e77e5b84cc8f77cf12d15727c30df366') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 525f48584..f5e38afc7 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 149976 2012-02-11 23:31:36Z allan $ +# $Id: PKGBUILD 165295 2012-08-15 00:30:47Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Douglas Soares de Andrade @@ -6,7 +6,7 @@ pkgname=varnish pkgver=3.0.2 -pkgrel=5 +pkgrel=6 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64' 'mips64el') url="http://www.varnish-cache.org/" @@ -18,13 +18,17 @@ install=$pkgname.install options=('!libtool') source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" "$pkgname.conf.d" - "rc.$pkgname") + "rc.$pkgname" + varnish-vcl-reload + varnish.service) md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a' 'edd1237d097d72173d9772754335890c' - '8366f51568c0bbb3d3891aa0cc724369') + '40b4c83b3ad225ed2f4bd7e677fe41a2' + '56be884f43b8b4c900a073d9282f124a' + '45cc1fd57aa2ffc22d6af62f9eedc842') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr \ @@ -35,11 +39,18 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - make DESTDIR="$pkgdir" install + # reload helper + install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin" - install -D -m755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname" - install -D -m644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname" - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # sysvinit + install -Dm755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname" + install -Dm644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname" + + # systemd + install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service" + + # license + install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/varnish/rc.varnish b/extra/varnish/rc.varnish index 2841665e5..352f07dbd 100644 --- a/extra/varnish/rc.varnish +++ b/extra/varnish/rc.varnish @@ -4,27 +4,6 @@ . /etc/rc.d/functions . /etc/conf.d/varnish -reload_vcl() { - local activecfg newcfg - - if [[ -z $VARNISH_CFG ]]; then - printf '==> ERROR: VARNISH_CFG is undefined in /etc/conf.d/varnish!\n' - return 1 - fi - - activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }') - if [[ -z $activecfg ]]; then - printf '==> ERROR: No active VCL found!\n' - return 1 - fi - - printf -v newcfg 'vcl-%(%s)T' -1 - - varnishadm "vcl.load $newcfg $VARNISH_CFG" && - varnishadm "vcl.use $newcfg" && - varnishadm "vcl.discard $activecfg" || return 1 -} - pidfile=/run/varnish.pid if [[ -r $pidfile ]]; then read -r PID < "$pidfile" @@ -62,10 +41,9 @@ case $1 in $0 start ;; reload) - stat_busy "Recompiling and Reloading VCL" - reload_vcl && stat_done || stat_fail + status "Recompiling and Reloading VCL" varnish-vcl-reload $VARNISH_CFG ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart|reload}" ;; esac diff --git a/extra/varnish/varnish-vcl-reload b/extra/varnish/varnish-vcl-reload new file mode 100644 index 000000000..aaac385c4 --- /dev/null +++ b/extra/varnish/varnish-vcl-reload @@ -0,0 +1,21 @@ +#!/bin/sh + +cfg=${1:-/etc/varnish/default.vcl} + +if [ ! -e "$cfg" ]; then + printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2 + exit 1 +fi + +activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }') +if [ -z "$activecfg" ]; then + printf 'ERROR: No active VCL found!\n' >&2 + exit 1 +fi + +newcfg=$(date +'vcl-%s') +printf 'INFO: using new config %s\n' "$cfg" + +varnishadm "vcl.load $newcfg $cfg" && +varnishadm "vcl.use $newcfg" && +varnishadm "vcl.discard $activecfg" diff --git a/extra/varnish/varnish.service b/extra/varnish/varnish.service new file mode 100644 index 000000000..c8bb6c6e1 --- /dev/null +++ b/extra/varnish/varnish.service @@ -0,0 +1,10 @@ +[Unit] +Description=Web Application Accelerator +After=network.target + +[Service] +ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -b localhost:8080 -T localhost:6082 -s malloc,64M -u nobody -g nobody -F +ExecReload=/usr/bin/varnish-vcl-reload + +[Install] +WantedBy=multi-user.target diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD index c1324d590..cf6298e63 100644 --- a/extra/x11vnc/PKGBUILD +++ b/extra/x11vnc/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 137979 2011-09-13 20:01:54Z bisson $ +# $Id: PKGBUILD 165299 2012-08-15 01:45:56Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=x11vnc pkgver=0.9.13 -pkgrel=1 +pkgrel=2 pkgdesc='VNC server for real X displays' -arch=('i686' 'x86_64' 'mips64el') url='http://www.karlrunge.com/x11vnc/' +arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') +depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') optdepends=('tk: for GUI support') backup=('etc/conf.d/x11vnc') source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'conf.d' - 'rc.d') + 'service' + 'conf.d' + 'rc.d') sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa' + '53e1ed7f84518a699a29607a03bee2321f9f9624' '11011cce06511e9ba61672a1c80bb63a3a187539' '477892cf0f0020043444b7493c80684762ded506') @@ -28,9 +30,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - + install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/x11vnc" + install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/x11vnc" rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver - - install -D -m 755 "${srcdir}/rc.d" "${pkgdir}/etc/rc.d/x11vnc" - install -D -m 644 "${srcdir}/conf.d" "${pkgdir}/etc/conf.d/x11vnc" } diff --git a/extra/x11vnc/service b/extra/x11vnc/service new file mode 100644 index 000000000..0ccc2fea0 --- /dev/null +++ b/extra/x11vnc/service @@ -0,0 +1,7 @@ +[Unit] +Description=VNC Server for X11 +Requires=graphical.target +After=graphical.target + +[Service] +ExecStart=/usr/bin/x11vnc diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD index 4605cfba5..7f2101b18 100644 --- a/kernels/linux-libre-aufs_friendly/PKGBUILD +++ b/kernels/linux-libre-aufs_friendly/PKGBUILD @@ -13,7 +13,7 @@ pkgbase=linux-libre-aufs_friendly # Build stock -LIBRE-AUFS_FRIENDLY kernel _basekernel=3.3 _sublevel=4 pkgver=${_basekernel}.${_sublevel} -pkgrel=1.2 +pkgrel=1.3 _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -234,10 +234,10 @@ _package() { # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-AUFS_FRIENDLY}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-AUFS_FRIENDLY}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-AUFS_FRIENDLY}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-AUFS_FRIENDLY}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-AUFS_FRIENDLY}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-AUFS_FRIENDLY}/version" # move module tree /lib -> /usr/lib mv "$pkgdir/lib" "$pkgdir/usr" diff --git a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install index 50ac390e7..019c659ed 100644 --- a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install +++ b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-aufs_friendly -KERNEL_VERSION=3.3.4-1.2-LIBRE-AUFS_FRIENDLY +KERNEL_VERSION=3.3.4-1.3-LIBRE-AUFS_FRIENDLY post_install () { # updating module dependencies diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD index 8f47d0168..74a883c1b 100644 --- a/kernels/linux-libre-lts-rt/PKGBUILD +++ b/kernels/linux-libre-lts-rt/PKGBUILD @@ -11,12 +11,12 @@ pkgbase=linux-libre-lts-rt # Build stock -LIBRE-LTS-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_releasever=40 -_rtpatchver=rt60 +_releasever=41 +_rtpatchver=rt61 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} -pkgrel=1.1 -_lxopkgver=${_basekernel}.39 # nearly always the same as pkgver +pkgrel=1 +_lxopkgver=${_basekernel}.41 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -41,8 +41,8 @@ _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-LTS-RT _aurversionkernelname=-rt-lts # in this case, in the aur version on Archlinux, the kernel name is different than ours md5sums=('5f64180fe7df4e574dac5911b78f5067' - '4c42d5680df7921c20dda6f5fa44b275' - 'b7e3a739f569ecac90880624ab05ec6c' + 'b4ebaa2ebf8418c75aba96fd4dd6daf3' + '11bb95e505726abd1e1adfa522ef178f' '7266f5e7af09cc6e4b15d7a952e3b350' '5387f0cf51652c071190789569adf9c7' '85f04a9555bdc295f7c387a6564f0c81' @@ -52,7 +52,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'c8299cf750a84e12d60b372c8ca7e1e8' - 'eea9aa0065f636fc924a23b3ffd24343') + '1f082cc9e5a18e227f7a044ff429914a') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -231,10 +231,10 @@ _package() { # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-RT}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-RT}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-RT}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-RT}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-RT}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-RT}/version" # move module tree /lib -> /usr/lib mv "$pkgdir/lib" "$pkgdir/usr" diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install index 6dc458bae..7f7e3a11f 100644 --- a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install +++ b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts-rt -KERNEL_VERSION=3.0.40-1.1-rt60-LIBRE-LTS-RT +KERNEL_VERSION=3.0.41-1-rt61-LIBRE-LTS-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-lts-xen/PKGBUILD b/kernels/linux-libre-lts-xen/PKGBUILD index 186614bc0..71a136f93 100644 --- a/kernels/linux-libre-lts-xen/PKGBUILD +++ b/kernels/linux-libre-lts-xen/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=linux-libre-lts-xen # Build stock -LIBRE-LTS-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 pkgver=${_basekernel}.31 -pkgrel=1.2 +pkgrel=1.3 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -152,10 +152,10 @@ _package() { # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-XEN}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-XEN}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-XEN}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS-XEN}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-XEN}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS-XEN}/version" # move module tree /lib -> /usr/lib mv "$pkgdir/lib" "$pkgdir/usr" diff --git a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install index 0eb1f2870..a369c337c 100644 --- a/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install +++ b/kernels/linux-libre-lts-xen/linux-libre-lts-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts-xen -KERNEL_VERSION=3.0.31-1.2-LIBRE-LTS-XEN +KERNEL_VERSION=3.0.31-1.3-LIBRE-LTS-XEN post_install () { # updating module dependencies diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 503d1d30a..6348f4093 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -11,12 +11,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.4 -_releasever=8 -_rtpatchver=rt16 +_releasever=9 +_rtpatchver=rt17 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} -pkgrel=1 -_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver +pkgrel=1.1 +_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -40,8 +40,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-RT md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - '15c770a780368718e99997fddb38245a' - '563c761c01333ca3b88a5544675ebf47' + '6ef5ab23e1999605f0185a6fc4d224f2' + '8ddc7ee43b418e06121bd09fa0e97bf6' 'd176ceb303ecfb2303d9659ea2dd91c7' 'bcb219ab37ed19912126189cfca30538' '82496e68851d1960543a07ba51cdb44a' @@ -51,7 +51,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' '80a46681386bb87813989faeb92bdd9a' - '7c8fc7c55a9102831e5cef2f4033aa70') + '9ead3a0a09633b4da08983b2584b4c6f') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -230,10 +230,10 @@ _package() { # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-RT}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-RT}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-RT}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-RT}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-RT}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-RT}/version" # move module tree /lib -> /usr/lib mv "$pkgdir/lib" "$pkgdir/usr" diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 9321a1c8b..1f57ce546 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.4.8-1-rt16-LIBRE-RT +KERNEL_VERSION=3.4.9-1.1-rt17-LIBRE-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 85475feb8..7f14d134d 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.3 pkgver=${_basekernel}.6 -pkgrel=1.2 +pkgrel=1.3 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -155,10 +155,10 @@ _package() { # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-XEN}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-XEN}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-XEN}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-XEN}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-XEN}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-XEN}/version" # move module tree /lib -> /usr/lib mv "$pkgdir/lib" "$pkgdir/usr" diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 7683e4527..b670328cd 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.3.6-1.2-LIBRE-XEN +KERNEL_VERSION=3.3.6-1.3-LIBRE-XEN post_install () { # updating module dependencies diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 065ca3fc0..e7d044b92 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=40 +_sublevel=41 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.39 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.41 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,9 +33,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-LTS md5sums=('5f64180fe7df4e574dac5911b78f5067' - '4c42d5680df7921c20dda6f5fa44b275' - '5e3362ef81c99563852f1b7a8c5b5837' - '3d078c10d51f9c2f4d0ec6be531caf1d' + 'b4ebaa2ebf8418c75aba96fd4dd6daf3' + '8cd05778fc1c2d8145b3b9932b4e3164' + '87a54dc6251cf2adf35f72ddeddb6ea8' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -43,7 +43,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - 'eea9aa0065f636fc924a23b3ffd24343') + '1f082cc9e5a18e227f7a044ff429914a') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -219,10 +219,10 @@ _package() { # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}/version" # move module tree /lib -> /usr/lib mv "$pkgdir/lib" "$pkgdir/usr" diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 240eccfbf..f4e10c441 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.39-1 Kernel Configuration +# Linux/i386 3.0.40-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -62,7 +62,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="-LIBRE-LTS" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y @@ -106,13 +106,14 @@ CONFIG_IRQ_FORCED_THREADING=y # # RCU Subsystem # -CONFIG_TREE_PREEMPT_RCU=y -CONFIG_PREEMPT_RCU=y +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_PREEMPT_RCU is not set # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=32 # CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_RCU_FAST_NO_HZ is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_RCU_BOOST is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 @@ -194,6 +195,7 @@ CONFIG_OPROFILE=m CONFIG_HAVE_OPROFILE=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_OPTPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y @@ -252,27 +254,27 @@ CONFIG_PADATA=y # CONFIG_INLINE_SPIN_LOCK_BH is not set # CONFIG_INLINE_SPIN_LOCK_IRQ is not set # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -# CONFIG_INLINE_SPIN_UNLOCK is not set +CONFIG_INLINE_SPIN_UNLOCK=y # CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set # CONFIG_INLINE_READ_TRYLOCK is not set # CONFIG_INLINE_READ_LOCK is not set # CONFIG_INLINE_READ_LOCK_BH is not set # CONFIG_INLINE_READ_LOCK_IRQ is not set # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set +CONFIG_INLINE_READ_UNLOCK=y # CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set # CONFIG_INLINE_WRITE_TRYLOCK is not set # CONFIG_INLINE_WRITE_LOCK is not set # CONFIG_INLINE_WRITE_LOCK_BH is not set # CONFIG_INLINE_WRITE_LOCK_IRQ is not set # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set +CONFIG_INLINE_WRITE_UNLOCK=y # CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set # CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y @@ -360,9 +362,9 @@ CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_IRQ_TIME_ACCOUNTING is not set -# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y +# CONFIG_PREEMPT is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -3809,6 +3811,7 @@ CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_I810 is not set CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m @@ -5315,7 +5318,6 @@ CONFIG_TIMER_STATS=y # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -5346,7 +5348,6 @@ CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 -# CONFIG_RCU_CPU_STALL_VERBOSE is not set # CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set @@ -5383,7 +5384,6 @@ CONFIG_FTRACE=y CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y CONFIG_BRANCH_PROFILE_NONE=y diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 86b096eaf..80f5a7aca 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.39-1 Kernel Configuration +# Linux/x86_64 3.0.40-2 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -63,7 +63,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="-LIBRE-LTS" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y @@ -107,13 +107,14 @@ CONFIG_IRQ_FORCED_THREADING=y # # RCU Subsystem # -CONFIG_TREE_PREEMPT_RCU=y -CONFIG_PREEMPT_RCU=y +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_PREEMPT_RCU is not set # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=64 # CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_RCU_FAST_NO_HZ is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_RCU_BOOST is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=19 @@ -195,6 +196,7 @@ CONFIG_OPROFILE=m CONFIG_HAVE_OPROFILE=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_OPTPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y @@ -253,27 +255,27 @@ CONFIG_PADATA=y # CONFIG_INLINE_SPIN_LOCK_BH is not set # CONFIG_INLINE_SPIN_LOCK_IRQ is not set # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -# CONFIG_INLINE_SPIN_UNLOCK is not set +CONFIG_INLINE_SPIN_UNLOCK=y # CONFIG_INLINE_SPIN_UNLOCK_BH is not set -# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set # CONFIG_INLINE_READ_TRYLOCK is not set # CONFIG_INLINE_READ_LOCK is not set # CONFIG_INLINE_READ_LOCK_BH is not set # CONFIG_INLINE_READ_LOCK_IRQ is not set # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -# CONFIG_INLINE_READ_UNLOCK is not set +CONFIG_INLINE_READ_UNLOCK=y # CONFIG_INLINE_READ_UNLOCK_BH is not set -# CONFIG_INLINE_READ_UNLOCK_IRQ is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set # CONFIG_INLINE_WRITE_TRYLOCK is not set # CONFIG_INLINE_WRITE_LOCK is not set # CONFIG_INLINE_WRITE_LOCK_BH is not set # CONFIG_INLINE_WRITE_LOCK_IRQ is not set # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -# CONFIG_INLINE_WRITE_UNLOCK is not set +CONFIG_INLINE_WRITE_UNLOCK=y # CONFIG_INLINE_WRITE_UNLOCK_BH is not set -# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set # CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_FREEZER=y @@ -342,9 +344,9 @@ CONFIG_NR_CPUS=64 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_IRQ_TIME_ACCOUNTING is not set -# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y +# CONFIG_PREEMPT is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -3625,6 +3627,7 @@ CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y +# CONFIG_DRM_I810 is not set CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m @@ -5056,7 +5059,6 @@ CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set -# CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -5086,7 +5088,6 @@ CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 -# CONFIG_RCU_CPU_STALL_VERBOSE is not set # CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set @@ -5123,7 +5124,6 @@ CONFIG_FTRACE=y CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y CONFIG_BRANCH_PROFILE_NONE=y diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 58b0a302a..e92e5eb16 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.40-1-LIBRE-LTS +KERNEL_VERSION=3.0.41-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD index 1422f451f..e6cc4238c 100644 --- a/libre/linux-libre-manpages/PKGBUILD +++ b/libre/linux-libre-manpages/PKGBUILD @@ -1,18 +1,18 @@ -# $Id$ +# $Id: PKGBUILD 142395 2011-11-08 23:03:12Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=linux-libre-manpages pkgver=3.1 -pkgrel=1 -pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel." +pkgrel=1.2 +pkgdesc="Kernel libre hackers manual - Section 9 manpages that comes with the linux-libre kernel" arch=('any') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') -replaces=('kernel26-manpages' 'linux-manpages') -conflicts=('kernel26-manpages' 'linux-manpages') +replaces=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages') +conflicts=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages') provides=('kernel26-manpages' 'linux-manpages') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/linux-libre-${pkgver}-gnu.tar.xz") md5sums=('38703cdbb0b9107e7220bc094c5e36b1') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index ad9bb852e..687d2de9c 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.5 -_sublevel=1 +_sublevel=2 pkgver=${_basekernel}.${_sublevel} -pkgrel=1 -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +pkgrel=1.1 +_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -29,22 +29,20 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - 'avmfritz-only-few-bytes-are-transfered-on-a-conn.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE md5sums=('2407fc9563a74acaf38aa0c06516eb1c' - '67b650dd355fbca16035510df063420b' - '7f0b7950bc9d2a20cdb6b850e6e4eb5a' - 'a796ea383eb136cb38fab0a52b6d2f52' + 'b081f37b73c652cbb0d5193174092709' + '3ba164b409d8024fdd433f3cc4ae1fea' + 'fa1e2ab2f036974199374f015f5a2c46' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' - '2afcc001cc178be72e3a19d95f4bd5eb' - 'eb25429666af638b01baa663eca74d08') + 'd822cc131b20090f39b0d448b0e1f8be') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -67,11 +65,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix avmfritz capi20 functionallity - # will be added to 3.5.2 - # https://bugzilla.kernel.org/show_bug.cgi?id=45271 - patch -Np1 -i "${srcdir}/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ @@ -213,10 +206,10 @@ _package() { # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version" # move module tree /lib -> /usr/lib mv "$pkgdir/lib" "$pkgdir/usr" @@ -377,7 +370,7 @@ _package-headers() { } _package-docs() { - pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel" + pkgdesc="Kernel libre hackers manual - HTML documentation that comes with the ${pkgbase} kernel" provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}") conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index a66ebeaa7..54db12ba1 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -334,7 +334,7 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_PARAVIRT_TIME_ACCOUNTING=y # CONFIG_XEN_PRIVILEGED_GUEST is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 350a2b905..31da569ad 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -335,7 +335,7 @@ CONFIG_X86_MPPARSE=y CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_XEN=y CONFIG_XEN_DOM0=y CONFIG_XEN_PRIVILEGED_GUEST=y diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 9d56698c6..59b77b82d 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.5.1-1-LIBRE +KERNEL_VERSION=3.5.2-1.1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD new file mode 100644 index 000000000..d30bbb1a3 --- /dev/null +++ b/libre/mcomix-libre/PKGBUILD @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Ray Powell <ray_al@xphoniexx.net> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=mcomix +pkgname=mcomix-libre +pkgver=0.99 +pkgrel=1 +pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books" +arch=('any') +url="http://sourceforge.net/projects/mcomix/" +license=('GPL') +depends=('pygtk' 'python-imaging' 'xdg-utils' 'python2' \ + 'desktop-file-utils' 'hicolor-icon-theme' 'python2-distribute') +makedepends=('gettext' 'intltool') +optdepends=('ununrar: for rar compressed comics') +conflicts=('mcomix' 'comix') +replaces=('mcomix' 'comix') +provides=("mcomix=${pkgver}") +install='mcomix.install' +source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2") + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + + # python2 fix + for file in $(grep -Rl "/usr/bin/env python" .); + do + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done +} + +package() { + cd ${srcdir}/${_pkgname}-${pkgver} + + export PYTHONPATH=${pkgdir}/usr/lib/python2.7/site-packages/ + mkdir -p $PYTHONPATH + + python2 setup.py install --prefix=${pkgdir}/usr --optimize=1 \ + --single-version-externally-managed --root=/ + + install -Dm644 mime/comicbook.schemas \ + ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas +} + +md5sums=('a1ff7e1955042069d5005b4034e7a914') diff --git a/libre/mcomix-libre/mcomix.install b/libre/mcomix-libre/mcomix.install new file mode 100644 index 000000000..2d3c6c3e3 --- /dev/null +++ b/libre/mcomix-libre/mcomix.install @@ -0,0 +1,32 @@ +pkgname=mcomix + +post_install() { + if [ -f usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate + fi + if [ -f usr/sbin/gconfpkg ]; then + usr/sbin/gconfpkg --install ${pkgname} + fi + update-desktop-database -q +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + if [ -f usr/sbin/gconfpkg ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi +} + +post_remove() { + if [ -f usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate + fi + update-desktop-database -q +} diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 385790ccd..7a95abd0b 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: André Silva <emulatorman@lavabit.com> pkgname=parabola-keyring -pkgver=20120723 +pkgver=20120816 pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') @@ -16,5 +16,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('f9ab13c8c969c3bf136e302a666e32d9' - '5c27394f0575ab9fb27bf3ab9cb212e3') +md5sums=('4163ebfce3ccc32e2398e18c19158fc1' + 'b4b1b532657eb754ef2e9f7cf4d0a09a') diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 9b86cc51e..5e5b3411f 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -7,8 +7,8 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.5-LIBRE -pkgrel=7 -pkgdesc="Kernel module that emulates SCSI devices" +pkgrel=7.1 +pkgdesc="Kernel libre module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" license=('GPL') diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 588f72271..1d5f60079 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-modules-lts' 'virtualbox-libre-parabola-modules-lts') pkgver=4.1.18 -pkgrel=4.1 +pkgrel=7 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -101,7 +101,7 @@ build() { } package_virtualbox-libre-parabola-modules-lts(){ - pkgdesc="Additions only for Parabola guests (long-term supported kernel modules)" + pkgdesc="Additions only for Parabola guests (long-term supported kernel libre modules)" license=('GPL') install=virtualbox-libre-parabola-modules-lts.install depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') @@ -125,7 +125,7 @@ package_virtualbox-libre-parabola-modules-lts(){ } package_virtualbox-libre-modules-lts(){ - pkgdesc="Long-term supported kernel modules for VirtualBox" + pkgdesc="Long-term supported kernel libre modules for VirtualBox" license=('GPL') install=virtualbox-libre-modules-lts.install depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') diff --git a/libre/virtualbox-libre-modules/.directory b/libre/virtualbox-libre-modules/.directory index 7486c78f1..9f6471595 100644 --- a/libre/virtualbox-libre-modules/.directory +++ b/libre/virtualbox-libre-modules/.directory @@ -1,2 +1,3 @@ [Dolphin] -Timestamp=2012,3,20,12,36,27 +Timestamp=2012,8,16,6,34,39 +Version=3 diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index d1b6f5fae..11f78dfab 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules') pkgver=4.1.18 -pkgrel=6 +pkgrel=6.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -104,7 +104,7 @@ build() { } package_virtualbox-libre-parabola-modules(){ - pkgdesc="Additions only for Parabola guests (kernel modules)" + pkgdesc="Additions only for Parabola guests (kernel libre modules)" license=('GPL') install=virtualbox-libre-parabola-modules.install depends=('linux-libre>=3.5' 'linux-libre<3.6') @@ -130,7 +130,7 @@ package_virtualbox-libre-parabola-modules(){ } package_virtualbox-libre-modules(){ - pkgdesc="Kernel modules for VirtualBox" + pkgdesc="Kernel libre modules for VirtualBox" license=('GPL') install=virtualbox-libre-modules.install depends=('linux-libre>=3.5' 'linux-libre<3.6') diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 80de2315f..79c0d0b02 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -11,7 +11,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-source' 'virtualbox-libre-parabola-source') pkgver=4.1.18 -pkgrel=5 +pkgrel=5.2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -84,7 +84,7 @@ package_virtualbox-libre() { optdepends=('qt: for VirtualBox GUI' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-libre-sdk: developer kit' - 'virtualbox-libre-source: host kernel source modules for non-stock kernels' + 'virtualbox-libre-source: host kernel libre source modules for non-stock kernels' 'net-tools: for host-only or bridged networking') backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') @@ -164,7 +164,7 @@ package_virtualbox-libre() { } package_virtualbox-libre-source() { - pkgdesc="VirtualBox kernel modules source" + pkgdesc="VirtualBox kernel libre modules source" depends=(dkms gcc make) replaces=('virtualbox-source') conflicts=('virtualbox-source') @@ -240,7 +240,7 @@ package_virtualbox-libre-parabola-additions(){ } package_virtualbox-libre-parabola-source() { - pkgdesc='VirtualBox Additions kernel modules source' + pkgdesc='VirtualBox Additions kernel libre modules source' depends=(dkms gcc make) replaces=('virtualbox-archlinux-source') conflicts=('virtualbox-archlinux-source') @@ -257,7 +257,7 @@ package_virtualbox-libre-parabola-source() { md5sums=('38db0a87cba659b484af868b0c2bd3ac' '5f85710e0b8606de967716ded7b2d351' - '2d599c6cf8bbbf183a7c07a9bcb926c7' + '7e14fbec3aa6904b1015ae82b5a7b097' 'a1ff1d1b4423556887e48a32978226a6' '4ff559f2bea335d59c4012048983ca91' '97e193f050574dd272a38e5ee5ebe62b' diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch index c2c673386..6991a49d7 100644 --- a/libre/virtualbox-libre/vboxdrv-reference.patch +++ b/libre/virtualbox-libre/vboxdrv-reference.patch @@ -1,34 +1,55 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp --- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000 +++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000 -@@ -75,10 +75,9 @@ - "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " + + /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */ + QString g_QStrHintLinuxNoMemory = QApplication::tr( +- "This error means that the kernel driver was either not able to " ++ "This error means that the kernel libre driver was either not able to " + "allocate enough memory or that some mapping operation failed." + ); + + QString g_QStrHintLinuxNoDriver = QApplication::tr( +- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " ++ "The VirtualBox Linux-libre kernel driver (vboxdrv) is either not loaded or " "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " - "module by executing<br/><br/>" +- "module by executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" - "as root. If it is available in your distribution, you should install the " - "DKMS package first. This package keeps track of Linux kernel changes and " - "recompiles the vboxdrv kernel module if necessary." ++ "libre module by executing<br/><br/>" + " <font color=blue>'pacman -S virtualbox-libre-modules'</font><br/><br/>" + "as root. If you don't use our stock kernel, install virtualbox-libre-source and " + "execute dkms install vboxhost/4.1.18 ." ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( -@@ -90,11 +89,8 @@ - +- "The VirtualBox kernel modules do not match this version of " ++ "The VirtualBox kernel libre modules do not match this version of " + "VirtualBox. The installation of VirtualBox was apparently not " + "successful. Please try completely uninstalling and reinstalling " + "VirtualBox." + ); + QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( - "The VirtualBox kernel modules do not match this version of " +- "The VirtualBox kernel modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" - "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." ++ "The VirtualBox kernel libre modules do not match this version of " + "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> " + " <font color=blue>'dkms install vboxhost/4.1.18'</font><br/><br/>" ); - + QString g_QStrHintOtherNoDriver = QApplication::tr( +- "Make sure the kernel module has been loaded successfully." ++ "Make sure the kernel libre module has been loaded successfully." + ); + + /* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh --- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000 +++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000 @@ -37,7 +58,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- WARNING: The vboxdrv kernel module is not loaded. Either there is no module available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by -+ load. Please reinstall the kernel module virtualbox-libre-modules or ++ load. Please reinstall the kernel libre module virtualbox-libre-modules or + if you don't use our stock kernel compile the modules with - sudo /etc/init.d/vboxdrv setup diff --git a/multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch b/multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch new file mode 100644 index 000000000..822b57294 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch @@ -0,0 +1,68 @@ +diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c +index 06d951a..2103b10 100644 +--- a/sunrpc/rpc_main.c ++++ b/sunrpc/rpc_main.c +@@ -75,12 +75,9 @@ struct commandline + + static const char *cmdname; + +-#define SVR4_CPP "/usr/ccs/lib/cpp" +-#define SUNOS_CPP "/lib/cpp" +- + static const char *svcclosetime = "120"; + static int cppDefined; /* explicit path for C preprocessor */ +-static const char *CPP = SUNOS_CPP; ++static const char *CPP = "/lib/cpp"; + static const char CPPFLAGS[] = "-C"; + static char *pathbuf; + static int cpp_pid; +@@ -327,23 +324,17 @@ find_cpp (void) + { + struct stat buf; + +- if (stat (CPP, &buf) < 0) +- { /* /lib/cpp or explicit cpp does not exist */ +- if (cppDefined) +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); +- crash (); +- } +- else +- { /* try the other one */ +- CPP = SVR4_CPP; +- if (stat (CPP, &buf) < 0) +- { /* can't find any cpp */ +- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); +- crash (); +- } +- } ++ if (stat (CPP, &buf) == 0) ++ return; ++ ++ if (cppDefined) /* user specified cpp but it does not exist */ ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ crash (); + } ++ ++ /* fall back to system CPP */ ++ CPP = "cpp"; + } + + /* +@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define) + close (1); + dup2 (pd[1], 1); + close (pd[0]); +- execv (arglist[0], (char **) arglist); +- perror ("execv"); ++ execvp (arglist[0], (char **) arglist); ++ if (errno == ENOENT) ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ exit (1); ++ } ++ perror ("execvp"); + exit (1); + case -1: + perror ("fork"); diff --git a/multilib/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch b/multilib/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch new file mode 100644 index 000000000..822b57294 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch @@ -0,0 +1,68 @@ +diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c +index 06d951a..2103b10 100644 +--- a/sunrpc/rpc_main.c ++++ b/sunrpc/rpc_main.c +@@ -75,12 +75,9 @@ struct commandline + + static const char *cmdname; + +-#define SVR4_CPP "/usr/ccs/lib/cpp" +-#define SUNOS_CPP "/lib/cpp" +- + static const char *svcclosetime = "120"; + static int cppDefined; /* explicit path for C preprocessor */ +-static const char *CPP = SUNOS_CPP; ++static const char *CPP = "/lib/cpp"; + static const char CPPFLAGS[] = "-C"; + static char *pathbuf; + static int cpp_pid; +@@ -327,23 +324,17 @@ find_cpp (void) + { + struct stat buf; + +- if (stat (CPP, &buf) < 0) +- { /* /lib/cpp or explicit cpp does not exist */ +- if (cppDefined) +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); +- crash (); +- } +- else +- { /* try the other one */ +- CPP = SVR4_CPP; +- if (stat (CPP, &buf) < 0) +- { /* can't find any cpp */ +- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); +- crash (); +- } +- } ++ if (stat (CPP, &buf) == 0) ++ return; ++ ++ if (cppDefined) /* user specified cpp but it does not exist */ ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ crash (); + } ++ ++ /* fall back to system CPP */ ++ CPP = "cpp"; + } + + /* +@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define) + close (1); + dup2 (pd[1], 1); + close (pd[0]); +- execv (arglist[0], (char **) arglist); +- perror ("execv"); ++ execvp (arglist[0], (char **) arglist); ++ if (errno == ENOENT) ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ exit (1); ++ } ++ perror ("execvp"); + exit (1); + case -1: + perror ("fork"); diff --git a/testing/cyrus-sasl/0003_saslauthd_mdoc.patch b/testing/cyrus-sasl/0003_saslauthd_mdoc.patch new file mode 100644 index 000000000..694f4bb67 --- /dev/null +++ b/testing/cyrus-sasl/0003_saslauthd_mdoc.patch @@ -0,0 +1,35 @@ +0003_saslauthd_mdoc.dpatch by <fabbe@debian.org> + +Use the correct path for the saslauthd.conf file, and use another +date format (cosmetic). + +diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc +--- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 +@@ -10,7 +10,7 @@ + .\" manpage in saslauthd.8 whenever you change this source + .\" version. Only the pre-formatted manpage is installed. + .\" +-.Dd 10 24 2002 ++.Dd October 24 2002 + .Dt SASLAUTHD 8 + .Os "CMU-SASL" + .Sh NAME +@@ -216,7 +216,7 @@ + .Em (All platforms that support OpenLDAP 2.0 or higher) + .Pp + Authenticate against an ldap server. The ldap configuration parameters are +-read from /usr/local/etc/saslauthd.conf. The location of this file can be ++read from /etc/saslauthd.conf. The location of this file can be + changed with the -O parameter. See the LDAP_SASLAUTHD file included with the + distribution for the list of available parameters. + .It Li sia +@@ -249,7 +249,7 @@ + .Bl -tag -width "/var/run/saslauthd/mux" + .It Pa /var/run/saslauthd/mux + The default communications socket. +-.It Pa /usr/local/etc/saslauthd.conf ++.It Pa /etc/saslauthd.conf + The default configuration file for ldap support. + .El + .Sh SEE ALSO diff --git a/testing/cyrus-sasl/0010_maintainer_mode.patch b/testing/cyrus-sasl/0010_maintainer_mode.patch new file mode 100644 index 000000000..cf3d02a08 --- /dev/null +++ b/testing/cyrus-sasl/0010_maintainer_mode.patch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0010_maintainer_mode.dpatch by <fabbe@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable maintainer mode to avoid auto* problems. + +@DPATCH@ +diff -urNad trunk~/configure.in trunk/configure.in +--- trunk~/configure.in 2006-05-29 22:52:46.000000000 +0300 ++++ trunk/configure.in 2006-11-01 23:24:55.000000000 +0200 +@@ -62,6 +62,8 @@ + AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22) + CMU_INIT_AUTOMAKE + ++AM_MAINTAINER_MODE ++ + # and include our config dir scripts + ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config" + diff --git a/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch b/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch new file mode 100644 index 000000000..3805b4857 --- /dev/null +++ b/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch @@ -0,0 +1,15 @@ +0011_saslauthd_ac_prog_libtool.dpatch by <fabbe@debian.org> + +Enable libtool use. + +diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in +--- trunk~/saslauthd/configure.in 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/configure.in 2006-11-01 23:41:51.000000000 +0200 +@@ -25,6 +25,7 @@ + AC_PROG_MAKE_SET + AC_PROG_LN_S + AC_PROG_INSTALL ++AC_PROG_LIBTOOL + + dnl Checks for build foo + CMU_C___ATTRIBUTE__ diff --git a/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch b/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch new file mode 100644 index 000000000..d50ec8343 --- /dev/null +++ b/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch @@ -0,0 +1,20 @@ +0012_xopen_crypt_prototype.dpatch by <dannf@debian.org> + +When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h> +will define a correct function prototype for the crypt function. +This avoids segfaults on architectures where the size of a pointer +is greater than the size of an integer (ia64 and amd64 are examples). +This may be detected by looking for build log lines such as the +following: +auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ +auth_shadow.c:183: warning: cast to pointer from integer of different +size + +diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c +--- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 +@@ -1,3 +1,4 @@ ++#define _XOPEN_SOURCE + #define PWBUFSZ 256 /***SWB***/ + + /* MODULE: auth_shadow */ diff --git a/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch b/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch new file mode 100644 index 000000000..e9170cef3 --- /dev/null +++ b/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch @@ -0,0 +1,27 @@ +0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org> + +pid_file_lock is created with a mask of 644 instead of 0644. +This patch fixes this octal/decimal confusion as well as the +(harmless) one in the previous umask() call. + +diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c +--- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 +@@ -276,7 +276,7 @@ + exit(1); + } + +- umask(077); ++ umask(0077); + + pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; + if ((pid_file_lock = malloc(pid_file_size)) == NULL) { +@@ -287,7 +287,7 @@ + strlcpy(pid_file_lock, run_path, pid_file_size); + strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); + +- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { ++ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { + rc = errno; + logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); + logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/testing/cyrus-sasl/0018_auth_rimap_quotes.patch b/testing/cyrus-sasl/0018_auth_rimap_quotes.patch new file mode 100644 index 000000000..13fa999f0 --- /dev/null +++ b/testing/cyrus-sasl/0018_auth_rimap_quotes.patch @@ -0,0 +1,35 @@ +0016_auth_rimap_quotes.dpatch by <fabbe@debian.org> + +All lines beginning with `## DP:' are a description of the patch. +Avoid infinite loop when username/password has a double quote character. +Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 + +diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c +--- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 ++++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 +@@ -162,6 +162,7 @@ + num_quotes = 0; + p1 = s; + while ((p1 = strchr(p1, '"')) != NULL) { ++ p1++; + num_quotes++; + } + +@@ -438,7 +439,7 @@ + syslog(LOG_WARNING, "auth_rimap: writev: %m"); + memset(qlogin, 0, strlen(qlogin)); + free(qlogin); +- memset(qpass, 0, strlen(qlogin)); ++ memset(qpass, 0, strlen(qpass)); + free(qpass); + (void)close(s); + return strdup(RESP_IERROR); +@@ -447,7 +448,7 @@ + /* don't need these any longer */ + memset(qlogin, 0, strlen(qlogin)); + free(qlogin); +- memset(qpass, 0, strlen(qlogin)); ++ memset(qpass, 0, strlen(qpass)); + free(qpass); + + /* read and parse the LOGIN response */ diff --git a/testing/cyrus-sasl/0019_ldap_deprecated.patch b/testing/cyrus-sasl/0019_ldap_deprecated.patch new file mode 100644 index 000000000..8825256cb --- /dev/null +++ b/testing/cyrus-sasl/0019_ldap_deprecated.patch @@ -0,0 +1,22 @@ +0019_ldap_deprecated.dpatch by dann frazier <dannf@debian.org> + +The function ldap_get_values, used in saslauthd/lak.c, is deprecated. +Therefore, its prototype is not included by default when compiling +against the ldap.h headers. As a result, the compiler cannot know the +return type of the function at compile time, and will implicitly +convert to a pointer. This has implications on 64-bit systems. +This patch sets the deprecation mode on, so that the function prototype +gets included when compiling. +(Description by Fabian Fagerholm <fabbe@debian.org>) + +diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c +--- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 ++++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 +@@ -55,6 +55,7 @@ + #include <openssl/des.h> + #endif + ++#define LDAP_DEPRECATED 1 + #include <ldap.h> + #include <lber.h> + #include <sasl.h> diff --git a/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch b/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch new file mode 100644 index 000000000..a49b553f0 --- /dev/null +++ b/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch @@ -0,0 +1,26 @@ +0022_gcc4.4_preprocessor_syntax.dpatch by <fabbe@paniq.net> + +The #elif preprocessor directive requires a test condition. +GCC 4.4 enforces this rule. + +diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c +--- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 ++++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 +@@ -2715,7 +2715,7 @@ + "DIGEST-MD5", /* mech_name */ + #ifdef WITH_RC4 + 128, /* max_ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, +@@ -4034,7 +4034,7 @@ + "DIGEST-MD5", + #ifdef WITH_RC4 /* mech_name */ + 128, /* max ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, diff --git a/testing/cyrus-sasl/0025_ld_as_needed.patch b/testing/cyrus-sasl/0025_ld_as_needed.patch new file mode 100644 index 000000000..67b48b4a4 --- /dev/null +++ b/testing/cyrus-sasl/0025_ld_as_needed.patch @@ -0,0 +1,27 @@ +Author: Matthias Klose <doko@ubuntu.com> +Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use +it. +--- a/saslauthd/Makefile.am ++++ b/saslauthd/Makefile.am +@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c + saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ + saslauthd_LDADD = @SASL_KRB_LIB@ \ + @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ +- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ ++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ + + testsaslauthd_SOURCES = testsaslauthd.c utils.c + testsaslauthd_LDADD = @LIB_SOCKET@ +--- a/sasldb/Makefile.am ++++ b/sasldb/Makefile.am +@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) +-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) +-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) ++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) ++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) + + # Prevent make dist stupidity + libsasldb_a_SOURCES = diff --git a/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch b/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch new file mode 100644 index 000000000..cc00867ef --- /dev/null +++ b/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch @@ -0,0 +1,14 @@ +Author: Roberto C. Sanchez <roberto@connexer.com> +Description: Drop gratuitous dependency on krb5support +--- a/cmulocal/sasl2.m4 ++++ b/cmulocal/sasl2.m4 +@@ -112,9 +112,6 @@ if test "$gssapi" != no; then + fi + + if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then +- # check for libkrb5support first +- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) +- + gss_failed=0 + AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, + ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) diff --git a/testing/cyrus-sasl/0027_db5_support.patch b/testing/cyrus-sasl/0027_db5_support.patch new file mode 100644 index 000000000..522824074 --- /dev/null +++ b/testing/cyrus-sasl/0027_db5_support.patch @@ -0,0 +1,24 @@ +Author: Ondřej Surý <ondrej@debian.org> +Description: Support newer Berkeley DB versions +--- a/sasldb/db_berkeley.c ++++ b/sasldb/db_berkeley.c +@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); +--- a/utils/dbconverter-2.c ++++ b/utils/dbconverter-2.c +@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch b/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch new file mode 100644 index 000000000..14a322496 --- /dev/null +++ b/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch @@ -0,0 +1,134 @@ +--- a/lib/dlopen.c ++++ b/lib/dlopen.c +@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi + return result; + } + +-/* this returns the file to actually open. +- * out should be a buffer of size PATH_MAX +- * and may be the same as in. */ +- +-/* We'll use a static buffer for speed unless someone complains */ +-#define MAX_LINE 2048 +- +-static int _parse_la(const char *prefix, const char *in, char *out) +-{ +- FILE *file; +- size_t length; +- char line[MAX_LINE]; +- char *ntmp = NULL; +- +- if(!in || !out || !prefix || out == in) return SASL_BADPARAM; +- +- /* Set this so we can detect failure */ +- *out = '\0'; +- +- length = strlen(in); +- +- if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) { +- if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) { +- /* check for a .la file */ +- strcpy(line, prefix); +- strcat(line, in); +- length = strlen(line); +- *(line + (length - strlen(SO_SUFFIX))) = '\0'; +- strcat(line, LA_SUFFIX); +- file = fopen(line, "r"); +- if(file) { +- /* We'll get it on the .la open */ +- fclose(file); +- return SASL_FAIL; +- } +- } +- strcpy(out, prefix); +- strcat(out, in); +- return SASL_OK; +- } +- +- strcpy(line, prefix); +- strcat(line, in); +- +- file = fopen(line, "r"); +- if(!file) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "unable to open LA file: %s", line); +- return SASL_FAIL; +- } +- +- while(!feof(file)) { +- if(!fgets(line, MAX_LINE, file)) break; +- if(line[strlen(line) - 1] != '\n') { +- _sasl_log(NULL, SASL_LOG_WARN, +- "LA file has too long of a line: %s", in); +- return SASL_BUFOVER; +- } +- if(line[0] == '\n' || line[0] == '#') continue; +- if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) { +- /* We found the line with the name in it */ +- char *end; +- char *start; +- size_t len; +- end = strrchr(line, '\''); +- if(!end) continue; +- start = &line[sizeof("dlname=")-1]; +- len = strlen(start); +- if(len > 3 && start[0] == '\'') { +- ntmp=&start[1]; +- *end='\0'; +- /* Do we have dlname="" ? */ +- if(ntmp == end) { +- _sasl_log(NULL, SASL_LOG_DEBUG, +- "dlname is empty in .la file: %s", in); +- return SASL_FAIL; +- } +- strcpy(out, prefix); +- strcat(out, ntmp); +- } +- break; +- } +- } +- if(ferror(file) || feof(file)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Error reading .la: %s\n", in); +- fclose(file); +- return SASL_FAIL; +- } +- fclose(file); +- +- if(!(*out)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Could not find a dlname line in .la file: %s", in); +- return SASL_FAIL; +- } +- +- return SASL_OK; +-} + #endif /* DO_DLOPEN */ + + /* loads a plugin library */ +@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_ + if (length + pos>=PATH_MAX) continue; /* too big */ + + if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)), +- SO_SUFFIX) +- && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)), +- LA_SUFFIX)) ++ SO_SUFFIX)) + continue; + ++ /* We only use .so files for loading plugins */ ++ + memcpy(name,dir->d_name,length); + name[length]='\0'; + +- result = _parse_la(prefix, name, tmp); +- if(result != SASL_OK) +- continue; +- ++ /* Create full name with path */ ++ strncpy(tmp, prefix, PATH_MAX); ++ strncat(tmp, name, PATH_MAX); ++ + /* skip "lib" and cut off suffix -- + this only need be approximate */ + strcpy(plugname, name + 3); diff --git a/testing/cyrus-sasl/PKGBUILD b/testing/cyrus-sasl/PKGBUILD new file mode 100644 index 000000000..b6c2a29bc --- /dev/null +++ b/testing/cyrus-sasl/PKGBUILD @@ -0,0 +1,203 @@ +# $Id: PKGBUILD 165399 2012-08-17 23:39:59Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +# This package spans multiple repositories. +# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk. + +pkgbase=('cyrus-sasl') +pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') +#pkgname=libsasl +pkgver=2.1.23 +pkgrel=10 +pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" +arch=('i686' 'x86_64') +url="http://cyrusimap.web.cmu.edu/" +license=('custom') +options=('!makeflags' '!libtool') +makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl') +source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz + cyrus-sasl-2.1.19-checkpw.c.patch + cyrus-sasl-2.1.22-crypt.patch + cyrus-sasl-2.1.22-qa.patch + cyrus-sasl-2.1.22-automake-1.10.patch + cyrus-sasl-2.1.23-authd-fix.patch + 0003_saslauthd_mdoc.patch + 0010_maintainer_mode.patch + 0011_saslauthd_ac_prog_libtool.patch + 0012_xopen_crypt_prototype.patch + 0016_pid_file_lock_creation_mask.patch + 0018_auth_rimap_quotes.patch + 0019_ldap_deprecated.patch + 0022_gcc4.4_preprocessor_syntax.patch + 0025_ld_as_needed.patch + 0026_drop_krb5support_dependency.patch + 0027_db5_support.patch + 0030-dont_use_la_files_for_opening_plugins.patch + saslauthd.service + saslauthd.conf.d + saslauthd) +md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' + 'e27ddff076342e7a3041c4759817d04b' + 'd7e6886e88af04d05f3dec7f0a59ccf7' + '79b8a5e8689989e2afd4b7bda595a7b1' + 'f4131b077ddb5240b375d749162f1b7a' + 'c7ad2c70c1ef814eb4b119f316c064f2' + 'caeeac3feba19cbbd36e7345cc805600' + 'f45d8b60e8f74dd7f7c2ec1665fa602a' + '9d93880514cb5ff5da969f1ceb64a661' + 'dfdc052a7e678db9f687482c5d52f34e' + '4a09f6b24b91f8450892a78e378860da' + '213abe7c5dfe0d7f446992787da1e780' + '5a0321177ad30cb5518c8b6812e3961a' + '0c965748970eea29fa295524821d43f0' + '62bf892fe4d1df41ff748e91a1afaf67' + 'b7848957357e7c02d6490102be496bf9' + 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' + '8e7106f32e495e9ade69014fd1b3352a' + '00f6b781549a274630e22173f77bd41d' + '49219af5641150edec288a3fdb65e7c1' + '75542f613185d5a90520ad0d7d926a20') + +build() { + cd "${srcdir}/cyrus-sasl-${pkgver}" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" + patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" + patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" + patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" + patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" + patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" + patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" + patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" + patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" + patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" + patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" + patch -Np1 -i "${srcdir}/0027_db5_support.patch" + patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" + + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I cmulocal + automake -a -c + autoheader + autoconf + + pushd saslauthd + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I ../cmulocal -I ../config + automake -a -c + autoheader + autoconf + popd + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --disable-static \ + --enable-shared \ + --enable-alwaystrue \ + --enable-checkapop \ + --enable-cram \ + --enable-digest \ + --disable-otp \ + --disable-srp \ + --disable-srp-setpass \ + --disable-krb4 \ + --enable-gssapi \ + --enable-auth-sasldb \ + --enable-plain \ + --enable-anon \ + --enable-login \ + --enable-ntlm \ + --disable-passdss \ + --enable-sql \ + --enable-ldapdb \ + --disable-macos-framework \ + --with-pam \ + --with-saslauthd=/var/run/saslauthd \ + --with-ldap \ + --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ + --sysconfdir=/etc \ + --with-devrandom=/dev/urandom + make +} + +package_libsasl() { + pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" + depends=('openssl') + conflicts=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}" + for dir in include lib sasldb plugins utils; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* + install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" + install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" +} + +package_cyrus-sasl() { + depends=("libsasl=${pkgver}") + pkgdesc="Cyrus saslauthd SASL authentication daemon" + backup=('etc/conf.d/saslauthd') + + cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" + make DESTDIR="${pkgdir}" install + install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" + install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" +} + +package_cyrus-sasl-gssapi() { + pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" + depends=("libsasl=${pkgver}" 'krb5') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" +} + +package_cyrus-sasl-ldap() { + pkgdesc="ldapdb auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}" 'libldap') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/" +} + +package_cyrus-sasl-sql() { + pkgdesc="SQL auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmysqlclient') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/" +} diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch new file mode 100644 index 000000000..f7bf44b79 --- /dev/null +++ b/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch @@ -0,0 +1,170 @@ +diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in +--- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200 ++++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200 +@@ -120,7 +120,7 @@ + JAVA_TRUE = @JAVA_TRUE@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = -lcrypt @LIBS@ + LIBTOOL = @LIBTOOL@ + LIB_CRYPT = @LIB_CRYPT@ + LIB_DES = @LIB_DES@ +diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c +--- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100 ++++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200 +@@ -94,6 +94,23 @@ + # endif + #endif + ++/****************************** ++ * crypt(3) patch start * ++ ******************************/ ++char *crypt(const char *key, const char *salt); ++ ++/* cleartext password formats */ ++#define PASSWORD_FORMAT_CLEARTEXT 1 ++#define PASSWORD_FORMAT_CRYPT 2 ++#define PASSWORD_FORMAT_CRYPTTRAD 3 ++#define PASSWORD_SALT_BUF_LEN 22 ++ ++/* weeds out crypt(3) password's salt */ ++int _sasl_get_salt (char *dest, char *src, int format); ++ ++/****************************** ++ * crypt(3) patch stop * ++ ******************************/ + + /* we store the following secret to check plaintext passwords: + * +@@ -143,7 +160,51 @@ + "*cmusaslsecretPLAIN", + NULL }; + struct propval auxprop_values[3]; +- ++ ++ /****************************** ++ * crypt(3) patch start * ++ * for password format check * ++ ******************************/ ++ sasl_getopt_t *getopt; ++ void *context; ++ const char *p = NULL; ++ /** ++ * MD5: 12 char salt ++ * BLOWFISH: 16 char salt ++ */ ++ char salt[PASSWORD_SALT_BUF_LEN]; ++ int password_format; ++ ++ /* get password format from auxprop configuration */ ++ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { ++ getopt(context, NULL, "password_format", &p, NULL); ++ } ++ ++ /* set password format */ ++ if (p) { ++ /* ++ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); ++ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); ++ */ ++ /* modern, modular crypt(3) */ ++ if (strncmp(p, "crypt", 11) == 0) ++ password_format = PASSWORD_FORMAT_CRYPT; ++ /* traditional crypt(3) */ ++ else if (strncmp(p, "crypt_trad", 11) == 0) ++ password_format = PASSWORD_FORMAT_CRYPTTRAD; ++ /* cleartext password */ ++ else ++ password_format = PASSWORD_FORMAT_CLEARTEXT; ++ } else { ++ /* cleartext password */ ++ password_format = PASSWORD_FORMAT_CLEARTEXT; ++ } ++ ++ /****************************** ++ * crypt(3) patch stop * ++ * for password format check * ++ ******************************/ ++ + if (!conn || !userstr) + return SASL_BADPARAM; + +@@ -180,14 +241,31 @@ + goto done; + } + +- /* At the point this has been called, the username has been canonified +- * and we've done the auxprop lookup. This should be easy. */ +- if(auxprop_values[0].name +- && auxprop_values[0].values +- && auxprop_values[0].values[0] +- && !strcmp(auxprop_values[0].values[0], passwd)) { +- /* We have a plaintext version and it matched! */ +- return SASL_OK; ++ ++ /****************************** ++ * crypt(3) patch start * ++ ******************************/ ++ ++ /* get salt */ ++ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); ++ ++ /* crypt(3)-ed password? */ ++ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { ++ /* compare password */ ++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) ++ return SASL_OK; ++ else ++ ret = SASL_BADAUTH; ++ } ++ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { ++ /* compare passwords */ ++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) ++ return SASL_OK; ++ else ++ ret = SASL_BADAUTH; ++ /****************************** ++ * crypt(3) patch stop * ++ ******************************/ + } else if(auxprop_values[1].name + && auxprop_values[1].values + && auxprop_values[1].values[0]) { +@@ -975,3 +1053,37 @@ + #endif + { NULL, NULL } + }; ++ ++/* weeds out crypt(3) password's salt */ ++int _sasl_get_salt (char *dest, char *src, int format) { ++ int num; /* how many characters is salt long? */ ++ switch (format) { ++ case PASSWORD_FORMAT_CRYPT: ++ /* md5 crypt */ ++ if (src[1] == '1') ++ num = 12; ++ /* blowfish crypt */ ++ else if (src[1] == '2') ++ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; ++ /* traditional crypt */ ++ else ++ num = 2; ++ break; ++ ++ case PASSWORD_FORMAT_CRYPTTRAD: ++ num = 2; ++ break; ++ ++ default: ++ return 1; ++ } ++ ++ /* destroy destination */ ++ memset(dest, '\0', (num + 1)); ++ ++ /* copy salt to destination */ ++ strncpy(dest, src, num); ++ ++ return 1; ++} ++ diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch new file mode 100644 index 000000000..1294cb507 --- /dev/null +++ b/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch @@ -0,0 +1,11 @@ +--- saslauthd/configure.in.orig 2006-05-23 15:53:17.000000000 -0700 ++++ saslauthd/configure.in 2006-05-23 15:53:33.000000000 -0700 +@@ -77,7 +77,7 @@ + AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) + SASL_DB_PATH_CHECK() + SASL_DB_CHECK() +- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" ++ SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB" + fi + + AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch new file mode 100644 index 000000000..8cd71c0c5 --- /dev/null +++ b/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch @@ -0,0 +1,94 @@ +Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was +originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building +using automake 1.10. + +--- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 ++++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 +@@ -82,73 +82,73 @@ + libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la + + libplain_la_SOURCES = plain.c plain_init.c $(common_sources) +-libplain_la_LDFLAGS = -version-info $(plain_version) ++libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) + libplain_la_DEPENDENCIES = $(COMPAT_OBJS) + libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) + + libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) +-libanonymous_la_LDFLAGS = -version-info $(anonymous_version) ++libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) + libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) + libanonymous_la_LIBADD = $(COMPAT_OBJS) + + libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) +-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) ++libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) + libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) + libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) + + libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) +-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) ++libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) + libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) + libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) + + libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) +-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) ++libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) + libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) + libcrammd5_la_LIBADD = $(COMPAT_OBJS) + + libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) +-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) ++libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) + libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) + libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) + + liblogin_la_SOURCES = login.c login_init.c $(common_sources) +-liblogin_la_LDFLAGS = -version-info $(login_version) ++liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) + liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) + liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) + + libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) +-libsrp_la_LDFLAGS = -version-info $(srp_version) ++libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) + libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) + libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) + + libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) +-libotp_la_LDFLAGS = -version-info $(otp_version) ++libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) + libotp_la_DEPENDENCIES = $(COMPAT_OBJS) + libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) + + libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) +-libntlm_la_LDFLAGS = -version-info $(ntlm_version) ++libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) + libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) + libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) + + libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) +-libpassdss_la_LDFLAGS = -version-info $(passdss_version) ++libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) + libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) + libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) + + # Auxprop Plugins + libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) +-libsasldb_la_LDFLAGS = -version-info $(sasldb_version) ++libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) + libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) + libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) + + libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) +-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) ++libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) + libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) + libldapdb_la_LIBADD = $(COMPAT_OBJS) + + libsql_la_SOURCES = sql.c sql_init.c $(common_sources) +-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) ++libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) + libsql_la_DEPENDENCIES = $(COMPAT_OBJS) + libsql_la_LIBADD = $(COMPAT_OBJS) + diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch new file mode 100644 index 000000000..fd356327b --- /dev/null +++ b/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch @@ -0,0 +1,71 @@ +http://bugs.gentoo.org/152544 + +--- cyrus-sasl-2.1.22/lib/Makefile.am ++++ cyrus-sasl-2.1.22/lib/Makefile.am +@@ -45,6 +45,7 @@ sasl_version = 2:22:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb + ++AM_CFLAGS = -fPIC + EXTRA_DIST = windlopen.c staticopen.h NTMakefile + EXTRA_LIBRARIES = libsasl2.a + noinst_LIBRARIES = @SASL_STATIC_LIBS@ +--- cyrus-sasl-2.1.22/plugins/Makefile.am ++++ cyrus-sasl-2.1.22/plugins/Makefile.am +@@ -63,6 +63,7 @@ srp_version = 2:22:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include + AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) ++AM_CFLAGS = -fPIC + + COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ + +--- cyrus-sasl-2.1.22/sasldb/Makefile.am ++++ cyrus-sasl-2.1.22/sasldb/Makefile.am +@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top + + extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c + ++AM_CFLAGS = -fPIC + EXTRA_DIST = NTMakefile + + noinst_LTLIBRARIES = libsasldb.la +--- cyrus-sasl-2.1.22/utils/Makefile.am ++++ cyrus-sasl-2.1.22/utils/Makefile.am +@@ -42,7 +42,7 @@ + # + ################################################################ + +-all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) ++all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) + all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) + + sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer +--- cyrus-sasl-2.1.22/sample/Makefile.am ++++ cyrus-sasl-2.1.22/sample/Makefile.am +@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c + server_SOURCES = server.c common.c common.h + client_SOURCES = client.c common.c common.h + +-server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) +-client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) ++server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) ++client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) + +-sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) +-sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) ++sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) ++sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) + + EXTRA_DIST = NTMakefile +--- cyrus-sasl-2.1.22/lib/Makefile.am ++++ cyrus-sasl-2.1.22/lib/Makefile.am +@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la + libsasl2_la_SOURCES = $(common_sources) $(common_headers) + libsasl2_la_LDFLAGS = -version-info $(sasl_version) + libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) +-libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) ++libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) + + if MACOSX + framedir = /Library/Frameworks/SASL2.framework diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch new file mode 100644 index 000000000..4f7b04f13 --- /dev/null +++ b/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch @@ -0,0 +1,22 @@ +fix missing prototype warnings + +--- cyrus-sasl-2.1.22/lib/auxprop.c ++++ cyrus-sasl-2.1.22/lib/auxprop.c +@@ -43,6 +43,7 @@ + */ + + #include <config.h> ++#include <stdio.h> + #include <sasl.h> + #include <prop.h> + #include <ctype.h> +--- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c ++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c +@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF + ******************************************************************/ + + #include <shadow.h> ++#include <string.h> + + extern char *crypt(); + diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch new file mode 100644 index 000000000..f5f372d17 --- /dev/null +++ b/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch @@ -0,0 +1,28 @@ +fix warnings: + +auth_sasldb.c: In function ‘auth_sasldb’: +auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ + +auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type +../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ + +--- saslauthd/auth_sasldb.c ++++ saslauthd/auth_sasldb.c +@@ -41,6 +41,7 @@ + #include <string.h> + #include <stdlib.h> + #include <pwd.h> ++#include <unistd.h> + /* END PUBLIC DEPENDENCIES */ + + #define RETURN(x) return strdup(x) +@@ -131,7 +132,8 @@ + /* VARIABLES */ + char pw[1024]; /* pointer to passwd file entry */ + sasl_utils_t utils; +- int ret, outsize; ++ int ret; ++ size_t outsize; + const char *use_realm; + char realm_buf[MAXHOSTNAMELEN]; + /* END VARIABLES */ diff --git a/testing/cyrus-sasl/saslauthd b/testing/cyrus-sasl/saslauthd new file mode 100644 index 000000000..6afafae0b --- /dev/null +++ b/testing/cyrus-sasl/saslauthd @@ -0,0 +1,49 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd + +. /etc/rc.conf +. /etc/rc.d/functions + +DAEMON_NAME="saslauthd" +SASLAUTHD_BIN=/usr/sbin/saslauthd +SASLAUTHD_RUN=/var/run/saslauthd +SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid + +case "$1" in + start) + stat_busy "Starting $DAEMON_NAME" + [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd + if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then + add_daemon $DAEMON_NAME + stat_done + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $DAEMON_NAME" + [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm_daemon $DAEMON_NAME + stat_done + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +# vim: ts=2 sw=2 et ft=sh diff --git a/testing/cyrus-sasl/saslauthd.conf.d b/testing/cyrus-sasl/saslauthd.conf.d new file mode 100644 index 000000000..167211290 --- /dev/null +++ b/testing/cyrus-sasl/saslauthd.conf.d @@ -0,0 +1 @@ +SASLAUTHD_OPTS="-a pam" diff --git a/testing/cyrus-sasl/saslauthd.service b/testing/cyrus-sasl/saslauthd.service new file mode 100644 index 000000000..42d8ad768 --- /dev/null +++ b/testing/cyrus-sasl/saslauthd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Cyrus SASL authentication daemon + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/saslauthd +ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS +PidFile=/var/run/saslauthd/saslauthd.pid + +[Install] +WantedBy=multi-user.target diff --git a/testing/dhcp/dhcpd4.service b/testing/dhcp/dhcpd4.service new file mode 100644 index 000000000..2ef4a9f26 --- /dev/null +++ b/testing/dhcp/dhcpd4.service @@ -0,0 +1,13 @@ +[Unit] +Description=IPv4 DHCP server +After=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpd4.pid +ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid +ExecReload=/bin/kill -TERM $MAINPID +KillSignal=SIGINT + +[Install] +WantedBy=multi-user.target diff --git a/testing/dhcp/dhcpd6.service b/testing/dhcp/dhcpd6.service new file mode 100644 index 000000000..eb3b337c6 --- /dev/null +++ b/testing/dhcp/dhcpd6.service @@ -0,0 +1,13 @@ +[Unit] +Description=IPv6 DHCP server +After=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpd6.pid +ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid +ExecReload=/bin/kill -TERM $MAINPID +KillSignal=SIGINT + +[Install] +WantedBy=multi-user.target diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD new file mode 100644 index 000000000..71b0db89f --- /dev/null +++ b/testing/gdm/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 165393 2012-08-17 23:22:35Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gdm +pkgver=3.4.1 +pkgrel=3 +pkgdesc="Gnome Display Manager (a reimplementation of xdm)" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org" +backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'etc/pam.d/gdm-password' + 'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf') +groups=('gnome-extra') +options=('!libtool') +depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss') +makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection') +optdepends=('gnome-shell: new login interface' + 'fprintd: fingerprint authentication') +install=gdm.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + fix_external_program_directories.patch + gdm-vt-allocation-hack.patch + gdm gdm.service + gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam) +sha256sums=('6292968dff5fc89877b5e1aaa3c7d1484dd3ed2d4f388e935841d053439be665' + 'f68600ccf80f475deb417d58ab3306c4a1ba4622688e2901996c8549c85a9ee6' + '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' + '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' + 'b7b91c682ff4c7cfb2d395c65abeca9dad8c0997b399dcf22abdf481c3e61349' + '6a8b286d1ffa04150b3cc401f64e6ddec778c7b65f5bfc831031b64345d7e6b2' + 'dd50f5bd28807a16c5ebe89fc868b7c47fa571138498e879f2b1c9da1ad6eb84' + 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' + '1a1e9b3f26de4eb9f45d1e9a0b5d0db902ca734461ba46b4bb620b0298bb98aa' + '844d5fae0df59241d34099a3d458289bd95707b2aae976627c663904294043d8' + '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834') + +build() { + cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix_external_program_directories.patch" + patch -Np1 -i "$srcdir/gdm-vt-allocation-hack.patch" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gdm \ + --localstatedir=/var \ + --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \ + --disable-scrollkeeper \ + --disable-static \ + --without-tcp-wrappers \ + --disable-schemas-compile \ + --with-systemd=no + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do + install -m644 "$srcdir/$i" "$pkgdir/etc/pam.d/${i%.pam}" + done + + install -Dm755 "$srcdir/gdm" "$pkgdir/etc/rc.d/gdm" + install -Dm644 "$srcdir/gdm.service" "$pkgdir/usr/lib/systemd/system/gdm.service" + + chmod 1770 "$pkgdir/var/log/gdm" + chmod 700 "$pkgdir/var/lib/gdm/.config/dconf" + rm -rf "$pkgdir/var/run" "$pkgdir/var/gdm" +} diff --git a/testing/gdm/fix_external_program_directories.patch b/testing/gdm/fix_external_program_directories.patch new file mode 100644 index 000000000..b3a0f0cf6 --- /dev/null +++ b/testing/gdm/fix_external_program_directories.patch @@ -0,0 +1,34 @@ +diff -Nur gdm-3.3.92.orig/daemon/gdm-server.c gdm-3.3.92/daemon/gdm-server.c +--- gdm-3.3.92.orig/daemon/gdm-server.c 2012-03-19 22:30:05.311490006 +0000 ++++ gdm-3.3.92/daemon/gdm-server.c 2012-03-19 22:30:17.004732251 +0000 +@@ -139,7 +139,7 @@ + g_return_val_if_fail (GDM_IS_SERVER (server), NULL); + + error = NULL; +- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s", ++ command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s", + server->priv->display_name); + + g_debug ("GdmServer: Running helper %s", command); +diff -Nur gdm-3.3.92.orig/data/gdm-shell.session.in gdm-3.3.92/data/gdm-shell.session.in +--- gdm-3.3.92.orig/data/gdm-shell.session.in 2012-03-19 22:30:05.311490006 +0000 ++++ gdm-3.3.92/data/gdm-shell.session.in 2012-03-19 22:30:17.004732251 +0000 +@@ -1,5 +1,5 @@ + [GNOME Session] + Name=Display Manager + RequiredComponents=gnome-shell;gnome-settings-daemon; +-IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated' ++IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated' + FallbackSession=gdm-fallback +diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c +--- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:05.304823391 +0000 ++++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:17.004732251 +0000 +@@ -131,7 +131,7 @@ + ret = FALSE; + + error = NULL; +- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); ++ g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error); + if (error != NULL) { + g_warning ("Error starting settings daemon: %s", error->message); + g_error_free (error); diff --git a/testing/gdm/gdm b/testing/gdm/gdm new file mode 100755 index 000000000..c3e635a6d --- /dev/null +++ b/testing/gdm/gdm @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting GDM" + /usr/sbin/gdm & + if [ $? -gt 0 ]; then + stat_fail + else + + add_daemon gdm + stat_done + fi + ;; + stop) + stat_busy "Stopping GDM" + [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon gdm + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/gdm/gdm-autologin.pam b/testing/gdm/gdm-autologin.pam new file mode 100644 index 000000000..bc0193df0 --- /dev/null +++ b/testing/gdm/gdm-autologin.pam @@ -0,0 +1,20 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so + +auth requisite pam_permit.so + +auth sufficient pam_succeed_if.so uid >= 1000 quiet +auth required pam_deny.so + +account required pam_access.so +account required pam_time.so +account required pam_unix.so + +password required pam_deny.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so revoke +session required pam_limits.so +session required pam_unix.so diff --git a/testing/gdm/gdm-fingerprint.pam b/testing/gdm/gdm-fingerprint.pam new file mode 100644 index 000000000..38fab5782 --- /dev/null +++ b/testing/gdm/gdm-fingerprint.pam @@ -0,0 +1,20 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so + +auth requisite pam_fprintd.so + +auth sufficient pam_succeed_if.so uid >= 1000 quiet +auth required pam_deny.so + +account required pam_access.so +account required pam_time.so +account required pam_unix.so + +password required pam_deny.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so revoke +session required pam_limits.so +session required pam_unix.so diff --git a/testing/gdm/gdm-password.pam b/testing/gdm/gdm-password.pam new file mode 100644 index 000000000..eed5e1003 --- /dev/null +++ b/testing/gdm/gdm-password.pam @@ -0,0 +1,22 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so + +auth requisite pam_unix.so nullok +auth optional pam_gnome_keyring.so + +auth sufficient pam_succeed_if.so uid >= 1000 quiet +auth required pam_deny.so + +account required pam_access.so +account required pam_time.so +account required pam_unix.so + +password required pam_unix.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so force revoke +session required pam_limits.so +session required pam_unix.so +session optional pam_gnome_keyring.so auto_start diff --git a/testing/gdm/gdm-smartcard.pam b/testing/gdm/gdm-smartcard.pam new file mode 100644 index 000000000..c5c29e73f --- /dev/null +++ b/testing/gdm/gdm-smartcard.pam @@ -0,0 +1,20 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so + +auth requisite pam_pkcs11.so wait_for_card card_only + +auth sufficient pam_succeed_if.so uid >= 1000 quiet +auth required pam_deny.so + +account required pam_access.so +account required pam_time.so +account required pam_unix.so + +password required pam_pkcs11.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so revoke +session required pam_limits.so +session required pam_unix.so diff --git a/testing/gdm/gdm-vt-allocation-hack.patch b/testing/gdm/gdm-vt-allocation-hack.patch new file mode 100644 index 000000000..56fa5a151 --- /dev/null +++ b/testing/gdm/gdm-vt-allocation-hack.patch @@ -0,0 +1,118 @@ +diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c +index 39def47..03488fd 100644 +--- a/daemon/gdm-server.c ++++ b/daemon/gdm-server.c +@@ -33,6 +33,8 @@ + #include <grp.h> + #include <signal.h> + #include <sys/resource.h> ++#include <sys/ioctl.h> ++#include <sys/vt.h> + + #include <glib.h> + #include <glib/gi18n.h> +@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server) + return out; + } + ++#ifndef O_NOCTTY ++# define O_NOCTTY 0 ++#endif ++ ++static int ++open_vt (int vtno) ++{ ++ char *vtname; ++ int fd; ++ ++ vtname = g_strdup_printf ("/dev/tty%d", vtno); ++ ++ do { ++ errno = 0; ++ fd = open (vtname, O_RDWR | O_NOCTTY, 0); ++ } while (errno == EINTR); ++ ++ g_free (vtname); ++ return fd; ++} ++ ++static gint ++find_first_probably_free_vt (void) ++{ ++ int fd, fdv; ++ int vtno; ++ unsigned short vtmask; ++ struct vt_stat vtstat; ++ guint v_state; ++ ++ fdv = -1; ++ ++ do { ++ errno = 0; ++ fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0); ++ } while (errno == EINTR); ++ ++ if (fd >= 0) { ++ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) { ++ v_state = vtstat.v_state; ++ } else { ++ close (fd); ++ v_state = 0; ++ fd = -1; ++ } ++ } else { ++ v_state = 0; ++ } ++ ++ if (fd < 0) { ++ do { ++ errno = 0; ++ fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0); ++ } while (errno == EINTR); ++ ++ if (fd >= 0) { ++ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) ++ v_state = vtstat.v_state; ++ } ++ } ++ ++ for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) { ++ /* Is this console in use? */ ++ if (v_state & vtmask) ++ continue; ++ ++ /* No, try to open it */ ++ fdv = open_vt (vtno); ++ if (fdv >= 0) ++ break; ++ ++ /* If we're here, kernel indicated that the console was free, ++ * but we failed to open it. Just go on to higher VTs. */ ++ } ++ ++ if (fdv >= 0) ++ close (fdv); ++ else ++ vtno = -1; ++ ++ if (fd >= 0) ++ close (fd); ++ ++ return vtno; ++} ++ + char * + gdm_server_get_display_device (GdmServer *server) + { +@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer *server, + + if (vtarg != NULL && ! gotvtarg) { + argv[len++] = g_strdup (vtarg); ++ } else if (!query_in_arglist && !gotvtarg) { ++ gint vtnum = find_first_probably_free_vt (); ++ ++ if (vtnum > 0) ++ argv [len++] = g_strdup_printf ("vt%d", vtnum); + } + + argv[len++] = NULL; diff --git a/testing/gdm/gdm-welcome.pam b/testing/gdm/gdm-welcome.pam new file mode 100644 index 000000000..cc3811c19 --- /dev/null +++ b/testing/gdm/gdm-welcome.pam @@ -0,0 +1,12 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so + +account required pam_nologin.so +account required pam_unix.so + +password required pam_deny.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so force revoke diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install new file mode 100644 index 000000000..c48faf4ae --- /dev/null +++ b/testing/gdm/gdm.install @@ -0,0 +1,30 @@ +pkgname=gdm + +post_install() { + getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm + getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm + passwd -l gdm > /dev/null + chown -R gdm:gdm /var/lib/gdm > /dev/null + + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + dconf update +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then + gconfpkg --uninstall ${pkgname} + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas + dconf update + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + getent passwd gdm >/dev/null 2>&1 && userdel gdm + getent group gdm >/dev/null 2>&1 && groupdel gdm +} diff --git a/testing/gdm/gdm.pam b/testing/gdm/gdm.pam new file mode 100644 index 000000000..655299cb7 --- /dev/null +++ b/testing/gdm/gdm.pam @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_unix.so +auth optional pam_gnome_keyring.so +account required pam_unix.so +session required pam_limits.so +session required pam_unix.so +session optional pam_gnome_keyring.so auto_start +password required pam_unix.so diff --git a/testing/gdm/gdm.service b/testing/gdm/gdm.service new file mode 100644 index 000000000..0125934d6 --- /dev/null +++ b/testing/gdm/gdm.service @@ -0,0 +1,10 @@ +[Unit] +Description=Gnome Display Manager +After=systemd-user-sessions.service + +[Service] +ExecStart=/usr/sbin/gdm -nodaemon +Restart=always + +[Install] +Alias=display-manager.service diff --git a/testing/git/ChangeLog b/testing/git/ChangeLog new file mode 100644 index 000000000..f0c15233e --- /dev/null +++ b/testing/git/ChangeLog @@ -0,0 +1,57 @@ +Simple version bumps are omitted from the following ChangeLog. + +2011-08-16 Dan McGee <dan@archlinux.org> + Version 1.7.6.1-1 + * Enable USE_LIBPCRE for `git grep -P` usage + +2011-05-05 Dan McGee <dan@archlinux.org> + Version 1.7.5.1-1 + * Byte compile emacs files (FS#20874) + * Respect CFLAGS/LDFLAGS (FS#23963) + +2011-04-27 Dan McGee <dan@archlinux.org> + Version 1.7.5-1 + * Add missing optdepends for git send-email (FS#20923) + +2011-01-05 Dan McGee <dan@archlinux.org> + Version 1.7.3.5-1 + * More flexible git-daemon RC scripts (FS#20575) + +2010-10-01 Allan McRae <allan@archlinux.org> + Version 1.7.3.1-2 + * Python 2/3 rebuild + +2010-06-29 Dan McGee <dan@archlinux.org> + Version 1.7.1.1-1 + * Add emacs completion files (FS#17968) + * Add git-daemon RC scripts (FS#19291) + +2009-06-05 Dan McGee <dan@archlinux.org> + Version 1.6.3.2-1 + * Remove gitweb from /usr/share; it needs customization to be helpful + * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) + +2008-09-14 Dan McGee <dan@archlinux.org> + Version 1.6.0.2-1 + * Moved optional depends from install file to optdepends array + +2008-06-15 Dan McGee <dan@archlinux.org> + Version 1.5.6-1 + * Removed 'cpio' dependency, clone is now a builtin and no longer needs it + +2008-02-02 Dan McGee <dan@archlinux.org> + Version 1.5.4-1 + * Upstream version 1.5.4 + * Enable pthreads support in pack-objects. To use, set the pack.threads + git config option. Read manpages of pack-objects and config for more + details. + * Changelog added (with entries going back a bit). + +2008-01-28 Kevin Piche <kevin@archlinux.org> + Version 1.5.3.7-2 + * Updated for new perl policy (vendor dirs) + * Change license to GPL2 + +2007-11-01 Eric Belanger <eric@archlinux.org> + Version 1.5.3.5-2 + * Fix Perl module location diff --git a/testing/git/PKGBUILD b/testing/git/PKGBUILD new file mode 100644 index 000000000..bc0f8c8df --- /dev/null +++ b/testing/git/PKGBUILD @@ -0,0 +1,115 @@ +# $Id: PKGBUILD 165368 2012-08-16 14:45:26Z dan $ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgname=git +pkgver=1.7.11.5 +pkgrel=2 +pkgdesc="the fast distributed version control system" +arch=(i686 x86_64) +url="http://git-scm.com/" +license=('GPL2') +depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') +makedepends=('python2' 'emacs') +optdepends=('tk: gitk and git gui' + 'perl-libwww: git svn' + 'perl-term-readkey: git svn' + 'perl-mime-tools: git send-email' + 'perl-net-smtp-ssl: git send-email TLS support' + 'perl-authen-sasl: git send-email TLS support' + 'python2: various helper scripts' + 'subversion: git svn' + 'cvsps: git cvsimport') +replaces=('git-core') +provides=('git-core') +backup=('etc/conf.d/git-daemon.conf') +install=git.install +source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" + "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" + git-daemon + git-daemon.conf + git-daemon@.service + git-daemon.socket) +changelog=ChangeLog + +build() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE=1 \ + NO_CROSS_DIRECTORY_HARDLINKS=1 \ + all + + cd contrib/emacs + make prefix=/usr +} + +check() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + local jobs + jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE=1 \ + NO_CROSS_DIRECTORY_HARDLINKS=1 \ + NO_SVN_TESTS=y \ + DEFAULT_TEST_TARGET=prove \ + GIT_PROVE_OPTS="$jobs -Q" \ + GIT_TEST_OPTS="--root=/dev/shm/" \ + test +} + +package() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE=1 \ + NO_CROSS_DIRECTORY_HARDLINKS=1 \ + INSTALLDIRS=vendor DESTDIR="$pkgdir" install + + # bash completion + # until this is fixed, no point in loading it dynamically: + # http://git.661346.n2.nabble.com/bash-completion-now-loads-completions-dynamically-so-git-ps1-is-not-defined-when-you-open-a-shell-td7415323.html + #mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ + #install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git + mkdir -p "$pkgdir"/etc/bash_completion.d/ + install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git + # more contrib stuff + cp -a ./contrib $pkgdir/usr/share/git/ + # scripts are for python 2.x + sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ + $(find "$pkgdir" -name '*.py') \ + "$pkgdir"/usr/lib/git-core/git-p4 \ + "$pkgdir"/usr/share/git/gitview/gitview + + # emacs interface + cd contrib/emacs + make prefix=/usr DESTDIR="$pkgdir" install + + # how 'bout some manpages? + for mansect in man1 man5 man7; do + for manpage in "$srcdir"/$mansect/*; do + install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage) + done + done + + # remove perllocal.pod, .packlist, and empty directories. + rm -rf "$pkgdir"/usr/lib/perl5 + + # git daemon script + install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon + install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf + + # systemd stuff + install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service + install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket +} + +md5sums=('9985d35c11531d546426ebefb327c847' + 'f08a5a60e57f00399bbd384cfd7791f3' + '8e2648910fd5dd4f1c41d3c7fa9e9156' + '2e42bf97779a1c6411d89043334c9e78' + '198ef9d9e79bd8d5868f95ed9f79cc34' + '779c00deb490291c6b477b8cc0161123') diff --git a/testing/git/git-daemon b/testing/git/git-daemon new file mode 100644 index 000000000..21ba73ed5 --- /dev/null +++ b/testing/git/git-daemon @@ -0,0 +1,70 @@ +#!/bin/bash + +daemon_bin="/usr/lib/git-core/git-daemon" +daemon_name=$(basename $daemon_bin) +PIDF="/var/run/$daemon_name.pid" + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f $PIDF ] && rm -f $PIDF + # RUN + $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > $PIDF + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f $PIDF &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 diff --git a/testing/git/git-daemon.conf b/testing/git/git-daemon.conf new file mode 100644 index 000000000..3f9a12060 --- /dev/null +++ b/testing/git/git-daemon.conf @@ -0,0 +1,5 @@ +# path to git repositories served +GIT_REPO="/srv/git/" +# see `man git-daemon` for all available options +# $GIT_REPO will be present twice in most configs +GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" diff --git a/testing/git/git-daemon.socket b/testing/git/git-daemon.socket new file mode 100644 index 000000000..c84740588 --- /dev/null +++ b/testing/git/git-daemon.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Git Daemon Socket +After=network.target + +[Socket] +ListenStream=9418 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/testing/git/git-daemon@.service b/testing/git/git-daemon@.service new file mode 100644 index 000000000..67d4cfa9c --- /dev/null +++ b/testing/git/git-daemon@.service @@ -0,0 +1,11 @@ +[Unit] +Description=Git Daemon Instance +After=network.target + +[Service] +User=git +# The '-' is to ignore non-zero exit statuses +ExecStart=-/usr/lib/git-core/git-daemon --inetd --export-all --base-path=/srv/git +StandardInput=socket +StandardOutput=inherit +StandardError=journal diff --git a/testing/git/git.install b/testing/git/git.install new file mode 100644 index 000000000..9edc065ba --- /dev/null +++ b/testing/git/git.install @@ -0,0 +1,22 @@ +post_install() { + if ! getent group git >/dev/null; then + groupadd --system git + fi + if ! getent passwd git >/dev/null; then + useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git + passwd -l git >/dev/null + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + if getent passwd git >/dev/null; then + userdel git + fi + if getent group git >/dev/null; then + groupdel git + fi +} diff --git a/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch b/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch new file mode 100644 index 000000000..822b57294 --- /dev/null +++ b/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch @@ -0,0 +1,68 @@ +diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c +index 06d951a..2103b10 100644 +--- a/sunrpc/rpc_main.c ++++ b/sunrpc/rpc_main.c +@@ -75,12 +75,9 @@ struct commandline + + static const char *cmdname; + +-#define SVR4_CPP "/usr/ccs/lib/cpp" +-#define SUNOS_CPP "/lib/cpp" +- + static const char *svcclosetime = "120"; + static int cppDefined; /* explicit path for C preprocessor */ +-static const char *CPP = SUNOS_CPP; ++static const char *CPP = "/lib/cpp"; + static const char CPPFLAGS[] = "-C"; + static char *pathbuf; + static int cpp_pid; +@@ -327,23 +324,17 @@ find_cpp (void) + { + struct stat buf; + +- if (stat (CPP, &buf) < 0) +- { /* /lib/cpp or explicit cpp does not exist */ +- if (cppDefined) +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); +- crash (); +- } +- else +- { /* try the other one */ +- CPP = SVR4_CPP; +- if (stat (CPP, &buf) < 0) +- { /* can't find any cpp */ +- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); +- crash (); +- } +- } ++ if (stat (CPP, &buf) == 0) ++ return; ++ ++ if (cppDefined) /* user specified cpp but it does not exist */ ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ crash (); + } ++ ++ /* fall back to system CPP */ ++ CPP = "cpp"; + } + + /* +@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define) + close (1); + dup2 (pd[1], 1); + close (pd[0]); +- execv (arglist[0], (char **) arglist); +- perror ("execv"); ++ execvp (arglist[0], (char **) arglist); ++ if (errno == ENOENT) ++ { ++ fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP); ++ exit (1); ++ } ++ perror ("execvp"); + exit (1); + case -1: + perror ("fork"); diff --git a/testing/irqbalance/PKGBUILD b/testing/irqbalance/PKGBUILD new file mode 100644 index 000000000..52c5ae477 --- /dev/null +++ b/testing/irqbalance/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Dan McGee <dan@archlinux.org> +# Contributor: Martin Striz <ms@poruba.net> + +pkgname=irqbalance +_realver=1.0.3 +pkgver=1.0.3.20110809 +pkgrel=1 +pkgdesc="IRQ balancing daemon for SMP systems" +arch=('i686' 'x86_64') +url="http://code.google.com/p/irqbalance" +license=('GPL') +depends=(glib2 numactl libcap-ng) +makedepends=(pkgconfig) +backup=(etc/conf.d/irqbalance) +source=(http://irqbalance.googlecode.com/files/irqbalance-$_realver.tar.gz + irqbalance-2011-08-09.patch + irqbalance.conf.d + irqbalance.rc.d + irqbalance.service) +md5sums=('6f246481d6295bcb9a79751c03207c96' + '49a5669fc3eb452a5d24abec887f0a6a' + '336c1ee99818f9ecda1687e34c69fd6b' + 'fb82fc5d267d39110baf720d81282a7c' + '9e82dc471128117982a8dd0c4bd5f246') + +build() { + cd "$srcdir/$pkgname-$_realver" + patch -Np1 < ../irqbalance-2011-08-09.patch + autoreconf -fi + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$_realver" + make install DESTDIR="$pkgdir" + install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance + install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance + install -D -m644 ../irqbalance.service "$pkgdir"/usr/lib/systemd/system/irqbalance.service +} diff --git a/testing/irqbalance/irqbalance-2011-08-09.patch b/testing/irqbalance/irqbalance-2011-08-09.patch new file mode 100644 index 000000000..fcdb8bdbf --- /dev/null +++ b/testing/irqbalance/irqbalance-2011-08-09.patch @@ -0,0 +1,1584 @@ +diff --git a/ChangeLog b/ChangeLog +deleted file mode 100644 +index f5e9428..0000000 +--- a/ChangeLog ++++ /dev/null +@@ -1,3 +0,0 @@ +-This is all tracked in the SVN repo. This file is just here to keep the +-autotools from complaining +- +diff --git a/Makefile.am b/Makefile.am +index 9847232..188e34f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,17 +22,17 @@ + + AUTOMAKE_OPTIONS = no-dependencies + ACLOCAL_AMFLAGS = -I m4 +-EXTRA_DIST = README INSTALL COPYING autogen.sh m4/cap-ng.m4 misc/irqbalance.service +- ++EXTRA_DIST = INSTALL COPYING autogen.sh misc/irqbalance.service ++ + INCLUDES = -I${top_srcdir} +-LIBS = $(CAPNG_LDADD) $(GLIB_LIBS) @LIBS@ +-AM_CFLAGS = $(GLIB_CFLAGS) ++AM_CFLAGS = $(LIBCAP_NG_CFLAGS) $(GLIB_CFLAGS) + AM_CPPFLAGS = -W -Wall -Wshadow -Wformat -Wundef -D_GNU_SOURCE + noinst_HEADERS = bitmap.h constants.h cpumask.h irqbalance.h non-atomic.h \ + types.h + sbin_PROGRAMS = irqbalance + irqbalance_SOURCES = activate.c bitmap.c classify.c cputree.c irqbalance.c \ +- irqlist.c numa.c placement.c powermode.c procinterrupts.c ++ irqlist.c numa.c placement.c procinterrupts.c ++irqbalance_LDADD = $(LIBCAP_NG_LIBS) $(GLIB_LIBS) + dist_man_MANS = irqbalance.1 + + CONFIG_CLEAN_FILES = debug*.list config/* +@@ -40,3 +40,6 @@ clean-generic: + rm -rf autom4te*.cache + rm -f *.rej *.orig *~ + ++if LOCAL_GLIB ++SUBDIRS = glib-local ++endif +diff --git a/NEWS b/NEWS +deleted file mode 100644 +index 7cc0277..0000000 +--- a/NEWS ++++ /dev/null +@@ -1 +0,0 @@ +-No news currently +diff --git a/README b/README +deleted file mode 100644 +index e69de29..0000000 +diff --git a/activate.c b/activate.c +index 292c44a..02fc8dc 100644 +--- a/activate.c ++++ b/activate.c +@@ -1,5 +1,6 @@ + /* + * Copyright (C) 2006, Intel Corporation ++ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> + * + * This file is part of irqbalance + * +@@ -31,34 +32,63 @@ + + #include "irqbalance.h" + ++static int check_affinity(struct irq_info *info, cpumask_t applied_mask) ++{ ++ cpumask_t current_mask; ++ char buf[PATH_MAX]; ++ char *line = NULL; ++ size_t size = 0; ++ FILE *file; ++ ++ sprintf(buf, "/proc/irq/%i/smp_affinity", info->irq); ++ file = fopen(buf, "r"); ++ if (!file) ++ return 1; ++ if (getline(&line, &size, file)==0) { ++ free(line); ++ fclose(file); ++ return 1; ++ } ++ cpumask_parse_user(line, strlen(line), current_mask); ++ fclose(file); ++ free(line); ++ ++ return cpus_equal(applied_mask, current_mask); ++} + + static void activate_mapping(struct irq_info *info, void *data __attribute__((unused))) + { + char buf[PATH_MAX]; + FILE *file; + cpumask_t applied_mask; ++ int valid_mask = 0; ++ ++ if ((hint_policy == HINT_POLICY_EXACT) && ++ (!cpus_empty(info->affinity_hint))) { ++ applied_mask = info->affinity_hint; ++ valid_mask = 1; ++ } else if (info->assigned_obj) { ++ applied_mask = info->assigned_obj->mask; ++ valid_mask = 1; ++ if ((hint_policy == HINT_POLICY_SUBSET) && ++ (!cpus_empty(info->affinity_hint))) ++ cpus_and(applied_mask, applied_mask, info->affinity_hint); ++ } + + /* + * only activate mappings for irqs that have moved + */ +- if (!info->moved) ++ if (!info->moved && (!valid_mask || check_affinity(info, applied_mask))) + return; + + if (!info->assigned_obj) + return; + +- + sprintf(buf, "/proc/irq/%i/smp_affinity", info->irq); + file = fopen(buf, "w"); + if (!file) + return; + +- if ((hint_policy == HINT_POLICY_EXACT) && +- (!cpus_empty(info->affinity_hint))) +- applied_mask = info->affinity_hint; +- else +- applied_mask = info->assigned_obj->mask; +- + cpumask_scnprintf(buf, PATH_MAX, applied_mask); + fprintf(file, "%s", buf); + fclose(file); +diff --git a/autogen.sh b/autogen.sh +index 5ad9f14..b792e8b 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -1,4 +1,5 @@ + #! /bin/sh + set -x -e ++mkdir -p m4 + # --no-recursive is available only in recent autoconf versions + autoreconf -fv --install +diff --git a/classify.c b/classify.c +index 124dab0..05b3bfb 100644 +--- a/classify.c ++++ b/classify.c +@@ -52,6 +52,8 @@ static short class_codes[MAX_CLASS] = { + }; + + static GList *interrupts_db; ++static GList *new_irq_list; ++static GList *banned_irqs; + + #define SYSDEV_DIR "/sys/bus/pci/devices" + +@@ -63,6 +65,30 @@ static gint compare_ints(gconstpointer a, gconstpointer b) + return ai->irq - bi->irq; + } + ++void add_banned_irq(int irq) ++{ ++ struct irq_info find, *new; ++ GList *entry; ++ ++ find.irq = irq; ++ entry = g_list_find_custom(banned_irqs, &find, compare_ints); ++ if (entry) ++ return; ++ ++ new = calloc(sizeof(struct irq_info), 1); ++ if (!new) { ++ if (debug_mode) ++ printf("No memory to ban irq %d\n", irq); ++ return; ++ } ++ ++ new->irq = irq; ++ ++ banned_irqs = g_list_append(banned_irqs, new); ++ return; ++} ++ ++ + /* + * Inserts an irq_info struct into the intterupts_db list + * devpath points to the device directory in sysfs for the +@@ -90,6 +116,13 @@ static struct irq_info *add_one_irq_to_db(const char *devpath, int irq) + return NULL; + } + ++ entry = g_list_find_custom(banned_irqs, &find, compare_ints); ++ if (entry) { ++ if (debug_mode) ++ printf("SKIPPING BANNED IRQ %d\n", irq); ++ return NULL; ++ } ++ + new = calloc(sizeof(struct irq_info), 1); + if (!new) + return NULL; +@@ -175,6 +208,43 @@ out: + return new; + } + ++static int check_for_irq_ban(char *path, int irq) ++{ ++ char *cmd; ++ int rc; ++ ++ if (!banscript) ++ return 0; ++ ++ cmd = alloca(strlen(path)+strlen(banscript)+32); ++ if (!cmd) ++ return 0; ++ ++ sprintf(cmd, "%s %s %d",banscript, path, irq); ++ rc = system(cmd); ++ ++ /* ++ * The system command itself failed ++ */ ++ if (rc == -1) { ++ if (debug_mode) ++ printf("%s failed, please check the --banscript option\n", cmd); ++ else ++ syslog(LOG_INFO, "%s failed, please check the --banscript option\n", cmd); ++ return 0; ++ } ++ ++ if (WEXITSTATUS(rc)) { ++ if (debug_mode) ++ printf("irq %d is baned by %s\n", irq, banscript); ++ else ++ syslog(LOG_INFO, "irq %d is baned by %s\n", irq, banscript); ++ return 1; ++ } ++ return 0; ++ ++} ++ + /* + * Figures out which interrupt(s) relate to the device we're looking at in dirname + */ +@@ -199,6 +269,10 @@ static void build_one_dev_entry(const char *dirname) + irqnum = strtol(entry->d_name, NULL, 10); + if (irqnum) { + sprintf(path, "%s/%s", SYSDEV_DIR, dirname); ++ if (check_for_irq_ban(path, irqnum)) { ++ add_banned_irq(irqnum); ++ continue; ++ } + new = add_one_irq_to_db(path, irqnum); + if (!new) + continue; +@@ -221,6 +295,11 @@ static void build_one_dev_entry(const char *dirname) + */ + if (irqnum) { + sprintf(path, "%s/%s", SYSDEV_DIR, dirname); ++ if (check_for_irq_ban(path, irqnum)) { ++ add_banned_irq(irqnum); ++ goto done; ++ } ++ + new = add_one_irq_to_db(path, irqnum); + if (!new) + goto done; +@@ -248,6 +327,8 @@ void rebuild_irq_db(void) + { + DIR *devdir = opendir(SYSDEV_DIR); + struct dirent *entry; ++ GList *gentry; ++ struct irq_info *ninfo, *iinfo; + + free_irq_db(); + +@@ -263,22 +344,46 @@ void rebuild_irq_db(void) + build_one_dev_entry(entry->d_name); + + } while (entry != NULL); ++ + closedir(devdir); ++ ++ if (!new_irq_list) ++ return; ++ gentry = g_list_first(new_irq_list); ++ while(gentry) { ++ ninfo = gentry->data; ++ iinfo = get_irq_info(ninfo->irq); ++ new_irq_list = g_list_remove(gentry, ninfo); ++ if (!iinfo) { ++ if (debug_mode) ++ printf("Adding untracked IRQ %d to database\n", ninfo->irq); ++ interrupts_db = g_list_append(interrupts_db, ninfo); ++ } else ++ free(ninfo); ++ ++ gentry = g_list_first(new_irq_list); ++ } ++ g_list_free(new_irq_list); ++ new_irq_list = NULL; ++ + } + +-struct irq_info *add_misc_irq(int irq) ++struct irq_info *add_new_irq(int irq) + { +- struct irq_info *new; ++ struct irq_info *new, *nnew; + + new = calloc(sizeof(struct irq_info), 1); +- if (!new) ++ nnew = calloc(sizeof(struct irq_info), 1); ++ if (!new || !nnew) + return NULL; + + new->irq = irq; + new->type = IRQ_TYPE_LEGACY; + new->class = IRQ_OTHER; + new->numa_node = get_numa_node(-1); ++ memcpy(nnew, new, sizeof(struct irq_info)); + interrupts_db = g_list_append(interrupts_db, new); ++ new_irq_list = g_list_append(new_irq_list, nnew); + return new; + } + +@@ -307,7 +412,7 @@ struct irq_info *get_irq_info(int irq) + void migrate_irq(GList **from, GList **to, struct irq_info *info) + { + GList *entry; +- struct irq_info find, *tmp;; ++ struct irq_info find, *tmp; + + find.irq = info->irq; + entry = g_list_find_custom(*from, &find, compare_ints); +@@ -325,18 +430,9 @@ static gint sort_irqs(gconstpointer A, gconstpointer B) + a = (struct irq_info*)A; + b = (struct irq_info*)B; + +- if (a->class < b->class) +- return 1; +- if (a->class > b->class) +- return -1; +- if (a->load < b->load) +- return 1; +- if (a->load > b->load) +- return -1; +- if (a<b) ++ if (a->class < b->class || a->load < b->load || a < b) + return 1; + return -1; +- + } + + void sort_irq_list(GList **list) +diff --git a/configure.ac b/configure.ac +index eed55ba..1230d66 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,49 +1,12 @@ +-dnl +-define([AC_INIT_NOTICE], +-[### Generated automatically using autoconf version] AC_ACVERSION [ +-### Copyright 2009 Steve Grubb <sgrubb@redhat.com> +-### +-### Permission is hereby granted, free of charge, to any person obtaining a +-### copy of this software and associated documentation files (the "Software"), +-### to deal in the Software without restriction, including without limitation +-### the rights to use, copy, modify, merge, publish, distribute, sublicense, +-### and/or sell copies of the Software, and to permit persons to whom the +-### Software is furnished to do so, subject to the following conditions: +-### +-### The above copyright notice and this permission notice shall be included +-### in all copies or substantial portions of the Software. +-### +-### THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-### IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-### FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +-### THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +-### OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +-### ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +-### OTHER DEALINGS IN THE SOFTWARE. +-### +-### For usage, run `./configure --help' +-### For more detailed information on installation, read the file `INSTALL'. +-### +-### If configuration succeeds, status is in the file `config.status'. +-### A log of configuration tests is in `config.log'. +-]) +- +-AC_REVISION($Revision: 1.3 $)dnl + AC_INIT(irqbalance,1.0.3) + AC_PREREQ(2.12)dnl + AM_CONFIG_HEADER(config.h) + +-echo Configuring irqbalance $VERSION +- + AC_CONFIG_MACRO_DIR([m4]) +-AC_CANONICAL_TARGET +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + AM_PROG_LIBTOOL + AC_SUBST(LIBTOOL_DEPS) + +-AC_MSG_NOTICE() +-AC_MSG_NOTICE([Checking for programs]) +- + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_AWK +@@ -55,9 +18,6 @@ AS_IF([test "$enable_numa" = "no"],[ + ac_cv_lib_numa_numa_available=no + ]) + +-AC_MSG_NOTICE +-AC_MSG_NOTICE([echo Checking for header files]) +- + AC_HEADER_STDC + AC_CHECK_HEADERS([numa.h]) + +@@ -70,10 +30,57 @@ AC_C_CONST + AC_C_INLINE + AM_PROG_CC_C_O + +-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28]) +-LIBCAP_NG_PATH ++AC_ARG_WITH([glib2], ++ [AS_HELP_STRING([--without-glib2], ++ [Don't use system glib2 library. Use local implementation instead.])], ++ [], ++ [with_glib2=check]) ++ ++local_glib2= ++AS_IF( ++ [test "x$with_glib2" = xyes], ++ [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])], ++ ++ [test "x$with_glib2" = xno], ++ [local_glib2="yes"], ++ ++ [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28], [], [local_glib2="yes"])] ++) ++ ++AS_IF( ++ [test "x$local_glib2" = xyes], ++ [ ++ GLIB_CFLAGS=-I./glib-local ++ GLIB_LIBS=glib-local/libglib.a ++ AC_SUBST(GLIB_CFLAGS) ++ AC_SUBST(GLIB_LIBS) ++ AC_MSG_WARN(Using locale implementation of GList functions) ++ ] ++) ++ ++AM_CONDITIONAL([LOCAL_GLIB], [test "x$local_glib2" = "xyes"]) ++ ++AC_ARG_WITH([libcap-ng], ++ AS_HELP_STRING([libcap-ng], [Add libcap-ng-support @<:@default=auto@:>@])) ++ ++AS_IF( ++ [test "x$libcap_ng" != "xno"], ++ [ ++ PKG_CHECK_MODULES([LIBCAP_NG], [libcap-ng], ++ [AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])], ++ [ ++ AS_IF( ++ [test "x$libcap_ng" = "xyes"], ++ [ ++ AC_MSG_ERROR([libcap-ng not found]) ++ ] ++ ) ++ ] ++ ) ++ ] ++) + +-AC_OUTPUT(Makefile) ++AC_OUTPUT(Makefile glib-local/Makefile) + + AC_MSG_NOTICE() + AC_MSG_NOTICE([irqbalance Version: $VERSION]) +diff --git a/cputree.c b/cputree.c +index af4fd3a..9568967 100644 +--- a/cputree.c ++++ b/cputree.c +@@ -1,5 +1,6 @@ + /* + * Copyright (C) 2006, Intel Corporation ++ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> + * + * This file is part of irqbalance + * +diff --git a/glib-local/Makefile.am b/glib-local/Makefile.am +new file mode 100644 +index 0000000..336b56e +--- /dev/null ++++ b/glib-local/Makefile.am +@@ -0,0 +1,8 @@ ++## Process this file with automake to produce Makefile.in ++noinst_LIBRARIES = libglib.a ++ ++libglib_a_SOURCES = glist.c ++ ++libglib_a_CFLAGS = @GLIB_CFLAGS@ ++ ++noinst_HEADERS = glib.h glist.h +diff --git a/glib-local/glib.h b/glib-local/glib.h +new file mode 100644 +index 0000000..5874892 +--- /dev/null ++++ b/glib-local/glib.h +@@ -0,0 +1 @@ ++#include <glist.h> +diff --git a/glib-local/glist.c b/glib-local/glist.c +new file mode 100644 +index 0000000..6fa1761 +--- /dev/null ++++ b/glib-local/glist.c +@@ -0,0 +1,381 @@ ++#include <stdlib.h> ++ ++#include "glist.h" ++ ++/** ++ * g_list_free: ++ * @list: a #GList ++ * ++ * Frees all of the memory used by a #GList. ++ * The freed elements are returned to the slice allocator. ++ * ++ * <note><para> ++ * If list elements contain dynamically-allocated memory, ++ * you should either use g_list_free_full() or free them manually ++ * first. ++ * </para></note> ++ */ ++void ++g_list_free (GList *list) ++{ ++ GList *l = list; ++ ++ while(l) { ++ GList *tmp = l->next; ++ free(l); ++ l = tmp; ++ } ++} ++ ++/** ++ * g_list_last: ++ * @list: a #GList ++ * ++ * Gets the last element in a #GList. ++ * ++ * Returns: the last element in the #GList, ++ * or %NULL if the #GList has no elements ++ */ ++GList* ++g_list_last (GList *list) ++{ ++ if (list) ++ { ++ while (list->next) ++ list = list->next; ++ } ++ ++ return list; ++} ++ ++/** ++ * g_list_append: ++ * @list: a pointer to a #GList ++ * @data: the data for the new element ++ * ++ * Adds a new element on to the end of the list. ++ * ++ * <note><para> ++ * The return value is the new start of the list, which ++ * may have changed, so make sure you store the new value. ++ * </para></note> ++ * ++ * <note><para> ++ * Note that g_list_append() has to traverse the entire list ++ * to find the end, which is inefficient when adding multiple ++ * elements. A common idiom to avoid the inefficiency is to prepend ++ * the elements and reverse the list when all elements have been added. ++ * </para></note> ++ * ++ * |[ ++ * /* Notice that these are initialized to the empty list. */ ++ * GList *list = NULL, *number_list = NULL; ++ * ++ * /* This is a list of strings. */ ++ * list = g_list_append (list, "first"); ++ * list = g_list_append (list, "second"); ++ * ++ * /* This is a list of integers. */ ++ * number_list = g_list_append (number_list, GINT_TO_POINTER (27)); ++ * number_list = g_list_append (number_list, GINT_TO_POINTER (14)); ++ * ]| ++ * ++ * Returns: the new start of the #GList ++ */ ++GList* ++g_list_append (GList *list, ++ gpointer data) ++{ ++ GList *new_list; ++ GList *last; ++ ++ new_list = malloc(sizeof(*new_list)); ++ new_list->data = data; ++ new_list->next = NULL; ++ ++ if (list) ++ { ++ last = g_list_last (list); ++ /* g_assert (last != NULL); */ ++ last->next = new_list; ++ new_list->prev = last; ++ ++ return list; ++ } ++ else ++ { ++ new_list->prev = NULL; ++ return new_list; ++ } ++} ++ ++static inline GList* ++_g_list_remove_link (GList *list, ++ GList *link) ++{ ++ if (link) ++ { ++ if (link->prev) ++ link->prev->next = link->next; ++ if (link->next) ++ link->next->prev = link->prev; ++ ++ if (link == list) ++ list = list->next; ++ ++ link->next = NULL; ++ link->prev = NULL; ++ } ++ ++ return list; ++} ++ ++/** ++ * g_list_delete_link: ++ * @list: a #GList ++ * @link_: node to delete from @list ++ * ++ * Removes the node link_ from the list and frees it. ++ * Compare this to g_list_remove_link() which removes the node ++ * without freeing it. ++ * ++ * Returns: the new head of @list ++ */ ++GList* ++g_list_delete_link (GList *list, ++ GList *link_) ++{ ++ list = _g_list_remove_link (list, link_); ++ free (link_); ++ ++ return list; ++} ++ ++/** ++ * g_list_first: ++ * @list: a #GList ++ * ++ * Gets the first element in a #GList. ++ * ++ * Returns: the first element in the #GList, ++ * or %NULL if the #GList has no elements ++ */ ++GList* ++g_list_first (GList *list) ++{ ++ if (list) ++ { ++ while (list->prev) ++ list = list->prev; ++ } ++ ++ return list; ++} ++ ++static GList * ++g_list_sort_merge (GList *l1, ++ GList *l2, ++ GFunc compare_func, ++ gpointer user_data) ++{ ++ GList list, *l, *lprev; ++ gint cmp; ++ ++ l = &list; ++ lprev = NULL; ++ ++ while (l1 && l2) ++ { ++ cmp = ((GCompareDataFunc) compare_func) (l1->data, l2->data, user_data); ++ ++ if (cmp <= 0) ++ { ++ l->next = l1; ++ l1 = l1->next; ++ } ++ else ++ { ++ l->next = l2; ++ l2 = l2->next; ++ } ++ l = l->next; ++ l->prev = lprev; ++ lprev = l; ++ } ++ l->next = l1 ? l1 : l2; ++ l->next->prev = l; ++ ++ return list.next; ++} ++ ++static GList* ++g_list_sort_real (GList *list, ++ GFunc compare_func, ++ gpointer user_data) ++{ ++ GList *l1, *l2; ++ ++ if (!list) ++ return NULL; ++ if (!list->next) ++ return list; ++ ++ l1 = list; ++ l2 = list->next; ++ ++ while ((l2 = l2->next) != NULL) ++ { ++ if ((l2 = l2->next) == NULL) ++ break; ++ l1 = l1->next; ++ } ++ l2 = l1->next; ++ l1->next = NULL; ++ ++ return g_list_sort_merge (g_list_sort_real (list, compare_func, user_data), ++ g_list_sort_real (l2, compare_func, user_data), ++ compare_func, ++ user_data); ++} ++ ++/** ++ * g_list_sort: ++ * @list: a #GList ++ * @compare_func: the comparison function used to sort the #GList. ++ * This function is passed the data from 2 elements of the #GList ++ * and should return 0 if they are equal, a negative value if the ++ * first element comes before the second, or a positive value if ++ * the first element comes after the second. ++ * ++ * Sorts a #GList using the given comparison function. ++ * ++ * Returns: the start of the sorted #GList ++ */ ++/** ++ * GCompareFunc: ++ * @a: a value. ++ * @b: a value to compare with. ++ * @Returns: negative value if @a < @b; zero if @a = @b; positive ++ * value if @a > @b. ++ * ++ * Specifies the type of a comparison function used to compare two ++ * values. The function should return a negative integer if the first ++ * value comes before the second, 0 if they are equal, or a positive ++ * integer if the first value comes after the second. ++ **/ ++GList * ++g_list_sort (GList *list, ++ GCompareFunc compare_func) ++{ ++ return g_list_sort_real (list, (GFunc) compare_func, NULL); ++ ++} ++ ++/** ++ * g_list_length: ++ * @list: a #GList ++ * ++ * Gets the number of elements in a #GList. ++ * ++ * <note><para> ++ * This function iterates over the whole list to ++ * count its elements. ++ * </para></note> ++ * ++ * Returns: the number of elements in the #GList ++ */ ++guint ++g_list_length (GList *list) ++{ ++ guint length; ++ ++ length = 0; ++ while (list) ++ { ++ length++; ++ list = list->next; ++ } ++ ++ return length; ++} ++ ++/** ++ * g_list_foreach: ++ * @list: a #GList ++ * @func: the function to call with each element's data ++ * @user_data: user data to pass to the function ++ * ++ * Calls a function for each element of a #GList. ++ */ ++/** ++ * GFunc: ++ * @data: the element's data. ++ * @user_data: user data passed to g_list_foreach() or ++ * g_slist_foreach(). ++ * ++ * Specifies the type of functions passed to g_list_foreach() and ++ * g_slist_foreach(). ++ **/ ++void ++g_list_foreach (GList *list, ++ GFunc func, ++ gpointer user_data) ++{ ++ while (list) ++ { ++ GList *next = list->next; ++ (*func) (list->data, user_data); ++ list = next; ++ } ++} ++ ++/** ++ * g_list_free_full: ++ * @list: a pointer to a #GList ++ * @free_func: the function to be called to free each element's data ++ * ++ * Convenience method, which frees all the memory used by a #GList, and ++ * calls the specified destroy function on every element's data. ++ * ++ * Since: 2.28 ++ */ ++void ++g_list_free_full (GList *list, ++ GDestroyNotify free_func) ++{ ++ g_list_foreach (list, (GFunc) free_func, NULL); ++ g_list_free (list); ++} ++ ++/** ++ * g_list_find_custom: ++ * @list: a #GList ++ * @data: user data passed to the function ++ * @func: the function to call for each element. ++ * It should return 0 when the desired element is found ++ * ++ * Finds an element in a #GList, using a supplied function to ++ * find the desired element. It iterates over the list, calling ++ * the given function which should return 0 when the desired ++ * element is found. The function takes two #gconstpointer arguments, ++ * the #GList element's data as the first argument and the ++ * given user data. ++ * ++ * Returns: the found #GList element, or %NULL if it is not found ++ */ ++GList* ++g_list_find_custom (GList *list, ++ gconstpointer data, ++ GCompareFunc func) ++{ ++ g_return_val_if_fail (func != NULL, list); ++ ++ while (list) ++ { ++ if (! func (list->data, data)) ++ return list; ++ list = list->next; ++ } ++ ++ return NULL; ++} +diff --git a/glib-local/glist.h b/glib-local/glist.h +new file mode 100644 +index 0000000..47f2cfe +--- /dev/null ++++ b/glib-local/glist.h +@@ -0,0 +1,56 @@ ++#ifndef __G_LIST_H__ ++#define __G_LIST_H__ ++ ++typedef int gint; ++typedef unsigned int guint; ++typedef void* gpointer; ++typedef const void *gconstpointer; ++typedef gint (*GCompareFunc) (gconstpointer a, ++ gconstpointer b); ++typedef gint (*GCompareDataFunc) (gconstpointer a, ++ gconstpointer b, ++ gpointer user_data); ++typedef void (*GFunc) (gpointer data, ++ gpointer user_data); ++typedef void (*GDestroyNotify) (gpointer data); ++ ++struct _GList; ++typedef struct _GList GList; ++ ++struct _GList ++{ ++ gpointer data; ++ GList *next; ++ GList *prev; ++}; ++ ++/* Doubly linked lists ++ */ ++void g_list_free (GList *list); ++GList* g_list_append (GList *list, ++ gpointer data); ++GList* g_list_delete_link (GList *list, ++ GList *link_); ++GList* g_list_first (GList *list); ++GList* g_list_sort (GList *list, ++ GCompareFunc compare_func); ++guint g_list_length (GList *list); ++void g_list_foreach (GList *list, ++ GFunc func, ++ gpointer user_data); ++void g_list_free_full (GList *list, ++ GDestroyNotify free_func); ++GList* g_list_find_custom (GList *list, ++ gconstpointer data, ++ GCompareFunc func); ++ ++#define g_list_previous(list) ((list) ? (((GList *)(list))->prev) : NULL) ++#define g_list_next(list) ((list) ? (((GList *)(list))->next) : NULL) ++ ++#define g_return_val_if_fail(expr,val) do { \ ++ if (expr) { } else \ ++ { \ ++ return (val); \ ++ } } while(0); ++ ++#endif /* __G_LIST_H__ */ +diff --git a/irqbalance.1 b/irqbalance.1 +index 55fc15f..20105bc 100644 +--- a/irqbalance.1 ++++ b/irqbalance.1 +@@ -39,7 +39,11 @@ Causes irqbalance to be run once, after which the daemon exits + .TP + + .B --debug +-Causes irqbalance to run in the foreground and extra debug information to be printed ++Causes irqbalance to print extra debug information. Implies --foreground ++ ++.TP ++.B --foreground ++Causes irqbalance to run in the foreground (without --debug) + + .TP + .B --hintpolicy=[exact | subset | ignore] +@@ -62,6 +66,30 @@ average cpu softirq workload, and no cpus are more than 1 standard deviation + above (and have more than 1 irq assigned to them), attempt to place 1 cpu in + powersave mode. In powersave mode, a cpu will not have any irqs balanced to it, + in an effort to prevent that cpu from waking up without need. ++ ++.TP ++.B --banirq=<irqnum> ++Add the specified irq list to the set of banned irqs. irqbalance will not affect ++the affinity of any irqs on the banned list, allowing them to be specified ++manually. This option is addative and can be specified multiple times ++ ++.TP ++.B --banscript=<script> ++Execute the specified script for each irq that is discovered, passing the sysfs ++path to the associated device as the first argument, and the irq vector as the ++second. An exit value of 0 tells irqbalance that this interrupt should balanced ++and managed as a normal irq, while a non-zero exit code indicates this irq ++should be ignored by irqbalance completely (see --banirq above). Use of this ++script provides users the ability to dynamically select which irqs get exluded ++from balancing, and provides an opportunity for manual affinity setting in one ++single code point. ++ ++.TP ++.B --pid=<file> ++Have irqbalance write its process id to the specified file. By default no ++pidfile is written. The written pidfile is automatically unlinked when ++irqbalance exits. ++ + .SH "ENVIRONMENT VARIABLES" + .TP + .B IRQBALANCE_ONESHOT +@@ -75,9 +103,10 @@ Same as --debug + .B IRQBALANCE_BANNED_CPUS + Provides a mask of cpus which irqbalance should ignore and never assign interrupts to + ++.SH "SIGNALS" + .TP +-.B IRQBALANCE_BANNED_INTERRUPTS +-A list of space delimited IRQ numbers that irqbalance should not touch ++.B SIGHUP ++Forces a rescan of the available irqs and system topology + + .SH "Homepage" + http://code.google.com/p/irqbalance +diff --git a/irqbalance.c b/irqbalance.c +index 99c5db7..fbe6ac6 100644 +--- a/irqbalance.c ++++ b/irqbalance.c +@@ -1,5 +1,6 @@ + /* + * Copyright (C) 2006, Intel Corporation ++ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> + * + * This file is part of irqbalance + * +@@ -27,6 +28,10 @@ + #include <syslog.h> + #include <unistd.h> + #include <signal.h> ++#include <time.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <fcntl.h> + #ifdef HAVE_GETOPT_LONG + #include <getopt.h> + #endif +@@ -39,12 +44,15 @@ + volatile int keep_going = 1; + int one_shot_mode; + int debug_mode; ++int foreground_mode; + int numa_avail; +-int need_cpu_rescan; ++int need_rescan; + extern cpumask_t banned_cpus; + enum hp_e hint_policy = HINT_POLICY_SUBSET; + unsigned long power_thresh = ULONG_MAX; + unsigned long long cycle_count = 0; ++char *pidfile = NULL; ++char *banscript = NULL; + + void sleep_approx(int seconds) + { +@@ -64,32 +72,45 @@ void sleep_approx(int seconds) + struct option lopts[] = { + {"oneshot", 0, NULL, 'o'}, + {"debug", 0, NULL, 'd'}, ++ {"foreground", 0, NULL, 'f'}, + {"hintpolicy", 1, NULL, 'h'}, + {"powerthresh", 1, NULL, 'p'}, ++ {"banirq", 1 , NULL, 'i'}, ++ {"banscript", 1, NULL, 'b'}, ++ {"pid", 1, NULL, 's'}, + {0, 0, 0, 0} + }; + + static void usage(void) + { +- printf("irqbalance [--oneshot | -o] [--debug | -d] [--hintpolicy= | -h [exact|subset|ignore]]\n"); +- printf(" [--powerthresh= | -p <off> | <n>]\n"); ++ printf("irqbalance [--oneshot | -o] [--debug | -d] [--foreground | -f] [--hintpolicy= | -h [exact|subset|ignore]]\n"); ++ printf(" [--powerthresh= | -p <off> | <n>] [--banirq= | -i <n>]\n"); + } + + static void parse_command_line(int argc, char **argv) + { + int opt; + int longind; ++ unsigned long val; + + while ((opt = getopt_long(argc, argv, +- "odh:p:", ++ "odfh:i:p:s:", + lopts, &longind)) != -1) { + + switch(opt) { + case '?': + usage(); + exit(1); ++ break; ++ case 'b': ++ banscript = strdup(optarg); ++ break; + case 'd': + debug_mode=1; ++ foreground_mode=1; ++ break; ++ case 'f': ++ foreground_mode=1; + break; + case 'h': + if (!strncmp(optarg, "exact", strlen(optarg))) +@@ -103,6 +124,14 @@ static void parse_command_line(int argc, char **argv) + exit(1); + } + break; ++ case 'i': ++ val = strtoull(optarg, NULL, 10); ++ if (val == ULONG_MAX) { ++ usage(); ++ exit(1); ++ } ++ add_banned_irq((int)val); ++ break; + case 'p': + if (!strncmp(optarg, "off", strlen(optarg))) + power_thresh = ULONG_MAX; +@@ -117,6 +146,9 @@ static void parse_command_line(int argc, char **argv) + case 'o': + one_shot_mode=1; + break; ++ case 's': ++ pidfile = optarg; ++ break; + } + } + } +@@ -172,18 +204,34 @@ static void handler(int signum) + keep_going = 0; + } + ++static void force_rescan(int signum) ++{ ++ if (cycle_count) ++ need_rescan = 1; ++} ++ + int main(int argc, char** argv) + { +- struct sigaction action; ++ struct sigaction action, hupaction; + + #ifdef HAVE_GETOPT_LONG + parse_command_line(argc, argv); + #else +- if (argc>1 && strstr(argv[1],"--debug")) ++ if (argc>1 && strstr(argv[1],"--debug")) { + debug_mode=1; ++ foreground_mode=1; ++ } ++ if (argc>1 && strstr(argv[1],"--foreground")) ++ foreground_mode=1; + if (argc>1 && strstr(argv[1],"--oneshot")) + one_shot_mode=1; + #endif ++ ++ /* ++ * Open the syslog connection ++ */ ++ openlog(argv[0], 0, LOG_DAEMON); ++ + if (getenv("IRQBALANCE_BANNED_CPUS")) { + cpumask_parse_user(getenv("IRQBALANCE_BANNED_CPUS"), strlen(getenv("IRQBALANCE_BANNED_CPUS")), banned_cpus); + } +@@ -212,17 +260,35 @@ int main(int argc, char** argv) + + + /* On single core UP systems irqbalance obviously has no work to do */ +- if (core_count<2) ++ if (core_count<2) { ++ char *msg = "Balaincing is ineffective on systems with a " ++ "single cache domain. Shutting down\n"; ++ ++ if (debug_mode) ++ printf("%s", msg); ++ else ++ syslog(LOG_INFO, "%s", msg); + exit(EXIT_SUCCESS); ++ } + /* On dual core/hyperthreading shared cache systems just do a one shot setup */ + if (cache_domain_count==1) + one_shot_mode = 1; + +- if (!debug_mode) ++ if (!foreground_mode) { ++ int pidfd = -1; + if (daemon(0,0)) + exit(EXIT_FAILURE); ++ /* Write pidfile */ ++ if (pidfile && (pidfd = open(pidfile, ++ O_WRONLY | O_CREAT | O_EXCL | O_TRUNC, ++ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0) { ++ char str[16]; ++ snprintf(str, sizeof(str), "%u\n", getpid()); ++ write(pidfd, str, strlen(str)); ++ close(pidfd); ++ } ++ } + +- openlog(argv[0], 0, LOG_DAEMON); + + #ifdef HAVE_LIBCAP_NG + // Drop capabilities +@@ -236,6 +302,11 @@ int main(int argc, char** argv) + parse_proc_interrupts(); + parse_proc_stat(); + ++ hupaction.sa_handler = force_rescan; ++ sigemptyset(&hupaction.sa_mask); ++ hupaction.sa_flags = 0; ++ sigaction(SIGHUP, &hupaction, NULL); ++ + while (keep_going) { + sleep_approx(SLEEP_INTERVAL); + if (debug_mode) +@@ -247,8 +318,8 @@ int main(int argc, char** argv) + parse_proc_stat(); + + /* cope with cpu hotplug -- detected during /proc/interrupts parsing */ +- if (need_cpu_rescan) { +- need_cpu_rescan = 0; ++ if (need_rescan) { ++ need_rescan = 0; + /* if there's a hotplug event we better turn off power mode for a bit until things settle */ + power_mode = 0; + if (debug_mode) +@@ -282,5 +353,10 @@ int main(int argc, char** argv) + + } + free_object_tree(); ++ ++ /* Remove pidfile */ ++ if (!foreground_mode && pidfile) ++ unlink(pidfile); ++ + return EXIT_SUCCESS; + } +diff --git a/irqbalance.h b/irqbalance.h +index 4e85325..e46f31f 100644 +--- a/irqbalance.h ++++ b/irqbalance.h +@@ -9,6 +9,7 @@ + #include <stdint.h> + #include <glib.h> + #include <syslog.h> ++#include <limits.h> + + #include "types.h" + #ifdef HAVE_NUMA_H +@@ -40,7 +41,6 @@ void dump_tree(void); + + void activate_mappings(void); + void account_for_nic_stats(void); +-void check_power_mode(void); + void clear_cpu_tree(void); + void pci_numa_scan(void); + +@@ -64,10 +64,11 @@ enum hp_e { + extern int debug_mode; + extern int one_shot_mode; + extern int power_mode; +-extern int need_cpu_rescan; ++extern int need_rescan; + extern enum hp_e hint_policy; + extern unsigned long long cycle_count; + extern unsigned long power_thresh; ++extern char *banscript; + + /* + * Numa node access routines +@@ -103,10 +104,11 @@ extern int get_cpu_count(void); + */ + extern void rebuild_irq_db(void); + extern void free_irq_db(void); ++extern void add_banned_irq(int irq); + extern void for_each_irq(GList *list, void (*cb)(struct irq_info *info, void *data), void *data); + extern struct irq_info *get_irq_info(int irq); + extern void migrate_irq(GList **from, GList **to, struct irq_info *info); +-extern struct irq_info *add_misc_irq(int irq); ++extern struct irq_info *add_new_irq(int irq); + #define irq_numa_node(irq) ((irq)->numa_node) + + +diff --git a/irqlist.c b/irqlist.c +index c29ee84..2523173 100644 +--- a/irqlist.c ++++ b/irqlist.c +@@ -1,5 +1,6 @@ + /* + * Copyright (C) 2006, Intel Corporation ++ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> + * + * This file is part of irqbalance + * +@@ -45,6 +46,7 @@ struct load_balance_info { + unsigned int num_within; + unsigned int num_over; + unsigned int num_under; ++ unsigned int num_powersave; + struct topo_obj *powersave; + }; + +@@ -106,13 +108,16 @@ static void migrate_overloaded_irqs(struct topo_obj *obj, void *data) + struct load_balance_info *info = data; + int deviation; + ++ if (obj->powersave_mode) ++ info->num_powersave++; ++ + /* + * Don't rebalance irqs on objects whos load is below the average + */ + if (obj->load <= info->avg_load) { + if ((obj->load + info->std_deviation) <= info->avg_load) { + info->num_under++; +- if (!info->powersave) ++ if (power_thresh != ULONG_MAX && !info->powersave) + if (!obj->powersave_mode) + info->powersave = obj; + } else +@@ -172,13 +177,13 @@ void update_migration_status(void) + { + struct load_balance_info info; + find_overloaded_objs(cpus, info); +- if (cycle_count > 5) { ++ if (power_thresh != ULONG_MAX && cycle_count > 5) { + if (!info.num_over && (info.num_under >= power_thresh) && info.powersave) { + syslog(LOG_INFO, "cpu %d entering powersave mode\n", info.powersave->number); + info.powersave->powersave_mode = 1; + if (g_list_length(info.powersave->interrupts) > 0) + for_each_irq(info.powersave->interrupts, force_irq_migration, NULL); +- } else if (info.num_over) { ++ } else if ((info.num_over) && (info.num_powersave)) { + syslog(LOG_INFO, "Load average increasing, re-enabling all cpus for irq balancing\n"); + for_each_object(cpus, clear_powersave_mode, NULL); + } +diff --git a/m4/cap-ng.m4 b/m4/cap-ng.m4 +deleted file mode 100644 +index 0024edc..0000000 +--- a/m4/cap-ng.m4 ++++ /dev/null +@@ -1,40 +0,0 @@ +-# libcap-ng.m4 - Checks for the libcap-ng support +-# Copyright (c) 2009 Steve Grubb sgrubb@redhat.com +-# +-AC_DEFUN([LIBCAP_NG_PATH], +-[ +- AC_ARG_WITH(libcap-ng, +- [ --with-libcap-ng=[auto/yes/no] Add Libcap-ng support [default=auto]],, +- with_libcap_ng=auto) +- +- # Check for Libcap-ng API +- # +- # libcap-ng detection +- +- if test x$with_libcap_ng = xno ; then +- have_libcap_ng=no; +- else +- # Start by checking for header file +- AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no) +- +- # See if we have libcap-ng library +- AC_CHECK_LIB(cap-ng, capng_clear, +- CAPNG_LDADD=-lcap-ng,) +- +- # Check results are usable +- if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then +- AC_MSG_ERROR(libcap-ng support was requested and the library was not found) +- fi +- if test x$CAPNG_LDADD != x -a $capng_headers = no ; then +- AC_MSG_ERROR(libcap-ng libraries found but headers are missing) +- fi +- fi +- AC_SUBST(CAPNG_LDADD) +- AC_MSG_CHECKING(whether to use libcap-ng) +- if test x$CAPNG_LDADD != x ; then +- AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support]) +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no) +- fi +-]) +diff --git a/misc/irqbalance.env b/misc/irqbalance.env +new file mode 100644 +index 0000000..bd87e3d +--- /dev/null ++++ b/misc/irqbalance.env +@@ -0,0 +1,26 @@ ++# irqbalance is a daemon process that distributes interrupts across ++# CPUS on SMP systems. The default is to rebalance once every 10 ++# seconds. This is the environment file that is specified to systemd via the ++# EnvironmentFile key in the service unit file (or via whatever method the init ++# system you're using has. ++# ++# ONESHOT=yes ++# after starting, wait for a minute, then look at the interrupt ++# load and balance it once; after balancing exit and do not change ++# it again. ++#IRQBALANCE_ONESHOT= ++ ++# ++# IRQBALANCE_BANNED_CPUS ++# 64 bit bitmask which allows you to indicate which cpu's should ++# be skipped when reblancing irqs. Cpu numbers which have their ++# corresponding bits set to one in this mask will not have any ++# irq's assigned to them on rebalance ++# ++#IRQBALANCE_BANNED_CPUS= ++ ++# ++# IRQBALANCE_ARGS ++# append any args here to the irqbalance daemon as documented in the man page ++# ++#IRQBALANCE_ARGS= +diff --git a/misc/irqbalance.service b/misc/irqbalance.service +index f349616..3139a83 100644 +--- a/misc/irqbalance.service ++++ b/misc/irqbalance.service +@@ -3,9 +3,8 @@ Description=irqbalance daemon + After=syslog.target + + [Service] +-EnvironmentFile=/etc/sysconfig/irqbalance +-Type=forking +-ExecStart=/usr/sbin/irqbalance $ONESHOT ++EnvironmentFile=/path/to/irqbalance.env ++ExecStart=/usr/sbin/irqbalance --foreground $IRQBALANCE_ARGS + + [Install] + WantedBy=multi-user.target +diff --git a/numa.c b/numa.c +index 710ed67..96703bd 100644 +--- a/numa.c ++++ b/numa.c +@@ -1,5 +1,6 @@ + /* + * Copyright (C) 2006, Intel Corporation ++ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> + * + * This file is part of irqbalance + * +@@ -106,11 +107,11 @@ void build_numa_node_list(void) + static void free_numa_node(gpointer data) + { + struct topo_obj *obj = data; +- if (data == &unspecified_node) +- return; +- + g_list_free(obj->children); +- free(data); ++ g_list_free(obj->interrupts); ++ ++ if (data != &unspecified_node) ++ free(data); + } + + void free_numa_node_list(void) +diff --git a/placement.c b/placement.c +index 108ccc9..1172849 100644 +--- a/placement.c ++++ b/placement.c +@@ -1,5 +1,6 @@ + /* + * Copyright (C) 2006, Intel Corporation ++ * Copyright (C) 2012, Neil Horman <nhoramn@tuxdriver.com> + * + * This file is part of irqbalance + * +@@ -48,7 +49,7 @@ static void find_best_object(struct topo_obj *d, void *data) + /* + * Don't consider the unspecified numa node here + */ +- if ((d->obj_type == OBJ_TYPE_NODE) && (d->number == -1)) ++ if (numa_avail && (d->obj_type == OBJ_TYPE_NODE) && (d->number == -1)) + return; + + /* +diff --git a/powermode.c b/powermode.c +deleted file mode 100644 +index 82ba490..0000000 +--- a/powermode.c ++++ /dev/null +@@ -1,34 +0,0 @@ +-/* +- * Copyright (C) 2006, Intel Corporation +- * +- * This file is part of irqbalance +- * +- * This program file is free software; you can redistribute it and/or modify it +- * under the terms of the GNU General Public License as published by the +- * Free Software Foundation; version 2 of the License. +- * +- * This program is distributed in the hope that it will be useful, but WITHOUT +- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +- * for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program in a file named COPYING; if not, write to the +- * Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, +- * Boston, MA 02110-1301 USA +- */ +-#include "config.h" +-#include <stdio.h> +-#include <stdlib.h> +-#include <unistd.h> +-#include <stdint.h> +-#include <string.h> +- +-#include "irqbalance.h" +- +- +-void check_power_mode(void) +-{ +-} +- +diff --git a/procinterrupts.c b/procinterrupts.c +index 4d3b07b..431fffa 100644 +--- a/procinterrupts.c ++++ b/procinterrupts.c +@@ -1,5 +1,6 @@ + /* + * Copyright (C) 2006, Intel Corporation ++ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> + * + * This file is part of irqbalance + * +@@ -32,6 +33,8 @@ + + #define LINESIZE 4096 + ++extern cpumask_t banned_cpus; ++ + static int proc_int_has_msi = 0; + static int msi_found_in_sysfs = 0; + +@@ -80,8 +83,12 @@ void parse_proc_interrupts(void) + c++; + number = strtoul(line, NULL, 10); + info = get_irq_info(number); +- if (!info) +- info = add_misc_irq(number); ++ if (!info) { ++ if (!cycle_count) ++ continue; ++ need_rescan = 1; ++ info = add_new_irq(number); ++ } + + count = 0; + cpunr = 0; +@@ -97,7 +104,7 @@ void parse_proc_interrupts(void) + cpunr++; + } + if (cpunr != core_count) +- need_cpu_rescan = 1; ++ need_rescan = 1; + + info->last_irq_count = info->irq_count; + info->irq_count = count; +@@ -217,6 +224,9 @@ void parse_proc_stat(void) + + cpunr = strtoul(&line[3], NULL, 10); + ++ if (cpu_isset(cpunr, banned_cpus)) ++ continue; ++ + rc = sscanf(line, "%*s %*d %*d %*d %*d %*d %d %d", &irq_load, &softirq_load); + if (rc < 2) + break; diff --git a/testing/irqbalance/irqbalance.conf.d b/testing/irqbalance/irqbalance.conf.d new file mode 100644 index 000000000..ef1bdfd75 --- /dev/null +++ b/testing/irqbalance/irqbalance.conf.d @@ -0,0 +1,6 @@ +# +# Settings for irqbalance daemon +# + +# one shot mode - set to 1 if you have Pentium 4 with HT +ONESHOT=0 diff --git a/testing/irqbalance/irqbalance.rc.d b/testing/irqbalance/irqbalance.rc.d new file mode 100644 index 000000000..987c26b51 --- /dev/null +++ b/testing/irqbalance/irqbalance.rc.d @@ -0,0 +1,46 @@ +#!/bin/bash + +# source application-specific settings +ONESHOT=0 +[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance + +if [ "$ONESHOT" -ne 0 ]; then + ONESHOT_CMD="--oneshot" +fi + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/irqbalance` +case "$1" in + start) + stat_busy "Starting IRQ balancing" + [ -z "$PID" ] && /usr/sbin/irqbalance $ONESHOT_CMD + if [ $? -gt 0 ]; then + stat_fail + else + if [ "$ONESHOT" -eq 0 ]; then + add_daemon irqbalance + fi + stat_done + fi + ;; + stop) + stat_busy "Stopping IRQ balancing" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon irqbalance + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/irqbalance/irqbalance.service b/testing/irqbalance/irqbalance.service new file mode 100644 index 000000000..372ac0aa4 --- /dev/null +++ b/testing/irqbalance/irqbalance.service @@ -0,0 +1,8 @@ +[Unit] +Description=CPU Interrupt Request Balancer + +[Service] +ExecStart=/usr/sbin/irqbalance --foreground + +[Install] +WantedBy=multi-user.target diff --git a/testing/libmpc/PKGBUILD b/testing/libmpc/PKGBUILD new file mode 100644 index 000000000..0c358f943 --- /dev/null +++ b/testing/libmpc/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 165240 2012-08-14 08:30:00Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=libmpc +pkgver=1.0 +pkgrel=1 +pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" +arch=('i686' 'x86_64') +url="http://www.multiprecision.org/" +license=('LGPL') +depends=('mpfr>=3.0.0') +options=('!libtool') +install=libmpc.install +source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz) +md5sums=('13370ceb2e266c5eeb2f7e78c24b7858') + +build() { + cd "${srcdir}/mpc-${pkgver}" + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/mpc-${pkgver}" + make check +} + +package() { + cd "${srcdir}/mpc-${pkgver}" + make DESTDIR="${pkgdir}" install + mv ${pkgdir}/usr/share/info/{mpc,libmpc}.info +} diff --git a/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch b/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch new file mode 100644 index 000000000..3bf324728 --- /dev/null +++ b/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch @@ -0,0 +1,63 @@ +--- trunk/configure.ac 2011/02/21 12:18:31 932 ++++ trunk/configure.ac 2011/02/21 16:41:09 936 +@@ -33,7 +33,7 @@ + AC_CANONICAL_HOST + AC_CONFIG_MACRO_DIR([m4]) + +-dnl Extra arguments to configure ++# Extra arguments to configure + AC_ARG_WITH([mpfr_include], + [AC_HELP_STRING([--with-mpfr-include=DIR], + [MPFR include directory])], +@@ -85,18 +85,19 @@ + ) + + +-dnl Setup CC and CFLAGS ++# Setup CC and CFLAGS ++AC_PROG_CC ++AC_LANG(C) + +-dnl Check for user specification of CC or CFLAGS ++# Set up LibTool ++AC_PROG_LIBTOOL ++ ++# Check for user specification of CC or CFLAGS + if test -n "$CFLAGS" || test -n "$CC" ; then + user_redefine_cc=yes + fi + +-# Check for programs +-AC_PROG_CC +-AC_LANG(C) +- +-dnl Check GMP Header ++# Check GMP Header + AC_MSG_CHECKING(for gmp.h) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include "gmp.h" +@@ -105,22 +106,19 @@ + AC_MSG_ERROR([gmp.h can't be found, or is unusable.]) + ]) + +-dnl Check for GMP CFLAGS in gmp.h ++# Check for GMP CFLAGS in gmp.h + if test -z "$user_redefine_cc" ; then + MPC_GMP_CC_CFLAGS + fi + + +-dnl Configs for Windows DLLs ++# Configs for Windows DLLs + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + MPC_WINDOWS + esac + + +-dnl Finally set up LibTool +-AC_PROG_LIBTOOL +- + # Checks for header files. + AC_HEADER_STDC + AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h]) diff --git a/testing/libmpc/libmpc.install b/testing/libmpc/libmpc.install new file mode 100644 index 000000000..b0718c745 --- /dev/null +++ b/testing/libmpc/libmpc.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(libmpc.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/memcached/PKGBUILD b/testing/memcached/PKGBUILD new file mode 100644 index 000000000..540073226 --- /dev/null +++ b/testing/memcached/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 165366 2012-08-16 14:41:50Z dan $ +# Maintainer: Dan McGee <dan@archlinux.org> +# Contributor: Michael Irwin <6d6469@gmail.com> + +pkgname=memcached +pkgver=1.4.14 +pkgrel=2 +pkgdesc="A distributed memory object caching system" +arch=(i686 x86_64) +url="http://memcached.org/" +license=('GPL') +depends=('libevent') +optdepends=('perl: for memcached-tool usage') +backup=('etc/conf.d/memcached') +install=memcached.install +source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz + memcached.conf + memcached.sh + memcached.service) +sha256sums=('f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef' + '17f66873b77e96c6706dcf13ab0aa8ddff94b2851366c787fc23e614dfc11f47' + '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb' + '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool + install -D -m 644 ../memcached.conf "$pkgdir"/etc/conf.d/memcached + install -D -m 755 ../memcached.sh "$pkgdir"/etc/rc.d/memcached + install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service +} diff --git a/testing/memcached/memcached.conf b/testing/memcached/memcached.conf new file mode 100644 index 000000000..4415e1a55 --- /dev/null +++ b/testing/memcached/memcached.conf @@ -0,0 +1,4 @@ +# user to run memcached as; also used for pid file ownership +MEMCACHED_USER="memcached" +# see 'memcached -h' for available options +MEMCACHED_ARGS="-l 127.0.0.1 -t 1" diff --git a/testing/memcached/memcached.install b/testing/memcached/memcached.install new file mode 100644 index 000000000..6009b713f --- /dev/null +++ b/testing/memcached/memcached.install @@ -0,0 +1,22 @@ +post_install() { + if ! getent group memcached >/dev/null; then + groupadd --system memcached + fi + if ! getent passwd memcached >/dev/null; then + useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached + passwd -l memcached >/dev/null + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + if getent passwd memcached >/dev/null; then + userdel memcached + fi + if getent group memcached >/dev/null; then + groupdel memcached + fi +} diff --git a/testing/memcached/memcached.service b/testing/memcached/memcached.service new file mode 100644 index 000000000..c6e15fb7c --- /dev/null +++ b/testing/memcached/memcached.service @@ -0,0 +1,11 @@ +[Unit] +Description=Memcached Daemon +After=network.target + +[Service] +User=memcached +# Remove '-l 127.0.0.1' to listen on all addresses +ExecStart=/usr/bin/memcached -l 127.0.0.1 + +[Install] +WantedBy=multi-user.target diff --git a/testing/memcached/memcached.sh b/testing/memcached/memcached.sh new file mode 100644 index 000000000..9c9727507 --- /dev/null +++ b/testing/memcached/memcached.sh @@ -0,0 +1,63 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/memcached + +PIDFILE='/var/run/memcached.pid' + +getpid() { + local pid + pid=$(cat $PIDFILE 2>/dev/null) + # if the process is no longer valid, don't return it + if [ -n "$pid" ]; then + if ! ps -p $pid >/dev/null; then + rm -f $PIDFILE + pid="" + fi + fi + echo $pid +} + +PID="$(getpid)" + +case "$1" in + start) + stat_busy "Starting memcached" + # memcached is retarded and doesn't write to the pidfile + # before it drops permissions + if [ -n "$PID" ]; then + stat_fail + elif [ -z "$MEMCACHED_USER" ]; then + echo "MEMCACHED_USER must be defined in /etc/conf.d/memcached" + stat_fail + else + touch $PIDFILE && chown $MEMCACHED_USER $PIDFILE + /usr/bin/memcached -d -P $PIDFILE -u $MEMCACHED_USER $MEMCACHED_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon memcached + stat_done + fi + fi + ;; + stop) + stat_busy "Stopping memcached" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f $PIDFILE + rm_daemon memcached + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/modemmanager/PKGBUILD b/testing/modemmanager/PKGBUILD new file mode 100644 index 000000000..403673c39 --- /dev/null +++ b/testing/modemmanager/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 165395 2012-08-17 23:24:24Z heftig $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=modemmanager +_realname=ModemManager +pkgver=0.5.2.0 +pkgrel=3 +pkgdesc="Mobile broadband modem management service" +arch=('i686' 'x86_64') +url="http://cgit.freedesktop.org/ModemManager/ModemManager/" +license=('GPL2') +depends=('dbus-glib' 'udev' 'ppp') +makedepends=('intltool') +optdepends=('usb_modeswitch: install if your modem shows up as a storage drive') +options=('!libtool') +source=(http://download.gnome.org/sources/$_realname/0.5/$_realname-$pkgver.tar.xz + modem-manager.service) +sha256sums=('7f8b3e1996a24e031df7534e226a0f0c7c2dd8b30322e6c5f4611dc1a848e6c8' + '66c9947972066dd5494c3a18b0e833f236e0866b455675368b5994900cbaf384') + +build() { + cd "$_realname-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-udev-base-dir=/usr/lib/udev \ + --disable-static + make +} + +package() { + cd "$_realname-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/modem-manager.service" \ + "$pkgdir/usr/lib/systemd/system/modem-manager.service" + echo "SystemdService=modem-manager.service" \ + >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.ModemManager.service" +} diff --git a/testing/modemmanager/modem-manager.service b/testing/modemmanager/modem-manager.service new file mode 100644 index 000000000..4e0c43c8c --- /dev/null +++ b/testing/modemmanager/modem-manager.service @@ -0,0 +1,10 @@ +[Unit] +Description=Modem Manager + +[Service] +Type=dbus +BusName=org.freedesktop.ModemManager +ExecStart=/usr/sbin/modem-manager + +[Install] +WantedBy=multi-user.target diff --git a/testing/mysql/PKGBUILD b/testing/mysql/PKGBUILD new file mode 100644 index 000000000..74a6654e6 --- /dev/null +++ b/testing/mysql/PKGBUILD @@ -0,0 +1,133 @@ +# $Id: PKGBUILD 165319 2012-08-15 14:54:28Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgbase=mysql +pkgname=('libmysqlclient' 'mysql-clients' 'mysql') +pkgver=5.5.27 +pkgrel=3 +arch=('i686' 'x86_64') +license=('GPL') +url="https://www.mysql.com/products/community/" +makedepends=('cmake' 'openssl' 'zlib') +options=('!libtool') +source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" + 'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service') +md5sums=('82baf46acfced6eef072e9d8a479c86e' + 'e7eb2faeab755cbb2fe03542bf328da9' + '1c949c0dbea5206af0db14942d9927b6' + '6ea6ceb360d09a774e87335ee098ddd5' + '2fa6e456964d4ff5e6d4f9ff0126aed6' + 'a0e1460c276a50a9666c331de83271f2') + +build() { + mkdir build + cd build + + # CFLAGS/CXXFLAGS as suggested upstream + + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/mysql \ + -DMYSQL_DATADIR=/var/lib/mysql \ + -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ + -DDEFAULT_CHARSET=utf8 \ + -DDEFAULT_COLLATION=utf8_general_ci \ + -DENABLED_LOCAL_INFILE=ON \ + -DINSTALL_INFODIR=share/mysql/docs \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_DOCREADMEDIR=share/mysql \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_DOCDIR=share/mysql/docs \ + -DINSTALL_SHAREDIR=share/mysql \ + -DWITH_READLINE=ON \ + -DWITH_ZLIB=system \ + -DWITH_SSL=system \ + -DWITH_LIBWRAP=OFF \ + -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ + -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ + -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ + -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ + -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" + + make +} + +package_libmysqlclient(){ + pkgdesc="MySQL client libraries" + depends=('openssl') + + cd build + for dir in include libmysql libmysqld libservices; do + make -C ${dir} DESTDIR="${pkgdir}" install + done + + install -d "${pkgdir}"/usr/bin + install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/ + install -d "${pkgdir}"/usr/share/man/man1 + for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + done +} + +package_mysql-clients(){ + pkgdesc="MySQL client tools" + depends=('libmysqlclient') + + cd build + make -C client DESTDIR="${pkgdir}" install + + # install man pages + install -d "${pkgdir}"/usr/share/man/man1 + for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + done + + # provided by mysql + rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest} +} + +package_mysql(){ + pkgdesc="A fast SQL database server" + backup=('etc/mysql/my.cnf') + install=mysql.install + depends=('mysql-clients' 'systemd-tools') + options=('emptydirs') + + cd build + make DESTDIR="${pkgdir}" install + + install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf + install -Dm755 "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld + install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post + install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf + install -d "${pkgdir}"/usr/lib/systemd/system + install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/ + + # provided by libmysqlclient + rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} + rm "${pkgdir}"/usr/lib/libmysql* + rm -r "${pkgdir}"/usr/include/ + rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 + + # provided by mysql-clients + rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} + rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + + # not needed + rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench} + rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 + + install -dm700 "${pkgdir}"/var/lib/mysql +} diff --git a/testing/mysql/my.cnf b/testing/mysql/my.cnf new file mode 100644 index 000000000..9a41b4fc3 --- /dev/null +++ b/testing/mysql/my.cnf @@ -0,0 +1,145 @@ +# MySQL config file for medium systems. +# +# This is for a system with little memory (32M - 64M) where MySQL plays +# an important part, or systems up to 128M where MySQL is used together with +# other programs (such as a web server) +# +# MySQL programs look for option files in a set of +# locations which depend on the deployment platform. +# You can copy this option file to one of those +# locations. For information about these locations, see: +# http://dev.mysql.com/doc/mysql/en/option-files.html +# +# In this file, you can use all long options that a program supports. +# If you want to know which options a program supports, run the program +# with the "--help" option. + +# The following options will be passed to all MySQL clients +[client] +#password = your_password +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here follows entries for some specific programs + +# The MySQL server +[mysqld] +port = 3306 +socket = /var/run/mysqld/mysqld.sock +datadir = /var/lib/mysql +skip-external-locking +key_buffer_size = 16M +max_allowed_packet = 1M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M + +# Don't listen on a TCP/IP port at all. This can be a security enhancement, +# if all processes that need to connect to mysqld run on the same host. +# All interaction with mysqld must be made via Unix sockets or named pipes. +# Note that using this option without enabling named pipes on Windows +# (via the "enable-named-pipe" option) will render mysqld useless! +# +skip-networking + +# Replication Master Server (default) +# binary logging is required for replication +log-bin=mysql-bin + +# binary logging format - mixed recommended +binlog_format=mixed + +# required unique id between 1 and 2^32 - 1 +# defaults to 1 if master-host is not set +# but will not function as a master if omitted +server-id = 1 + +# Replication Slave (comment out master section to use this) +# +# To configure this host as a replication slave, you can choose between +# two methods : +# +# 1) Use the CHANGE MASTER TO command (fully described in our manual) - +# the syntax is: +# +# CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>, +# MASTER_USER=<user>, MASTER_PASSWORD=<password> ; +# +# where you replace <host>, <user>, <password> by quoted strings and +# <port> by the master's port number (3306 by default). +# +# Example: +# +# CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306, +# MASTER_USER='joe', MASTER_PASSWORD='secret'; +# +# OR +# +# 2) Set the variables below. However, in case you choose this method, then +# start replication for the first time (even unsuccessfully, for example +# if you mistyped the password in master-password and the slave fails to +# connect), the slave will create a master.info file, and any later +# change in this file to the variables' values below will be ignored and +# overridden by the content of the master.info file, unless you shutdown +# the slave server, delete master.info and restart the slaver server. +# For that reason, you may want to leave the lines below untouched +# (commented) and instead use CHANGE MASTER TO (see above) +# +# required unique id between 2 and 2^32 - 1 +# (and different from the master) +# defaults to 2 if master-host is set +# but will not function as a slave if omitted +#server-id = 2 +# +# The replication master for this slave - required +#master-host = <hostname> +# +# The username the slave will use for authentication when connecting +# to the master - required +#master-user = <username> +# +# The password the slave will authenticate with when connecting to +# the master - required +#master-password = <password> +# +# The port the master is listening on. +# optional - defaults to 3306 +#master-port = <port> +# +# binary logging - not required for slaves, but recommended +#log-bin=mysql-bin + +# Uncomment the following if you are using InnoDB tables +#innodb_data_home_dir = /var/lib/mysql +#innodb_data_file_path = ibdata1:10M:autoextend +#innodb_log_group_home_dir = /var/lib/mysql +# You can set .._buffer_pool_size up to 50 - 80 % +# of RAM but beware of setting memory usage too high +#innodb_buffer_pool_size = 16M +#innodb_additional_mem_pool_size = 2M +# Set .._log_file_size to 25 % of buffer pool size +#innodb_log_file_size = 5M +#innodb_log_buffer_size = 8M +#innodb_flush_log_at_trx_commit = 1 +#innodb_lock_wait_timeout = 50 + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +no-auto-rehash +# Remove the next comment character if you are not familiar with SQL +#safe-updates + +[myisamchk] +key_buffer_size = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout diff --git a/testing/mysql/mysql.install b/testing/mysql/mysql.install new file mode 100644 index 000000000..a98f1a877 --- /dev/null +++ b/testing/mysql/mysql.install @@ -0,0 +1,28 @@ +post_install(){ + groupadd -g 89 mysql &>/dev/null + useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + usr/bin/mysql_install_db --user=mysql --basedir=/usr + chown -R mysql:mysql var/lib/mysql &>/dev/null + + usr/bin/systemd-tmpfiles --create mysqld.conf +} + +post_upgrade(){ + getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + + if [ "$(vercmp $2 5.5)" -lt 0 ]; then + echo " >> " + echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." + echo " >> " + fi +} + +post_remove(){ + if getent passwd mysql >/dev/null 2>&1; then + userdel mysql + fi + if getent group mysql >/dev/null 2>&1; then + groupdel mysql + fi +} diff --git a/testing/mysql/mysqld-post.sh b/testing/mysql/mysqld-post.sh new file mode 100755 index 000000000..8dc9c4eea --- /dev/null +++ b/testing/mysql/mysqld-post.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +while true; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 +done diff --git a/testing/mysql/mysqld-tmpfile.conf b/testing/mysql/mysqld-tmpfile.conf new file mode 100644 index 000000000..6883dc798 --- /dev/null +++ b/testing/mysql/mysqld-tmpfile.conf @@ -0,0 +1 @@ +d /run/mysqld 0755 mysql mysql - diff --git a/testing/mysql/mysqld.rc b/testing/mysql/mysqld.rc new file mode 100755 index 000000000..4bbddb5a4 --- /dev/null +++ b/testing/mysql/mysqld.rc @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting MySQL Server" + [ ! -d /run/mysqld ] && install -d -g mysql -o mysql /run/mysqld &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /run/mysqld/mysqld.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping MySQL Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /run/mysqld/mysqld.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/mysql/mysqld.service b/testing/mysql/mysqld.service new file mode 100644 index 000000000..0175c685b --- /dev/null +++ b/testing/mysql/mysqld.service @@ -0,0 +1,11 @@ +[Unit] +Description=MySQL Server + +[Service] +User=mysql +ExecStart=/usr/bin/mysqld --user=mysql +ExecStartPost=/usr/bin/mysqld-post +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/testing/openvpn/PKGBUILD b/testing/openvpn/PKGBUILD new file mode 100644 index 000000000..ea7443098 --- /dev/null +++ b/testing/openvpn/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 165397 2012-08-17 23:28:47Z heftig $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=openvpn +pkgver=2.2.2 +pkgrel=2 +pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" +arch=(i686 x86_64) +url="http://openvpn.net/index.php/open-source.html" +depends=('openssl' 'lzo2' 'iproute2') +license=('custom') +backup=(usr/share/openvpn/easy-rsa/vars + usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf + etc/conf.d/openvpn-tapdev) +source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz + http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz.asc + openvpn@.service + openvpn.rc + openvpn-tapdev.rc + openvpn-tapdev.conf) +md5sums=('c5181e27b7945fa6276d21873329c5c7' + '81ff11ec8cd9fc3c8bc646aae24c4298' + '44047df812a3fcd57a7e36a61732a9b9' + 'a3809b9727f0c2af2d0770f5c7442db2' + 'd2c48e970088d679dd3c2afd914ff731' + '722f483c9e3ce2ec66d3301aaf7cf3d5') + +build() { + cd $srcdir/$pkgname-$pkgver + # Build openvpn + CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \ + --prefix=/usr \ + --enable-password-save \ + --mandir=/usr/share/man \ + --enable-iproute2 + make + + # Build plugins + for plug in auth-pam down-root; do + cd $srcdir/$pkgname-$pkgver/plugin/$plug + make + done +} + +package() { + cd $srcdir/$pkgname-$pkgver + # Install openvpn + make DESTDIR=$pkgdir install + install -d -m755 $pkgdir/etc/openvpn + # Install examples + install -d -m755 $pkgdir/usr/share/openvpn + cp -r sample-config-files $pkgdir/usr/share/openvpn/examples + find $pkgdir/usr/share/openvpn -type f -exec chmod 644 {} \; + find $pkgdir/usr/share/openvpn -type d -exec chmod 755 {} \; + # Install license + install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + # Install plugins + for plug in auth-pam down-root; do + cd $srcdir/$pkgname-$pkgver/plugin/$plug + install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so + cd - + done + # Install contrib + install -d -m755 $pkgdir/usr/share/openvpn/contrib + cp -r contrib $pkgdir/usr/share/openvpn + # Install easy-rsa + cd $srcdir/$pkgname-$pkgver + make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa + rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf + # Install rc scripts + install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn + install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev + install -D -m644 $srcdir/openvpn-tapdev.conf $pkgdir/etc/conf.d/openvpn-tapdev + install -D -m644 $srcdir/openvpn@.service $pkgdir/usr/lib/systemd/system/openvpn@.service +} diff --git a/testing/openvpn/openvpn-tapdev.conf b/testing/openvpn/openvpn-tapdev.conf new file mode 100644 index 000000000..afa5586dd --- /dev/null +++ b/testing/openvpn/openvpn-tapdev.conf @@ -0,0 +1,12 @@ +# +# /etc/conf.d/openvpn-tapdev +# +# Place openvpn-tapdev before network into your DAEMONS array +# This will create permanent tap devices which you can use for bridging +# +# Example: +# TAPDEVS="work home" +# Will create two tap devices "work" and "home" +# + +TAPDEVS="" diff --git a/testing/openvpn/openvpn-tapdev.rc b/testing/openvpn/openvpn-tapdev.rc new file mode 100755 index 000000000..2c51f8248 --- /dev/null +++ b/testing/openvpn/openvpn-tapdev.rc @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +. /etc/conf.d/openvpn-tapdev + +case "$1" in + start) + stat_busy "Creating tap devices for OpenVPN ... " + success=0 + for tapdev in ${TAPDEVS}; do + stat_append "${tapdev} " + /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? + done + if [ $success -eq 0 ]; then + add_daemon openvpn-tapdev + stat_done + else + stat_fail + fi + ;; + stop) + stat_busy "Destroying tap devices for OpenVPN ..." + for tapdev in ${TAPDEVS}; do + stat_append "${tapdev} " + /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? + done + rm_daemon openvpn-tapdev + stat_done + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/openvpn/openvpn.rc b/testing/openvpn/openvpn.rc new file mode 100755 index 000000000..96c28b641 --- /dev/null +++ b/testing/openvpn/openvpn.rc @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +CFGDIR="/etc/openvpn" +STATEDIR="/var/run/openvpn" + +case "$1" in + start) + stat_busy "Starting OpenVPN ... " + success=0 + mkdir -p "${STATEDIR}" + for cfg in "${CFGDIR}"/*.conf; do + stat_append "$(basename "${cfg}" .conf) " + /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$? + done + if [ $success -eq 0 ]; then + add_daemon openvpn + stat_done + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping OpenVPN ..." + for pidfile in "${STATEDIR}"/*.pid; do + stat_append "$(basename "${pidfile}" .pid) " + kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null + rm -f "${pidfile}" + done + rm_daemon openvpn + stat_done + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/openvpn/openvpn@.service b/testing/openvpn/openvpn@.service new file mode 100644 index 000000000..c3de3bdf7 --- /dev/null +++ b/testing/openvpn/openvpn@.service @@ -0,0 +1,10 @@ +[Unit] +Description=OpenVPN connection to %i +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i --cd /etc/openvpn + +[Install] +WantedBy=multi-user.target diff --git a/testing/postgresql/PKGBUILD b/testing/postgresql/PKGBUILD new file mode 100644 index 000000000..e7f743d8e --- /dev/null +++ b/testing/postgresql/PKGBUILD @@ -0,0 +1,154 @@ +# $Id: PKGBUILD 165398 2012-08-17 23:34:22Z heftig $ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgbase=postgresql +pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') +pkgver=9.1.4 +_majorver=${pkgver%.*} +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.postgresql.org/" +license=('custom:PostgreSQL') +makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') +source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 + postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate + postgresql.service postgresql-initdb) +md5sums=('a8035688dba988b782725ac1aec60186' + '1ddd1df8010549f237e7983bb326025e' + 'a54d09a20ab1672adf08f037df188d53' + '96f82c38f3f540b53f3e5144900acf17' + 'd28e443f9f65a5712c52018b84e27137' + '1ec1fbf1ce998324248c543e6cc2c5e6' + '1488a98a5d5d96a04416e4f5872223bf') +sha256sums=('a0795a8eb3ae2d1a2914b63bf143d20182835d90699915ff43567c041d3c9712' + '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' + '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' + '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' + '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' + '7014ccc8f3bbac8be9473a43fca2ed4037ee04e56d8e07d6027b3b4ef0317c89' + 'c22f82a3cf5b555935039853fab2d7e5ff6188cdb1fb528fa9171a87b94f42b0') + +build() { + cd "${srcdir}/postgresql-${pkgver}" + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --datadir=/usr/share/postgresql \ + --with-krb5 \ + --with-libxml \ + --with-openssl \ + --with-perl \ + --with-python PYTHON=/usr/bin/python2 \ + --with-tcl \ + --with-pam \ + --with-system-tzdata=/usr/share/zoneinfo \ + --enable-nls \ + --enable-thread-safety + + make world +} + +package_postgresql-libs() { + pkgdesc="Libraries for use with PostgreSQL" + depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0') + provides=('postgresql-client') + conflicts=('postgresql-client') + + cd "${srcdir}/postgresql-${pkgver}" + + # install license + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE" + + # install libs + for dir in src/interfaces src/bin/pg_config src/bin/psql; do + make -C ${dir} DESTDIR="${pkgdir}" install + done + + install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1" + install -D -m644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1" + + cd src/include + + mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq} + + # these headers are needed by the public headers of the interfaces + install -m644 pg_config.h "${pkgdir}/usr/include/" + install -m644 pg_config_os.h "${pkgdir}/usr/include/" + install -m644 postgres_ext.h "${pkgdir}/usr/include/" + install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/" + install -m644 pg_config_manual.h "${pkgdir}/usr/include/" + + # these headers are needed by the not-so-public headers of the interfaces + install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/" + install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/" + install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/" + install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/" +} + +package_postgresql-docs() { + pkgdesc="HTML documentation for PostgreSQL" + options=(docs) + + cd "${srcdir}/postgresql-${pkgver}" + + # install license + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE" + + make -C doc/src/sgml DESTDIR="${pkgdir}" install-html + chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/" + + # clean up + rmdir "${pkgdir}"/usr/share/man/man{1,3,7} + rmdir "${pkgdir}"/usr/share/man +} + +package_postgresql() { + pkgdesc="A sophisticated object-relational DBMS" + backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql') + depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0') + optdepends=('python2: for PL/Python support' + 'perl: for PL/Perl support' + 'tcl: for PL/Tcl support' + 'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade') + install=postgresql.install + + cd "${srcdir}/postgresql-${pkgver}" + + # install + make DESTDIR="${pkgdir}" install + make -C contrib DESTDIR="${pkgdir}" install + make -C doc/src/sgml DESTDIR="${pkgdir}" install-man + + # we don't want these, they are in the -libs package + for dir in src/interfaces src/bin/pg_config src/bin/psql; do + make -C ${dir} DESTDIR="${pkgdir}" uninstall + done + rm "${pkgdir}/usr/share/man/man1/pg_config.1" + rm "${pkgdir}/usr/share/man/man1/psql.1" + + # install license + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE" + + # clean up unneeded installed items + rm -rf "${pkgdir}/usr/include/postgresql/internal" + rm -rf "${pkgdir}/usr/include/libpq" + find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} + + rmdir "${pkgdir}/usr/share/doc/postgresql/html" + + # install launch script + install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql" + install -D -m644 "${srcdir}/postgresql.service" \ + "${pkgdir}/usr/lib/systemd/system/postgresql.service" + install -D -m755 "${srcdir}/postgresql-initdb" \ + "${pkgdir}/usr/lib/systemd/scripts/postgresql-initdb" + + # install conf file + install -D -m644 ${srcdir}/postgresql.confd \ + "${pkgdir}/etc/conf.d/postgresql" + + install -D -m644 ${srcdir}/postgresql.pam \ + "${pkgdir}/etc/pam.d/postgresql" + + install -D -m644 ${srcdir}/postgresql.logrotate \ + "${pkgdir}/etc/logrotate.d/postgresql" +} diff --git a/testing/postgresql/postgresql-initdb b/testing/postgresql/postgresql-initdb new file mode 100755 index 000000000..a691a83ff --- /dev/null +++ b/testing/postgresql/postgresql-initdb @@ -0,0 +1,33 @@ +#!/bin/sh + +set -e + +. /etc/conf.d/postgresql + +# 2nd clause is necessary to prevent symlinking the directory to itself when it +# doesn't exist yet +if [ ! /var/lib/postgres -ef "$PGROOT" ] && [ /var/lib/postgres != "$PGROOT" ]; then + echo "Creating symlink /var/lib/postgres -> $PGROOT" + + # Remove /var/lib/postgres if empty dir, but not if symlink + if [ ! -L /var/lib/postgres ] && [ -d /var/lib/postgres ]; then + rmdir /var/lib/postgres + fi + + ln -sf "$PGROOT" /var/lib/postgres +fi + +PGDATA="$PGROOT/data" + +if [ ! -d "$PGDATA" ]; then + echo "Initializing database in $PGDATA" + + mkdir -p "$PGDATA" + chown -R postgres:postgres "$PGDATA" + + su - postgres -m -c "/usr/bin/initdb $INITOPTS -D '$PGDATA'" >/dev/null + + if [ -f /etc/postgresql/postgresql.conf ]; then + ln -sf /etc/postgresql/postgresql.conf "$PGDATA/postgresql.conf" + fi +fi diff --git a/testing/postgresql/postgresql.confd b/testing/postgresql/postgresql.confd new file mode 100644 index 000000000..6001c16d1 --- /dev/null +++ b/testing/postgresql/postgresql.confd @@ -0,0 +1,11 @@ +## +## Parameters to be passed to postgresql +## +## Default data directory location +#PGROOT="/var/lib/postgres" +## Passed to initdb if necessary +INITOPTS="--locale en_US.UTF-8" +## Default log file location +#PGLOG="/var/log/postgresql.log" +## Additional options to pass via pg_ctl's '-o' option +#PGOPTS="" diff --git a/testing/postgresql/postgresql.install b/testing/postgresql/postgresql.install new file mode 100644 index 000000000..c52432271 --- /dev/null +++ b/testing/postgresql/postgresql.install @@ -0,0 +1,26 @@ +post_install() { + if [ ! -d '/var/lib/postgres' ]; then + mkdir -p '/var/lib/postgres' + fi + getent group postgres >/dev/null || groupadd -g 88 postgres + getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres + passwd -l postgres >/dev/null +} + +post_upgrade() { + post_install $1 + # FS#23858, fix postgres user shell issue + postgres_shell=$(getent passwd postgres | cut -d: -f7) + if [ "$postgres_shell" = "/sbin/nologin" ]; then + chsh -s /bin/bash postgres + fi +} + +post_remove() { + if getent passwd postgres >/dev/null; then + userdel postgres + fi + if getent group postgres >/dev/null; then + groupdel postgres + fi +} diff --git a/testing/postgresql/postgresql.logrotate b/testing/postgresql/postgresql.logrotate new file mode 100644 index 000000000..9c36918be --- /dev/null +++ b/testing/postgresql/postgresql.logrotate @@ -0,0 +1,4 @@ +/var/log/postgresql.log { + copytruncate + missingok +} diff --git a/testing/postgresql/postgresql.pam b/testing/postgresql/postgresql.pam new file mode 100644 index 000000000..53724d1f8 --- /dev/null +++ b/testing/postgresql/postgresql.pam @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/testing/postgresql/postgresql.rcd b/testing/postgresql/postgresql.rcd new file mode 100755 index 000000000..f3600b30b --- /dev/null +++ b/testing/postgresql/postgresql.rcd @@ -0,0 +1,79 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/postgresql + +# Default PGROOT if it wasn't defined in the conf.d file +PGROOT=${PGROOT:-/var/lib/postgres} +PGLOG=${PGLOG:-/var/log/postgresql.log} +PGCTL_BIN=/usr/bin/pg_ctl +PGCTL_ARGS=(-D "$PGROOT/data" -l "$PGLOG" -s -w) +[[ $PGOPTS ]] && PGCTL_ARGS+=(-o "$PGOPTS") + +postgres_init() { + # initialization + if [[ ! -d "$PGROOT/data" ]]; then + mkdir -p "$PGROOT/data" && chown -R postgres:postgres "$PGROOT" + su - postgres -c "/usr/bin/initdb $INITOPTS -D '$PGROOT/data'" + fi + if [[ ! -e "$PGLOG" ]]; then + touch "$PGLOG" + chown postgres "$PGLOG" + fi +} + +do_postgres() { + su - postgres -c "'$PGCTL_BIN' $(printf '%q ' "${PGCTL_ARGS[@]}" "$@")" +} + +case $1 in + start) + postgres_init + stat_busy "Starting PostgreSQL" + if do_postgres start; then + add_daemon postgresql + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping PostgreSQL" + if do_postgres stop -m fast; then + rm_daemon postgresql + stat_done + else + stat_fail + exit 1 + fi + ;; + reload) + stat_busy "Reloading PostgreSQL" + if do_postgres reload; then + stat_done + else + stat_fail + exit 1 + fi + ;; + restart) + postgres_init + stat_busy "Restarting PostgreSQL" + if do_postgres restart -m fast; then + add_daemon postgresql + stat_done + else + stat_fail + exit 1 + fi + ;; + status) + stat_busy "Checking PostgreSQL status"; + ck_status postgresql + ;; + *) + echo "usage: $0 {start|stop|reload|restart|status}" + exit 1 +esac diff --git a/testing/postgresql/postgresql.service b/testing/postgresql/postgresql.service new file mode 100644 index 000000000..2fcd3e93d --- /dev/null +++ b/testing/postgresql/postgresql.service @@ -0,0 +1,20 @@ +[Unit] +Description=PostgreSQL database server + +[Service] +Type=forking +SyslogIdentifier=postgres +PIDFile=/var/lib/postgres/data/postmaster.pid + +# initdb script takes care for symlinking $PGROOT to /var/lib/postgres +ExecStartPre=/usr/lib/systemd/scripts/postgresql-initdb +ExecStart= /bin/su - postgres -m -c "/usr/bin/pg_ctl -s -D /var/lib/postgres/data start" +ExecReload=/bin/su - postgres -m -c "/usr/bin/pg_ctl -s -D /var/lib/postgres/data reload" +ExecStop= /bin/su - postgres -m -c "/usr/bin/pg_ctl -s -D /var/lib/postgres/data stop -m fast" + +# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in +# killing Postgres +OOMScoreAdjust=-200 + +[Install] +WantedBy=multi-user.target diff --git a/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD new file mode 100644 index 000000000..4bfa43e3d --- /dev/null +++ b/testing/proftpd/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 165249 2012-08-14 16:09:40Z andrea $ +# Maintainer: +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=proftpd +pkgver=1.3.4b +pkgrel=2 +epoch=1 +pkgdesc="A high-performance, scalable FTP server" +arch=('i686' 'x86_64') +url="http://www.proftpd.org" +license=('GPL') +depends=('libmysqlclient' 'postgresql-libs') +backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') +source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc} + 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service') +md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2' + 'e5b9bd78029a15f82994efcb7ed2e9fb' + 'c439a0a1dbc21b604d8382da87aa021b' + 'ddb09eb13131becdf0e081eef413116b' + '71d5932b0461c318ed68c2c0c2660736' + '2c446f531948c8cc0a1e0fae28f8dfda') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --disable-pam \ + --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ + --sysconfdir=/etc \ + --localstatedir=/run/proftpd \ + --enable-ctrls \ + --enable-ipv6 \ + --with-includes=/usr/include/mysql:/usr/include/postgresql \ + --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ + --enable-nls \ + --with-systemd + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" + + install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" + install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" + install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" + install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" + + install -d "${pkgdir}/usr/lib/systemd/system/" + install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/" +} diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd new file mode 100755 index 000000000..9ea1d47fc --- /dev/null +++ b/testing/proftpd/proftpd @@ -0,0 +1,41 @@ +#!/bin/bash + +# source application-specific settings +PROFTPD_ARGS= +[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting ProFTPd Server" + /usr/sbin/proftpd ${PROFTPD_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon proftpd + stat_done + fi + ;; + stop) + stat_busy "Stopping ProFTPd Server" + [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /run/proftpd/proftpd.pid + rm_daemon proftpd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d new file mode 100644 index 000000000..1a5a8a201 --- /dev/null +++ b/testing/proftpd/proftpd.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to proftpd +# +PROFTPD_ARGS="" diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate new file mode 100644 index 000000000..7b6d7a87b --- /dev/null +++ b/testing/proftpd/proftpd.logrotate @@ -0,0 +1,5 @@ +/var/log/xferlog { + postrotate + /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/proftpd/proftpd.service b/testing/proftpd/proftpd.service new file mode 100644 index 000000000..c202a2fdf --- /dev/null +++ b/testing/proftpd/proftpd.service @@ -0,0 +1,14 @@ +[Unit] +Description = ProFTPD FTP Server +After = network.target nss-lookup.target local-fs.target remote-fs.target + +[Service] +Type = forking +PIDFile = /run/proftpd/proftpd.pid +Environment = PROFTPD_ARGS= +EnvironmentFile = -/etc/conf.d/proftpd +ExecStart = /usr/sbin/proftpd $PROFTPD_ARGS +ExecReload = /bin/kill -HUP $MAINPID + +[Install] +WantedBy = multi-user.target diff --git a/testing/rfkill/PKGBUILD b/testing/rfkill/PKGBUILD new file mode 100644 index 000000000..2d03e6dbb --- /dev/null +++ b/testing/rfkill/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 165297 2012-08-15 01:17:54Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Thomas Bächler <thomas@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=rfkill +pkgver=0.4 +pkgrel=5 +pkgdesc='Tool for enabling and disabling wireless devices' +url='http://linuxwireless.org/en/users/Documentation/rfkill' +license=('custom') +arch=('i686' 'x86_64') +source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'rules.d' + 'service' + 'conf.d' + 'rc.d') +sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b' + '6390eaa793b473098aaa11b13c5254d611a4c13a' + 'cadc563f967c5ac680e7cdfd764718b412201f8a' + 'd969fe927a9fb2926af43a311a7c1fa126fe59a9' + '380af0b002f51543557306ed68a27f0059fd5a6f') + +backup=('etc/conf.d/rfkill') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules" + install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/rfkill.service" + install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill" + install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill" +} diff --git a/testing/rfkill/conf.d b/testing/rfkill/conf.d new file mode 100644 index 000000000..4483da26c --- /dev/null +++ b/testing/rfkill/conf.d @@ -0,0 +1,20 @@ +# +# /etc/conf.d/rfkill +# Configuration for the rfkill startup script +# + +# List of devices to block on startup (space-separated) +RFKILL_BLOCK="" + +# List of devices to unblock on startup (space-separated) +RFKILL_UNBLOCK="all" + +# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ... +# See "rfkill list" for available devices +# Examples: +# +# Block all bluetooth devices: +# RFKILL_BLOCK="bluetooth" +# +# Unblock the phy0 wifi device and all wwan devices: +# RFKILL_UNBLOCK="phy0 wwan" diff --git a/testing/rfkill/rc.d b/testing/rfkill/rc.d new file mode 100755 index 000000000..ce90ee150 --- /dev/null +++ b/testing/rfkill/rc.d @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/rfkill + +case "$1" in + start) + for device in ${RFKILL_BLOCK}; do + stat_busy "Blocking rfkill device: ${device}" + /usr/sbin/rfkill block ${device} + if [ $? -eq 0 ]; then + stat_done + else + stat_fail + fi + done + for device in ${RFKILL_UNBLOCK}; do + stat_busy "Unblocking rfkill device: ${device}" + /usr/sbin/rfkill unblock ${device} + if [ $? -eq 0 ]; then + stat_done + else + stat_fail + fi + done + ;; + stop) + ;; + restart) + $0 start + ;; + *) + echo "usage: $0 {start}" + exit 1 + ;; +esac +exit 0 diff --git a/testing/rfkill/rules.d b/testing/rfkill/rules.d new file mode 100644 index 000000000..bc98a3bef --- /dev/null +++ b/testing/rfkill/rules.d @@ -0,0 +1 @@ +KERNEL=="rfkill", GROUP="rfkill", MODE="0664" diff --git a/testing/rfkill/service b/testing/rfkill/service new file mode 100644 index 000000000..decd5b6fc --- /dev/null +++ b/testing/rfkill/service @@ -0,0 +1,11 @@ +[Unit] +Description=RFKill-Block Selected Devices + +[Service] +Type=oneshot +ExecStart=/usr/sbin/rfkill block 9999 +ExecStop=/usr/sbin/rfkill unblock all +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/testing/spamassassin/PKGBUILD b/testing/spamassassin/PKGBUILD new file mode 100644 index 000000000..a6b0dbb0b --- /dev/null +++ b/testing/spamassassin/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 165370 2012-08-16 16:16:07Z bluewind $ +# Maintainer: Dale Blount <dale@archlinux.org> +# Contributor: Manolis Tzanidakis +pkgname=spamassassin +pkgver=3.3.2 +pkgrel=4 +pkgdesc="A mail filter to identify spam." +arch=('i686' 'x86_64') +license=('APACHE') +url="http://spamassassin.apache.org" +depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl' + 'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http' + 'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay') +makedepends=('razor' 'perl-dbi') +optdepends=('razor: to identify collaborately-flagged spam') +backup=('etc/conf.d/spamd' + 'etc/mail/spamassassin/local.cf' + 'etc/mail/spamassassin/init.pre' + 'etc/mail/spamassassin/v310.pre' + 'etc/mail/spamassassin/v312.pre' + 'etc/mail/spamassassin/v320.pre' + 'etc/mail/spamassassin/v330.pre') +install="${pkgname}.install" +options=('!emptydirs') +source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz" + 'spamd.conf.d' 'spamd' 'spamassassin.service') +md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' + 'af501c6b0bb937a2775b747cc4b6d150' + '57545e6877503d897db21e9a2e8bd2b9' + '1c39572b79bc20c822387814050ee5c1') + +build() { + cd "${srcdir}/Mail-SpamAssassin-${pkgver}" + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \ + CONTACT_ADDRESS=root@localhost ENABLE_SSL=yes PERL_TAINT=no + make +} + +check() { + cd "${srcdir}/Mail-SpamAssassin-${pkgver}" + + # SSLv2 is disabled by upstream so this test would fail + rm -rf t/spamd_ssl_v2.t + + # parallel tests cause lots of failures; disable for now + #export HARNESS_OPTIONS="j$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/')" + + make test +} + +package() { + cd "${srcdir}/Mail-SpamAssassin-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd" + install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd" + install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.serivce" +} diff --git a/testing/spamassassin/spamassassin.install b/testing/spamassassin/spamassassin.install new file mode 100644 index 000000000..fae0264b2 --- /dev/null +++ b/testing/spamassassin/spamassassin.install @@ -0,0 +1,11 @@ +post_install() { + echo "You must run 'sa-update' to install spam rules before use." +} + +post_upgrade() { + # Compile rules, if rules have previously been compiled, and it's possible + if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]] + echo "Detected compiled rules, running sa-compile..." + sa-compile > /dev/null 2>&1 +fi +} diff --git a/testing/spamassassin/spamassassin.service b/testing/spamassassin/spamassassin.service new file mode 100644 index 000000000..a74f6e644 --- /dev/null +++ b/testing/spamassassin/spamassassin.service @@ -0,0 +1,14 @@ +[Unit] +Description=Spamassassin daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/spamd.pid +ExecStart=/usr/bin/vendor_perl/spamd --pidfile /var/run/spamd.pid -c +StandardOutput=syslog +StandardError=syslog +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/testing/spamassassin/spamd b/testing/spamassassin/spamd new file mode 100644 index 000000000..3fb97566e --- /dev/null +++ b/testing/spamassassin/spamd @@ -0,0 +1,55 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/spamd ] && . /etc/conf.d/spamd + +. /etc/rc.conf +. /etc/rc.d/functions + +PIDFILE=/var/run/spamd.pid +if [ -f $PIDFILE ]; then + PID=$(cat $PIDFILE) +else + PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat +fi + +case "$1" in + start) + stat_busy "Starting spamd" + [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d -r "$PIDFILE" ${SPAMD_OPTS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon spamd + stat_done + fi + ;; + stop) + stat_busy "Stopping spamd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + # Some users report that a second attempt at stopping the process + # works. So, take a little nap and give it another whirl... + sleep 2 + kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon spamd + stat_done + fi + else + rm_daemon spamd + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +# vim: ts=2 sw=2 et ft=sh diff --git a/testing/spamassassin/spamd.conf.d b/testing/spamassassin/spamd.conf.d new file mode 100644 index 000000000..4295e0073 --- /dev/null +++ b/testing/spamassassin/spamd.conf.d @@ -0,0 +1 @@ +SPAMD_OPTS="-c" diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD new file mode 100644 index 000000000..6c5931c19 --- /dev/null +++ b/testing/subversion/PKGBUILD @@ -0,0 +1,99 @@ +# $Id: PKGBUILD 165314 2012-08-15 13:09:50Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Paul Mattal <paul@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=subversion +pkgver=1.7.6 +pkgrel=1 +pkgdesc="A Modern Concurrent Version Control System" +arch=('i686' 'x86_64') +license=('APACHE') +depends=('neon' 'apr-util' 'sqlite' 'file') +optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ + 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') +makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' + 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') +url="http://subversion.apache.org/" +provides=('svn') +options=('!makeflags' '!libtool' '!emptydirs') +source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} + svnserve + svn + svnserve.conf + svnserve.tmpfiles + svnserve.service + subversion-1.7.6-kwallet-gcc47.patch + subversion.rpath.fix.patch) +sha1sums=('5b76a9f49e2c4bf064041a7d6b1bfcc3aa4ed068' + 'd8d99c01c49b189047389816b720923f1d9dbf2a' + '64ba3e6ebafc08ac62f59d788f7a825fdce69573' + '73b36c046c09cec2093354911c89e3ba8056af6c' + 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' + '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' + '9f6790d842cf3e0228b007483a43e39a42724068' + 'aa0d01e606de2ebc5eed9c533d218d37a217c50c' + '3d1e28408a9abb42af2e531adc0d01ce21acfad6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export PYTHON=/usr/bin/python2 + + patch -p0 -i ../subversion.rpath.fix.patch + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py + + patch -Np1 -i ../subversion-1.7.6-kwallet-gcc47.patch + + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ + --with-zlib=/usr --with-neon=/usr --with-apxs \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ + --enable-javahl --with-gnome-keyring --with-kwallet + + make external-all + make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all + make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ + swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl #swig-rb +} + +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# export LANG=C LC_ALL=C +# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb +#} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH} + make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ + swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ + swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ + install install-swig-py install-swig-pl install-javahl #install-swig-rb + + install -dm755 "${pkgdir}"/usr/share/subversion + cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ + rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in + + rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist + rm -r "${pkgdir}"/usr/lib/perl5/core_perl + + ## svnserve ... + + # ... iniscript/xinetd + install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve + install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn + + # ... systemd + install -D -m 644 "${srcdir}"/svnserve.service "${pkgdir}"/usr/lib/systemd/system/svnserve.service + install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf + + # ... common config + install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve + + install -Dm 644 tools/client-side/bash_completion \ + "${pkgdir}"/usr/share/bash-completion/completions/subversion + for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do + ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} + done +} diff --git a/testing/subversion/subversion-1.7.6-kwallet-gcc47.patch b/testing/subversion/subversion-1.7.6-kwallet-gcc47.patch new file mode 100644 index 000000000..a571c3c3c --- /dev/null +++ b/testing/subversion/subversion-1.7.6-kwallet-gcc47.patch @@ -0,0 +1,56 @@ +diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp +--- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp 2010-12-30 15:46:50.000000000 -0500 ++++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp 2012-08-14 19:43:16.694275908 -0400 +@@ -60,6 +60,9 @@ + /* KWallet simple provider, puts passwords in KWallet */ + /*-----------------------------------------------------------------------*/ + ++static int q_argc = 1; ++static char q_argv0[] = "svn"; // Build non-const char * from string constant ++static char *q_argv[] = { q_argv0 }; + + static const char * + get_application_name(apr_hash_t *parameters, +@@ -175,6 +178,10 @@ + "kwallet-initialized", + APR_HASH_KEY_STRING, + NULL); ++ apr_hash_set(parameters, ++ "kwallet-wallet", ++ APR_HASH_KEY_STRING, ++ NULL); + } + return APR_SUCCESS; + } +@@ -203,12 +210,11 @@ + QCoreApplication *app; + if (! qApp) + { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); ++ int argc = q_argc; ++ app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(1, +- (char *[1]) {(char *) "svn"}, ++ KCmdLineArgs::init(q_argc, q_argv, + get_application_name(parameters, pool), + "subversion", + ki18n(get_application_name(parameters, pool)), +@@ -273,12 +279,11 @@ + QCoreApplication *app; + if (! qApp) + { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); ++ int argc = q_argc; ++ app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(1, +- (char *[1]) {(char *) "svn"}, ++ KCmdLineArgs::init(q_argc, q_argv, + get_application_name(parameters, pool), + "subversion", + ki18n(get_application_name(parameters, pool)), diff --git a/testing/subversion/subversion.rpath.fix.patch b/testing/subversion/subversion.rpath.fix.patch new file mode 100644 index 000000000..ba6ee9e4e --- /dev/null +++ b/testing/subversion/subversion.rpath.fix.patch @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 ++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 +@@ -678,6 +678,7 @@ + + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} + + swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ + $(SWIG_PL_DIR)/native/Makefile diff --git a/testing/subversion/svn b/testing/subversion/svn new file mode 100644 index 000000000..8988aaf63 --- /dev/null +++ b/testing/subversion/svn @@ -0,0 +1,11 @@ +service svn +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/bin/svnserve + server_args = -i + log_on_failure += USERID + disable = yes +} diff --git a/testing/subversion/svnserve b/testing/subversion/svnserve new file mode 100755 index 000000000..670fee742 --- /dev/null +++ b/testing/subversion/svnserve @@ -0,0 +1,42 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/svnserve + +PID=`pidof -o %PPID /usr/bin/svnserve` +case "$1" in + start) + stat_busy "Starting svnserve" + if [ -z "$PID" ]; then + if [ -n "$SVNSERVE_USER" ]; then + su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & + else + /usr/bin/svnserve -d $SVNSERVE_ARGS & + fi + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon svnserve + stat_done + fi + ;; + stop) + stat_busy "Stopping svnserve" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon svnserve + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/subversion/svnserve.conf b/testing/subversion/svnserve.conf new file mode 100644 index 000000000..37fb7ea10 --- /dev/null +++ b/testing/subversion/svnserve.conf @@ -0,0 +1,7 @@ +# +# Parameters to be passed to svnserve +# +#SVNSERVE_ARGS="-r /path/to/some/repos" +SVNSERVE_ARGS="" + +#SVNSERVE_USER="svn" diff --git a/testing/subversion/svnserve.service b/testing/subversion/svnserve.service new file mode 100644 index 000000000..d8a8e10c1 --- /dev/null +++ b/testing/subversion/svnserve.service @@ -0,0 +1,11 @@ +[Unit] +Description=Subversion protocol daemon +After=syslog.target network.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/svnserve +ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS + +[Install] +WantedBy=multi-user.target diff --git a/testing/subversion/svnserve.tmpfiles b/testing/subversion/svnserve.tmpfiles new file mode 100644 index 000000000..e8487d373 --- /dev/null +++ b/testing/subversion/svnserve.tmpfiles @@ -0,0 +1 @@ +D /run/svnserve 0700 root root - diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD new file mode 100644 index 000000000..cc41c6564 --- /dev/null +++ b/testing/sudo/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 165301 2012-08-15 06:24:22Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=sudo +_ver=1.8.5p3 +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +pkgrel=1 +pkgdesc="Give certain users the ability to run some commands as root" +arch=('i686' 'x86_64') +url="http://www.sudo.ws/sudo/" +license=('custom') +depends=('glibc' 'pam') +backup=('etc/sudoers' 'etc/pam.d/sudo') +options=('!libtool' '!makeflags') +source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} + sudo.pam) +md5sums=('aa50e0a9ca02ac35d1020881bd3a221f' + 'aceea97d5f4fe063d6803bead339364d' + '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') + +build() { + cd "$srcdir/$pkgname-$_ver" + + ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ + --with-env-editor --with-all-insults --with-logfac=auth + make +} + +check() { + cd "$srcdir/$pkgname-$_ver" + make check +} + +package() { + cd "$srcdir/$pkgname-$_ver" + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" + + install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" +} diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam new file mode 100644 index 000000000..4e586cd22 --- /dev/null +++ b/testing/sudo/sudo.pam @@ -0,0 +1,3 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so diff --git a/testing/transmission/PKGBUILD b/testing/transmission/PKGBUILD new file mode 100644 index 000000000..ca972d116 --- /dev/null +++ b/testing/transmission/PKGBUILD @@ -0,0 +1,78 @@ +# $Id: PKGBUILD 165349 2012-08-16 08:25:26Z tomegun $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> + +pkgbase=transmission +pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') +pkgver=2.61 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.transmissionbt.com/" +license=('MIT') +makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent') +source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz + transmissiond transmissiond.conf transmission.systemd + transmission.tmpfiles) + +build() { + cd "$pkgbase-$pkgver" + + ./configure --prefix=/usr + make + pushd qt + qmake qtr.pro + make +} +package_transmission-cli() { + pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)" + depends=('curl' 'libevent') + backup=('etc/conf.d/transmissiond') + install=transmission-cli.install + + cd "$pkgbase-$pkgver" + + for dir in daemon cli web utils + do + make -C "$dir" DESTDIR="$pkgdir" install + done + + install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond" + install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" + install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf" + install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service" + ln -s transmission.service "$pkgdir/usr/lib/systemd/system/transmissiond.service" + install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" +} + +package_transmission-gtk() { + pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)" + depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') + optdepends=('notification-daemon: Desktop notification support' + 'transmission-cli: daemon and web support') + install=transmission-gtk.install + + cd "$pkgbase-$pkgver" + + make -C gtk DESTDIR="$pkgdir" install + make -C po DESTDIR="$pkgdir" install + install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-gtk/COPYING" +} + +package_transmission-qt() { + pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)" + depends=('curl' 'qt' 'libevent') + optdepends=('transmission-cli: daemon and web support') + install=transmission-qt.install + + cd "$pkgbase-$pkgver" + + make -C qt INSTALL_ROOT="$pkgdir"/usr install + + install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-qt/COPYING" + install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png" + install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop" +} +md5sums=('2ed5b7815ebda65223bac6bdb09dec42' + '7d6186ee2a852ae3d44980f05063e194' + 'db72b02fee139e8ab416324e6c044d76' + 'ecccabbc301d1024c9ef6a7f4aaa530a' + '23f2320361ad54373c3a4551ef634fe8') diff --git a/testing/transmission/transmission-cli.install b/testing/transmission/transmission-cli.install new file mode 100644 index 000000000..d99dcf8b7 --- /dev/null +++ b/testing/transmission/transmission-cli.install @@ -0,0 +1,16 @@ +post_install() { + cat << _EOF + + If you want to run the Transmission daemon at boot, + add transmissiond to the DAEMONS array in /etc/rc.conf. + +_EOF +} + +post_upgrade() { + # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files + getent group transmission >/dev/null || groupadd -g 169 transmission + getent passwd transmission >/dev/null || useradd -c 'Transmission BitTorrent Client' -u 169 -g transmission -b '/var/lib' -s /bin/false transmission + passwd -l transmission &>/dev/null + systemd-tmpfiles --create transmission.conf +} diff --git a/testing/transmission/transmission-gtk.install b/testing/transmission/transmission-gtk.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/testing/transmission/transmission-gtk.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/transmission/transmission-qt.install b/testing/transmission/transmission-qt.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/testing/transmission/transmission-qt.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/transmission/transmission.systemd b/testing/transmission/transmission.systemd new file mode 100644 index 000000000..2ca0dedf7 --- /dev/null +++ b/testing/transmission/transmission.systemd @@ -0,0 +1,11 @@ +[Unit] +Description=Transmission Bit Torrent Daemon + +[Service] +User=transmission +Type=forking +PIDFile=/run/transmission/transmission.pid +ExecStart=/usr/bin/transmission-daemon --pid-file /run/transmission/transmission.pid + +[Install] +WantedBy=multi-user.target diff --git a/testing/transmission/transmission.tmpfiles b/testing/transmission/transmission.tmpfiles new file mode 100644 index 000000000..b603066c1 --- /dev/null +++ b/testing/transmission/transmission.tmpfiles @@ -0,0 +1 @@ +d /run/transmission - transmission transmission - diff --git a/testing/transmission/transmissiond b/testing/transmission/transmissiond new file mode 100644 index 000000000..ea3d770f9 --- /dev/null +++ b/testing/transmission/transmissiond @@ -0,0 +1,46 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/transmissiond + +PID=`pidof -o %PPID /usr/bin/transmission-daemon` +case "$1" in + start) + stat_busy "Starting Transmission Daemon" + [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" "${TRANS_USER:-transmission}" + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon transmissiond + stat_done + fi + ;; + stop) + stat_busy "Stopping Transmission Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon transmissiond + stat_done + fi + ;; + restart) + $0 stop + while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done + $0 start + ;; + reload) + stat_busy "Reloading config" + [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|restart|reload}" +esac +exit 0 diff --git a/testing/transmission/transmissiond.conf b/testing/transmission/transmissiond.conf new file mode 100644 index 000000000..45a9fd51d --- /dev/null +++ b/testing/transmission/transmissiond.conf @@ -0,0 +1,4 @@ +# example configuration file + +# TRANS_USER="transmission" +# TRANS_ARGS="" diff --git a/testing/udisks/PKGBUILD b/testing/udisks/PKGBUILD new file mode 100644 index 000000000..f7fbd187d --- /dev/null +++ b/testing/udisks/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 165394 2012-08-17 23:23:28Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=udisks +pkgver=1.0.4 +pkgrel=5 +pkgdesc="Disk Management Service" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/udisks" +license=('GPL') +depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject') +makedepends=('intltool' 'docbook-xsl') +options=(!libtool) +source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service) +sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5' + '0b9cbf41935feed3e4e2430fd4e06eb29864554dbb9f330c9d2a5fa2ef185131') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/udisks --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install + chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh" + + # move udev helpers and rules to /usr/lib + mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ + rm -r "${pkgdir}"/lib + + install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service" + echo "SystemdService=udisks.service" \ + >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service" +} diff --git a/testing/udisks/udisks.service b/testing/udisks/udisks.service new file mode 100644 index 000000000..7105e90be --- /dev/null +++ b/testing/udisks/udisks.service @@ -0,0 +1,10 @@ +[Unit] +Description=UDisks + +[Service] +Type=dbus +BusName=org.freedesktop.UDisks +ExecStart=/usr/lib/udisks/udisks-daemon + +[Install] +WantedBy=graphical.target |