From ad4b2565385561c6ff56f1f91c1e40115cf939d7 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 12 Jun 2011 22:59:55 +0000 Subject: Sun Jun 12 22:59:55 UTC 2011 --- community/calibre/PKGBUILD | 8 +- community/mldonkey/PKGBUILD | 16 ++- community/mldonkey/mldonkey-gcc46.patch | 12 ++ community/mldonkey/mldonkey.conf | 3 - community/mldonkey/mldonkeyd | 21 ++- community/open-vm-tools-modules/PKGBUILD | 12 +- community/open-vm-tools/PKGBUILD | 10 +- community/rawtherapee/PKGBUILD | 7 +- community/virtualbox/PKGBUILD | 8 +- .../virtualbox/virtualbox-guest-modules.install | 2 +- community/wine/PKGBUILD | 145 +++++++++++++++++++++ community/wine/wine.install | 12 ++ core/coreutils/PKGBUILD | 12 +- core/net-tools/PKGBUILD | 25 ++-- core/net-tools/net-tools.install | 12 ++ extra/enchant/PKGBUILD | 5 +- extra/ethtool/PKGBUILD | 6 +- extra/exo/PKGBUILD | 6 +- extra/hplip/PKGBUILD | 18 ++- extra/lirc/PKGBUILD | 23 +++- extra/lirc/kernel-2.6.39.patch | 54 ++++++++ extra/lirc/lirc.install | 2 +- extra/lirc/lirc_atiusb-kfifo.patch | 31 +++++ extra/lirc/lirc_wpc8769l.patch | 88 +++++++++++++ extra/lirc/lircd-handle-large-config.patch | 39 ++++++ extra/wireshark/PKGBUILD | 10 +- libre/icecat/PKGBUILD | 8 +- libre/initscripts/PKGBUILD | 4 +- multilib-testing/lib32-glibc/PKGBUILD | 12 +- .../lib32-glibc/glibc-2.14-revert-4462fad3.patch | 37 ++++++ testing/glibc/PKGBUILD | 15 ++- testing/glibc/glibc-2.14-revert-4462fad3.patch | 37 ++++++ testing/python2/PKGBUILD | 87 +++++++++++++ testing/python2/python-2.7-db51.patch | 42 ++++++ testing/subversion/PKGBUILD | 8 +- 35 files changed, 741 insertions(+), 96 deletions(-) create mode 100644 community/mldonkey/mldonkey-gcc46.patch create mode 100644 community/wine/PKGBUILD create mode 100644 community/wine/wine.install create mode 100644 core/net-tools/net-tools.install create mode 100644 extra/lirc/kernel-2.6.39.patch create mode 100644 extra/lirc/lirc_atiusb-kfifo.patch create mode 100644 extra/lirc/lirc_wpc8769l.patch create mode 100644 extra/lirc/lircd-handle-large-config.patch create mode 100644 multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch create mode 100644 testing/glibc/glibc-2.14-revert-4462fad3.patch create mode 100644 testing/python2/PKGBUILD create mode 100644 testing/python2/python-2.7-db51.patch diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 5ad10d94b..14ae58ba1 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48634 2011-06-03 16:47:30Z stephane $ +# $Id: PKGBUILD 49119 2011-06-11 10:20:21Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Petrov Roman # Contributor: Andrea Fagiani pkgname=calibre -pkgver=0.8.3 -pkgrel=2 +pkgver=0.8.5 +pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') url="http://calibre-ebook.com/" @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('aee05cac444f68491f2a3d68b22da53e' +md5sums=('b6b07a35afe4dbf188f42e932536cca3' 'f4b80e3b34e34bce68b3f052ff52dee8') build() { diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index 5cd449c3f..c05548fba 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 40262 2011-02-22 17:18:28Z cbrannon $ +# $Id: PKGBUILD 49135 2011-06-11 15:20:48Z cbrannon $ # Maintainer: Chris Brannon # Contributor: Corrado Primier # Contributor: Alessio 'mOLOk' Bolognino pkgname=mldonkey pkgver=3.0.7 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-network P2P client" arch=('i686' 'x86_64') url="http://mldonkey.sourceforge.net/" @@ -17,11 +17,16 @@ optdepends=('librsvg: GUI support' backup=('etc/conf.d/mldonkey') install=mldonkey.install source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 - mldonkeyd mldonkey.conf mldonkey.desktop) + mldonkey-gcc46.patch + mldonkeyd + mldonkey.conf + mldonkey.desktop) build() { cd "$srcdir/$pkgname-$pkgver" + # Patch comes from upstream; will go away in later versions. + patch -p1 < "$srcdir/mldonkey-gcc46.patch" ./configure --prefix=/usr --enable-gui=newgui2 make } @@ -39,6 +44,7 @@ package() { install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey" } md5sums=('162b78fc4e20335a8fe31d91e1656db2' - 'c42526cb7ff703b313728dfdd92dfb1e' - '190cbbc30b510981e0d8b0ed8bae87a4' + 'c2bd99420ba5d48629b6823aae6bf127' + '75e4b6c7fb282f7de15a8d5478f3bd70' + '1f86d92db51c62cded0e6f3833057dee' '1de3266caa49f82bee73ba891eea12cf') diff --git a/community/mldonkey/mldonkey-gcc46.patch b/community/mldonkey/mldonkey-gcc46.patch new file mode 100644 index 000000000..656d72f85 --- /dev/null +++ b/community/mldonkey/mldonkey-gcc46.patch @@ -0,0 +1,12 @@ +diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h +index 775a898..af1621b 100644 +--- a/src/utils/lib/CryptoPP.h ++++ b/src/utils/lib/CryptoPP.h +@@ -695,6 +695,7 @@ class CRYPTOPP_DLL NullNameValuePairs : public NameValuePairs + { + public: + bool GetVoidValue(const char* /* name */, const std::type_info& /* valueType */, void* /* pValue */) const {return false;} ++ NullNameValuePairs() {} + }; + + //! _ diff --git a/community/mldonkey/mldonkey.conf b/community/mldonkey/mldonkey.conf index 7aa683f1a..24a25af74 100644 --- a/community/mldonkey/mldonkey.conf +++ b/community/mldonkey/mldonkey.conf @@ -3,6 +3,3 @@ MLDUSER="" # Parameters to be passed to the daemon (default is empty) PARAMS="" - -# PID file location (defaults to "/var/lock" if empty) -PIDDIR="" diff --git a/community/mldonkey/mldonkeyd b/community/mldonkey/mldonkeyd index bbd6954c2..6a458d68e 100644 --- a/community/mldonkey/mldonkeyd +++ b/community/mldonkey/mldonkeyd @@ -9,6 +9,15 @@ if [ -z $MLDUSER ] ; then exit 2 fi +if [ -z "$(getent passwd "$MLDUSER")" ]; then + # Perhaps we should create the account for the user? + echo "You must create the account $MLDUSER in order to run mldonkey." + echo "Please create the account manually, and try again." + exit 2 +fi + +MLDGROUPID=$(getent passwd "$MLDUSER" |cut -d':' -f4) +MLDGROUP=$(getent group $MLDGROUPID |cut -d':' -f1) USERDIR=$(getent passwd $MLDUSER | cut -d: -f6) if [ ! -d $USERDIR ]; then @@ -16,12 +25,20 @@ if [ ! -d $USERDIR ]; then exit 2 fi -PID=$(cat $USERDIR/.mldonkey/mlnet.pid 2>/dev/null) +PIDDIR="/var/run/mldonkey" +PIDFILE="$PIDDIR/mlnet.pid" +PID=$(cat $PIDFILE 2>/dev/null) case "$1" in start) stat_busy "Starting MLDonkey" - [ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &" + if [ ! -d $PIDDIR ]; then + install -d -m755 -o "$MLDUSER" -g "$MLDGROUP" $PIDDIR + fi + if [ "$(stat -c %U $PIDDIR)" != "$MLDUSER" ]; then + chown -R "$MLDUSER:$MLDGROUP" $PIDDIR + fi + [ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet -pid $PIDDIR $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &" if [ $? -gt 0 ]; then stat_fail else diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index 7c9125ade..127bf5c92 100644 --- a/community/open-vm-tools-modules/PKGBUILD +++ b/community/open-vm-tools-modules/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44312 2011-04-05 15:06:23Z spupykin $ +# $Id: PKGBUILD 49143 2011-06-11 22:40:49Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Krzysztof Raczkowski pkgname=open-vm-tools-modules -pkgver=2011.03.28 -_pkgsubver=387002 +pkgver=2011.05.27 +_pkgsubver=420096 pkgrel=1 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64') @@ -13,13 +13,13 @@ license=('GPL') makedepends=('libdnet' 'icu' 'uriparser' 'kernel26-headers') depends=("kernel26") install=$pkgname.install -source=(http://easynews.dl.sourceforge.net/sourceforge/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz) -md5sums=('a9c72ab0b8f7778d444e69e9d3b95527') +source=(http://kent.dl.sourceforge.net/sourceforge/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz) +md5sums=('3e43d4857d412d02115e69db193830b5') build() { cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" sed -i 's#-lproc-3.2.7#-lproc-3.2.8#' configure - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr + [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --without-x (cd modules && make modules) } diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index 9a97df2e4..447d3dedd 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48659 2011-06-03 19:34:11Z stephane $ +# $Id: PKGBUILD 49148 2011-06-11 22:48:15Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Krzysztof Raczkowski pkgname=open-vm-tools -pkgver=2011.03.28 -_pkgsubver=387002 -pkgrel=4 +pkgver=2011.05.27 +_pkgsubver=420096 +pkgrel=1 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/" @@ -24,7 +24,7 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver} tools.conf vmware-guestd xautostart.conf) -md5sums=('a9c72ab0b8f7778d444e69e9d3b95527' +md5sums=('3e43d4857d412d02115e69db193830b5' '06f7448e274db2a911f582e276088fc9' 'b183ec265200d68431a5e4eb1b0c8cf5' '8c333a979578bdc0c3134c1dd6bb7353' diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index 1de4c8f15..331f5b011 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 48519 2011-06-01 11:08:54Z stativ $ +# $Id: PKGBUILD 49124 2011-06-11 10:51:22Z stativ $ # Maintainer: Lukas Jirkovsky # Contributor: Bogdan Szczurek # Contributor: Vaclav Kramar # Contributor: Archie pkgname=rawtherapee -pkgver=3.1m5 +pkgver=3.1m6 pkgrel=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64') url="http://www.rawtherapee.com/" license=('GPL') -depends=('bzip2' 'libsigc++' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils') +depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils') makedepends=('mercurial' 'cmake') install=rawtherapee.install source=(rawtherapee.desktop rawtherapee.png) @@ -47,7 +47,6 @@ build() { cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DWITH_MYFILE_MMAP=OFF \ ../$_repo make } diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 99ccde3a0..ca6bff6ee 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 47286 2011-05-20 18:13:22Z ibiru $ +# $Id: PKGBUILD 49114 2011-06-11 08:28:49Z ibiru $ #Maintainer: Ionut Biru pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') pkgver=4.0.8 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -17,7 +17,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh 18-system-xorg.patch change_default_driver_dir.patch) -_kernver=2.6.38-ARCH +_kernver=2.6.39-ARCH build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" @@ -179,7 +179,7 @@ package_virtualbox-guest-modules(){ pkgdesc="VirtualBox kernel modules for Linux guests" license=('GPL') install=virtualbox-guest-modules.install - depends=('kernel26>=2.6.38' 'kernel26<2.6.39') + depends=('kernel26>=2.6.39' 'kernel26<2.6.40') replaces=('virtualbox-ose-additions-modules') conflicts=('virtualbox-ose-additions-modules') diff --git a/community/virtualbox/virtualbox-guest-modules.install b/community/virtualbox/virtualbox-guest-modules.install index 3681c28e3..ae05bd1ba 100644 --- a/community/virtualbox/virtualbox-guest-modules.install +++ b/community/virtualbox/virtualbox-guest-modules.install @@ -1,4 +1,4 @@ -KERNEL_VERSION='2.6.38-ARCH' +KERNEL_VERSION='2.6.39-ARCH' post_install() { cat << EOM diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD new file mode 100644 index 000000000..b71a1557d --- /dev/null +++ b/community/wine/PKGBUILD @@ -0,0 +1,145 @@ +# $Id: PKGBUILD 49102 2011-06-11 03:15:30Z svenstaro $ +# Maintainer: Sven-Hendrik Haase +# Contributor: Jan "heftig" Steffens +# Contributor: Eduardo Romero +# Contributor: Giovanni Scafora + +pkgname=wine +pkgver=1.3.22 +pkgrel=1 + +_pkgbasever=${pkgver/rc/-rc} + +source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) +md5sums=('46f313013644d31ad37b8fc5c2c16467') + +pkgdesc="A compatibility layer for running Windows programs" +url="http://www.winehq.com" +arch=(i686 x86_64) +license=(LGPL) +install=wine.install + +depends=( + fontconfig lib32-fontconfig + mesa lib32-mesa + libxcursor lib32-libxcursor + libxrandr lib32-libxrandr + libxdamage lib32-libxdamage + libxxf86dga lib32-libxxf86dga + libxi lib32-libxi + alsa-lib lib32-alsa-lib + desktop-file-utils +) + +makedepends=(autoconf ncurses bison perl fontforge flex prelink + 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' + giflib lib32-giflib + libxpm lib32-libxpm + libpng lib32-libpng + libxinerama lib32-libxinerama + libxcomposite lib32-libxcomposite + libxmu lib32-libxmu + libxxf86vm lib32-libxxf86vm + libxml2 lib32-libxml2 + libxslt lib32-libxslt + libldap lib32-libldap + lcms lib32-lcms + mpg123 lib32-mpg123 + openal lib32-openal + jack lib32-jack + libcups lib32-libcups + gnutls lib32-gnutls + v4l-utils lib32-v4l-utils + oss +) + +optdepends=( + giflib lib32-giflib + libpng lib32-libpng + libldap lib32-libldap + lcms lib32-lcms + libxml2 lib32-libxml2 + mpg123 lib32-mpg123 + openal lib32-openal + jack lib32-jack + libcups lib32-libcups + gnutls lib32-gnutls + v4l-utils lib32-v4l-utils + oss +) + +if [[ $CARCH == i686 ]]; then + # Strip lib32 etc. on i686 + depends=(${depends[@]/*32-*/}) + makedepends=(${makedepends[@]/*32-*/}) + makedepends=(${makedepends[@]/*-multilib*/}) + optdepends=(${optdepends[@]/*32-*/}) +else + provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") + conflicts=('bin32-wine' 'wine-wow64') + replaces=('bin32-wine') +fi + +build() { + cd "$srcdir" + + # Allow ccache to work + mv $pkgname-$_pkgbasever $pkgname + + # Get rid of old build dirs + rm -rf $pkgname-{32,64}-build + mkdir $pkgname-32-build + + if [[ $CARCH == x86_64 ]]; then + msg2 "Building Wine-64..." + + mkdir $pkgname-64-build + cd "$srcdir/$pkgname-64-build" + ../$pkgname/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --with-x \ + --enable-win64 + + make + + _wine32opts=( + --libdir=/usr/lib32 + --with-wine64="$srcdir/$pkgname-64-build" + ) + + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + + msg2 "Building Wine-32..." + cd "$srcdir/$pkgname-32-build" + ../$pkgname/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-x \ + "${_wine32opts[@]}" + + make +} + +package() { + msg2 "Packaging Wine-32..." + cd "$srcdir/$pkgname-32-build" + + if [[ $CARCH == i686 ]]; then + make prefix="$pkgdir/usr" install + else + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib32" \ + dlldir="$pkgdir/usr/lib32/wine" install + + msg2 "Packaging Wine-64..." + cd "$srcdir/$pkgname-64-build" + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib" \ + dlldir="$pkgdir/usr/lib/wine" install + fi +} + +# vim:set ts=8 sts=2 sw=2 et: diff --git a/community/wine/wine.install b/community/wine/wine.install new file mode 100644 index 000000000..f71262186 --- /dev/null +++ b/community/wine/wine.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." + echo "If you are on x86_64, the default WINEARCH will be win64." + echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." + echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." + echo "See the Arch wiki on wine for more information." +} + +post_remove() { + update-desktop-database -q +} diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 8fdbe0149..6d75f0659 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126199 2011-06-02 14:37:57Z bisson $ +# $Id: PKGBUILD 127042 2011-06-10 00:56:53Z bisson $ # Maintainer: Allan McRae # Contributor: judd pkgname=coreutils pkgver=8.12 -pkgrel=2 +pkgrel=3 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') license=('GPL3') @@ -35,8 +35,8 @@ build() { autoreconf -v ./configure --prefix=/usr \ - --enable-install-program=su,hostname \ - --enable-no-install-program=groups,kill,uptime \ + --enable-install-program=su \ + --enable-no-install-program=groups,hostname,kill,uptime \ --enable-pam make } @@ -54,8 +54,8 @@ package() { install -dm755 ${pkgdir}/{bin,usr/sbin} # binaries required by FHS - _fhs="cat chgrp chmod chown cp date dd df echo false hostname \ - ln ls mkdir mknod mv pwd rm rmdir stty su sync true uname" + _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \ + mkdir mknod mv pwd rm rmdir stty su sync true uname" mv ${_fhs} ${pkgdir}/bin # binaries required by various Arch scripts diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD index d9b2380bc..6a81124ea 100644 --- a/core/net-tools/PKGBUILD +++ b/core/net-tools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 126212 2011-06-02 16:50:35Z bisson $ +# $Id: PKGBUILD 127037 2011-06-10 00:48:19Z bisson $ # Maintainer: judd pkgname=net-tools pkgver=1.60 -pkgrel=16 +pkgrel=18 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64) license=('GPL') @@ -14,13 +14,7 @@ source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 net-tools-1.60-nameif.patch net-tools-1.60-nameif_strncpy.patch) options=(!makeflags) -md5sums=('888774accab40217dde927e21979c165' - '7ef8d0c6818faa0fdeea94970a20e3fb' - 'b52d899cba9956bb0055150506f41ac1' - '51de6eabe2d6d6dc860f72c41cee636b' - 'c16109863bc63f3dad4ef35305a340bb' - '29a32617382fab1735acba4d920f1fcd' - 'e66466b9304dac85eb42b32f1ec3b284') +install=net-tools.install build() { cd $srcdir/$pkgname-$pkgver @@ -37,7 +31,14 @@ package() { cd $srcdir/$pkgname-$pkgver make BASEDIR=$pkgdir update - # the following is provided by yp-tools and coreutils - rm "${pkgdir}"/bin/{{,dns,nis,yp}domainname,hostname} - rm "${pkgdir}"/usr/share/man/man1/{{,dns,nis,yp}domainname,hostname}.1 + # the following is provided by yp-tools + rm "${pkgdir}"/bin/{nis,yp}domainname + rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1 } +md5sums=('888774accab40217dde927e21979c165' + '7ef8d0c6818faa0fdeea94970a20e3fb' + 'b52d899cba9956bb0055150506f41ac1' + '51de6eabe2d6d6dc860f72c41cee636b' + 'c16109863bc63f3dad4ef35305a340bb' + '29a32617382fab1735acba4d920f1fcd' + 'e66466b9304dac85eb42b32f1ec3b284') diff --git a/core/net-tools/net-tools.install b/core/net-tools/net-tools.install new file mode 100644 index 000000000..9eee9e51b --- /dev/null +++ b/core/net-tools/net-tools.install @@ -0,0 +1,12 @@ +post_upgrade() { + if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then + echo "hostname and {,yp,nis}domainname has moved:" + echo "----------" + echo "hostname is now in coreutils" + echo "domainname is now in yp-tools" + echo "their functionality might have changed slightly" + echo "" + echo "dnsdomainname remains in net-tools" + echo "----------" + fi +} diff --git a/extra/enchant/PKGBUILD b/extra/enchant/PKGBUILD index 1f95981e7..2edd15320 100644 --- a/extra/enchant/PKGBUILD +++ b/extra/enchant/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 126152 2011-06-01 20:31:07Z andyrtr $ +# $Id: PKGBUILD 127251 2011-06-11 20:47:42Z andrea $ # Maintainer: Andrea Scarpino # Contributor: dorphell pkgname=enchant pkgver=1.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="A wrapper library for generic spell checking" arch=('i686' 'x86_64') url="http://www.abisource.com/enchant/" license=('LGPL') depends=('aspell' 'dbus-glib' 'hunspell') makedepends=('hspell') +optdepends=('hspell: Hebrew dictionary') options=('!libtool') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") md5sums=('de11011aff801dc61042828041fb59c7') diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index 3186db961..02c404210 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120232 2011-04-21 15:58:14Z ibiru $ +# $Id: PKGBUILD 127195 2011-06-11 08:04:12Z ibiru $ # Maintainer: Paul Mattal # Contributer: Martin Kemp pkgname=ethtool -pkgver=2.6.38 +pkgver=2.6.39 pkgrel=1 epoch=1 pkgdesc="gkernel ethtool" @@ -11,7 +11,7 @@ url="http://www.kernel.org/pub/software/network/ethtool/" license=('GPL') depends=('glibc') source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('4cc35c59e4fd0defff768f9f59fa41ad') +md5sums=('97211a1e3a496bc3bd0b75849d0fbae9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD index 046dca618..daf711480 100644 --- a/extra/exo/PKGBUILD +++ b/extra/exo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123595 2011-05-11 17:34:16Z andyrtr $ +# $Id: PKGBUILD 127211 2011-06-11 09:02:27Z andyrtr $ # Maintainer: AndyRTR # Contributor: tobias # Contributor: Aurelien Foret pkgname=exo -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Extensions to Xfce by os-cillation" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('perl-uri: for mail-compose helper script') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2ae3d9a9dedc3adebb748fa8724e02ce') +md5sums=('e25333df350abc30999cd16fe96ab690') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD index 21b65a2b2..22b0043ac 100644 --- a/extra/hplip/PKGBUILD +++ b/extra/hplip/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 116953 2011-03-26 16:48:46Z tpowa $ -# Maintainer : Tobias Powalowski +# $Id: PKGBUILD 127207 2011-06-11 09:02:04Z remy $ +# Maintainer : Rémy Oudompheng # Contributor: Morgan LEFIEUX pkgname=hplip -pkgver=3.11.3 +pkgver=3.11.5 pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('i686' 'x86_64') @@ -19,14 +19,17 @@ optdepends=('cups: for printing support' 'python-notify: for Desktop notification support' 'rpcbind: for network support' 'python2-qt: for running hp-toolbox' - 'pygobject: for running hp-toolbox') + 'pygobject: for running hp-toolbox' + 'hplip-plugin: binary blobs for specific devices') replaces=('hpijs') options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz) +md5sums=('0a3d0f46ec89857b4c0feea6923864f1') build() { cd "$srcdir/$pkgname-$pkgver" + export PYTHON=python2 find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + ./configure --prefix=/usr \ --enable-qt4 \ @@ -56,6 +59,9 @@ package() { # remove lp user, it's not used on archlinux sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules" # fix sysfs rules - sed -i -e "s|SYSFS|ATTRS|g" -e "s|sysfs|attrs|g" "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules" + sed -i -e "s|SYSFS|ATTR|g" \ + -e "s|sysfs|attr|g" \ + -e 's|"bin/sh|"/bin/sh|g' \ + "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules" } -md5sums=('9a2f39cb02214ee0def550defac0d240') + diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD index 1008b2723..201e916fa 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 118049 2011-04-05 07:45:38Z jgc $ +# $Id: PKGBUILD 127217 2011-06-11 09:10:14Z ibiru $ # Maintainer: Paul Mattal pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=2 +pkgrel=4 epoch=1 -_kernver=2.6.38-ARCH +_kernver=2.6.39-ARCH arch=('i686' 'x86_64') url="http://www.lirc.org/" license=('GPL') -makedepends=('help2man' 'kernel26-headers>=2.6.38' 'kernel26-headers<2.6.39' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python') +makedepends=('help2man' 'kernel26-headers>=2.6.39' 'kernel26-headers<2.6.40' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 + lirc_wpc8769l.patch + lircd-handle-large-config.patch + lirc_atiusb-kfifo.patch + kernel-2.6.39.patch lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd) md5sums=('b232aef26f23fe33ea8305d276637086' + '1cce37e18e3f6f46044abab29016d18f' + 'b70cc9640505205446ec47b7d4779f38' + '1f8b104a2365d9f93404b143f499059b' + '087a7d102e1c96bf1179f38db2b0b237' '8d0e238dc0eda95e340fe570605da492' '85f7fdac55e5256967241864049bf5e9' '3deb02604b37811d41816e9b4385fcc3' @@ -24,6 +32,10 @@ md5sums=('b232aef26f23fe33ea8305d276637086' build() { cd "${srcdir}/lirc-${pkgver}" + patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch" + patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" + patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch" + patch -Np1 -i "${srcdir}/kernel-2.6.39.patch" sed -i '/AC_PATH_XTRA/d' configure.ac sed -e 's/@X_CFLAGS@//g' \ @@ -48,7 +60,7 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'kernel26>=2.6.38' 'kernel26<2.6.39') + depends=('lirc-utils' 'kernel26>=2.6.39' 'kernel26<2.6.40') replaces=('lirc+pctv') install=lirc.install @@ -66,6 +78,7 @@ package_lirc-utils() { depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip' '!libtool') + backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') cd "${srcdir}/lirc-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/lirc/kernel-2.6.39.patch b/extra/lirc/kernel-2.6.39.patch new file mode 100644 index 000000000..7353d61ca --- /dev/null +++ b/extra/lirc/kernel-2.6.39.patch @@ -0,0 +1,54 @@ +diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c +--- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c 2011-06-07 17:02:20.356580306 +0200 +@@ -48,7 +48,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c +--- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c 2011-06-07 17:04:19.725933627 +0200 +@@ -555,8 +555,8 @@ + kfree(ir); + return -EINVAL; + } +- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n", +- adap->id, addr, ir->c.name); ++ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n", ++ addr, ir->c.name); + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) + /* register device */ +diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c +--- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-06-07 17:07:23.984935411 +0200 +@@ -361,14 +361,14 @@ + size = count << 3; + + ldata = (unsigned long *) data_buf; +- next_one = generic_find_next_le_bit(ldata, size, 0); ++ next_one = find_next_zero_bit_le(ldata, size, 0); + + if (next_one > 0) + put_pulse_bit(next_one + * WPC8769L_USECS_PER_BIT); + + while (next_one < size) { +- next_zero = generic_find_next_zero_le_bit(ldata, ++ next_zero = find_next_zero_bit_le(ldata, + size, next_one + 1); + + put_space_bit( +@@ -376,7 +376,7 @@ + * WPC8769L_USECS_PER_BIT); + + if (next_zero < size) { +- next_one = generic_find_next_le_bit(ldata, ++ next_one = find_next_bit_le(ldata, + size, next_zero + 1); + + put_pulse_bit( diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install index 61151ecf5..26fb1391e 100644 --- a/extra/lirc/lirc.install +++ b/extra/lirc/lirc.install @@ -1,4 +1,4 @@ -KERNEL_VERSION=2.6.38-ARCH +KERNEL_VERSION=2.6.39-ARCH post_install() { # updating module dependencies diff --git a/extra/lirc/lirc_atiusb-kfifo.patch b/extra/lirc/lirc_atiusb-kfifo.patch new file mode 100644 index 000000000..a64984dce --- /dev/null +++ b/extra/lirc/lirc_atiusb-kfifo.patch @@ -0,0 +1,31 @@ +From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001 +From: Jason Martin +Date: Fri, 3 Jun 2011 00:12:51 -0400 +Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo + +I came across posts with regards to lirc_atiusb and its compatibility +with newer kernels, and their use of kfifo.I spent a little bit of time +this evening, and was able to correct the issues with the driver, and +now have a functioning lirc_atiusb device under the 2.6.38 kernel. + +Signed-off-by: Jarod Wilson +--- + drivers/lirc_atiusb/lirc_atiusb.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c +index 52080de..bf2b631 100644 +--- a/drivers/lirc_atiusb/lirc_atiusb.c ++++ b/drivers/lirc_atiusb/lirc_atiusb.c +@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf) + goto new_irctl_failure_check; + } + +- if (lirc_buffer_init(driver->rbuf, dclen, 1)) { ++ if (lirc_buffer_init(driver->rbuf, dclen, 2)) { + mem_failure = 4; + goto new_irctl_failure_check; + } +-- +1.7.0.1 + diff --git a/extra/lirc/lirc_wpc8769l.patch b/extra/lirc/lirc_wpc8769l.patch new file mode 100644 index 000000000..e4e2a049b --- /dev/null +++ b/extra/lirc/lirc_wpc8769l.patch @@ -0,0 +1,88 @@ +From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= +Date: Wed, 30 Mar 2011 16:46:35 -0400 +Subject: [PATCH] Make lirc_wpc8769l functional again + +Signed-off-by: Jarod Wilson +--- + drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++----------- + 1 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +index f820d11..4d04063 100644 +--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c ++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +@@ -816,10 +816,6 @@ static int set_use_inc(void *data) + /* Reset last timeout value. */ + lastus = 0; + +- /* Init the read buffer. */ +- if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) +- return -ENOMEM; +- + /* Acquire the IRQ. */ + result = request_irq(irq, irq_handler, + IRQF_DISABLED | IRQF_SHARED, +@@ -863,9 +859,6 @@ static void set_use_dec(void *data) + /* Free the IRQ. */ + free_irq(irq, THIS_MODULE); + dprintk("Freed IRQ %d\n", irq); +- +- /* Free the RX buffer. */ +- lirc_buffer_free(&rbuf); + } + + static struct lirc_driver driver = { +@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void) + /* Do load-time checks. */ + wpc8769l_power_up_and_check_if_we_woke_us_up(); + ++ /* Init the read buffer. */ ++ if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) { ++ rc = -ENOMEM; ++ goto exit_platform_exit; ++ } ++ + /* Configure the driver hooks. */ + driver.features = LIRC_CAN_REC_MODE2; ++ driver.dev = &lirc_wpc8769l_platform_dev->dev; + driver.minor = lirc_register_driver(&driver); + if (driver.minor < 0) { + eprintk("lirc_register_driver failed!\n"); + rc = -EIO; +- goto exit_platform_exit; ++ goto exit_release_buffer; + } + + iprintk("Driver loaded.\n"); + + return 0; /* Everything OK. */ + ++exit_release_buffer: ++ lirc_buffer_free(&rbuf); ++ + exit_platform_exit: + lirc_wpc8769l_platform_exit(); + +@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init); + + static void __exit lirc_wpc8769l_module_exit(void) + { +- /* Unregister the platform driver and device. */ +- lirc_wpc8769l_platform_exit(); +- + /* Unregister the LIRC driver. */ + lirc_unregister_driver(driver.minor); + ++ /* Free the buffer. */ ++ lirc_buffer_free(&rbuf); ++ ++ /* Unregister the platform driver and device. */ ++ lirc_wpc8769l_platform_exit(); ++ + /* Release the second range. */ + if (baseport2) + release_region(baseport2, WPC8769L_IO_REGION_2_SIZE); +-- +1.7.0.1 + diff --git a/extra/lirc/lircd-handle-large-config.patch b/extra/lirc/lircd-handle-large-config.patch new file mode 100644 index 000000000..85bc20518 --- /dev/null +++ b/extra/lirc/lircd-handle-large-config.patch @@ -0,0 +1,39 @@ +From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001 +From: Jarod Wilson +Date: Wed, 6 Apr 2011 11:04:12 -0400 +Subject: [PATCH] lircd: handle larger config files in write_socket better + +Pointed out by Michael Zanetti on list, irsend LIST has issues with long +config files, which didn't exist in maintainer mode, as we were using a +do while loop to make sure we spit out everything. Just use that loop +all the time. + +Signed-off-by: Jarod Wilson +--- + daemons/lircd.c | 8 ++------ + 1 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/daemons/lircd.c b/daemons/lircd.c +index 6c21a3a..ddcca05 100644 +--- a/daemons/lircd.c ++++ b/daemons/lircd.c +@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len) + int done, todo = len; + + while (todo) { +-#ifdef SIM_REC + do { + done = write(fd, buf, todo); +- } +- while (done < 0 && errno == EAGAIN); +-#else +- done = write(fd, buf, todo); +-#endif ++ } while (done < 0 && errno == EAGAIN); ++ + if (done <= 0) + return (done); + buf += done; +-- +1.7.0.1 + diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index a617eb19e..eac2509d0 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 126496 2011-06-05 16:47:00Z guillaume $ +# $Id: PKGBUILD 127256 2011-06-11 21:34:35Z guillaume $ # Maintainer: Guillaume ALAUX # Contributor: Florian Pritz pkgname=(wireshark-cli wireshark-gtk) pkgbase=wireshark -pkgver=1.4.7 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua') url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('b5065426d5524ddc1667314f8256c2b1') +md5sums=('9f9314c89bf1c8b440a7909884838cfd') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -20,7 +20,7 @@ build() { ./configure \ --prefix=/usr \ --with-ssl \ - --with-zlib=no \ + --with-zlib=yes \ --with-lua make all } diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index b2af0eaf1..89f6755fb 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Figue # Contributor: Figue # Contributor (Parabola): fauno -# Contrubutor (Parabola): vando +# Contributor (Parabola): vando # Thank you very much to the older contributors: # Contributor: evr # Contributor: Muhammad 'MJ' Jassim @@ -20,7 +20,7 @@ pkgname=icecat pkgver=4.0.1 -pkgrel=1 +pkgrel=2 _xulver=2.0.1 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') @@ -28,9 +28,9 @@ url="http://www.gnu.org/software/gnuzilla/" license=('GPL2' 'MPL' 'LGPL') depends=("xulrunner=${_xulver}" 'desktop-file-utils') makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') -provides=('firefox') +provides=("firefox=${pkgver}") conflicts=('firefox') -replaces=("firefox=${pkgver}") +replaces=('firefox') install=icecat.install source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz mozconfig diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index bb255b4aa..a6a3abecb 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -6,7 +6,7 @@ pkgname=initscripts pkgver=2011.06.4 -pkgrel=1.1 +pkgrel=2 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('i686' 'x86_64') url="http://parabolagnulinux.org" @@ -22,7 +22,7 @@ optdepends=('bridge-utils: Network bridging support' install=initscripts.install source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" 'wireless.conf.d') -md5sums=('de758f8da0552555135f53bd7184966a' +md5sums=('df73e4c4043d4eaf6502ca6738c549aa' '027576534885b8d5dded9be546057b12') package() { diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index f5958c7da..e1ed19461 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48898 2011-06-07 12:25:15Z heftig $ +# $Id: PKGBUILD 49129 2011-06-11 13:29:12Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Jan de Groot # Contributor: Allan McRae @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.14 -pkgrel=1 +pkgrel=2 _glibcdate=20110605 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -26,6 +26,7 @@ source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-futex.patch glibc-2.14-libdl-crash.patch + glibc-2.14-revert-4462fad3.patch lib32-glibc.conf) md5sums=('a96742599fc8a99e52b9e344f39a1000' '4dadb9203b69a3210d53514bb46f41c3' @@ -35,6 +36,7 @@ md5sums=('a96742599fc8a99e52b9e344f39a1000' 'b042647ea7d6f22ad319e12e796bd13e' '7d0154b7e17ea218c9fa953599d24cc4' 'cea62cc6b903d222c5f26e05a3c0e0e6' + '46e56492cccb1c9172ed3a235cf43c6c' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -65,6 +67,10 @@ build() { # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch + # revert fix for http://sourceware.org/bugzilla/show_bug.cgi?id=12684 + # as it causes crashes (FS#24615) + patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch + cd ${srcdir} mkdir glibc-build cd glibc-build @@ -119,7 +125,7 @@ package() { usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib32/{pt_chown,gconv/*.so} + usr/lib32/{pt_chown,{audit,gconv}/*.so} # Dynamic linker install -d -m755 ${pkgdir}/lib diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch new file mode 100644 index 000000000..d71e37492 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch @@ -0,0 +1,37 @@ +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c +--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 ++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 +@@ -549,7 +549,7 @@ + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or +@@ -1275,14 +1275,10 @@ + (*thisresplenp > *thisanssizp) + ? *thisanssizp : *thisresplenp); + +- if (recvresp1 || (buf2 != NULL && recvresp2)) { +- *resplen2 = 0; ++ if (recvresp1 || (buf2 != NULL && recvresp2)) + return resplen; +- } + if (buf2 != NULL) + { +- /* No data from the first reply. */ +- resplen = 0; + /* We are waiting for a possible second reply. */ + if (hp->id == anhp->id) + recvresp1 = 1; diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD index 51a4b2ae0..3c31ac43a 100644 --- a/testing/glibc/PKGBUILD +++ b/testing/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126794 2011-06-07 10:57:24Z allan $ +# $Id: PKGBUILD 127202 2011-06-11 08:46:22Z allan $ # Maintainer: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.14 -pkgrel=1 +pkgrel=2 _glibcdate=20110605 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -27,6 +27,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-futex.patch glibc-2.14-libdl-crash.patch + glibc-2.14-revert-4462fad3.patch nscd locale.gen.txt locale-gen) @@ -38,6 +39,7 @@ md5sums=('a96742599fc8a99e52b9e344f39a1000' 'b042647ea7d6f22ad319e12e796bd13e' '7d0154b7e17ea218c9fa953599d24cc4' 'cea62cc6b903d222c5f26e05a3c0e0e6' + '46e56492cccb1c9172ed3a235cf43c6c' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -79,6 +81,10 @@ build() { # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch + # revert fix for http://sourceware.org/bugzilla/show_bug.cgi?id=12684 + # as it causes crashes (FS#24615) + patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -165,8 +171,5 @@ package() { lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ lib/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib/{pt_chown,gconv/*.so} - -# add usr/lib/audit/sotruss-lib.so, usr/bin/sotruss - + usr/lib/{pt_chown,{audit,gconv}/*.so} } diff --git a/testing/glibc/glibc-2.14-revert-4462fad3.patch b/testing/glibc/glibc-2.14-revert-4462fad3.patch new file mode 100644 index 000000000..d71e37492 --- /dev/null +++ b/testing/glibc/glibc-2.14-revert-4462fad3.patch @@ -0,0 +1,37 @@ +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c +--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 ++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 +@@ -549,7 +549,7 @@ + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or +@@ -1275,14 +1275,10 @@ + (*thisresplenp > *thisanssizp) + ? *thisanssizp : *thisresplenp); + +- if (recvresp1 || (buf2 != NULL && recvresp2)) { +- *resplen2 = 0; ++ if (recvresp1 || (buf2 != NULL && recvresp2)) + return resplen; +- } + if (buf2 != NULL) + { +- /* No data from the first reply. */ +- resplen = 0; + /* We are waiting for a possible second reply. */ + if (hp->id == anhp->id) + recvresp1 = 1; diff --git a/testing/python2/PKGBUILD b/testing/python2/PKGBUILD new file mode 100644 index 000000000..f1c56f85d --- /dev/null +++ b/testing/python2/PKGBUILD @@ -0,0 +1,87 @@ +# $Id: PKGBUILD 127261 2011-06-12 03:23:25Z stephane $ +# Maintainer: Stéphane Gaudreault +# Contributer: Allan McRae +# Contributer: Jason Chu + +pkgname=python2 +pkgver=2.7.2 +pkgrel=1 +_pybasever=2.7 +pkgdesc="A high-level scripting language" +arch=('i686' 'x86_64') +license=('PSF') +url="http://www.python.org/" +depends=('db' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' '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 + python-2.7-db51.patch) +sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53' + '9667a2a2f8594902b352793e649f78696a77bd13') + +build() { + cd "${srcdir}/Python-${pkgver}" + + patch -Np1 -i ../python-2.7-db51.patch + + # 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 SQLite3 module to load extensions (fix FS#22122) + sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py + + # FS#2399 + 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 + + 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/testing/python2/python-2.7-db51.patch b/testing/python2/python-2.7-db51.patch new file mode 100644 index 000000000..2da95c375 --- /dev/null +++ b/testing/python2/python-2.7-db51.patch @@ -0,0 +1,42 @@ +diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c +--- Python-2.7-orig//Modules/_bsddb.c 2010-05-10 00:46:46.000000000 +1000 ++++ Python-2.7/Modules/_bsddb.c 2010-10-20 13:19:26.436669911 +1000 +@@ -9765,8 +9765,11 @@ + + ADD_INT(d, DB_REP_PERMANENT); + +-#if (DBVER >= 44) ++#if (DBVER >= 44) && (DBVER <= 48) + ADD_INT(d, DB_REP_CONF_NOAUTOINIT); ++#endif ++ ++#if (DBVER >= 44) + ADD_INT(d, DB_REP_CONF_DELAYCLIENT); + ADD_INT(d, DB_REP_CONF_BULK); + ADD_INT(d, DB_REP_CONF_NOWAIT); +diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py +--- Python-2.7-orig//setup.py 2010-06-27 22:36:16.000000000 +1000 ++++ Python-2.7/setup.py 2010-10-20 13:10:48.256670026 +1000 +@@ -765,7 +765,7 @@ + # a release. Most open source OSes come with one or more + # versions of BerkeleyDB already installed. + +- max_db_ver = (4, 8) ++ max_db_ver = (5, 1) + min_db_ver = (4, 1) + db_setup_debug = False # verbose debug prints from this script? + +@@ -787,8 +787,12 @@ + return True + + def gen_db_minor_ver_nums(major): +- if major == 4: ++ if major == 5: + for x in range(max_db_ver[1]+1): ++ if allow_db_ver((5, x)): ++ yield x ++ if major == 4: ++ for x in range(9): + if allow_db_ver((4, x)): + yield x + elif major == 3: diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD index 40784dcb7..19cb12294 100644 --- a/testing/subversion/PKGBUILD +++ b/testing/subversion/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 126240 2011-06-02 20:16:49Z stephane $ +# $Id: PKGBUILD 127222 2011-06-11 09:32:25Z andrea $ # Maintainer: Paul Mattal # Contributor: Jason Chu pkgname=subversion pkgver=1.6.17 -pkgrel=3 +pkgrel=4 pkgdesc="Replacement for CVS, another versioning system (SVN)" arch=('i686' 'x86_64') license=('apache' 'bsd') -depends=('neon' 'apr-util') +depends=('neon' 'apr-util' 'sqlite3') makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' - 'autoconf' 'sqlite3' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') + 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 svnserve svn svnserve.conf svnmerge.py subversion.rpath.fix.patch -- cgit v1.2.3-54-g00ecf