diff options
78 files changed, 1438 insertions, 271 deletions
diff --git a/community-testing/php-geoip/PKGBUILD b/community-testing/php-geoip/PKGBUILD new file mode 100644 index 000000000..d12726a44 --- /dev/null +++ b/community-testing/php-geoip/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 70079 2012-04-29 06:43:36Z pschmitz $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> + +pkgname=php-geoip +pkgver=1.0.8 +pkgrel=2 +pkgdesc="GeoIP module for PHP" +arch=('i686' 'x86_64') +url="http://pecl.php.net/package/geoip" +license=('PHP') +depends=('php' 'geoip') +backup=('etc/php/conf.d/geoip.ini') +source=(http://pecl.php.net/get/geoip-$pkgver.tgz) +sha256sums=('08beeb2cbe9ab729d06b026795f5b9084aead6a1762493b0be53c4393d68d08a') + +build() { + cd "$srcdir/geoip-$pkgver" + + phpize + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/geoip-$pkgver" + + make INSTALL_ROOT="$pkgdir" install + echo ';extension=geoip.so' >geoip.ini + install -Dm644 geoip.ini "$pkgdir/etc/php/conf.d/geoip.ini" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/php-memcache/PKGBUILD b/community-testing/php-memcache/PKGBUILD new file mode 100644 index 000000000..5e49b5e67 --- /dev/null +++ b/community-testing/php-memcache/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 70081 2012-04-29 06:43:37Z pschmitz $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> + +pkgname=php-memcache +pkgver=3.0.6 +pkgrel=3 +pkgdesc="Memcache module for PHP" +arch=('i686' 'x86_64') +url="http://pecl.php.net/package/memcache" +license=('PHP') +depends=('php') +backup=('etc/php/conf.d/memcache.ini') +install=php-memcache.install +source=(http://pecl.php.net/get/memcache-$pkgver.tgz) +sha256sums=('cf6871f0944ee38022c5f84910f306d83b0f51564bbc08624a215e06d8486618') + +build() { + cd "$srcdir/memcache-$pkgver" + + phpize + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/memcache-$pkgver" + + make INSTALL_ROOT="$pkgdir" install + echo ';extension=memcache.so' >memcache.ini + install -Dm644 memcache.ini "$pkgdir/etc/php/conf.d/memcache.ini" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/php-memcache/php-memcache.install b/community-testing/php-memcache/php-memcache.install new file mode 100644 index 000000000..fa56baf81 --- /dev/null +++ b/community-testing/php-memcache/php-memcache.install @@ -0,0 +1,10 @@ +post_install() { + echo ' + ==> PHP extension + + A config file was stored under /etc/php/conf.d/. In order to use this + extension make sure to uncomment it from its config file. + ' +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/php-memcached/PKGBUILD b/community-testing/php-memcached/PKGBUILD new file mode 100644 index 000000000..7e36997b5 --- /dev/null +++ b/community-testing/php-memcached/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 70083 2012-04-29 06:43:38Z pschmitz $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> + +pkgname=php-memcached +pkgver=2.0.1 +pkgrel=4 +pkgdesc="PHP extension for interfacing with memcached via libmemcached library" +arch=('i686' 'x86_64') +url="http://pecl.php.net/package/memcached" +license=('PHP') +depends=('php' 'libmemcached') +backup=('etc/php/conf.d/memcached.ini') +source=(http://pecl.php.net/get/memcached-$pkgver.tgz) +sha256sums=('250779594e846b7b31390c384697eb24a5096123b0d3e2f4a1a0b79d14fb1bff') + +build() { + cd "$srcdir/memcached-$pkgver" + + phpize + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/memcached-$pkgver" + + make INSTALL_ROOT="$pkgdir" install + echo ';extension=memcached.so' >memcached.ini + install -Dm644 memcached.ini "$pkgdir/etc/php/conf.d/memcached.ini" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/xdebug/PKGBUILD b/community-testing/xdebug/PKGBUILD new file mode 100644 index 000000000..3c21729e1 --- /dev/null +++ b/community-testing/xdebug/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 70085 2012-04-29 06:43:40Z pschmitz $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Jonathan Wiersma <arch aur at jonw dot org> +# Contributor: Jonathan Wiersma <arch aur at jonw dot org> +# Contributor: sracker <smb.sac@gmail.com> + +pkgname=xdebug +pkgver=2.2.0RC2 +pkgrel=1 +pkgdesc="PHP debugging extension" +arch=('i686' 'x86_64') +url="http://www.xdebug.org" +license=('GPL') +depends=('php') +install="${pkgname}.install" +backup=('etc/php/conf.d/xdebug.ini') +source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz + xdebug-5.2.ini + xdebug.ini) +md5sums=('2227de3691ca569d17a342ae30b2e57c' + '6b7fdbbe0bf381bda40e77e29981f439' + '68de800943369d4c76bdf7eb35c8463b') + +build() { + local PHPVER=`php -r 'echo phpversion();'` + + cd $srcdir/$pkgname-$pkgver + phpize + ./configure --prefix=/usr --enable-xdebug + make + + cd debugclient + ./configure --prefix=/usr + make + make DESTDIR=$pkgdir install + + cd $srcdir/$pkgname-$pkgver + if [ "$PHPVER" \< "5.3.0" ] ; then + install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/xdebug.so + install -D -m 644 $srcdir/xdebug-5.2.ini $pkgdir/etc/php/conf.d/xdebug.ini + else + install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so + install -D -m 644 $srcdir/xdebug.ini $pkgdir/etc/php/conf.d/xdebug.ini + fi +} diff --git a/community-testing/xdebug/xdebug-5.2.ini b/community-testing/xdebug/xdebug-5.2.ini new file mode 100644 index 000000000..9beb7fc30 --- /dev/null +++ b/community-testing/xdebug/xdebug-5.2.ini @@ -0,0 +1,5 @@ +zend_extension=/usr/lib/php/xdebug.so +;xdebug.remote_enable=on +;xdebug.remote_host=127.0.0.1 +;xdebug.remote_port=9000 +;xdebug.remote_handler=dbgp diff --git a/community-testing/xdebug/xdebug.ini b/community-testing/xdebug/xdebug.ini new file mode 100644 index 000000000..c6c9222ea --- /dev/null +++ b/community-testing/xdebug/xdebug.ini @@ -0,0 +1,5 @@ +zend_extension=/usr/lib/php/modules/xdebug.so +;xdebug.remote_enable=on +;xdebug.remote_host=127.0.0.1 +;xdebug.remote_port=9000 +;xdebug.remote_handler=dbgp diff --git a/community-testing/xdebug/xdebug.install b/community-testing/xdebug/xdebug.install new file mode 100644 index 000000000..a7ec0b9cc --- /dev/null +++ b/community-testing/xdebug/xdebug.install @@ -0,0 +1,18 @@ +post_install() { + local _configfile=/etc/php/conf.d/xdebug.ini + echo " ==> You may wish to uncomment/change the settings found in " + echo " $_configfile" + echo "" +} + +post_upgrade() { + local _configfile=/etc/php/conf.d/xdebug.ini + local PHPVER=$(php -r 'echo phpversion();') + post_install $1 + + if [ "$PHPVER" \< "5.3" ] ; then + echo " ==> You are currenty running a version of php < 5.3." + echo " When/if you upgrade php to a version >= 5.3, you will need to reinstall $pkgname." + echo "" + fi +} diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index bd147a0f5..ad7c282f2 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 69184 2012-04-10 02:18:40Z spupykin $ +# $Id: PKGBUILD 70105 2012-04-29 13:20:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.0 +pkgver=1.0.3 _pkgver=1.0 -pkgrel=2 +pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ @@ -19,7 +19,7 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) -md5sums=('b72375782519b7a4a6b8efcad1bfcf6b') +md5sums=('9877a012b2b39f0e5859783db508f580') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD index 86baa44e9..a5a20f572 100644 --- a/community/ifuse/PKGBUILD +++ b/community/ifuse/PKGBUILD @@ -1,16 +1,17 @@ +# $Id: PKGBUILD 70102 2012-04-29 11:48:29Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=ifuse -pkgver=1.1.1 -pkgrel=5 +pkgver=1.1.2 +pkgrel=1 pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch' url='http://libimobiledevice.org/' arch=('i686' 'x86_64') license=('LGPL2.1') depends=('libimobiledevice' 'fuse') source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8d528a79de024b91f12f8ac67965c37c') +md5sums=('4152526b2ac3c505cb41797d997be14d') build() { cd "${pkgname}-${pkgver}" diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index 9507e7317..3065207ca 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61228 2011-12-25 08:59:30Z schiv $ +# $Id: PKGBUILD 70089 2012-04-29 08:01:28Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Daniele Paolella <danielepaolella@email.it> # Contributor: Philipp Überbacher <hollunder at gmx dot at> @@ -9,7 +9,7 @@ pkgname=('jack2' 'jack2-dbus') #pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.8 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) @@ -91,7 +91,7 @@ package_jack2() { "$pkgdir/etc/security/limits.d/99-audio.conf" install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" } package_jack2-dbus() { @@ -114,7 +114,7 @@ package_jack2-dbus() { "$pkgdir/etc/security/limits.d/99-audio.conf" install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" } # vim:set ts=2 sw=2 et: diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD index 7983e7bad..39ea1129d 100644 --- a/community/luaposix/PKGBUILD +++ b/community/luaposix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61274 2011-12-27 22:28:27Z seblu $ +# $Id: PKGBUILD 70108 2012-04-29 20:00:10Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Laszlo Papp <djszapi at archlinux us> # Contributor: Donald Ephraim Curtis <dcurtis@gmail.com> pkgname=luaposix -pkgver=5.1.15 +pkgver=5.1.19 pkgrel=1 pkgdesc='A POSIX library for Lua programming language' arch=('i686' 'x86_64') @@ -14,11 +14,10 @@ license=('GPL' 'LGPL') depends=('lua') options=('!libtool') source=("https://github.com/downloads/rrthomas/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('c492541a768302fb67ad14a294306f3a') +md5sums=('3d74beb1b1d887adb689e6e9316abb42') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr \ --libdir=/usr/lib/lua/5.1 \ --datadir=/usr/share/lua/5.1 @@ -27,9 +26,7 @@ build() { package() { cd $pkgname-$pkgver - make PREFIX=/usr DESTDIR="$pkgdir/" install - # examples install -d "$pkgdir/usr/share/$pkgname/examples" install -D -m 644 *.lua "$pkgdir/usr/share/$pkgname/examples" diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index ee9c5669c..e704fb928 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68955 2012-04-06 14:13:47Z ttopper $ +# $Id: PKGBUILD 70112 2012-04-29 22:28:19Z ttopper $ # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=mathomatic -pkgver=15.8.2 +pkgver=15.8.3 pkgrel=1 pkgdesc="General purpose Computer Algebra System written in C" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' 'm4: for complex operations using the matho script' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('f7ebe7974f0bb26541bcae60932f1a74') +md5sums=('df4296e27840ecafe87f16ff9cf181ac') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD index bd44690c8..9eea0ebcf 100644 --- a/community/mc/PKGBUILD +++ b/community/mc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69681 2012-04-22 13:52:54Z schuay $ +# $Id: PKGBUILD 70092 2012-04-29 08:10:26Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=mc pkgver=4.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" arch=('i686' 'x86_64') url="http://www.ibiblio.org/mc/" @@ -26,7 +26,8 @@ optdepends=('p7zip: support for 7zip archives' 'unrar: urar extfs' 'zip: uzip extfs') options=('!emptydirs' '!makeflags') -source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") +source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2" + 'changeset_8607bcc1.diff') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -39,6 +40,9 @@ build() { --without-debug --without-gnome --without-included-gettext \ --libexecdir=/usr/lib + # see FS#29562 + patch -Np0 < ${srcdir}/changeset_8607bcc1.diff + make } @@ -55,4 +59,7 @@ package() { -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } -md5sums=('12d38ad4969df3f8bbf66c3967a191ee') + + +md5sums=('12d38ad4969df3f8bbf66c3967a191ee' + '998b44a100a671085526a7723bb72092') diff --git a/community/mc/changeset_8607bcc1.diff b/community/mc/changeset_8607bcc1.diff new file mode 100644 index 000000000..071d6159e --- /dev/null +++ b/community/mc/changeset_8607bcc1.diff @@ -0,0 +1,22 @@ +Index: src/vfs/cpio/cpio.c
+===================================================================
+--- src/vfs/cpio/cpio.c (revision 764cdf2497ac1fe79b4237e9c75d600f7d868351)
++++ src/vfs/cpio/cpio.c (revision 8607bcc103ce2f9449b6b9736a9709cdb62a7178)
+@@ -250,5 +250,5 @@
+ mc_close (fd);
+ s = g_strconcat (super->name, decompress_extension (type), (char *) NULL);
+- tmp_vpath = vfs_path_from_str (s);
++ tmp_vpath = vfs_path_from_str_flags (s, VPF_NO_CANON);
+ fd = mc_open (tmp_vpath, O_RDONLY);
+ vfs_path_free (tmp_vpath);
+Index: src/vfs/tar/tar.c
+===================================================================
+--- src/vfs/tar/tar.c (revision 764cdf2497ac1fe79b4237e9c75d600f7d868351)
++++ src/vfs/tar/tar.c (revision 8607bcc103ce2f9449b6b9736a9709cdb62a7178)
+@@ -317,5 +317,5 @@
+ mc_close (result);
+ s = g_strconcat (archive->name, decompress_extension (type), (char *) NULL);
+- tmp_vpath = vfs_path_from_str (s);
++ tmp_vpath = vfs_path_from_str_flags (s, VPF_NO_CANON);
+ result = mc_open (tmp_vpath, O_RDONLY);
+ vfs_path_free (tmp_vpath);
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index b6d8915ba..0e4ead5f6 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id$ +# $Id: PKGBUILD 70110 2012-04-29 20:23:17Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=quagga -pkgver=0.99.20 -pkgrel=3 +pkgver=0.99.20.1 +pkgrel=1 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' @@ -12,11 +12,11 @@ depends=('libcap' 'net-snmp' 'readline' 'ncurses') options=('!libtool' '!buildflags') backup=() install=quagga.install -source=("http://www.quagga.net/download/$pkgname-$pkgver.tar.gz" +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" 'quagga.rc' 'quagga.conf') -md5sums=('64cc29394eb8a4e24649d19dac868f64' - '6ebd2be39c45361eabe3e278bb21efa0' +md5sums=('270ddd464407f8ce6fa8ada8bc1abbd7' + '71d474228a1e02d698cd24e9fd55ca38' '0c4f2dd13c7dac1b73de923d1d5e4e17') build() { diff --git a/community/quagga/quagga.rc b/community/quagga/quagga.rc index f938c6f8a..ad6614b14 100644 --- a/community/quagga/quagga.rc +++ b/community/quagga/quagga.rc @@ -4,19 +4,18 @@ . /etc/rc.d/functions . /etc/conf.d/${0##*/} -NAME=${0##*/} -DAEMON=/usr/sbin/$NAME +DAEMON=/usr/sbin/${0##*/} PID=$(pidof -o %PPID $DAEMON) case "$1" in start) - stat_busy "Starting Quagga $NAME daemon" - [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0 + stat_busy "Starting ${0##*/} daemon" + [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0 stat_fail ;; stop) - stat_busy "Stopping $NAME daemon" - [[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0 + stat_busy "Stopping ${0##*/} daemon" + [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0 stat_fail ;; restart) @@ -24,7 +23,7 @@ case "$1" in $0 start exit 0 ;; - *) + *) echo "usage: ${0##*/} {start|stop|restart}" >&2 ;; esac diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 19a127b4b..607ea0b3e 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69788 2012-04-23 09:37:57Z spupykin $ +# $Id: PKGBUILD 70098 2012-04-29 09:24:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=32.0.2 +pkgver=33.0.0 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('0d6ff6a4601a4aaaa7f24a05c9228e0e' +md5sums=('61f7df51378ab94324ef6df17f793f1d' '377ace3363124f4c086de0babb820761') build() { diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index b6e815c5e..918a84d27 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151749 2012-03-02 07:36:36Z tpowa $ +# $Id: PKGBUILD 157726 2012-04-29 04:09:24Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils pkgver=1.0.25 -pkgrel=2 +pkgrel=3 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" @@ -20,7 +20,9 @@ backup=(etc/conf.d/alsa) build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-alsaconf --with-systemdsystemunitdir=/lib/systemd/system + ./configure --prefix=/usr --disable-alsaconf \ + --with-udev-rules-dir=/usr/lib/udev/rules.d \ + --with-systemdsystemunitdir=/usr/lib/systemd/system make } @@ -30,6 +32,7 @@ package() { install -D -m755 ../alsa ${pkgdir}/etc/rc.d/alsa install -D -m644 ../alsa.conf.d ${pkgdir}/etc/conf.d/alsa install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa + # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD index d0cf8b899..d26d78b21 100644 --- a/extra/bluedevil/PKGBUILD +++ b/extra/bluedevil/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 140234 2011-10-10 10:51:49Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 157804 2012-04-29 17:06:36Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=bluedevil -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc='KDE bluetooth framework' arch=('i686' 'x86_64') @@ -13,7 +12,7 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f1b2b932f3e1e52b13b0bad515bf4125') +md5sums=('e792576d34956d27cd0c3eb3c81a5923') build(){ cd "${srcdir}" diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 35a6d3036..50bb1b6b2 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156730 2012-04-23 09:04:12Z ibiru $ +# $Id: PKGBUILD 157728 2012-04-29 04:45:00Z allan $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord pkgver=0.1.19 -pkgrel=1 +pkgrel=2 pkgdesc="Color daemon" arch=('i686' 'x86_64') url="http://www.freedesktop.org/software/colord" @@ -17,6 +17,10 @@ sha1sums=('d133c6320fcdd069be86f4a7afa723f48f99acb3') build() { cd "$pkgname-$pkgver" + + # put udev files in /usr/lib + sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure + ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/colord \ --localstatedir=/var --disable-static \ diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 76f899f0c..ed2ec4c1e 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155881 2012-04-08 20:56:39Z dreisner $ +# $Id: PKGBUILD 157810 2012-04-30 00:00:31Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq -pkgver=2.60 -pkgrel=3 +pkgver=2.61 +pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 'dnsmasq.confd' 'rc.dnsmasq' 'dnsmasq.service') -md5sums=('5a09908e02724d759ac60d9cafd27de8' +md5sums=('6ed0a5c2524dfc3a74ef494ee2469f09' '66479e99123faeab83ebaed709ef95b5' '819fbdf6440d710616e6df5f8ca9cdba' '631d8349acbed1b01d4e11d9f42fdb7d') diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD index f82f5959a..c16e6d78d 100644 --- a/extra/fuse/PKGBUILD +++ b/extra/fuse/PKGBUILD @@ -1,63 +1,51 @@ -# $Id: PKGBUILD 149637 2012-02-08 21:50:56Z ronald $ +# $Id: PKGBUILD 157796 2012-04-29 15:29:44Z dreisner $ # Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse -pkgver=2.8.7 +pkgver=2.9.0 pkgrel=1 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64') url="http://fuse.sourceforge.net/" -license="GPL2" +license=('GPL2') depends=('glibc') makedepends=('pkg-config') backup=(etc/fuse.conf) -install=fuse.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'fuse.conf') options=(!libtool) -sha1sums=('284f22401131ec148bd04362dc86f7b0e94fb5f4' +sha1sums=('e64396d516cca55995e0a8f8dd75456fd9d9d21d' '3b42e37a741d4651099225987dc40e7f02a716ad') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$pkgname-$pkgver" # fix building with glibc-2.14 sed -i '1i#define _GNU_SOURCE' util/fusermount.c - ./configure --prefix=/usr --enable-lib \ + ./configure --prefix=/usr --libdir=/usr/lib --enable-lib \ --enable-util --bindir=/bin make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$pkgname-$pkgver" make DESTDIR=${pkgdir} install - # static device nodes will cause collision. - rm -rf ${pkgdir}/dev - # Remove init script in wrong path # Don't add our own for now, as fusectl fs oopses on 2.6.18 rm -rf ${pkgdir}/etc/init.d #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse - install -d ${pkgdir}/lib - mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/ - ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver} - ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2 - mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/ - ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 - ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1 - # install sample config file install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf - # Fix udev rule location - install -d -m755 "${pkgdir}/lib" - mv "${pkgdir}/etc/udev" "${pkgdir}/lib/" + # remove udev rules (is in the udev package} + rm -rf ${pkgdir}/etc/udev - # remove udev rules (should already be in udev package} - rm -f ${pkgdir}/lib/udev/rules.d/99-fuse.rules + # static device nodes are handled by udev + rm -rf ${pkgdir}/dev } diff --git a/extra/gnome-phone-manager/PKGBUILD b/extra/gnome-phone-manager/PKGBUILD index 4bce16951..a9e098140 100644 --- a/extra/gnome-phone-manager/PKGBUILD +++ b/extra/gnome-phone-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140561 2011-10-17 08:06:31Z heftig $ +# $Id: PKGBUILD 157740 2012-04-29 05:35:15Z eric $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-phone-manager pkgver=0.68 -pkgrel=1 +pkgrel=2 pkgdesc="Control your mobile phone from your GNOME desktop." arch=('i686' 'x86_64') url="http://live.gnome.org/PhoneManager" @@ -12,13 +12,17 @@ depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' ' makedepends=('intltool' 'gnome-common') options=('!emptydirs' '!libtool') install=gnome-phone-manager.install -source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/${pkgver}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3777b62ee36492274532ece965f4688600457014f17a6f21dd01fb63bbb77f8f') +source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/${pkgver}/${pkgname}-${pkgver}.tar.xz + phonemgr-gnome-bluetooth-3.3.patch) +sha256sums=('3777b62ee36492274532ece965f4688600457014f17a6f21dd01fb63bbb77f8f' + 'a69c1d2d1d25eca4f32215d8a8ca3c8e4a048af76d7a291b86b0aa7f0f65c452') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static + patch -p1 -i ../phonemgr-gnome-bluetooth-3.3.patch + autoreconf -fi + LIBS+="-lgthread-2.0" ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static make } @@ -27,6 +31,6 @@ package() { make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch b/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch new file mode 100644 index 000000000..2200f9dcf --- /dev/null +++ b/extra/gnome-phone-manager/phonemgr-gnome-bluetooth-3.3.patch @@ -0,0 +1,34 @@ +From 2877c3a41b7e8feeb6eb6d6f718f4556ffb0161c Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger <dimstar@opensuse.org> +Date: Mon, 05 Dec 2011 08:10:59 +0000 +Subject: Bug 665309: Adapt to gnome-bluetooth 3.3 API + +--- +diff --git a/configure.in b/configure.in +index 101a77f..d0a7651 100644 +--- a/configure.in ++++ b/configure.in +@@ -13,7 +13,7 @@ dnl Initialize libtool + AM_PROG_LIBTOOL + + GNOKII_REQS="gnokii >= 0.6.28" +-GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.0" ++GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.3" + + AC_PROG_CC + AC_PROG_INSTALL +diff --git a/gnome-bluetooth/phonemgr.c b/gnome-bluetooth/phonemgr.c +index 9ebac12..fecc367 100644 +--- a/gnome-bluetooth/phonemgr.c ++++ b/gnome-bluetooth/phonemgr.c +@@ -44,7 +44,7 @@ get_type (const char *address) + gboolean cont; + + client = bluetooth_client_new (); +- model = bluetooth_client_get_device_model (client, NULL); ++ model = bluetooth_client_get_device_model (client); + if (model == NULL) { + g_object_unref (client); + return type; +-- +cgit v0.9.0.2 diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD index 0da149312..751500159 100644 --- a/extra/jack/PKGBUILD +++ b/extra/jack/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145264 2011-12-20 18:09:32Z schiv $ +# $Id: PKGBUILD 157734 2012-04-29 05:10:29Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: tobias <tobias@archlinux.net> # Contributor: Robert Emil Berge <robert@rebi.no> @@ -6,7 +6,7 @@ pkgname=jack _longname=jack-audio-connection-kit pkgver=0.121.3 -pkgrel=5 +pkgrel=6 pkgdesc="A low-latency audio server" arch=('i686' 'x86_64') license=('GPL' 'LGPL') @@ -47,7 +47,7 @@ package() { "$pkgdir/etc/security/limits.d/99-audio.conf" install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" # install a missing header forgotten by upstream # see https://bugs.archlinux.org/task/26865 diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD index 760cd2510..93357f5db 100644 --- a/extra/libbluedevil/PKGBUILD +++ b/extra/libbluedevil/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 140236 2011-10-10 10:55:52Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 157802 2012-04-29 17:04:04Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libbluedevil -pkgver=1.9.1 +pkgver=1.9.2 pkgrel=1 pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack' arch=('i686' 'x86_64') @@ -12,7 +11,7 @@ license=('GPL') depends=('qt' 'bluez') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b3f04954f75f78c874cdb462c2454afc') +md5sums=('b492db1825b239e5185c543badb21c26') build(){ cd "${srcdir}" diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD index cad6d04c5..083cc1a4d 100644 --- a/extra/libbluray/PKGBUILD +++ b/extra/libbluray/PKGBUILD @@ -1,28 +1,37 @@ -# $Id: PKGBUILD 144944 2011-12-11 14:37:09Z ibiru $ +# $Id: PKGBUILD 157790 2012-04-29 15:02:33Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrew Cook <ariscop@gmail.com> pkgname=libbluray -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="Library to access Blu-Ray disks for video playback" arch=('i686' 'x86_64') url="http://www.videolan.org/developers/libbluray.html" license=('LGPL2.1') depends=('libxml2') +makedepends=('apache-ant' 'jdk7-openjdk') +optdepends=('java-environment: Blu-ray Disc Java support library') options=(!libtool) source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -sha512sums=('b938ca838d6e4ceaac74ca8850efb9d8c312638b70a9b42ebffd63bf703341eab3ce98b6edeea9b3284ba1d0f8b46fe803db1f668e72752e1e23e96435ac77dc') +sha512sums=('a27eaa929ef05c544beb966a24dfc5425546d6035bfb3e86dc60987b8a4761031ce27c3836a64f71cc76b5308c3cd75efb3bc1f238185819385477e64883888a') build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --disable-static + cd "$pkgname-$pkgver" + + . /etc/profile.d/jdk.sh + ./configure --prefix=/usr \ + --enable-bdjava \ + --with-jdk=${JAVA_HOME} \ + --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + #install bdj + install -Dm644 src/.libs/libbluray.jar "$pkgdir/usr/share/java/libbluray.jar" } # vim:set ts=2 sw=2 et: diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD index 92f2b3084..ef3168dee 100644 --- a/extra/libcanberra/PKGBUILD +++ b/extra/libcanberra/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139194 2011-10-01 13:46:12Z heftig $ +# $Id: PKGBUILD 157775 2012-04-29 10:03:21Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libcanberra pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) pkgver=0.28 -pkgrel=2 +pkgrel=3 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" arch=(i686 x86_64) license=('LGPL') @@ -22,7 +22,7 @@ build() { ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ --disable-static --with-builtin=dso --enable-null --disable-oss \ --enable-alsa --enable-gstreamer --enable-pulse \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system make } diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD index 580f63adc..772ebec46 100644 --- a/extra/libffado/PKGBUILD +++ b/extra/libffado/PKGBUILD @@ -1,29 +1,34 @@ -# $Id: PKGBUILD 142989 2011-11-19 21:35:53Z schiv $ +# $Id: PKGBUILD 157813 2012-04-30 03:19:10Z heftig $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado pkgver=2.0.1 -pkgrel=5 +pkgrel=7 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64') url="http://www.ffado.org/" license=('GPL') depends=('libiec61883' 'libavc1394' 'libsigc++' - 'libxml++' 'alsa-lib' 'dbus') -makedepends=('scons' 'python2-qt') + 'libxml++' 'alsa-lib' 'dbus') +makedepends=('scons' 'python2-pyqt') optdepends=('python2: ffado-diag' - 'python2-qt: mixer applet') + 'python2-pyqt: mixer applet') provides=('ffado') source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz" - '60-ffado.rules') + "libffado-gcc47.patch" "fix-segfault-on-close.patch" '60-ffado.rules') md5sums=('786f31facd417e6207e429f50af0e15e' + '287bb3f506e31626c4b8f91f0e1d9407' + 'ac9763cb2dc2f3eb4e1894e30645c6f1' 'f03a3e950801c4405b8934084651bca8') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "$srcdir"/libffado-gcc47.patch + patch -p3 -i "$srcdir"/fix-segfault-on-close.patch + # hack to use CFLAGS without optimising sed -i 's/-O2//g' SConstruct @@ -38,7 +43,7 @@ build() { sed -i 's:python support/tools:python2 support/tools:' \ support/tools/SConscript - scons PREFIX=/usr #ENABLE_OPTIMIZATIONS=True + scons PREFIX=/usr } package() { @@ -49,7 +54,7 @@ package() { # add audio device rules # see https://bugs.archlinux.org/task/26342 install -Dm644 "$srcdir/60-ffado.rules" \ - "$pkgdir/lib/udev/rules.d/60-ffado.rules" + "$pkgdir/usr/lib/udev/rules.d/60-ffado.rules" # python2 fix for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do @@ -61,7 +66,7 @@ package() { "$pkgdir/usr/share/applications/ffadomixer.desktop" install -Dm644 support/xdg/hi64-apps-ffado.png \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" + "$pkgdir/usr/share/pixmaps/$pkgname.png" } # vim:set ts=2 sw=2 et: diff --git a/extra/libffado/fix-segfault-on-close.patch b/extra/libffado/fix-segfault-on-close.patch new file mode 100644 index 000000000..c81b97e40 --- /dev/null +++ b/extra/libffado/fix-segfault-on-close.patch @@ -0,0 +1,64 @@ +Index: /trunk/libffado/src/debugmodule/debugmodule.h
+===================================================================
+--- /trunk/libffado/src/debugmodule/debugmodule.h (revision 1763)
++++ /trunk/libffado/src/debugmodule/debugmodule.h (revision 1999)
+@@ -283,6 +283,10 @@
+ void hexDumpQuadlets( quadlet_t *data_start, unsigned int length );
+
++class DebugModuleManager;
++
+ class DebugModule {
+ public:
++ friend class DebugModuleManager;
++
+ enum {
+ eDL_Message = DEBUG_LEVEL_MESSAGE,
+@@ -333,4 +337,5 @@
+ std::string m_name;
+ debug_level_t m_level;
++ DebugModuleManager* m_manager;
+ };
+
+Index: /trunk/libffado/src/debugmodule/debugmodule.cpp
+===================================================================
+--- /trunk/libffado/src/debugmodule/debugmodule.cpp (revision 1763)
++++ /trunk/libffado/src/debugmodule/debugmodule.cpp (revision 1999)
+@@ -84,5 +84,6 @@
+ // << endl;
+ // }
+- if ( !DebugModuleManager::instance()->unregisterModule( *this ) ) {
++
++ if (m_manager && !m_manager->unregisterModule( *this ) ) {
+ cerr << "Could not unregister DebugModule at DebugModuleManager"
+ << endl;
+@@ -263,12 +264,9 @@
+ DebugModuleManager::~DebugModuleManager()
+ {
+- // cleanin up leftover modules
+- for ( DebugModuleVectorIterator it = m_debugModules.begin();
+- it != m_debugModules.end();
+- ++it )
++ // cleaning up leftover modules
++ while (!m_debugModules.empty())
+ {
+- fprintf(stderr,"Cleaning up leftover debug module: %s\n",(*it)->getName().c_str());
+- m_debugModules.erase( it );
+- delete *it;
++ DebugModule *mod = m_debugModules.back();
++ unregisterModule(*mod);
+ }
+
+@@ -455,4 +453,6 @@
+ } else {
+ m_debugModules.push_back( &debugModule );
++ if (debugModule.m_manager == NULL)
++ debugModule.m_manager = this;
+ }
+ return true;
+@@ -469,4 +469,6 @@
+ if ( *it == &debugModule ) {
+ m_debugModules.erase( it );
++ if (debugModule.m_manager == this)
++ debugModule.m_manager = NULL;
+ return true;
+ }
diff --git a/extra/libffado/libffado-gcc47.patch b/extra/libffado/libffado-gcc47.patch new file mode 100644 index 000000000..f296956a5 --- /dev/null +++ b/extra/libffado/libffado-gcc47.patch @@ -0,0 +1,55 @@ +diff -Naur libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp +--- libffado-2.0.1-old/src/bebob/bebob_dl_mgr.cpp 2009-05-17 23:42:38.000000000 +1000 ++++ libffado-2.0.1/src/bebob/bebob_dl_mgr.cpp 2012-04-29 15:26:29.011454798 +1000 +@@ -35,6 +35,7 @@ + + #include <cstdio> + #include <cstring> ++#include <unistd.h> + + namespace BeBoB { + enum { +diff -Naur libffado-2.0.1-old/src/ffadodevice.cpp libffado-2.0.1/src/ffadodevice.cpp +--- libffado-2.0.1-old/src/ffadodevice.cpp 2008-11-23 21:25:32.000000000 +1000 ++++ libffado-2.0.1/src/ffadodevice.cpp 2012-04-29 15:26:54.883998052 +1000 +@@ -34,6 +34,7 @@ + + #include <iostream> + #include <sstream> ++#include <unistd.h> + + #include <assert.h> + +diff -Naur libffado-2.0.1-old/src/fireworks/fireworks_device.cpp libffado-2.0.1/src/fireworks/fireworks_device.cpp +--- libffado-2.0.1-old/src/fireworks/fireworks_device.cpp 2009-11-23 00:40:08.000000000 +1000 ++++ libffado-2.0.1/src/fireworks/fireworks_device.cpp 2012-04-29 15:27:24.123105334 +1000 +@@ -44,6 +44,7 @@ + #define FIREWORKS_MIN_FIRMWARE_VERSION 0x04080000 + + #include <sstream> ++#include <unistd.h> + using namespace std; + + // FireWorks is the platform used and developed by ECHO AUDIO +diff -Naur libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp +--- libffado-2.0.1-old/src/libieee1394/IsoHandlerManager.cpp 2010-04-18 05:15:54.000000000 +1000 ++++ libffado-2.0.1/src/libieee1394/IsoHandlerManager.cpp 2012-04-29 15:27:44.515816147 +1000 +@@ -34,6 +34,7 @@ + #include "libutil/Configuration.h" + + #include <cstring> ++#include <unistd.h> + #include <assert.h> + + IMPL_DEBUG_MODULE( IsoHandlerManager, IsoHandlerManager, DEBUG_LEVEL_NORMAL ); +diff -Naur libffado-2.0.1-old/support/dbus/test-dbus.cpp libffado-2.0.1/support/dbus/test-dbus.cpp +--- libffado-2.0.1-old/support/dbus/test-dbus.cpp 2008-04-27 03:30:41.000000000 +1000 ++++ libffado-2.0.1/support/dbus/test-dbus.cpp 2012-04-29 15:28:31.531047923 +1000 +@@ -24,6 +24,7 @@ + #include <argp.h> + #include <stdlib.h> + #include <iostream> ++#include <unistd.h> + #include <signal.h> + + #include "controlclient.h" diff --git a/extra/libva-driver-intel/PKGBUILD b/extra/libva-driver-intel/PKGBUILD index 371c319db..55f0d3237 100644 --- a/extra/libva-driver-intel/PKGBUILD +++ b/extra/libva-driver-intel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141738 2011-11-02 16:42:28Z ibiru $ +# $Id: PKGBUILD 157792 2012-04-29 15:12:31Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva-driver-intel -pkgver=1.0.15 +pkgver=1.0.17 pkgrel=1 pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family." arch=('i686' 'x86_64') @@ -11,19 +11,19 @@ license=('MIT') depends=('libva') options=('!libtool') source=(http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${pkgver}.tar.bz2) -md5sums=('9dbd642f18993335146480a3a2987874') +md5sums=('3421dcaed1df346b9070b85ec8b238cd') build() { - cd ${srcdir}/intel-driver-${pkgver} + cd intel-driver-$pkgver ./autogen.sh ./configure --prefix=/usr make } package() { - cd ${srcdir}/intel-driver-${pkgver} - make DESTDIR="${pkgdir}" install - install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + cd intel-driver-$pkgver + make DESTDIR="$pkgdir" install + install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } # vim:set ts=2 sw=2 et: diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 85ad485e0..73c9628c4 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157227 2012-04-26 08:49:24Z giovanni $ +# $Id: PKGBUILD 157806 2012-04-29 18:29:57Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.04.26 +pkgver=2012.04.27 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('4c7202e0611951998325b0e41ae63041') +md5sums=('463acc2cab4640544d120af933fde9f1') build() { cd ${srcdir}/live diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD index 052e071a7..ec76e7e3a 100644 --- a/extra/modemmanager/PKGBUILD +++ b/extra/modemmanager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153526 2012-03-15 14:49:43Z ibiru $ +# $Id: PKGBUILD 157746 2012-04-29 05:53:55Z allan $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=modemmanager _realname=ModemManager pkgver=0.5.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mobile broadband modem management service" arch=('i686' 'x86_64') url="http://cgit.freedesktop.org/ModemManager/ModemManager/" @@ -20,6 +20,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --with-udev-base-dir=/usr/lib/udev \ --disable-static make } diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD index 587ac1415..5a29e8eb7 100644 --- a/extra/ossp/PKGBUILD +++ b/extra/ossp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149814 2012-02-11 04:06:47Z heftig $ +# $Id: PKGBUILD 157748 2012-04-29 05:59:42Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jonathan Liu <net147@gmail.com> pkgname=ossp pkgver=1.3.2 -pkgrel=13 +pkgrel=14 pkgdesc="Emulate OSS device using CUSE" arch=(i686 x86_64) url="http://sourceforge.net/projects/osspd" @@ -31,11 +31,11 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/lib/udev/rules.d install + make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/usr/lib/udev/rules.d install # Make compatible with udev ACLs sed -e 's/GROUP="audio"/SUBSYSTEM=="cuse", MODE="0666"/' \ - -i "$pkgdir/lib/udev/rules.d/98-osscuse.rules" + -i "$pkgdir/usr/lib/udev/rules.d/98-osscuse.rules" install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" @@ -44,6 +44,6 @@ package() { install -Dm644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd" # systemd - install -Dm644 "$srcdir/osspd.service" "$pkgdir/lib/systemd/system/osspd.service" + install -Dm644 "$srcdir/osspd.service" "$pkgdir/usr/lib/systemd/system/osspd.service" install -Dm644 "$srcdir/osspd.modules-load" "$pkgdir/usr/lib/modules-load.d/osspd.conf" } diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index fbfb18060..c752ca0f9 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157462 2012-04-28 17:12:24Z heftig $ +# $Id: PKGBUILD 157751 2012-04-29 06:33:27Z allan $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -8,7 +8,7 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=1.1 -pkgrel=3 +pkgrel=4 arch=(i686 x86_64) url="http://pulseaudio.org/" license=(GPL LGPL) @@ -28,6 +28,7 @@ build() { --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ + --with-udev-rules-dir=/usr/lib/udev/rules.d \ --with-database=tdb \ --disable-hal \ --disable-tcpwrap \ diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD new file mode 100644 index 000000000..02731754c --- /dev/null +++ b/extra/python2/PKGBUILD @@ -0,0 +1,84 @@ +# $Id: PKGBUILD 157413 2012-04-28 09:27:14Z allan $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributer: Allan McRae <allan@archlinux.org> +# Contributer: Jason Chu <jason@archlinux.org> + +pkgname=python2 +pkgver=2.7.3 +pkgrel=2 +_pybasever=2.7 +pkgdesc="A high-level scripting language" +arch=('i686' 'x86_64') +license=('PSF') +url="http://www.python.org/" +depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi') +makedepends=('tk') +optdepends=('tk: for IDLE') +conflicts=('python<3') +options=('!makeflags') +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) +sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357') + +build() { + cd "${srcdir}/Python-${pkgver}" + + # Temporary workaround for FS#22322 + # See http://bugs.python.org/issue10835 for upstream report + sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c + + # Enable built-in SQLite module to load extensions (fix FS#22122) + sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py + + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + + export OPT="${CFLAGS}" + ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ + --enable-unicode=ucs4 --with-system-expat --with-system-ffi \ + --with-dbmliborder=gdbm:ndbm + + make +} + +package() { + cd "${srcdir}/Python-${pkgver}" + make DESTDIR="${pkgdir}" altinstall maninstall + + ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2" + ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config" + ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1" + + ln -sf ../../libpython${_pybasever}.so \ + "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so" + + mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/" + + # some useful "stuff" + install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts} + install -m755 Tools/i18n/{msgfmt,pygettext}.py \ + "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/" + install -m755 Tools/scripts/{README,*py} \ + "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/" + + # fix conflicts with python + mv "${pkgdir}"/usr/bin/idle{,2} + mv "${pkgdir}"/usr/bin/pydoc{,2} + mv "${pkgdir}"/usr/bin/2to3{,-2.7} + + # clean up #!s + find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \ + xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" + + # clean-up reference to build directory + sed -i "s#${srcdir}/Python-${pkgver}:##" \ + "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile" + + # license + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD index c240df1e1..7ab0d162c 100644 --- a/extra/rtkit/PKGBUILD +++ b/extra/rtkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149435 2012-02-07 17:06:43Z heftig $ +# $Id: PKGBUILD 157777 2012-04-29 10:12:33Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=rtkit pkgver=0.10 -pkgrel=3 +pkgrel=4 pkgdesc="Realtime Policy and Watchdog Daemon" arch=('i686' 'x86_64') url="http://git.0pointer.de/?p=rtkit.git" @@ -21,7 +21,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system make } diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index 89fb54c23..f42a0ee01 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152194 2012-03-05 07:53:46Z tpowa $ +# $Id: PKGBUILD 157761 2012-04-29 06:49:21Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,7 +6,7 @@ pkgname=sane pkgver=1.0.22 -pkgrel=7 +pkgrel=8 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64') @@ -48,14 +48,14 @@ package () { echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf" # install udev files install -D -m0644 tools/udev/libsane.rules \ - "${pkgdir}/lib/udev/rules.d/53-sane.rules" + "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules" # fix udev rules - sed -i 's|NAME="%k", ||g' "${pkgdir}/lib/udev/rules.d/53-sane.rules" + sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules" # install xinetd file install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane" # Install the pkg-config file install -D -m644 tools/sane-backends.pc \ - "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc " + "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc" } diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index fca464709..d60ca334f 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156513 2012-04-20 01:11:09Z bisson $ +# $Id: PKGBUILD 157786 2012-04-29 11:52:40Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim -pkgver=1.4.12 +pkgver=1.4.13 pkgrel=1 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' @@ -14,22 +14,15 @@ arch=('i686' 'x86_64') makedepends=('intltool') depends=('libltdl' 'gtk2') backup=('etc/scim/config' 'etc/scim/global') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'ftp://ftp.archlinux.org/other/scim/scim-docs-20120420.tar.xz') -sha1sums=('948180ec0af18e435a95edbdb840cf41f3b24d32' - 'b2cccb43673e1760abf6825768bc4354a981a0ad') - -# Docs tarball temporarily generated with: -# svn co https://scim.svn.sourceforge.net/svnroot/scim/scim/trunk/docs docs +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('dafe08bbdd3faa0324800cb63e44926d71be2e47') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - mv ../docs . - ./bootstrap - sed 's/\$nls_cv_use_gnu_gettext/yes/' -i configure + export CXXFLAGS+=' -fpermissive' # so configure detects gettext with gcc-4.7 ./configure \ --prefix=/usr \ diff --git a/extra/scim/install b/extra/scim/install index c05312bfd..ae6ea9d56 100644 --- a/extra/scim/install +++ b/extra/scim/install @@ -1,5 +1,7 @@ post_install() { - /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + [[ -x usr/bin/gtk-query-immodules-2.0 ]] && usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + [[ -x usr/bin/gtk-query-immodules-3.0 ]] && usr/bin/gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules + true } post_upgrade() { diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index a82a303bb..73ec9cdda 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144364 2011-12-05 10:53:50Z ibiru $ +# $Id: PKGBUILD 157763 2012-04-29 07:02:42Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower pkgver=0.9.15 -pkgrel=1 +pkgrel=3 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" @@ -16,6 +16,10 @@ sha256sums=('d5941480f32dcee47401b3f650485c71f70e7eb0d92537bf4b62410248a6238c') build() { cd "$srcdir/$pkgname-$pkgver" + + # put udev files in /usr/lib + sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/upower --disable-static make diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index cfce9bffb..a429579a1 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156508 2012-04-20 01:03:19Z tdziedzic $ +# $Id: PKGBUILD 157798 2012-04-29 16:19:15Z tdziedzic $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -10,7 +10,7 @@ _patchlevel=495 __hgrev=a104dae7f903 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" @@ -53,7 +53,7 @@ mksource() { build() { # remove -O2 because there is a crash with python because of it - export CFLAGS="-march=x86-64 -mtune=generic -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" + export CFLAGS="${CFLAGS/-O2 /}" cd "${srcdir}" diff --git a/extra/yasm/PKGBUILD b/extra/yasm/PKGBUILD index 0affd661c..d1096c2ff 100644 --- a/extra/yasm/PKGBUILD +++ b/extra/yasm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142979 2011-11-19 15:19:43Z roman $ +# $Id: PKGBUILD 157779 2012-04-29 10:55:02Z allan $ # Maintainer: Роман Кирилич (Roman Kyrylych) <roman@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=yasm pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)" arch=('i686' 'x86_64') license=('custom') @@ -21,6 +21,11 @@ build() { make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install diff --git a/multilib-testing/lib32-llvm/PKGBUILD b/multilib-testing/lib32-llvm/PKGBUILD new file mode 100644 index 000000000..143037d3b --- /dev/null +++ b/multilib-testing/lib32-llvm/PKGBUILD @@ -0,0 +1,96 @@ +# $Id: PKGBUILD 70100 2012-04-29 10:00:59Z lcarlier $ +# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Sebastian Nowicki <sebnow@gmail.com> +# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> +# Contributor: Tobias Kieslich <tobias@justdreams.de> +# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> +# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> +# Contributor: Roberto Alsina <ralsina@kde.org> +# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> + +pkgname=('lib32-llvm') +pkgver=3.0 +pkgrel=3 +arch=('x86_64') +url="http://llvm.org/" +license=('custom:University of Illinois/NCSA Open Source License') +makedepends=('lib32-libffi' 'python2' 'gcc-multilib') +source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tar.gz) +sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477') + +build() { + cd "$srcdir/llvm-$pkgver.src" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + # Fix installation directories, ./configure doesn't seem to set them right + sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ + -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32/llvm:' \ + -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ + Makefile.config.in + + # Fix insecure rpath (http://bugs.archlinux.org/task/14017) + sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules + + # Apply strip option to configure + _optimized_switch="enable" + [[ $(check_option strip) == n ]] && _optimized_switch="disable" + + # Include location of libffi headers in CPPFLAGS + export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" + + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib32/llvm \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-libffi \ + --enable-targets=all \ + --disable-expensive-checks \ + --disable-debug-runtime \ + --disable-assertions \ + --with-binutils-include=/usr/include \ + --with-cxx-include-arch=$CHOST \ + --$_optimized_switch-optimized + + make REQUIRES_RTTI=1 +} + +package() { + pkgdesc="Low Level Virtual Machine (32 bits version)" + depends=('perl' 'lib32-libffi' 'llvm') + + cd "$srcdir/llvm-$pkgver.src" + + # We move the clang directory out of the tree so it won't get installed and + # then we bring it back in for the clang package + # mv tools/clang "$srcdir" + # -j1 is due to race conditions during the installation of the OCaml bindings + make -j1 DESTDIR="$pkgdir" install + + # Fix permissions of static libs + chmod -x "$pkgdir"/usr/lib32/llvm/*.a + + # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) + sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/lib32/llvm:' "$pkgdir/usr/bin/llvm-config" + mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm-config" + + # Get rid of example Hello transformation + rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.* + + # Symlink the gold plugin where clang expects it + ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so" + + # Add ld.so.conf.d entry + install -d "$pkgdir/etc/ld.so.conf.d" + echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf" + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}} + mkdir "$pkgdir"/usr/bin + mv "$pkgdir/usr/lib32/llvm-config" "$pkgdir/usr/bin/llvm-config32" +} diff --git a/multilib-testing/lib32-llvm/cindexer-clang-path.patch b/multilib-testing/lib32-llvm/cindexer-clang-path.patch new file mode 100644 index 000000000..ddaab690e --- /dev/null +++ b/multilib-testing/lib32-llvm/cindexer-clang-path.patch @@ -0,0 +1,10 @@ +--- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 ++++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 +@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP + + // We now have the CIndex directory, locate clang relative to it. + LibClangPath.eraseComponent(); ++ LibClangPath.eraseComponent(); + #endif + + LibClangPath.appendComponent("clang"); diff --git a/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch b/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch new file mode 100644 index 000000000..f46eb9fce --- /dev/null +++ b/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch @@ -0,0 +1,11 @@ +diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map +--- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200 ++++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300 +@@ -2,6 +2,7 @@ + global: main; + __progname; + environ; ++ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE; + + local: *; + }; diff --git a/multilib-testing/lib32-llvm/clang-pure64.patch b/multilib-testing/lib32-llvm/clang-pure64.patch new file mode 100644 index 000000000..9bbbfaa8b --- /dev/null +++ b/multilib-testing/lib32-llvm/clang-pure64.patch @@ -0,0 +1,13 @@ +Index: lib/Driver/Tools.cpp +=================================================================== +--- lib/Driver/Tools.cpp (revision 123373) ++++ lib/Driver/Tools.cpp (working copy) +@@ -3306,7 +3306,7 @@ + else if (ToolChain.getArch() == llvm::Triple::ppc64) + CmdArgs.push_back("/lib64/ld64.so.1"); + else +- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); ++ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); + } + + CmdArgs.push_back("-o"); diff --git a/multilib-testing/lib32-llvm/enable-lto.patch b/multilib-testing/lib32-llvm/enable-lto.patch new file mode 100644 index 000000000..3c8691b17 --- /dev/null +++ b/multilib-testing/lib32-llvm/enable-lto.patch @@ -0,0 +1,32 @@ +Index: lib/Driver/ToolChains.cpp +=================================================================== +--- lib/Driver/ToolChains.cpp (revision 123373) ++++ lib/Driver/ToolChains.cpp (working copy) +@@ -1398,7 +1398,7 @@ + PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + + GCCInstallation.getTriple() + "/bin").str()); + +- Linker = GetProgramPath("ld"); ++ Linker = GetProgramPath("ld.gold"); + + LinuxDistro Distro = DetectLinuxDistro(Arch); + +Index: lib/Driver/Tools.cpp +=================================================================== +--- lib/Driver/Tools.cpp (revision 123373) ++++ lib/Driver/Tools.cpp (working copy) +@@ -3412,11 +3412,11 @@ + } + } + +- if (Args.hasArg(options::OPT_use_gold_plugin)) { ++ // if (Args.hasArg(options::OPT_use_gold_plugin)) { + CmdArgs.push_back("-plugin"); +- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; ++ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so"; + CmdArgs.push_back(Args.MakeArgString(Plugin)); +- } ++ // } + + C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs)); + } diff --git a/multilib-testing/lib32-llvm/fix-gold-lto-linking.patch b/multilib-testing/lib32-llvm/fix-gold-lto-linking.patch new file mode 100644 index 000000000..84d166471 --- /dev/null +++ b/multilib-testing/lib32-llvm/fix-gold-lto-linking.patch @@ -0,0 +1,11 @@ +diff -upr llvm-3.0.src.orig/tools/gold/Makefile llvm-3.0.src/tools/gold/Makefile +--- llvm-3.0.src.orig/tools/gold/Makefile 2011-05-31 23:00:45.000000000 +0300 ++++ llvm-3.0.src/tools/gold/Makefile 2011-12-04 22:06:59.000000000 +0200 +@@ -26,6 +26,6 @@ LINK_COMPONENTS := support + # Because off_t is used in the public API, the largefile parts are required for + # ABI compatibility. + CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +-CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT) ++CXXFLAGS+=-L $(SharedLibDir) -lLTO + + include $(LEVEL)/Makefile.common diff --git a/multilib/lib32-gnutls/PKGBUILD b/multilib/lib32-gnutls/PKGBUILD index d23538cf1..789e44615 100644 --- a/multilib/lib32-gnutls/PKGBUILD +++ b/multilib/lib32-gnutls/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68983 2012-04-06 22:28:02Z bluewind $ +# $Id: PKGBUILD 70114 2012-04-29 23:27:51Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Christoph Vigano <mail at cvigano dot de> # Contributor: Biru Ionut <ionut@archlinux.ro> @@ -6,7 +6,7 @@ # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> _pkgbasename=gnutls pkgname=lib32-$_pkgbasename -pkgver=3.0.18 +pkgver=3.0.19 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)" arch=('x86_64') @@ -16,8 +16,8 @@ options=('!libtool') depends=('lib32-zlib' 'lib32-nettle>=2.4' 'lib32-p11-kit>=0.12' $_pkgbasename) makedepends=('gcc-multilib' 'lib32-libidn') source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.xz{,.sig}) -md5sums=('f46539a39857012ccc338a59beb4ac46' - 'fbca6ee827d8db0cea0f9b670b2f5c6c') +md5sums=('05e85d18955edd5c0fe40fbb7ef168bd' + '52c7b7ecf7032322321bf667d86eb084') build() { export CC="gcc -m32" diff --git a/testing/acl/PKGBUILD b/testing/acl/PKGBUILD new file mode 100644 index 000000000..f3d4796dc --- /dev/null +++ b/testing/acl/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 157730 2012-04-29 04:51:57Z dreisner $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=acl +pkgver=2.2.51 +pkgrel=2 +pkgdesc="Access control list utilities, libraries and headers" +arch=('i686' 'x86_64') +url="http://savannah.nongnu.org/projects/acl" +license=('LGPL') +depends=('attr>=2.4.46') +replaces=('xfsacl') +provides=('xfsacl') +conflicts=('xfsacl') +options=('!libtool') +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) +sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225' + '10893e2a044905acc88e2d98291e739b7b858b36c836ff66a3532909964067ce') + +build() { + cd "$pkgname-$pkgver" + + export INSTALL_USER=root INSTALL_GROUP=root + ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib + make +} + +package() { + make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev + + # tidy up + rm -f "$pkgdir"/usr/lib/libacl.a + chmod 0755 "$pkgdir"/usr/lib/libacl.so.*.*.* +} diff --git a/testing/attr/PKGBUILD b/testing/attr/PKGBUILD new file mode 100644 index 000000000..29e263c80 --- /dev/null +++ b/testing/attr/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 157732 2012-04-29 04:55:24Z dreisner $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=attr +pkgver=2.4.46 +pkgrel=2 +pkgdesc="Extended attribute support library for ACL support" +arch=('i686' 'x86_64') +url="http://savannah.nongnu.org/projects/attr" +license=('LGPL') +depends=('glibc') +makedepends=('gettext') +replaces=('xfsattr') +provides=('xfsattr') +conflicts=('xfsattr') +options=('!libtool') +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) +sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f' + 'a8ee37a0d02c0365049b8a06dc6963e6698a448ff2c0a54ed040f0c60f27bca3') + +build() { + cd "$pkgname-$pkgver" + + export INSTALL_USER=root INSTALL_GROUP=root + ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib + make +} + +package() { + make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev + + # tidy up + rm -f "$pkgdir"/usrlib/libattr.a + chmod 0755 "$pkgdir"/usr/lib/libattr.so.*.*.* + + # remove conflicting manpages + rm -rf "$pkgdir"/usr/share/man/man2 +} diff --git a/testing/bzip2/PKGBUILD b/testing/bzip2/PKGBUILD new file mode 100644 index 000000000..e02696cc8 --- /dev/null +++ b/testing/bzip2/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 157765 2012-04-29 08:16:05Z allan $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Judd <jvinet@zeroflux.org> + +pkgname=bzip2 +pkgver=1.0.6 +pkgrel=4 +pkgdesc="A high-quality data compression program" +arch=('i686' 'x86_64') +license=('custom') +url="http://sources.redhat.com/bzip2" +groups=('base') +depends=('glibc') +source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz + bzip2-1.0.4-bzip2recover.patch) +sha1sums=('3f89f861209ce81a6bab1fd1998c0ef311712002' + '85ce76fdb67f52f152bba368c1de81132dcdbdb5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # add large-file support + sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i ./Makefile-libbz2_so + + # use our optimization + sed -i "s|-O2|${CFLAGS}|g" Makefile + sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so + + patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch + + make -f Makefile-libbz2_so + make bzip2 bzip2recover libbz2.a +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make test +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -dm755 $pkgdir/usr/{bin,lib,include,share/man/man1} + + install -m755 bzip2-shared $pkgdir/usr/bin/bzip2 + install -m755 bzip2recover bzdiff bzgrep bzmore $pkgdir/usr/bin + ln -sf bzip2 $pkgdir/usr/bin/bunzip2 + ln -sf bzip2 $pkgdir/usr/bin/bzcat + + install -m755 libbz2.so.1.0.6 $pkgdir/usr/lib + ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so + ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1 + ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1.0 + install -m644 libbz2.a ${pkgdir}/usr/lib/libbz2.a + + install -m644 bzlib.h $pkgdir/usr/include/ + + install -m644 bzip2.1 $pkgdir/usr/share/man/man1/ + ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1 + ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1 + ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1 + + install -Dm644 $srcdir/${pkgname}-${pkgver}/LICENSE \ + $pkgdir/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/bzip2/bzip2-1.0.4-bzip2recover.patch b/testing/bzip2/bzip2-1.0.4-bzip2recover.patch new file mode 100644 index 000000000..e2bfe1cc1 --- /dev/null +++ b/testing/bzip2/bzip2-1.0.4-bzip2recover.patch @@ -0,0 +1,12 @@ +--- bzip2-1.0.4/bzip2recover.c.pom 2007-01-03 03:00:55.000000000 +0100 ++++ bzip2-1.0.4/bzip2recover.c 2007-02-05 11:55:17.000000000 +0100 +@@ -309,7 +309,8 @@ + UInt32 buffHi, buffLo, blockCRC; + Char* p; + +- strcpy ( progName, argv[0] ); ++ strncpy ( progName, argv[0], BZ_MAX_FILENAME-1); ++ progName[BZ_MAX_FILENAME-1]='\0'; + inFileName[0] = outFileName[0] = 0; + + fprintf ( stderr, diff --git a/testing/crda/PKGBUILD b/testing/crda/PKGBUILD new file mode 100644 index 000000000..1202d7890 --- /dev/null +++ b/testing/crda/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 157767 2012-04-29 08:23:51Z allan $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=crda +pkgver=1.1.2 +pkgrel=3 +pkgdesc="Central Regulatory Domain Agent for wireless networks" +arch=(i686 x86_64) +url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" +license=('custom') +depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw') +makedepends=('python-m2crypto') +install=crda.install +source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 + crda.rc libnl32.patch) +md5sums=('5226f65aebacf94baaf820f8b4e06df4' + '014eef3f8655e9a130064ec6891317fc' + 'c1f7aff29f15a0364ae6f7905a1d4ae6') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 -i "$srcdir/libnl32.patch" + sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py + make crda regdbdump +} + +package() { + # Install crda, regdbdump and udev rules + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ install + # This rule automatically sets the regulatory domain when cfg80211 is loaded + echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules + + install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE + + install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom +} diff --git a/testing/crda/crda.install b/testing/crda/crda.install new file mode 100644 index 000000000..c18e15f71 --- /dev/null +++ b/testing/crda/crda.install @@ -0,0 +1,18 @@ +## arg 1: the new package version +post_install() { + echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom." + echo "It will automatically be set when necessary." +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package + # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one + # from wireless-regdb by the user-defined one + if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then + if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then + mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom + fi + fi +} diff --git a/testing/crda/crda.rc b/testing/crda/crda.rc new file mode 100755 index 000000000..13dbd870e --- /dev/null +++ b/testing/crda/crda.rc @@ -0,0 +1,26 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/wireless-regdom + +case "$1" in + start) + if [ -n "${WIRELESS_REGDOM}" ]; then + stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}" + if iw reg set ${WIRELESS_REGDOM}; then + stat_done + else + stat_fail + fi + fi + ;; + stop) + ;; + restart) + $0 start + ;; + *) + echo "usage: $0 start" +esac +exit 0 diff --git a/testing/crda/libnl32.patch b/testing/crda/libnl32.patch new file mode 100644 index 000000000..682b6c5de --- /dev/null +++ b/testing/crda/libnl32.patch @@ -0,0 +1,12 @@ +diff -u -r crda-1.1.2/Makefile crda-1.1.2-libnl32/Makefile +--- crda-1.1.2/Makefile 2011-08-10 01:36:19.000000000 +0200 ++++ crda-1.1.2-libnl32/Makefile 2012-02-09 18:53:33.376430180 +0100 +@@ -51,7 +51,7 @@ + + ifeq ($(NL3FOUND),Y) + CFLAGS += -DCONFIG_LIBNL30 +-NLLIBS += -lnl-genl ++NLLIBS += $(shell pkg-config --libs libnl-genl-3.0) + NLLIBNAME = libnl-3.0 + else + ifeq ($(NL2FOUND),Y) diff --git a/testing/dmraid/PKGBUILD b/testing/dmraid/PKGBUILD index b3786478a..71dfb914b 100644 --- a/testing/dmraid/PKGBUILD +++ b/testing/dmraid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156525 2012-04-20 11:53:35Z tpowa $ +# $Id: PKGBUILD 157738 2012-04-29 05:29:44Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=3 +pkgrel=4 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') @@ -17,23 +17,23 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 dmraid_hook) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - '94dede91754b00783f1cd5244f6647bc' - '2a1ef82fb32f065ee560dceef736475e') + '832ed57a0f7ca6ba72adebcba2b17f87' + 'faec669dc85f87187b45b5d3968efe2c') build() { - cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname + cd "$pkgname/1.0.0.rc16-3/$pkgname" ./configure --enable-led --enable-intel_led make } package() { - cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname - make DESTDIR="$pkgdir" prefix=/ libdir=/lib mandir=/usr/share/man includedir=/usr/include install + cd "$pkgname/1.0.0.rc16-3/$pkgname" + make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install mkdir -p "$pkgdir"/var/lock/dmraid chmod 1777 "$pkgdir"/var/lock/ install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid # fix permissions - chmod 644 "$pkgdir"/lib/libdmraid.a + chmod 644 "$pkgdir"/usr/lib/libdmraid.a chmod 644 "$pkgdir"/usr/include/dmraid/* } diff --git a/testing/dmraid/dmraid_hook b/testing/dmraid/dmraid_hook index 6219a718a..37283e83e 100644 --- a/testing/dmraid/dmraid_hook +++ b/testing/dmraid/dmraid_hook @@ -1,19 +1,14 @@ -# vim: set ft=sh: -run_hook () -{ - /sbin/modprobe -q dm-mod >/dev/null 2>&1 - /sbin/modprobe -q dm-mirror >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - mkdir /dev/mapper - mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') - fi - msg ":: Activating dmraid arrays..." - # prevent any event monitoring calls with -I - if [ "${quiet}" = "y" ]; then - /sbin/dmraid -ay -I -Z >/dev/null - else - /sbin/dmraid -ay -I -Z - fi +#!/usr/bin/ash + +run_hook() { + modprobe -a -q dm-mod dm-mirror >/dev/null 2>&1 + msg ":: Activating dmraid arrays..." + # prevent any event monitoring calls with -I + if [ "$quiet" = "y" ]; then + dmraid -ay -I -Z >/dev/null + else + dmraid -ay -I -Z fi } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/dmraid/dmraid_install b/testing/dmraid/dmraid_install index 0ebfd0c0f..c48e6ceaf 100644 --- a/testing/dmraid/dmraid_install +++ b/testing/dmraid/dmraid_install @@ -1,19 +1,19 @@ -# vim: set ft=sh: +#!/bin/bash -build() -{ +build() { MODULES=" dm-mod dm-mirror " - BINARIES="/sbin/dmraid /sbin/dmsetup" - FILES="" + BINARIES="dmraid dmsetup" SCRIPT="dmraid" + add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" } -help () -{ -cat<<HELPEOF - This hook loads the necessary modules for a dmraid root device. +help() { + cat <<HELPEOF +This hook loads the necessary modules for a dmraid root device. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/e2fsprogs/PKGBUILD b/testing/e2fsprogs/PKGBUILD index 5257a03b6..8f80a6043 100644 --- a/testing/e2fsprogs/PKGBUILD +++ b/testing/e2fsprogs/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 154926 2012-03-31 08:27:07Z ronald $ +# $Id: PKGBUILD 157769 2012-04-29 09:29:25Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs pkgver=1.42.2 -pkgrel=1 +pkgrel=2 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'MIT') url="http://e2fsprogs.sourceforge.net" groups=('base') -depends=('sh' 'util-linux-ng') +depends=('sh' 'util-linux') makedepends=('bc') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'MIT-LICENSE') @@ -25,8 +25,8 @@ build() { # Remove unnecessary init.d directory sed -i '/init\.d/s|^|#|' misc/Makefile.in - ./configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs \ - --disable-fsck --disable-uuidd \ + ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \ + --enable-elf-shlibs --disable-fsck --disable-uuidd \ --disable-libuuid --disable-libblkid make diff --git a/testing/graphviz/LICENSE b/testing/graphviz/LICENSE new file mode 100644 index 000000000..16cc69a52 --- /dev/null +++ b/testing/graphviz/LICENSE @@ -0,0 +1,87 @@ +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the Program. + +Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. diff --git a/testing/graphviz/PKGBUILD b/testing/graphviz/PKGBUILD new file mode 100644 index 000000000..58df7bcbc --- /dev/null +++ b/testing/graphviz/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 157755 2012-04-29 06:41:34Z pierre $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> + +pkgname=graphviz +pkgver=2.28.0 +pkgrel=9 +pkgdesc='Graph visualization software' +url='http://www.graphviz.org/' +license=('custom:EPL') +arch=('i686' 'x86_64') +depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') +makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt') +optdepends=('mono: sharp bindings' + 'guile: guile bindings' + 'lua: lua bindings' + 'ocaml: ocaml bindings' + 'perl: perl bindings' + 'php: php bindings' + 'python2: python bindings' + 'r: r bindings' + 'ruby: ruby bindings' + 'tcl: tcl bindings' + 'qt: gvedit') +source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" + 'LICENSE') +sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d' + 'e78277e502c29abb74b9587a5dc951ec392554ea') + +options=('!libtool') +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed \ + -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,})"'":' \ + -e '/CONFIG/s:site:vendor:' \ + -i config/config_ruby.rb + + sed '/LIBPOSTFIX="64"/d' -i configure + export PYTHON=python2 + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # cf. http://www.graphviz.org/License.php + install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE +} diff --git a/testing/graphviz/install b/testing/graphviz/install new file mode 100644 index 000000000..65fba522b --- /dev/null +++ b/testing/graphviz/install @@ -0,0 +1,12 @@ +post_install() { + rm -f usr/lib/graphviz/config{,6} + usr/bin/dot -c +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/graphviz/config{,6} +} diff --git a/testing/linux-atm/PKGBUILD b/testing/linux-atm/PKGBUILD new file mode 100644 index 000000000..14e98013c --- /dev/null +++ b/testing/linux-atm/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 157771 2012-04-29 09:40:54Z allan $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Surain Mallawa Arachchi <mas@crc32.net> + +pkgname=linux-atm +pkgver=2.5.2 +pkgrel=2 +pkgdesc="Drivers and tools to support ATM networking under Linux." +arch=('i686' 'x86_64') +depends=('glibc') +url="http://linux-atm.sourceforge.net/" +license=(GPL) +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz + man-pages.patch) +options=(!libtool !makeflags) +md5sums=('d49499368c3cf15f73a05d9bce8824a8' + '181390736336cdb615ae32f1ae5acfa6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../man-pages.patch + + # install firmware in /usr/lib + sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in + + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/linux-atm/man-pages.patch b/testing/linux-atm/man-pages.patch new file mode 100644 index 000000000..c504cfe87 --- /dev/null +++ b/testing/linux-atm/man-pages.patch @@ -0,0 +1,45 @@ +diff -up linux-atm-2.5.1/src/led/zeppelin.8.fixman linux-atm-2.5.1/src/led/zeppelin.8 +--- linux-atm-2.5.1/src/led/zeppelin.8.fixman 2003-05-02 19:35:04.000000000 +0200 ++++ linux-atm-2.5.1/src/led/zeppelin.8 2010-10-13 12:58:18.000000000 +0200 +@@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using + recommended. Token Ring support has received less testing than its + Ethernet counterpart. + .SH FILES +-.IP \fI/var/run/lec[interface number].pid\fP ++\fI/var/run/lec[interface number].pid\fP + The file containing the process id of zeppelin. + .SH BUGS + John Bonham died 1980 and Led Zeppelin broke. +diff -up linux-atm-2.5.1/src/mpoad/mpcd.8.fixman linux-atm-2.5.1/src/mpoad/mpcd.8 +--- linux-atm-2.5.1/src/mpoad/mpcd.8.fixman 2001-10-10 00:33:07.000000000 +0200 ++++ linux-atm-2.5.1/src/mpoad/mpcd.8 2010-10-13 12:59:14.000000000 +0200 +@@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A + .B ]] + .SH DESCRIPTION + MPOA client +-.SM(MPC) is responsible for creating and receiving ++.SM (MPC) is responsible for creating and receiving + internetwork layer shortcuts. Using these shortcuts MPCs forward + unicast internetwork layer packets effectively over ATM without need + for routing protocols. +@@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o + shortcuts is done with the help of + .SM MPOA + server +-.SM(MPS). ++.SM (MPS). + .PP + Just as the Linux + .SM LAN +diff -up linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman linux-atm-2.5.1/src/sigd/atmsigd.conf.4 +--- linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman 2001-10-10 00:33:07.000000000 +0200 ++++ linux-atm-2.5.1/src/sigd/atmsigd.conf.4 2010-10-13 12:58:49.000000000 +0200 +@@ -125,7 +125,7 @@ a comment. The `#' character cannot be e + .P + If an option is specified in \fBatmsigd.conf\fP and on the command + line, the command line has priority. +-.COMPATIBILITY ++.SH COMPATIBILITY + Certain options used by past versions of \fBatmsigd\fP but no longer documented + on the man page are still recognized and supported, but they also yield a + warning message. Future versions of \fBatmsigd\fP will not recognize those diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD new file mode 100644 index 000000000..1cd89e22a --- /dev/null +++ b/testing/nilfs-utils/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 157773 2012-04-29 09:45:01Z allan $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + +pkgname=nilfs-utils +pkgver=2.1.1 +pkgrel=2 +pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" +arch=('i686' 'x86_64') +url="http://www.nilfs.org/" +license=('GPL2' 'LGPL2.1') +backup=('etc/nilfs_cleanerd.conf') +depends=('util-linux') +options=(!libtool) +source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) +md5sums=('caa7d8b7121311bd978120e2f0c45d81') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --enable-libmount + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install LDCONFIG=/bin/true +} diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD index 0a52bc805..67b39ac7e 100644 --- a/testing/openssh/PKGBUILD +++ b/testing/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 156652 2012-04-22 08:07:55Z bisson $ +# $Id: PKGBUILD 157788 2012-04-29 14:11:24Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=6.0p1 -pkgrel=1 +pkgrel=2 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -20,7 +20,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' '954bf1660aa32620c37034320877f4511b767ccb' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '3413909fd45a28701c92e6e5b59c6b65346ddb0f' + '659e3ee95c269014783ff8b318c6f50bf7496fbd' '21fa88de6cc1c7912e71655f50896ba17991a1c2') backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam index c7b91cdfb..aeef8be27 100644 --- a/testing/openssh/sshd.pam +++ b/testing/openssh/sshd.pam @@ -8,5 +8,6 @@ account required pam_time.so password required pam_unix.so session required pam_unix_session.so session required pam_limits.so +session optional pam_loginuid.so -session optional pam_ck_connector.so nox11 -session optional pam_systemd.so diff --git a/testing/php-apc/PKGBUILD b/testing/php-apc/PKGBUILD new file mode 100644 index 000000000..217b3d3c6 --- /dev/null +++ b/testing/php-apc/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 157759 2012-04-29 06:41:39Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=php-apc +pkgver=3.1.10 +pkgrel=2 +arch=('i686' 'x86_64') +pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' +url='http://pecl.php.net/package/APC' +depends=('php') +license=('PHP') +source=("http://pecl.php.net/get/APC-${pkgver}.tgz") +backup=('etc/php/conf.d/apc.ini') +md5sums=('f4a6b91903d6ba9dce89fc87bb6f26c9') + +build() { + cd $srcdir/APC-$pkgver + phpize + ./configure --prefix=/usr + make +} + +# check() { +# cd $srcdir/APC-$pkgver +# make test +# } + +package() { + cd $srcdir/APC-$pkgver + make INSTALL_ROOT=$pkgdir install + echo ';extension=apc.so' > apc.ini + install -D -m644 apc.ini $pkgdir/etc/php/conf.d/apc.ini + install -D -m644 apc.php $pkgdir/usr/share/php-apc/apc.php + install -D -m644 INSTALL $pkgdir/usr/share/doc/php-apc/install.txt +} diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD index fe09f5643..3c2202bb3 100644 --- a/testing/php/PKGBUILD +++ b/testing/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155941 2012-04-09 13:41:06Z andyrtr $ +# $Id: PKGBUILD 157757 2012-04-29 06:41:37Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,44 +21,35 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.3.10 -_suhosinver=5.3.9-0.9.10 -pkgrel=5 +pkgver=5.4.1 +pkgrel=2 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' -makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' - 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' + 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" - "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" - "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm' 'pcre_info.patch') -md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' - 'c099b3d7eac95018ababd41ded7f3066' - 'c15d18f846be1d69144a5d0056ee6506' - 'ffc338e8ce2a990f6f2a486355bbab65' + 'logrotate.d.php-fpm') +md5sums=('5b9529ed89dbc48c498e9693d1af3caf' + '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' - '740ec5fe2ecfd9d7febd4081c90ec65b' - '07c4e412909ac65a44ec90e7a2c4bade' - '8d3806bbb19e390f9b32ccf21611d937') + '59b3a25f9eb3afc02f1adf9ee699808c' + '07c4e412909ac65a44ec90e7a2c4bade') build() { phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + --config-cache \ --prefix=/usr \ --sysconfdir=/etc/php \ --localstatedir=/var \ --with-layout=GNU \ --with-config-file-path=/etc/php \ --with-config-file-scan-dir=/etc/php/conf.d \ - --enable-inline-optimization \ - --disable-debug \ --disable-rpath \ - --disable-static \ - --enable-shared \ --mandir=/usr/share/man \ --without-pear \ " @@ -70,36 +61,31 @@ build() { --enable-ftp=shared \ --enable-gd-native-ttf \ --enable-intl=shared \ - --enable-json=shared \ - --enable-mbregex \ --enable-mbstring \ - --enable-pdo \ --enable-phar=shared \ --enable-posix=shared \ - --enable-session \ --enable-shmop=shared \ --enable-soap=shared \ --enable-sockets=shared \ - --enable-sqlite-utf8 \ --enable-sysvmsg=shared \ --enable-sysvsem=shared \ --enable-sysvshm=shared \ - --enable-xml \ --enable-zip=shared \ --with-bz2=shared \ --with-curl=shared \ --with-db4=/usr \ --with-enchant=shared,/usr \ - --with-freetype-dir=shared,/usr \ + --with-freetype-dir=/usr \ --with-gd=shared \ - --with-gdbm=shared \ + --with-gdbm \ --with-gettext=shared \ --with-gmp=shared \ --with-iconv=shared \ --with-icu-dir=/usr \ - --with-imap-ssl=shared \ + --with-imap-ssl \ --with-imap=shared \ - --with-jpeg-dir=shared,/usr \ + --with-jpeg-dir=/usr \ + --with-vpx-dir=/usr \ --with-ldap=shared \ --with-ldap-sasl \ --with-mcrypt=shared \ @@ -115,19 +101,15 @@ build() { --with-pdo-pgsql=shared \ --with-pdo-sqlite=shared,/usr \ --with-pgsql=shared \ - --with-png-dir=shared,/usr \ + --with-png-dir=/usr \ --with-pspell=shared \ - --with-regex=php \ --with-snmp=shared \ --with-sqlite3=shared,/usr \ - --with-sqlite=shared \ --with-tidy=shared \ --with-unixODBC=shared,/usr \ --with-xmlrpc=shared \ --with-xsl=shared \ --with-zlib \ - --without-db2 \ - --without-db3 \ " EXTENSION_DIR=/usr/lib/php/modules @@ -137,11 +119,6 @@ build() { cd ${srcdir}/${pkgbase}-${pkgver} - patch -p1 -i ${srcdir}/pcre_info.patch - - # apply suhosin patch - patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch - # adjust paths patch -p0 -i ${srcdir}/php.ini.patch patch -p0 -i ${srcdir}/php-fpm.conf.in.patch @@ -279,11 +256,8 @@ package_php-pear() { backup=('etc/php/pear.conf') cd ${srcdir}/build-pear - make -j1 install-pear INSTALL_ROOT=${pkgdir} - local i - while read i; do - [ ! -e "$i" ] || rm -rf "$i" - done < <(find ${pkgdir} -name '.*') + make install-pear INSTALL_ROOT=${pkgdir} + rm -rf ${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry} } package_php-enchant() { @@ -293,7 +267,7 @@ package_php-enchant() { } package_php-gd() { - depends=('php' 'libpng' 'libjpeg' 'freetype2') + depends=('php' 'libpng' 'libjpeg' 'freetype2' 'libvpx') pkgdesc='gd module for PHP' install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so } @@ -349,8 +323,8 @@ package_php-snmp() { } package_php-sqlite() { - depends=('php' 'sqlite3') - pkgdesc='sqlite3 module for PHP' + depends=('php' 'sqlite') + pkgdesc='sqlite module for PHP' install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so } diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch index b923edb38..4e0f4a888 100644 --- a/testing/php/php-fpm.conf.in.patch +++ b/testing/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-01-11 10:50:14.905161442 +0100 ++++ sapi/fpm/php-fpm.conf.in 2012-03-01 19:50:48.549947258 +0100 @@ -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) @@ -26,7 +26,7 @@ +;listen = 127.0.0.1:9000 +listen = /var/run/php-fpm/php-fpm.sock - ; Set listen(2) backlog. A value of '-1' means unlimited. + ; Set listen(2) backlog. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) @@ -151,9 +152,9 @@ ; BSD-derived systems allow connections regardless of permissions. diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch index 3dc5b6560..bbaae2152 100644 --- a/testing/php/php.ini.patch +++ b/testing/php/php.ini.patch @@ -1,6 +1,6 @@ ---- php.ini-production 2011-12-15 11:31:02.000000000 +0100 -+++ php.ini-production 2012-01-11 10:43:02.069936043 +0100 -@@ -376,7 +376,7 @@ +--- php.ini-production 2012-03-29 06:17:59.000000000 +0200 ++++ php.ini-production 2012-03-30 10:46:21.181340861 +0200 +@@ -305,7 +305,7 @@ ; or per-virtualhost web server configuration file. This directive is ; *NOT* affected by whether Safe Mode is turned On or Off. ; http://php.net/open-basedir @@ -9,7 +9,7 @@ ; This directive allows you to disable certain functions for security reasons. ; It receives a comma-delimited list of function names. This directive is -@@ -793,7 +793,7 @@ +@@ -702,7 +702,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -18,7 +18,7 @@ ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" -@@ -816,7 +816,7 @@ +@@ -725,7 +725,7 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir @@ -27,7 +27,7 @@ ; On windows: ; extension_dir = "ext" -@@ -950,53 +950,49 @@ +@@ -859,51 +859,47 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; @@ -55,7 +55,6 @@ -;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client -;extension=php_openssl.dll -;extension=php_pdo_firebird.dll --;extension=php_pdo_mssql.dll -;extension=php_pdo_mysql.dll -;extension=php_pdo_oci.dll -;extension=php_pdo_odbc.dll @@ -71,7 +70,6 @@ - -;extension=php_soap.dll -;extension=php_sockets.dll --;extension=php_sqlite.dll -;extension=php_sqlite3.dll -;extension=php_sybase_ct.dll -;extension=php_tidy.dll @@ -92,7 +90,6 @@ +;extension=iconv.so +;extension=imap.so +;extension=intl.so -+extension=json.so +;extension=ldap.so +;extension=mcrypt.so +;extension=mssql.so @@ -113,7 +110,6 @@ +;extension=soap.so +;extension=sockets.so +;extension=sqlite3.so -+;extension=sqlite.so +;extension=sysvmsg.so +;extension=sysvsem.so +;extension=sysvshm.so diff --git a/testing/sysfsutils/PKGBUILD b/testing/sysfsutils/PKGBUILD new file mode 100644 index 000000000..e70eb3c6e --- /dev/null +++ b/testing/sysfsutils/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 157736 2012-04-29 05:13:38Z dreisner $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=sysfsutils +pkgver=2.1.0 +pkgrel=8 +pkgdesc="System Utilities Based on Sysfs" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +url="http://linux-diag.sourceforge.net/Sysfsutils.html" +groups=('base') +depends=('glibc') +source=(http://downloads.sourceforge.net/sourceforge/linux-diag/${pkgname}-${pkgver}.tar.gz) +md5sums=('14e7dcd0436d2f49aa403f67e1ef7ddc') +options=(!libtool) + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +check() { + cd "$pkgname-$pkgver" + make check +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + rm "$pkgdir/usr/lib/libsysfs.a" +} diff --git a/testing/xfce4-session/PKGBUILD b/testing/xfce4-session/PKGBUILD index 3c313b5da..95bc4ef03 100644 --- a/testing/xfce4-session/PKGBUILD +++ b/testing/xfce4-session/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157699 2012-04-29 02:55:15Z foutrelis $ +# $Id: PKGBUILD 157800 2012-04-29 16:48:26Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-session pkgver=4.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -12,10 +12,10 @@ license=('GPL2') groups=('xfce4') # keep xorg-server-utils for https://bugs.archlinux.org/task/21096 # upower and consolekit for reboot/shutdown/hibernate/suspend -depends=('libxfce4ui' 'libgnome-keyring' 'libwnck' 'libsm' 'xorg-iceauth' - 'upower' 'consolekit' 'hicolor-icon-theme') +depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'consolekit' + 'hicolor-icon-theme') makedepends=('intltool') -optdepends=('fortune-mod: for xfce4-tips') +optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled') replaces=('xfce-utils') options=('!libtool') install=$pkgname.install |