diff options
38 files changed, 481 insertions, 125 deletions
diff --git a/community-testing/awesome/PKGBUILD b/community-testing/awesome/PKGBUILD index a341e170a..83c1f336c 100644 --- a/community-testing/awesome/PKGBUILD +++ b/community-testing/awesome/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69377 2012-04-15 00:04:17Z seblu $ +# $Id: PKGBUILD 69984 2012-04-27 22:04:24Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: xduugu # Contributor: Ronald van Haren <ronald.archlinux.org> @@ -6,7 +6,7 @@ pkgname=awesome pkgver=3.4.11 -pkgrel=3 +pkgrel=4 pkgdesc='Highly configurable framework window manager' arch=('i686' 'x86_64') url='http://awesome.naquadah.org/' @@ -23,6 +23,7 @@ depends=( 'xcb-util-image' 'xcb-util-keysyms' 'xcb-util-wm' + 'xorg-xmessage' ) makedepends=( 'asciidoc' @@ -34,7 +35,10 @@ makedepends=( 'luadoc' 'xmlto' ) -optdepends=('rlwrap: readline support for awesome-client') +optdepends=( + 'rlwrap: readline support for awesome-client' + 'feh: image background setter for awsetbg' +) provides=('notification-daemon') source=("$url/download/$pkgname-$pkgver.tar.xz" "$pkgname.desktop" diff --git a/community-testing/open-vm-tools/PKGBUILD b/community-testing/open-vm-tools/PKGBUILD index 3914b43f2..7948a6b23 100644 --- a/community-testing/open-vm-tools/PKGBUILD +++ b/community-testing/open-vm-tools/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 69104 2012-04-09 13:50:02Z tdziedzic $ +# $Id: PKGBUILD 70004 2012-04-28 03:49:34Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools pkgver=2012.03.13 _pkgsubver=651368 -pkgrel=2 +pkgrel=3 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" arch=('i686' 'x86_64') url="http://open-vm-tools.sourceforge.net/" license=('LGPL') -depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps' 'uriparser' 'libsigc++' 'libxss') +depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps-ng' 'uriparser' 'libsigc++' 'libxss') makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst') optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm') options=('docs' '!libtool') @@ -37,29 +37,29 @@ md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7' build() { cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - [ -f Makefile ] || ./configure --prefix=/usr --without-kernel-modules + [ -f Makefile ] || CUSTOM_PROCPS_NAME="procps" ./configure --prefix=/usr --without-kernel-modules make } package() { cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - make install DESTDIR=$pkgdir - install -D -m 755 scripts/common/vmware-xdg-detect-de $pkgdir/usr/bin/vmware-xdg-detect-de - chmod 07755 $pkgdir/usr/bin/vmware-user-suid-wrapper + make install DESTDIR="$pkgdir" + install -D -m 755 scripts/common/vmware-xdg-detect-de "$pkgdir"/usr/bin/vmware-xdg-detect-de + chmod 07755 "$pkgdir"/usr/bin/vmware-user-suid-wrapper - cd $pkgdir - patch -p1 -i $srcdir/scripts-network.patch etc/vmware-tools/scripts/vmware/network - patch -p1 -i $srcdir/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network + cd "$pkgdir" + patch -p1 -i "$srcdir"/scripts-network.patch etc/vmware-tools/scripts/vmware/network + patch -p1 -i "$srcdir"/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network - install -D -m 755 $srcdir/open-vm-tools.rc.d $pkgdir/etc/rc.d/open-vm-tools - install -D -m 644 $srcdir/open-vm-tools.conf.d $pkgdir/etc/conf.d/open-vm-tools - install -D -m 644 $srcdir/tools.conf $pkgdir/etc/vmware-tools/tools.conf - install -D -m 644 $srcdir/xautostart.conf $pkgdir/etc/vmware-tools/xautostart.conf - install -D -m 644 $srcdir/vmware-guestd $pkgdir/etc/pam.d/vmware-guestd - rm -rf $pkgdir/usr/etc + install -D -m 755 "$srcdir"/open-vm-tools.rc.d "$pkgdir"/etc/rc.d/open-vm-tools + install -D -m 644 "$srcdir"/open-vm-tools.conf.d "$pkgdir"/etc/conf.d/open-vm-tools + install -D -m 644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf + install -D -m 644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf + install -D -m 644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd + rm -rf "$pkgdir"/usr/etc - ln -fs /usr/sbin/mount.vmhgfs $pkgdir/sbin/mount.vmhgfs + ln -fs /usr/sbin/mount.vmhgfs "$pkgdir"/sbin/mount.vmhgfs - cd $pkgdir && find -type f -exec sh -c "file {} | grep ELF >/dev/null && echo {} && chrpath -d {}" \; + cd "$pkgdir" && find -type f -exec sh -c "file {} | grep ELF >/dev/null && echo {} && chrpath -d {}" \; } diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD index fb206952e..de29d6970 100644 --- a/community/blender/PKGBUILD +++ b/community/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68036 2012-03-17 05:43:38Z svenstaro $ +# $Id: PKGBUILD 69995 2012-04-28 00:27:10Z svenstaro $ # Contributor: John Sowiak <john@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> @@ -13,8 +13,8 @@ _svn=false pkgname=blender -pkgver=2.62 -pkgrel=3 +pkgver=2.63 +pkgrel=1 epoch=3 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64') @@ -30,7 +30,7 @@ options=(!strip) install=blender.install if [ $_svn = false ]; then source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) - md5sums=('f2357584a5081b03f6e60ba3efe2a610') + md5sums=('1cc18a9074ba63313a5711887de76c54') else source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) md5sums=('7579d1139d0d6025df8afcfca64a65c4') @@ -83,10 +83,10 @@ build() { make $MAKEFLAGS - cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ - "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ - cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi - chmod 755 bmake +# cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ +# "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ +# cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi +# chmod 755 bmake make } @@ -96,9 +96,9 @@ package() { python -m compileall "${pkgdir}/usr/share/blender" # install plugins - install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} - cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ - "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ - cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ - "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ +# install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} +# cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ +# "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ +# cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ +# "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ } diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index 21e58a30b..e0a69c0a0 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 59192 2011-11-21 14:39:15Z spupykin $ +# $Id: PKGBUILD 69975 2012-04-27 16:14:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Igor Scabini <furester @ gmail.com> pkgname=('cython' 'cython2') pkgbase=cython -pkgver=0.15.1 -pkgrel=2 +pkgver=0.16 +pkgrel=1 pkgdesc="C-Extensions for Python " arch=(i686 x86_64) url="http://www.cython.org" license=('APACHE') makedepends=('python-distribute' 'python2-distribute') source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('171021b3845c9ca8bd6d8185b3cde664') +md5sums=('7934186ada3552110aba92062fa88b1c') build() { true diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index 8fb68594c..67da86e79 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69734 2012-04-23 09:07:27Z ibiru $ +# $Id: PKGBUILD 69964 2012-04-27 11:53:11Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64') @@ -15,9 +15,19 @@ install=$_pkgname.install url="http://www.gnome.org" source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz" 'systemd-fallback.patch' + 'evironment.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=9d7ea1d0b8b90b55f916751858a210a2e02a06b6' + 'arguments.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=00681573ad6ebeb127ec72ac61d30d69be6459f8' + 'mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=053f48b3b1b9a3b2ab0714d470da4354735d0c4b' + 'glist-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=214a832820f6448f07d438f6686267eaf8301dd1' + 'mouse-mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=09c215b42312ca5bb63b215c2f95231613b3103d' 'arch.patch') -sha256sums=('5639cbba28caa7b3e33990f49aeed11ed9325e78e76af2175d9ccd5ff298401d' +sha256sums=('d5d4a270ec5692cdc56a58cfb57bc7f8fa93374566912a65e78c1c3db7faf4ed' '82b721d0e274af15ed2770052d550d3162d2d37e5e9ee5e6fcebac1ed6cb8199' + '1ba33f6eadac4c54f3f08f4bce075d2bef8124f857f5af22eaee010c8d38bc3b' + '884a959b334f864f75dcb4eec8c137785f587c7c2ae57906f8b4e60e04c29246' + '3a3f8b2964406b9b3c85c05f25e677e8c9eaa221779b95826ffbc0474740decc' + 'af3bda801befdbd3d318723ae6de3aaf7df1e16bccd84e13f15b57f2dceaefcd' + '43b7397e622a2c19091b3665822e9461067fb6a497b9507418a3bbb100a69e1b' '727ab3e8181464af32ba604b2931b77cd6d4fbf34e10bbba99bb213eb992466e') build() { @@ -25,6 +35,11 @@ build() { patch -Np1 -i "$srcdir/arch.patch" patch -Np1 -i "$srcdir/systemd-fallback.patch" + patch -Np1 -i ../evironment.patch + patch -Np1 -i ../arguments.patch + patch -Np1 -i ../mem-leak.patch + patch -Np1 -i ../glist-leak.patch + patch -Np1 -i ../mouse-mem-leak.patch gnome-autogen.sh --prefix=/usr \ --sysconfdir=/etc \ diff --git a/community/gtk-engine-murrine/PKGBUILD b/community/gtk-engine-murrine/PKGBUILD index c8cf2b616..ead92660a 100644 --- a/community/gtk-engine-murrine/PKGBUILD +++ b/community/gtk-engine-murrine/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63618 2012-02-05 12:00:53Z ibiru $ +# $Id: PKGBUILD 69978 2012-04-27 16:16:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> @@ -6,8 +6,8 @@ # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gtk-engine-murrine -pkgver=0.98.1.1 -pkgrel=3 +pkgver=0.98.2 +pkgrel=1 pkgdesc="GTK2 engine to make your desktop look like a 'murrina', an italian word meaning the art glass works done by Venicians glass blowers." arch=('i686' 'x86_64') url="http://cimitan.com/murrine/project/murrine" @@ -15,8 +15,9 @@ license=('LGPL3') depends=('gtk2') makedepends=('intltool') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/murrine-${pkgver}.tar.bz2) +source=(http://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/murrine-${pkgver}.tar.xz) sha256sums=('e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912') +sha256sums=('e9c68ae001b9130d0f9d1b311e8121a94e5c134b82553ba03971088e57d12c89') build() { cd murrine-${pkgver} diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index c7e58b150..83e3dfd58 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 69068 2012-04-08 22:52:23Z seblu $ +# $Id: PKGBUILD 70002 2012-04-28 01:09:18Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=linux-tools pkgname=('perf' 'cpupower') pkgver=3.3 -kernver=${pkgver} +kernver=${pkgver}.4 [[ ${kernver##*rc} != $kernver ]] && testing='testing' -pkgrel=2 +pkgrel=4 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' @@ -17,9 +17,9 @@ makedepends+=('python2' 'libnewt' 'elfutils' 'pciutils') source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/$testing/linux-$kernver.tar.xz" 'cpupower.rc' 'cpupower.conf' - 'cpupower.service') -md5sums=('7133f5a2086a7d7ef97abac610c094f5' - '26af384ca282bc0dc38ff65acc7bb4b9' + 'cpupower.service') +md5sums=('1cf9bbadf579734c57ed2e2081895692' + '73dbc931e86b3b73d6e2338dcbee81a4' '857ccdd0598511e3bf4b63522754dc48' '20870541e88109d2f153be3c58a277f1') diff --git a/community/linux-tools/cpupower.rc b/community/linux-tools/cpupower.rc index 9b0bcddb7..27a491e95 100644 --- a/community/linux-tools/cpupower.rc +++ b/community/linux-tools/cpupower.rc @@ -33,7 +33,7 @@ case "$1" in (($fail > 0)) && stat_fail && exit 1 || stat_done ;; *) - echo "usage: $0 {start|restart}" + echo "usage: ${0##*/} {start|restart}" esac true diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index d12814082..97e494a30 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 61113 2011-12-21 20:57:39Z andrea $ +# $Id: PKGBUILD 69979 2012-04-27 16:17:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc -pkgver=5.1.9 -pkgrel=2 +pkgver=5.1.10 +pkgrel=1 pkgdesc="ODBC driver/connector for MySQL" arch=(i686 x86_64) url="http://dev.mysql.com/downloads/connector/odbc/" depends=('unixodbc' 'libmysqlclient') license=('GPL') options=('libtool') -source=("http://mysql.cce.usp.br/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-${pkgver}.tar.gz" +source=("http://mysql.cce.usp.br/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-${pkgver}-src.tar.gz" myconf.h.in) -md5sums=('80f146bd384a9011d968aa67df27e68e' +md5sums=('71d570a7f6839b81d101bf803e4f864a' '6c99c83e309b18d15ef0f07f0b461241') build() { - cd $srcdir/mysql-connector-odbc-${pkgver} + cd $srcdir/mysql-connector-odbc-${pkgver}-src cp $srcdir/myconf.h.in driver/myconf.h.in [ -x configure ] || { aclocal; libtoolize; automake --add-missing; autoreconf; } [ -f Makefile ] || CFLAGS="$CFLAGS -DTHREAD" \ @@ -26,6 +26,6 @@ build() { } package() { - cd $srcdir/mysql-connector-odbc-${pkgver} + cd $srcdir/mysql-connector-odbc-${pkgver}-src make DESTDIR=$pkgdir install } diff --git a/community/opencollada/PKGBUILD b/community/opencollada/PKGBUILD index 2e08bdaba..7a1344c65 100644 --- a/community/opencollada/PKGBUILD +++ b/community/opencollada/PKGBUILD @@ -1,7 +1,8 @@ +# $Id: PKGBUILD 69972 2012-04-27 14:32:38Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Liganic <liganic-aur@gmx.net> pkgname=opencollada -pkgver=867 +pkgver=869 pkgrel=1 pkgdesc="Stream based reader and writer library for COLLADA files" arch=(i686 x86_64) diff --git a/community/pax-utils/PKGBUILD b/community/pax-utils/PKGBUILD index 25e86bdbf..b71d940a5 100644 --- a/community/pax-utils/PKGBUILD +++ b/community/pax-utils/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 62235 2012-01-18 17:21:27Z tredaelli $ +# $Id: PKGBUILD 69966 2012-04-27 11:58:38Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: sh0 <mee@sh0.org> # Contributor: Maxwel <msg.maxwel@gmail.com> pkgname=pax-utils -pkgver=0.2.3 +pkgver=0.3.0 pkgrel=1 pkgdesc='ELF related utils for ELF 32/64 binaries that can check files for security relevant properties' url='http://hardened.gentoo.org/pax-utils.xml' arch=('i686' 'x86_64') license=('GPL') depends=('bash' 'libcap') -checkdepends=('python2') +checkdepends=('python') source=("http://distfiles.gentoo.org/distfiles/${pkgname}-${pkgver}.tar.xz") -md5sums=('d2d27891742d14d81b205cf4e42de28a') +md5sums=('f0c6577977472a327aa39adf1012f150') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/python /python2 /' tests/source/dotest make USE_CAP='yes' } diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index f3551b8fa..c27b0d27d 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 68626 2012-03-30 09:33:33Z mtorromeo $ +# $Id: PKGBUILD 69962 2012-04-27 10:25:29Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.21_rel25.1 +pkgver=5.5.22_rel25.2 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" arch=('i686' 'x86_64') @@ -99,6 +99,6 @@ package() { install -dm700 "${pkgdir}"/var/lib/mysql } -md5sums=('fdbc6cb1452f577d4c21ed3f1686dac8' +md5sums=('2fc67b0e0e31c1a7949beae9399abc33' '243864805611764a7e5883c1dba7afd8' '1c949c0dbea5206af0db14942d9927b6') diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index 1cc421432..f73213945 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 67206 2012-03-05 08:58:57Z ibiru $ +# $Id: PKGBUILD 69993 2012-04-28 00:04:33Z svenstaro $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Vasco Costa <vasco.costa@meiodigital.com> pkgname=pokerth _realname=PokerTH -pkgver=0.9.3 -pkgrel=2 +pkgver=0.9.4 +pkgrel=1 pkgdesc="Poker game written in C++/QT4" arch=('i686' 'x86_64') url="http://www.pokerth.net/" license=('GPL' 'custom') -depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls' +depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'qt' 'sdl_mixer' 'libircclient' 'tinyxml') makedepends=('boost') source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2) -md5sums=('09d173512f723441f288b2844e3c68cb') +md5sums=('afdc63e9a4e499fd70fc0eee4d8dc1a9') build() { cd "$srcdir/$_realname-$pkgver-src" + sed -i '1 i #include <unistd.h>' src/third_party/qtsingleapplication/qtlocalpeer.cpp + sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro sed -i '23 i #include <libircclient/libirc_rfcnumeric.h>' src/net/common/ircthread.cpp diff --git a/community/qtcurve-gtk2/PKGBUILD b/community/qtcurve-gtk2/PKGBUILD index b77e5b18c..6c8399cb9 100644 --- a/community/qtcurve-gtk2/PKGBUILD +++ b/community/qtcurve-gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66821 2012-02-28 23:45:44Z svenstaro $ +# $Id: PKGBUILD 69999 2012-04-28 00:40:23Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-gtk2 -pkgver=1.8.14 +pkgver=1.8.15 pkgrel=1 pkgdesc="A configurable set of widget styles for KDE and Gtk" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('cmake') groups=('qtcurve') options=('!libtool') source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2") -md5sums=('4d8e703c5e906e8e3d27b1a38b57db9b') +md5sums=('00054b1923f995fa55e0573730b9f3a6') build() { cd "${srcdir}" diff --git a/community/qtcurve-kde4/PKGBUILD b/community/qtcurve-kde4/PKGBUILD index 427455e56..2210a507d 100644 --- a/community/qtcurve-kde4/PKGBUILD +++ b/community/qtcurve-kde4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68485 2012-03-26 06:57:23Z svenstaro $ +# $Id: PKGBUILD 69997 2012-04-28 00:37:54Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-kde4 -pkgver=1.8.11 +pkgver=1.8.12 pkgrel=1 arch=('i686' 'x86_64') groups=('qtcurve') @@ -15,7 +15,7 @@ depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2" 'bypass-kde-config.patch') -md5sums=('62dde2f3a2fabf2a209b07c2cf2b9c13' +md5sums=('8a08d28204fab1b3db6813519f174014' '3f6681147cc361bd2bfd4d7477f2a8d0') build() { diff --git a/community/speed-dreams/PKGBUILD b/community/speed-dreams/PKGBUILD index 2b7195d0e..95f702c95 100644 --- a/community/speed-dreams/PKGBUILD +++ b/community/speed-dreams/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66408 2012-02-24 13:26:23Z svenstaro $ +# $Id: PKGBUILD 69991 2012-04-27 23:56:34Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD) pkgname=speed-dreams -pkgver=2.0.0rc1 -_pkgver=2.0.0-rc1-r4420 +pkgver=2.0.0 +_pkgver=2.0.0-r4687 pkgrel=1 pkgdesc="A racing simulator with rich graphics and physics" arch=('i686' 'x86_64') @@ -13,14 +13,16 @@ license=('GPL2') depends=('sdl' 'freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data') makedepends=('cmake' 'p7zip') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-src-base-${_pkgver}.tar.xz" + "http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-src-unmaintained-${_pkgver}.tar.xz" "http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-src-wip-cars-and-tracks-${_pkgver}.tar.xz" "http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-src-hq-cars-and-tracks-${_pkgver}.tar.xz" "http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-src-more-hq-cars-and-tracks-${_pkgver}.tar.xz" "${pkgname}.desktop") -md5sums=('bce029b4519d590dfa35ed83348475cd' - 'f4d155ff8463c61860f767823ae314ad' - '9f7bbb22fbc1c18548ae616dfc06f0b0' - 'ca6edc5a2f420214e826e8d112967495' +md5sums=('a6842887fc289ed6057be2ba9d2afaa2' + '8505c46aae6ce56a43353b8899d40ce4' + 'edcc842291737dbb13a3083252bf51d4' + '57cf5c475491294ce1fb249e2dc0273b' + 'c8ab7ef068fa3fbe67d2b3246b30ea8a' '634f8cb8f4f96686c8049c8a025e72d0') build() { diff --git a/extra/c-ares/PKGBUILD b/extra/c-ares/PKGBUILD index 45643af78..89b361691 100644 --- a/extra/c-ares/PKGBUILD +++ b/extra/c-ares/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143105 2011-11-23 02:52:51Z dreisner $ +# $Id: PKGBUILD 157361 2012-04-28 03:18:53Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=c-ares -pkgver=1.7.5 +pkgver=1.8.0 pkgrel=1 pkgdesc='C library that performs DNS requests and name resolves asynchronously' arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ depends=('glibc') options=('!libtool') source=("http://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} 'LICENSE') -md5sums=('800875fc23cd8e1924d8af9172ed33e7' - '593129fa3c0612b78594adbe4ee48ca1' +md5sums=('2936494add5663ecc57147cc3c9697f9' + '85b0cca26bc34005e25016169abbe66d' 'c69f2042941b708ce3e7121424d0b7e6') build() { diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index 896faa265..7422baf3b 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146192 2012-01-05 20:11:27Z giovanni $ +# $Id: PKGBUILD 157363 2012-04-28 03:29:31Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fping -pkgver=3.0 +pkgver=3.1 pkgrel=1 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://www.fping.org/" license=('custom') depends=('glibc') source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz") -md5sums=('e937c9a2b1d65b6f5294fec57891645b') +md5sums=('a2bbf3316da8c7b47a1a0ffe959d5d9e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD index 32952b819..d9a9b139e 100644 --- a/extra/gdb/PKGBUILD +++ b/extra/gdb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147258 2012-01-25 06:03:18Z allan $ +# $Id: PKGBUILD 157331 2012-04-27 05:07:31Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gdb -pkgver=7.4 +pkgver=7.4.1 pkgrel=1 pkgdesc="The GNU Debugger" arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ backup=('etc/gdb/gdbinit') options=('!libtool') install=gdb.install source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('95a9a8305fed4d30a30a6dc28ff9d060' - 'd5ac067e8dca336cf4586e4e2269d3b2') +md5sums=('8854d34691087ec127d934692639855f' + 'a3d48626efc9e7d802f0734ca39a7878') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index fe645903f..0bff642b8 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157111 2012-04-23 23:54:24Z tomegun $ +# $Id: PKGBUILD 157357 2012-04-27 21:14:32Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index d8f5938a8..d4911ea95 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156884 2012-04-23 09:08:18Z ibiru $ +# $Id: PKGBUILD 157347 2012-04-27 16:15:04Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.12.1 +pkgver=1.12.2 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('d75dbb0cee87ca93f393c96da56affa51609114814b87771cfc9871c09b5355e') +sha256sums=('998b9d0089d21e451e455b6bc5f421eb08bcb3e5ff0aceda98e424cc42ef6616') build() { cd "$pkgbase-$pkgver" diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index 2c1aeaba5..3b46ce518 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 157237 2012-04-26 13:06:28Z tpowa $ +# $Id: PKGBUILD 157340 2012-04-27 07:14:13Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hylafax pkgver=6.0.5 -pkgrel=4 +pkgrel=5 pkgdesc="Fax Server" arch=('i686' 'x86_64') install='hylafax.install' @@ -27,8 +27,8 @@ md5sums=('eb9ac942354ad708e20e4583cec6615f' '60f2a7e62c256ead4e9238cb31b35b90' '51d9f639bb76e5e39cdc8e2ac07e208d' '3d239c186f24720e945508d349b069b1' - '9c8916a753106795fc3f40268889f645' - 'a0b5a008b7fbf1943d167e0d5eb32341') + '832c8e8098e2dfa56040c975b554590c' + '38a00db6d9d765d130b2d8d3a98e5c24') build() { cd "$srcdir/${pkgname}-${pkgver}" diff --git a/extra/hylafax/faxq.service b/extra/hylafax/faxq.service index 1fef20a6d..0760a5b85 100644 --- a/extra/hylafax/faxq.service +++ b/extra/hylafax/faxq.service @@ -2,6 +2,7 @@ Description=Hyla FAX queue manager [Service] +Type=forking ExecStart=/usr/sbin/faxq ExecReload=/bin/kill -HUP $MAINPID diff --git a/extra/hylafax/hfaxd.service b/extra/hylafax/hfaxd.service index d5d96c34d..cc0c6ce56 100644 --- a/extra/hylafax/hfaxd.service +++ b/extra/hylafax/hfaxd.service @@ -2,6 +2,7 @@ Description=Hyla FAX client-server [Service] +Type=forking ExecStart=/usr/lib/fax/hfaxd -i hylafax ExecReload=/bin/kill -HUP $MAINPID diff --git a/extra/kshutdown/PKGBUILD b/extra/kshutdown/PKGBUILD index 9f4da82e0..f4235665b 100644 --- a/extra/kshutdown/PKGBUILD +++ b/extra/kshutdown/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 153572 2012-03-16 04:44:09Z eric $ +# $Id: PKGBUILD 157339 2012-04-27 07:13:20Z eric $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kshutdown -pkgver=3.0beta3 +pkgver=3.0beta4 pkgrel=1 pkgdesc="Shutdown Utility for KDE" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://kshutdown.sourceforge.net/" license=('GPL') depends=('kdebase-workspace') -makedepends=('pkg-config' 'cmake' 'automoc4') +makedepends=('cmake' 'automoc4') install='kshutdown.install' source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip") -md5sums=('2b1ee9aa2300989650cd808c3860cd0a') +sha1sums=('1dcdaa84b7e87560d9861209d6be6ea1d793ca78') build() { cd "${srcdir}" diff --git a/extra/lsof/PKGBUILD b/extra/lsof/PKGBUILD index a8687fff1..2c7f38411 100644 --- a/extra/lsof/PKGBUILD +++ b/extra/lsof/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 140198 2011-10-09 08:36:54Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> +# $Id: PKGBUILD 157359 2012-04-27 22:32:41Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=lsof -pkgver=4.85 +pkgver=4.86 pkgrel=1 pkgdesc="Lists open files for running Unix processes" arch=('i686' 'x86_64') @@ -13,8 +14,6 @@ url="http://people.freebsd.org/~abe/" license=('custom') depends=('glibc') source=(ftp://sunsite.ualberta.ca/pub/Mirror/lsof/${pkgname}_${pkgver}.tar.bz2 license.txt) -md5sums=('102ee2081172bbe76dccaa6cceda8573' - '1b63c76bd10437cabf890508c8e58d36') build() { cd ${srcdir}/${pkgname}_${pkgver} @@ -41,3 +40,5 @@ package() { install -D -m0644 -o root -g root ${srcdir}/license.txt \ ${pkgdir}/usr/share/licenses/lsof/LICENSE } +md5sums=('9f1cda41f35add068c7b81f873fa56b5' + '1b63c76bd10437cabf890508c8e58d36') diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index 546235263..4c973c4a5 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 156284 2012-04-16 15:22:10Z andyrtr $ +# $Id: PKGBUILD 157345 2012-04-27 12:08:41Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-input-synaptics -pkgver=1.5.99.903 +pkgver=1.5.99.904 pkgrel=1 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ options=(!libtool) backup=('etc/X11/xorg.conf.d/10-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 10-synaptics.conf) -sha1sums=('adb8e28a8aced2ff660a4058d35b8656ffdf46ce' +sha1sums=('4853bd933fa41b83ff513262cdf6e5b89f22d64b' '68e1f4ef5e1038231d210eb422fa4d18c5922f0f') build() { diff --git a/multilib-testing/lib32-glib2/PKGBUILD b/multilib-testing/lib32-glib2/PKGBUILD index e539dfd9c..62772f665 100644 --- a/multilib-testing/lib32-glib2/PKGBUILD +++ b/multilib-testing/lib32-glib2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69356 2012-04-14 13:00:00Z bluewind $ +# $Id: PKGBUILD 69968 2012-04-27 12:03:19Z lcarlier $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> @@ -6,7 +6,7 @@ _pkgbasename=glib2 pkgname=lib32-$_pkgbasename pkgver=2.32.1 -pkgrel=2 +pkgrel=3 pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)" url="http://www.gtk.org/" arch=('x86_64') diff --git a/multilib-testing/lib32-libffi/PKGBUILD b/multilib-testing/lib32-libffi/PKGBUILD new file mode 100644 index 000000000..f9d2cf31e --- /dev/null +++ b/multilib-testing/lib32-libffi/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 69958 2012-04-27 07:21:50Z lcarlier $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=lib32-libffi +pkgver=3.0.11 +pkgrel=1 +pkgdesc="A portable, high level programming interface to various calling conventions (32 bits version)" +arch=('x86_64') +license=('MIT') +url="http://sourceware.org/libffi" +depends=('lib32-glibc') +checkdepends=('dejagnu') +options=('!libtool') +source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) +md5sums=('f69b9693227d976835b4857b1ba7d0e3') + +build() { + cd "${srcdir}/libffi-${pkgver}" + + export CC="gcc -m32" + + ./configure --prefix=/usr \ + --libdir=/usr/lib32 --libexecdir=/usr/lib32 + + make +} + +check() { + cd "${srcdir}/libffi-${pkgver}" + + make check +} + +package() { + cd "${srcdir}/libffi-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" + rm -r "${pkgdir}"/usr/share/{info,man} +} diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 6f7fd8831..d6adc575b 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 69327 2012-04-13 19:38:30Z svenstaro $ +# $Id: PKGBUILD 69987 2012-04-27 22:56:11Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.5.2 +pkgver=1.5.3 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('a994a2d8ef526407b2085408f0a5e9b4') +md5sums=('91ce7a52a402e8609d6f80a7ab409cfd') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" diff --git a/testing/procps-ng/PKGBUILD b/testing/procps-ng/PKGBUILD new file mode 100644 index 000000000..324784932 --- /dev/null +++ b/testing/procps-ng/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 157364 2012-04-28 03:50:32Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=procps-ng +pkgver=3.3.2 +pkgrel=1 +pkgdesc="Utilities for monitoring your system and processes on your system" +arch=('i686' 'x86_64') +url="http://gitorious.org/procps" +license=('GPL' 'LGPL') +groups=('base') +depends=('ncurses') +conflicts=('procps') +provides=('procps') +replaces=('procps') +backup=('etc/sysctl.conf') +options=('!libtool') +source=(http://gitorious.org/procps/procps/archive-tarball/v${pkgver} + sysctl_man.patch includes_restrict.patch gnu-kbsd-version.patch + complain_unmounted_proc.patch sig_printf_literal.patch + makefile_watch_ncurses.patch) +sha1sums=('889692f891e790ea035315ec321cce92d00a8db2' + '39d6562b83389ec4893de88ec88222f7169fa732' + 'd588825497fef0b057491377421fd8f68730d181' + '9eb2bb32a13656b5d671f9cffed3094399a26048' + 'bf57f5a1f54a0f4a6d9e99d66b8e447225c3371d' + '25be10b456d56b8bdf6260276c60738a7d76a34d' + '9fc24e48f902c19315e2557e4deea5592bbfad7e') + +build() { + cd "${srcdir}/procps-procps" + ./autogen.sh + patch -p1 < ../sysctl_man.patch + patch -p1 < ../includes_restrict.patch + patch -p1 < ../gnu-kbsd-version.patch + patch -p1 < ../complain_unmounted_proc.patch + patch -p1 < ../sig_printf_literal.patch + patch -p1 < ../makefile_watch_ncurses.patch + ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib + make +} + +package() { + cd "${srcdir}/procps-procps" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/procps-ng/complain_unmounted_proc.patch b/testing/procps-ng/complain_unmounted_proc.patch new file mode 100644 index 000000000..ed932dbba --- /dev/null +++ b/testing/procps-ng/complain_unmounted_proc.patch @@ -0,0 +1,17 @@ +Author: <hesso@hesso.pool.math.tu-berlin.de> +Description: Complain when /proc/version cannot be found instead of +exiting silently. +--- a/proc/version.c ++++ b/proc/version.c +@@ -33,8 +33,10 @@ + char buf[256]; + int version_string_depth; + +- if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */ ++ if ( (fp=fopen("/proc/version","r")) == NULL) { ++ fprintf(stderr, "Cannot find /proc/version - is /proc mounted?\n"); + exit(1); ++ } + if (fgets(buf, 256, fp) == NULL) { + fprintf(stderr, "Cannot read kernel version from /proc/version\n"); + fclose(fp); diff --git a/testing/procps-ng/gnu-kbsd-version.patch b/testing/procps-ng/gnu-kbsd-version.patch new file mode 100644 index 000000000..f310a4c93 --- /dev/null +++ b/testing/procps-ng/gnu-kbsd-version.patch @@ -0,0 +1,38 @@ +Author: <csmall@debian.org> +Description: Rework version parsing so its ok with other OSes +--- a/proc/version.c ++++ b/proc/version.c +@@ -28,20 +28,26 @@ + int linux_version_code; + + void init_Linux_version(void) { +- static struct utsname uts; + int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ ++ FILE *fp; ++ char buf[256]; + int version_string_depth; + +- if (uname(&uts) == -1) /* failure implies impending death */ +- exit(1); +- +- version_string_depth = sscanf(uts.release, "%d.%d.%d", &x, &y, &z); ++ if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */ ++ exit(1); ++ if (fgets(buf, 256, fp) == NULL) { ++ fprintf(stderr, "Cannot read kernel version from /proc/version\n"); ++ fclose(fp); ++ exit(1); ++ } ++ fclose(fp); ++ version_string_depth = sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z); + + if ((version_string_depth < 2) || /* Non-standard for all known kernels */ + ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */ + fprintf(stderr, /* *very* unlikely to happen by accident */ + "Non-standard uts for running kernel:\n" +- "release %s=%d.%d.%d gives version code %d\n", +- uts.release, x, y, z, LINUX_VERSION(x,y,z)); ++ "%s=%d.%d.%d gives version code %d\n", ++ buf, x, y, z, LINUX_VERSION(x,y,z)); + linux_version_code = LINUX_VERSION(x, y, z); + } diff --git a/testing/procps-ng/includes_restrict.patch b/testing/procps-ng/includes_restrict.patch new file mode 100644 index 000000000..417e93223 --- /dev/null +++ b/testing/procps-ng/includes_restrict.patch @@ -0,0 +1,144 @@ +Author: Craig Small <csmall@debian.org> +Description: Change restrict to __restrict + procps automake defines restrict which means the binaries for procps + binaries compile. However external programs may not of defined + restrict. includes from libc6 use __restrict and if is good enough for + them, its good enough for us. + +--- a/proc/devname.h ++++ b/proc/devname.h +@@ -10,9 +10,9 @@ + #define ABBREV_TTY 2 /* remove tty */ + #define ABBREV_PTS 4 /* remove pts/ */ + +-extern unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags); ++extern unsigned dev_to_tty(char *__restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags); + +-extern int tty_to_dev(const char *restrict const name); ++extern int tty_to_dev(const char *__restrict const name); + + EXTERN_C_END + #endif +--- a/proc/escape.h ++++ b/proc/escape.h +@@ -14,10 +14,10 @@ + #define ESC_BRACKETS 0x2 // if using cmd, put '[' and ']' around it + #define ESC_DEFUNCT 0x4 // mark zombies with " <defunct>" + +-extern int escape_strlist(char *restrict dst, char *restrict const *restrict src, size_t n, int *cells); +-extern int escape_str(char *restrict dst, const char *restrict src, int bufsize, int *maxcells); +-extern int escape_command(char *restrict const outbuf, const proc_t *restrict const pp, int bytes, int *cells, unsigned flags); +-extern int escaped_copy(char *restrict dst, const char *restrict src, int bufsize, int *maxroom); ++extern int escape_strlist(char *__restrict dst, char *__restrict const *__restrict src, size_t n, int *cells); ++extern int escape_str(char *__restrict dst, const char *__restrict src, int bufsize, int *maxcells); ++extern int escape_command(char *__restrict const outbuf, const proc_t *__restrict const pp, int bytes, int *cells, unsigned flags); ++extern int escaped_copy(char *__restrict dst, const char *__restrict src, int bufsize, int *maxroom); + + EXTERN_C_END + #endif +--- a/proc/procps.h ++++ b/proc/procps.h +@@ -103,6 +103,6 @@ + #endif + + +-typedef void (*message_fn)(const char *restrict, ...) __attribute__((format(printf,1,2))); ++typedef void (*message_fn)(const char *__restrict, ...) __attribute__((format(printf,1,2))); + + #endif +--- a/proc/readproc.h ++++ b/proc/readproc.h +@@ -173,10 +173,10 @@ + // char deBug1[64]; + pid_t taskdir_user; // for threads + int did_fake; // used when taskdir is missing +- int(*finder)(struct PROCTAB *restrict const, proc_t *restrict const); +- proc_t*(*reader)(struct PROCTAB *restrict const, proc_t *restrict const); +- int(*taskfinder)(struct PROCTAB *restrict const, const proc_t *restrict const, proc_t *restrict const, char *restrict const); +- proc_t*(*taskreader)(struct PROCTAB *restrict const, const proc_t *restrict const, proc_t *restrict const, char *restrict const); ++ int(*finder)(struct PROCTAB *__restrict const, proc_t *__restrict const); ++ proc_t*(*reader)(struct PROCTAB *__restrict const, proc_t *__restrict const); ++ int(*taskfinder)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const); ++ proc_t*(*taskreader)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const); + pid_t* pids; // pids of the procs + uid_t* uids; // uids of procs + int nuid; // cannot really sentinel-terminate unsigned short[] +@@ -200,8 +200,8 @@ + int ntask; // * readproctab2 + } proc_data_t; // * when PROC_LOOSE_TASKS set + +-extern proc_data_t *readproctab2(int(*want_proc)(proc_t *buf), int(*want_task)(proc_t *buf), PROCTAB *restrict const PT); +-extern proc_data_t *readproctab3(int(*want_task)(proc_t *buf), PROCTAB *restrict const PT); ++extern proc_data_t *readproctab2(int(*want_proc)(proc_t *buf), int(*want_task)(proc_t *buf), PROCTAB *__restrict const PT); ++extern proc_data_t *readproctab3(int(*want_task)(proc_t *buf), PROCTAB *__restrict const PT); + + // Convenient wrapper around openproc and readproc to slurp in the whole process + // table subset satisfying the constraints of flags and the optional PID list. +@@ -222,12 +222,12 @@ + // only before first use. Thereafter, the library will manage such + // a passed proc_t, freeing any additional acquired memory associated + // with the previous process or thread. +-extern proc_t* readproc(PROCTAB *restrict const PT, proc_t *restrict p); +-extern proc_t* readtask(PROCTAB *restrict const PT, const proc_t *restrict const p, proc_t *restrict t); +-extern proc_t* readeither(PROCTAB *restrict const PT, proc_t *restrict x); ++extern proc_t* readproc(PROCTAB *__restrict const PT, proc_t *__restrict p); ++extern proc_t* readtask(PROCTAB *__restrict const PT, const proc_t *__restrict const p, proc_t *__restrict t); ++extern proc_t* readeither(PROCTAB *__restrict const PT, proc_t *__restrict x); + + // warning: interface may change +-extern int read_cmdline(char *restrict const dst, unsigned sz, unsigned pid); ++extern int read_cmdline(char *__restrict const dst, unsigned sz, unsigned pid); + + extern void look_up_our_self(proc_t *p); + +--- a/proc/sig.h ++++ b/proc/sig.h +@@ -16,13 +16,13 @@ + EXTERN_C_BEGIN + + /* return -1 on failure */ +-extern int signal_name_to_number(const char *restrict name); ++extern int signal_name_to_number(const char *__restrict name); + + extern const char *signal_number_to_name(int signo); + +-extern int print_given_signals(int argc, const char *restrict const *restrict argv, int max_line); ++extern int print_given_signals(int argc, const char *__restrict const *__restrict argv, int max_line); + +-extern char *strtosig(const char *restrict s); ++extern char *strtosig(const char *__restrict s); + + extern void pretty_print_signals(void); + +--- a/proc/sysinfo.h ++++ b/proc/sysinfo.h +@@ -57,11 +57,11 @@ + + #define BUFFSIZE (64*1024) + typedef unsigned long long jiff; +-extern void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, jiff *restrict czzz, +- unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout, +- unsigned *restrict intr, unsigned *restrict ctxt, +- unsigned int *restrict running, unsigned int *restrict blocked, +- unsigned int *restrict btime, unsigned int *restrict processes); ++extern void getstat(jiff *__restrict cuse, jiff *__restrict cice, jiff *__restrict csys, jiff *__restrict cide, jiff *__restrict ciow, jiff *__restrict cxxx, jiff *__restrict cyyy, jiff *__restrict czzz, ++ unsigned long *__restrict pin, unsigned long *__restrict pout, unsigned long *__restrict s_in, unsigned long *__restrict sout, ++ unsigned *__restrict intr, unsigned *__restrict ctxt, ++ unsigned int *__restrict running, unsigned int *__restrict blocked, ++ unsigned int *__restrict btime, unsigned int *__restrict processes); + + extern void meminfo(void); + +--- a/proc/wchan.h ++++ b/proc/wchan.h +@@ -6,8 +6,8 @@ + EXTERN_C_BEGIN + + extern const char * lookup_wchan(unsigned KLONG address, unsigned pid); +-extern int open_psdb(const char *restrict override); +-extern int open_psdb_message(const char *restrict override, message_fn message); ++extern int open_psdb(const char *__restrict override); ++extern int open_psdb_message(const char *__restrict override, message_fn message); + + EXTERN_C_END + diff --git a/testing/procps-ng/makefile_watch_ncurses.patch b/testing/procps-ng/makefile_watch_ncurses.patch new file mode 100644 index 000000000..08d70bdc7 --- /dev/null +++ b/testing/procps-ng/makefile_watch_ncurses.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -383,7 +383,7 @@ + @WITH_NCURSES_TRUE@slabtop_SOURCES = slabtop.c $(top_srcdir)/lib/strutils.c + @WITH_NCURSES_TRUE@slabtop_LDADD = @NCURSES_LIBS@ + @WITH_NCURSES_TRUE@watch_SOURCES = watch.c $(top_srcdir)/lib/strutils.c +-@WITH_NCURSES_TRUE@watch_LDADD = @NCURSES_LIBS@ ++@WITH_NCURSES_TRUE@watch_LDADD = @WATCH_NCURSES_LIBS@ + kill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c + skill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c + snice_SOURCES = skill.c $(top_srcdir)/lib/strutils.c diff --git a/testing/procps-ng/sig_printf_literal.patch b/testing/procps-ng/sig_printf_literal.patch new file mode 100644 index 000000000..2140abf0d --- /dev/null +++ b/testing/procps-ng/sig_printf_literal.patch @@ -0,0 +1,11 @@ +--- a/proc/sig.c ++++ b/proc/sig.c +@@ -257,7 +257,7 @@ + while(++i <= number_of_signals){ + int n; + n = printf("%2d %s", i, signal_number_to_name(i)); +- if(n>0 && i%7) printf(" \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n); ++ if(n>0 && i%7) printf("%s", " \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n); + else printf("\n"); + } + if((i-1)%7) printf("\n"); diff --git a/testing/procps-ng/sysctl_man.patch b/testing/procps-ng/sysctl_man.patch new file mode 100644 index 000000000..d6023edfb --- /dev/null +++ b/testing/procps-ng/sysctl_man.patch @@ -0,0 +1,20 @@ +--- a/sysctl.8 ++++ b/sysctl.8 +@@ -55,7 +55,7 @@ + \fB\-w\fR, \fB\-\-write\fR + Use this option when you want to change a sysctl setting. + .TP +-\fB\-p\fR, \fB\-\-load\fR[=\fIFILE\fR] ++\fB\-p\fR[\fIFILE\fR], \fB\-\-load\fR[=\fIFILE\fR] + Load in sysctl settings from the file specified or /etc/sysctl.conf if none + given. Specifying \- as filename means reading data from standard input. + .TP +@@ -117,7 +117,7 @@ + .br + /sbin/sysctl \-w kernel.domainname="example.com" + .br +-/sbin/sysctl \-p /etc/sysctl.conf ++/sbin/sysctl \-p/etc/sysctl.conf + .br + /sbin/sysctl \-a \-\-pattern forward + .br diff --git a/testing/racket/PKGBUILD b/testing/racket/PKGBUILD index 8dcc5145f..8c4cef02b 100644 --- a/testing/racket/PKGBUILD +++ b/testing/racket/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157302 2012-04-26 21:34:58Z allan $ +# $Id: PKGBUILD 157334 2012-04-27 05:08:35Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=racket @@ -14,7 +14,7 @@ options=('!libtool' '!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ drracket.desktop) -sha1sums=('a4ea408818236f8eaf937291dd641fd73a997793' +sha1sums=('b51cdd8b9825edb60e5c2c80472cec8220918cd1' 'a20808f6b250225704856f82a544681a962a299d') build() { |