summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcommunity/e-modules-extra-svn/PKGBUILD2
-rwxr-xr-xcommunity/e-svn/PKGBUILD4
-rwxr-xr-xcommunity/e_dbus-svn/PKGBUILD4
-rwxr-xr-xcommunity/ecore-svn/PKGBUILD4
-rwxr-xr-xcommunity/edje-svn/PKGBUILD4
-rwxr-xr-xcommunity/eet-svn/PKGBUILD4
-rw-r--r--community/eeze-svn/PKGBUILD2
-rwxr-xr-xcommunity/efreet-svn/PKGBUILD4
-rwxr-xr-xcommunity/eina-svn/PKGBUILD4
-rw-r--r--community/elementary-svn/PKGBUILD7
-rwxr-xr-xcommunity/embryo-svn/PKGBUILD6
-rwxr-xr-xcommunity/evas-svn/PKGBUILD4
-rw-r--r--community/gnunet-gtk/PKGBUILD10
-rw-r--r--community/gnunet/PKGBUILD9
-rw-r--r--community/gnunet/gnunet.install7
-rw-r--r--community/gnunet/gnunet.rc8
-rw-r--r--community/libexosip2/PKGBUILD9
-rw-r--r--community/libosip2/PKGBUILD6
-rw-r--r--community/linphone/PKGBUILD4
-rw-r--r--community/nut/PKGBUILD4
-rw-r--r--community/perl-berkeleydb/PKGBUILD6
-rw-r--r--community/usb_modeswitch/PKGBUILD10
-rw-r--r--core/nilfs-utils/PKGBUILD20
-rw-r--r--extra/desktop-file-utils/PKGBUILD9
-rw-r--r--extra/gob2/PKGBUILD18
-rw-r--r--extra/gphoto2/PKGBUILD12
-rw-r--r--extra/hwloc/PKGBUILD6
-rw-r--r--extra/libgphoto2/PKGBUILD22
-rw-r--r--extra/minicom/PKGBUILD10
-rw-r--r--extra/nss/PKGBUILD7
-rw-r--r--extra/nss/bug702090.patch20
-rw-r--r--extra/openconnect/PKGBUILD6
-rw-r--r--extra/smplayer/PKGBUILD22
-rw-r--r--extra/smplayer/smplayer.install12
-rw-r--r--multilib-testing/lib32-glibc/PKGBUILD16
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch27
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch229
-rw-r--r--testing/glibc/PKGBUILD16
-rw-r--r--testing/glibc/glibc-2.15-lddebug-scopes.patch27
-rw-r--r--testing/glibc/glibc-2.15-revert-c5a0802a.patch229
40 files changed, 702 insertions, 128 deletions
diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD
index a75ffb68e..3bedc783f 100755
--- a/community/e-modules-extra-svn/PKGBUILD
+++ b/community/e-modules-extra-svn/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=e-modules-extra-svn
-pkgver=64772
+pkgver=66402
pkgrel=1
pkgdesc="Extra gadgets for e17"
arch=('i686' 'x86_64')
diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD
index d37772530..0af60fa68 100755
--- a/community/e-svn/PKGBUILD
+++ b/community/e-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# $Id: PKGBUILD 61304 2011-12-28 09:16:51Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=e-svn
-pkgver=64801
+pkgver=66577
pkgrel=1
pkgdesc="Enlightenment window manager DR17 (aka e17)"
arch=('i686' 'x86_64')
diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD
index 3c42396b4..156f5c6ec 100755
--- a/community/e_dbus-svn/PKGBUILD
+++ b/community/e_dbus-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# $Id: PKGBUILD 61302 2011-12-28 09:16:20Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=e_dbus-svn
-pkgver=64761
+pkgver=66326
pkgrel=1
pkgdesc="dbus abstraction layer for e17"
arch=('i686' 'x86_64')
diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD
index d5ee6b31c..ddf7b3fba 100755
--- a/community/ecore-svn/PKGBUILD
+++ b/community/ecore-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# $Id: PKGBUILD 61292 2011-12-28 09:13:58Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=ecore-svn
-pkgver=64802
+pkgver=66578
pkgrel=1
pkgdesc="Ecore is an abstraction layer for e17"
arch=('i686' 'x86_64')
diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD
index 4b8b9490d..64aef44fe 100755
--- a/community/edje-svn/PKGBUILD
+++ b/community/edje-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# $Id: PKGBUILD 61298 2011-12-28 09:15:21Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=edje-svn
-pkgver=64793
+pkgver=66561
pkgrel=1
pkgdesc="A graphical design and layout library based on Evas"
arch=('i686' 'x86_64')
diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD
index e53fc77d4..5bd376e54 100755
--- a/community/eet-svn/PKGBUILD
+++ b/community/eet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# $Id: PKGBUILD 61288 2011-12-28 09:12:48Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=eet-svn
-pkgver=64494
+pkgver=66148
pkgrel=1
pkgdesc="A data storage and compression library"
arch=('i686' 'x86_64')
diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD
index 6b0e871aa..acf505473 100644
--- a/community/eeze-svn/PKGBUILD
+++ b/community/eeze-svn/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: bluebugs
pkgname=eeze-svn
-pkgver=63230
+pkgver=66151
pkgrel=1
pkgdesc="A data storage and compression library"
arch=('i686' 'x86_64')
diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD
index d8b0f9208..b891a574a 100755
--- a/community/efreet-svn/PKGBUILD
+++ b/community/efreet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# $Id: PKGBUILD 61300 2011-12-28 09:15:52Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=efreet-svn
-pkgver=64137
+pkgver=66149
pkgrel=1
pkgdesc="freedesktop.org specifications for e17"
arch=('i686' 'x86_64')
diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD
index bab9bbd9b..7dd8ecc23 100755
--- a/community/eina-svn/PKGBUILD
+++ b/community/eina-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# $Id: PKGBUILD 61286 2011-12-28 09:12:19Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=eina-svn
-pkgver=64778
+pkgver=66483
pkgrel=1
pkgdesc="E17 file chunk reading/writing library"
arch=('i686' 'x86_64')
diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD
index fe53120c5..763ed2ad4 100644
--- a/community/elementary-svn/PKGBUILD
+++ b/community/elementary-svn/PKGBUILD
@@ -3,19 +3,18 @@
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=elementary-svn
-pkgver=64794
+pkgver=66566
pkgrel=1
pkgdesc="Enlightenment's basic widget set"
arch=('i686' 'x86_64')
groups=('e17-libs-svn' 'e17-svn')
url="http://www.enlightenment.org"
license=('BSD')
-depends=('ecore-svn' 'eina-svn' 'evas-svn' 'edje-svn' 'e_dbus-svn'
- 'efreet-svn')
+depends=('edje-svn' 'e_dbus-svn' 'efreet-svn')
makedepends=('subversion')
conflicts=('elementary')
provides=('elementary')
-options=(!libtool)
+options=(!libtool !emptydirs)
source=()
md5sums=()
diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD
index 1b110b70f..32083801f 100755
--- a/community/embryo-svn/PKGBUILD
+++ b/community/embryo-svn/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# $Id: PKGBUILD 61296 2011-12-28 09:14:55Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=embryo-svn
-pkgver=64802
+pkgver=66150
pkgrel=1
pkgdesc="implementation of a C like scripting language for e17"
arch=('i686' 'x86_64')
groups=('e17-libs-svn' 'e17-svn')
url="http://www.enlightenment.org"
license=('BSD')
-depends=('glibc')
+depends=('glibc' 'eina-svn')
makedepends=('svn')
conflicts=('embryo')
provides=('embryo')
diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD
index a4cf223f7..d2de06582 100755
--- a/community/evas-svn/PKGBUILD
+++ b/community/evas-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# $Id: PKGBUILD 61290 2011-12-28 09:13:15Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=evas-svn
-pkgver=64779
+pkgver=66570
pkgrel=1
pkgdesc="A hardware-accelerated canvas API for X-Windows"
arch=('i686' 'x86_64')
diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD
index e4270812d..2fee0c8bb 100644
--- a/community/gnunet-gtk/PKGBUILD
+++ b/community/gnunet-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 59850 2011-12-01 08:07:01Z spupykin $
+# $Id: PKGBUILD 61360 2011-12-28 17:15:03Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: wahnby <wahnby@yahoo.fr>
pkgname=gnunet-gtk
-pkgver=0.9.0
+pkgver=0.9.1
pkgrel=1
pkgdesc="A frontend for GNUnet"
arch=('i686' 'x86_64')
@@ -14,13 +14,13 @@ depends=('gnunet' 'glade' 'adns')
makedepends=('pkgconfig')
source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz
drop_gtk2.patch)
-md5sums=('5df53665628889a6a12d2bc323003f8d'
+md5sums=('7034d34dbc4cdb219b23873d8056bba5'
'f709c0195beffd0ca64d498be83a118b')
build() {
cd $srcdir/$pkgname-$pkgver
- patch -Np1 -i $srcdir/drop_gtk2.patch
- autoreconf -fi
+# patch -Np1 -i $srcdir/drop_gtk2.patch
+# autoreconf -fi
./configure --prefix=/usr --with-gnunet=/usr
make
}
diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD
index ae15ac88f..fa60b32b3 100644
--- a/community/gnunet/PKGBUILD
+++ b/community/gnunet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 59848 2011-12-01 08:06:10Z spupykin $
+# $Id: PKGBUILD 61358 2011-12-28 17:14:11Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: wahnby <wahnby@yahoo.fr>
pkgname=gnunet
-pkgver=0.9.0
+pkgver=0.9.1
pkgrel=1
pkgdesc="A framework for secure peer-to-peer networking"
arch=('i686' 'x86_64')
@@ -13,12 +13,13 @@ depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite3' 'curl' 'libmicrohttpd')
makedepends=('gettext' 'pkgconfig')
backup=(etc/gnunetd.conf)
options=('!libtool' '!makeflags')
+install=gnunet.install
source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz
gnunet.rc
gnunet.conf.d
defaults.conf)
-md5sums=('e114291bbaf92de085a0ac6f2bfbe54c'
- '0d62ab7f2a28af3ac082015696ee6ef3'
+md5sums=('f5ff4c6a87e7b24047319af46113e5c3'
+ '5baf691913b007fb33e365239e3f7217'
'f161b46915736e4017e77ad735521453'
'0fe23b2ca5b3fc47a0b5645e04406da0')
diff --git a/community/gnunet/gnunet.install b/community/gnunet/gnunet.install
new file mode 100644
index 000000000..b9aff1dfe
--- /dev/null
+++ b/community/gnunet/gnunet.install
@@ -0,0 +1,7 @@
+post_install() {
+ echo 'Change nobody to proper username in /etc/conf.d/gnunetd'
+}
+
+post_upgrade() {
+ echo 'Change nobody to proper username in /etc/conf.d/gnunetd'
+}
diff --git a/community/gnunet/gnunet.rc b/community/gnunet/gnunet.rc
index 34c7c5fe1..30ac4d2ad 100644
--- a/community/gnunet/gnunet.rc
+++ b/community/gnunet/gnunet.rc
@@ -6,11 +6,11 @@ GNUNETD_USER=nobody
. /etc/rc.conf
. /etc/rc.d/functions
-PID=$(pidof -o %PPID /usr/bin/gnunetd)
+PID=$(pidof -o %PPID /usr/bin/gnunet-arm)
case "$1" in
start)
- stat_busy "Starting gnunetd"
- [ -z "$PID" ] && /usr/bin/gnunetd -c /etc/gnunetd.conf -u $GNUNETD_USER 1>/dev/null 2>/dev/null &
+ stat_busy "Starting gnunet services"
+ [ -z "$PID" ] && su -c '/usr/bin/gnunet-arm -s -c /etc/gnunetd.conf' - $GNUNETD_USER 1>/dev/null 2>/dev/null &
if [ $? -gt 0 ]; then
stat_fail
else
@@ -19,7 +19,7 @@ case "$1" in
fi
;;
stop)
- stat_busy "Stopping gnunetd"
+ stat_busy "Stopping gnunet services"
[ ! -z "$PID" ] && kill $PID &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
diff --git a/community/libexosip2/PKGBUILD b/community/libexosip2/PKGBUILD
index bdf6bd5c1..60b3103ae 100644
--- a/community/libexosip2/PKGBUILD
+++ b/community/libexosip2/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 47119 2011-05-17 07:23:32Z andrea $
+# $Id: PKGBUILD 61348 2011-12-28 15:42:18Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Darwin Bautista <djclue917@gmail.com>
pkgname=libexosip2
-pkgver=3.5.0
+pkgver=3.6.0
pkgrel=1
pkgdesc="A library that hides the complexity of using SIP for multimedia session establishement"
arch=('i686' 'x86_64')
url="http://savannah.nongnu.org/projects/exosip/"
license=('GPL')
-depends=('libosip2>=3.5.0' 'openssl')
+depends=('libosip2>=3.6.0' 'openssl')
options=(!libtool)
source=(http://download.savannah.nongnu.org/releases/exosip/libeXosip2-${pkgver/_/-}.tar.gz)
-md5sums=('51e85725571870614e448f63c33c8996')
+md5sums=('6fef4c110f1305048a8b307f440933d9')
build() {
cd "$srcdir/libeXosip2-${pkgver/_/-}"
./configure --prefix=/usr
make
}
+
package() {
cd "$srcdir/libeXosip2-${pkgver/_/-}"
make DESTDIR="$pkgdir" install
diff --git a/community/libosip2/PKGBUILD b/community/libosip2/PKGBUILD
index 3e33d2ddb..e881de22b 100644
--- a/community/libosip2/PKGBUILD
+++ b/community/libosip2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 47083 2011-05-16 14:18:27Z jelle $
+# $Id: PKGBUILD 61350 2011-12-28 15:43:02Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Michal Hybner <dta081@gmail.com>
pkgname=libosip2
-pkgver=3.5.0
+pkgver=3.6.0
pkgrel=1
pkgdesc="oSIP is an implementation of SIP"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('LGPL')
depends=(glibc)
options=(!emptydirs !libtool)
source=(http://ftp.gnu.org/gnu/osip/libosip2-${pkgver/_/-}.tar.gz)
-md5sums=('7691546f6b3349d10007fc1aaff0f4e0')
+md5sums=('92fd1c1698235a798497887db159c9b3')
build() {
cd $srcdir/libosip2-${pkgver/_/-}/
diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD
index 6680f0732..0f81fe282 100644
--- a/community/linphone/PKGBUILD
+++ b/community/linphone/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61230 2011-12-25 16:57:49Z spupykin $
+# $Id: PKGBUILD 61352 2011-12-28 15:43:45Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Darwin Bautista <djclue917@gmail.com>
pkgname=linphone
pkgver=3.5.0
-pkgrel=2
+pkgrel=3
pkgdesc="A Voice-over-IP phone"
arch=('i686' 'x86_64')
url="http://www.linphone.org/index.php/eng"
diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD
index f97dc3be9..d98fa95df 100644
--- a/community/nut/PKGBUILD
+++ b/community/nut/PKGBUILD
@@ -2,14 +2,14 @@
# Contributor: Slash <demodevil5 [at] yahoo [dot] com>
pkgname=nut
-pkgver=17.4
+pkgver=17.5
pkgrel=1
pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.'
url='http://nut.sourceforge.net/'
license=('GPL')
arch=('i686' 'x86_64')
source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz")
-md5sums=('9d8b33fe0edbc54a6ebc8050dec7d56b')
+md5sums=('1b18b9fab54a778f21ee4cd95fca5c63')
build() {
cd ${pkgname}-${pkgver}
diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD
index 3a0b8f93f..eba15cdcc 100644
--- a/community/perl-berkeleydb/PKGBUILD
+++ b/community/perl-berkeleydb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56001 2011-09-28 15:01:26Z spupykin $
+# $Id: PKGBUILD 61330 2011-12-28 15:12:23Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Charles Mauch <cmauch@gmail.com>
# Contributor: Francois Charette <firmicus@gmx.net>
pkgname=perl-berkeleydb
-pkgver=0.49
+pkgver=0.50
pkgrel=1
pkgdesc="Interface to Berkeley DB version 2, 3 or 4"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL' 'PerlArtistic')
depends=('perl' 'db')
options=('!emptydirs')
source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz)
-md5sums=('8a1883f87ba82fc1614a636c8f899ea5')
+md5sums=('6afc8f49133c262c606d1b96e1412863')
build() {
cd $srcdir/BerkeleyDB-$pkgver
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index 250bbee37..a029909b8 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 58972 2011-11-20 18:14:02Z spupykin $
+# $Id: PKGBUILD 61364 2011-12-28 19:37:10Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=usb_modeswitch
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=1
_pkgdata=20111023
pkgdesc="Activating switchable USB devices on Linux."
@@ -14,8 +14,8 @@ makedepends=('gcc' 'make')
backup=("etc/$pkgname.conf")
source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2"
"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2"
- "http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
-md5sums=('1932ab96d6e3c5e0a6bdfac863338627'
+ "usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
+md5sums=('d228f74e4045e1ba05d80db4fe0f4144'
'6e7cb67d0428bda241600b038ba11aeb'
'1378c0319520c817d49c7e9457c7d6e3')
@@ -37,7 +37,7 @@ package() {
mv ${pkgdir}/lib/udev/usb_modeswitch/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch.sh
rmdir ${pkgdir}/lib/udev/usb_modeswitch
mv ${pkgdir}/lib/udev/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch
- cp $srcdir/device_reference.txt $pkgdir/etc/usb_modeswitch.setup
+ cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup
cd $srcdir/usb-modeswitch-data-${_pkgdata}
make DESTDIR=$pkgdir install
diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD
index 5821edea0..4624df060 100644
--- a/core/nilfs-utils/PKGBUILD
+++ b/core/nilfs-utils/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 122457 2011-05-04 07:52:42Z ibiru $
+# $Id: PKGBUILD 145721 2011-12-28 18:28:07Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=nilfs-utils
-pkgver=2.0.23
-pkgrel=1
+pkgver=2.1.0
+pkgrel=2
pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
arch=('i686' 'x86_64')
url="http://www.nilfs.org/"
license=('GPL2' 'LGPL2.1')
backup=('etc/nilfs_cleanerd.conf')
-depends=('util-linux-ng')
+depends=('util-linux')
options=(!libtool)
-source=(http://www.nilfs.org/download/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7f7e835d02e14642e8b7b32a36b7fab0')
+source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
+md5sums=('738f7bee062051c14dcff444bb17ada7')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --libdir=/lib
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --libdir=/lib --enable-libmount
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install LDCONFIG=/bin/true
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
}
diff --git a/extra/desktop-file-utils/PKGBUILD b/extra/desktop-file-utils/PKGBUILD
index fcc02878f..90a3cddd4 100644
--- a/extra/desktop-file-utils/PKGBUILD
+++ b/extra/desktop-file-utils/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 108960 2011-02-05 09:46:18Z andyrtr $
+# $Id: PKGBUILD 145704 2011-12-28 10:22:56Z jgc $
# Maintainer: Alexander Fehr <pizzapunk gmail com>
pkgname=desktop-file-utils
-pkgver=0.18
+pkgver=0.19
pkgrel=1
pkgdesc="Command line utilities for working with desktop entries"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
license=('GPL')
depends=('glib2')
-source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.bz2)
-md5sums=('d966b743eb394650f98d5dd56b9aece1')
+source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz)
+md5sums=('cbb2427593b7f6d36e52e9d221fce82f')
build() {
cd "${srcdir}/desktop-file-utils-${pkgver}"
@@ -22,4 +22,3 @@ package() {
cd "${srcdir}/desktop-file-utils-${pkgver}"
make DESTDIR="${pkgdir}" install
}
-
diff --git a/extra/gob2/PKGBUILD b/extra/gob2/PKGBUILD
index 72f0a35df..061325a4b 100644
--- a/extra/gob2/PKGBUILD
+++ b/extra/gob2/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 79820 2010-05-08 10:48:54Z jgc $
+# $Id: PKGBUILD 145709 2011-12-28 14:25:19Z jgc $
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Maintainer: Kevin Piche <kevin@archlinux.org>
pkgname=gob2
-pkgver=2.0.17
+pkgver=2.0.18
pkgrel=1
pkgdesc="GTK Object Builder (GOB) is a simple preprocessor for easily creating GTK objects"
arch=(i686 x86_64)
license=('GPL')
depends=('glib2')
url="http://www.5z.com/jirka/gob.html"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e9f52fff7ada88a36da1d412f8b2b57b44cc0527e545cf2f5d873c002c0da7f4')
+source=(http://ftp.5z.com/pub/gob/${pkgname}-${pkgver}.tar.xz)
+md5sums=('cd08248762962aec88100ddaaff4f9e0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD
index 87e3e619f..c4eb78927 100644
--- a/extra/gphoto2/PKGBUILD
+++ b/extra/gphoto2/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 97700 2010-11-01 13:01:49Z ibiru $
+# $Id: PKGBUILD 145713 2011-12-28 15:08:15Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Eduardo Romero <eduardo@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=gphoto2
-pkgver=2.4.10
+pkgver=2.4.11
pkgrel=1
pkgdesc="A digital camera download and access program."
arch=(i686 x86_64)
url="http://www.gphoto.org"
license=('GPL' 'LGPL')
-depends=('libgphoto2>=2.4.10' 'popt' 'aalib' 'readline>=6.1')
+depends=('libgphoto2>=2.4.11' 'popt' 'aalib' 'readline')
source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3c86c9824b9bfc57a52be5f84ad205f7')
+md5sums=('2635075f702b40eb2e95a80658bd4773')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr
make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 13f086340..fba4aecc2 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143086 2011-11-22 17:32:42Z stephane $
+# $Id: PKGBUILD 145717 2011-12-28 15:42:53Z stephane $
# Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
# Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
pkgname=hwloc
-pkgver=1.3
+pkgver=1.3.1
pkgrel=1
pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('pkg-config')
optdepends=('cairo: Graphical output' 'libxml2: XML export')
options=('!libtool' '!docs')
source=(http://www.open-mpi.org/software/hwloc/v1.3/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('4d4de0f48f8b9a1eaf75d55bc93e0e624f6194eb')
+sha1sums=('1051c937c3d2a4c98922903f313a1fa021bb35ba')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD
index 23e7d74b9..b2fe27b17 100644
--- a/extra/libgphoto2/PKGBUILD
+++ b/extra/libgphoto2/PKGBUILD
@@ -1,37 +1,35 @@
-# $Id: PKGBUILD 101286 2010-11-28 17:59:39Z ibiru $
+# $Id: PKGBUILD 145711 2011-12-28 14:52:22Z jgc $
# Maintainer: Eduardo Romero <eduardo@archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
pkgname=libgphoto2
-pkgver=2.4.10.1
-pkgrel=2
+pkgver=2.4.11
+pkgrel=1
pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
arch=(i686 x86_64)
url="http://www.gphoto.org"
license=(LGPL)
-depends=('libexif>=0.6.19' 'libjpeg>=8' 'gd' 'libtool>=2.4' 'libusb-compat')
+depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat')
install=libgphoto2.install
options=('libtool')
source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8bf2bd1e267909203ec1e7f6ea3f83a0')
+md5sums=('a2230c31e320acb7ececd90bc02fe515')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
udevscriptdir=/lib/udev ./configure --prefix=/usr --with-drivers=all --disable-static --disable-rpath
- LD_PRELOAD="" make
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
rm -f ${pkgdir}/usr/lib/libgphoto2/${pkgver}/*.a
- install -m755 -d "${pkgdir}/usr/share/hal/fdi/information/20thirdparty"
install -m755 -d "${pkgdir}/lib/udev/rules.d"
LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
- "${pkgdir}/usr/lib/libgphoto2/print-camera-list" hal-fdi > \
- "${pkgdir}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
-
- LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
- CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
"${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 group camera mode 0660 > \
"${pkgdir}/lib/udev/rules.d/40-gphoto.rules"
diff --git a/extra/minicom/PKGBUILD b/extra/minicom/PKGBUILD
index a37a33f38..cf49521bb 100644
--- a/extra/minicom/PKGBUILD
+++ b/extra/minicom/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 144449 2011-12-05 22:54:28Z giovanni $
+# $Id: PKGBUILD 145702 2011-12-28 10:18:27Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Denis Tikhomirov <dvtikhomirov@gmail.com>
pkgname=minicom
-pkgver=2.5
-pkgrel=3
+pkgver=2.6
+pkgrel=1
pkgdesc="A serial communication program"
arch=('i686' 'x86_64')
url="http://alioth.debian.org/projects/minicom/"
@@ -14,8 +14,8 @@ license=('GPL')
depends=('bash' 'ncurses')
optdepends=('lrzsz: for xmodem, ymodem and zmodem file transfer protocols')
backup=('etc/minirc.dfl')
-source=("http://alioth.debian.org/frs/download.php/3487/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a5117d4d21e2c9e825edb586ee2fe8d2')
+source=("http://alioth.debian.org/frs/download.php/3689/${pkgname}-${pkgver}.tar.gz")
+md5sums=('74088234773b9beb0a1fc2bfcc2cc5cc')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index 77d538605..0dd8f4f2d 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145236 2011-12-19 19:17:54Z jgc $
+# $Id: PKGBUILD 145700 2011-12-28 10:05:27Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=nss
pkgver=3.13.1
-pkgrel=1
+pkgrel=2
pkgdesc="Mozilla Network Security Services"
arch=(i686 x86_64)
url="http://www.mozilla.org/projects/security/pki/nss/"
@@ -14,12 +14,14 @@ makedepends=('perl')
replaces=('nss-nspr')
options=('!strip')
source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_WITH_CKBI_1_88_RTM/src/${pkgname}-${pkgver}.with.ckbi.1.88.tar.gz
+ bug702090.patch
nss-no-rpath.patch
nss.pc.in
nss-config.in
add_spi+cacert_ca_certs.patch
ssl-renegotiate-transitional.patch)
sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6'
+ '057dd510ba567d344e705062436a786beb5592b6'
'c8fcdb153af9d39689243119adb475905a657284'
'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
@@ -28,6 +30,7 @@ sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6'
build() {
cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
+ patch -Np2 -i "${srcdir}/bug702090.patch"
# Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only
patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
# Adds transitional SSL renegotiate support - patch from Debian
diff --git a/extra/nss/bug702090.patch b/extra/nss/bug702090.patch
new file mode 100644
index 000000000..e25148554
--- /dev/null
+++ b/extra/nss/bug702090.patch
@@ -0,0 +1,20 @@
+--- ./mozilla/security/nss/lib/util/pkcs11n.h.orig 2011-09-14 10:21:10.000000000 +0900
++++ ./mozilla/security/nss/lib/util/pkcs11n.h 2011-11-19 00:45:01.131860104 +0900
+@@ -346,7 +346,7 @@
+ * labels have never been accurate to what was really implemented.
+ * The new labels correctly reflect what the values effectively mean.
+ */
+-#if __GNUC__ > 3
++#if defined(__GNUC__) && (__GNUC__ > 3)
+ /* make GCC warn when we use these #defines */
+ /*
+ * This is really painful because GCC doesn't allow us to mark random
+@@ -362,7 +362,7 @@
+ * cast the resulting value to the deprecated type in the #define, thus
+ * producting the warning when the #define is used.
+ */
+-#if (__GNUC__ == 4) && (__GNUC_MINOR < 5)
++#if (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)
+ /* The mac doesn't like the friendlier deprecate messages. I'm assuming this
+ * is a gcc version issue rather than mac or ppc specific */
+ typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index 740d47484..f794241d6 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142902 2011-11-17 19:06:36Z ibiru $
+# $Id: PKGBUILD 145723 2011-12-28 18:31:54Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=openconnect
-pkgver=3.14
+pkgver=3.15
pkgrel=1
epoch=1
pkgdesc="Open client for Cisco AnyConnect VPN"
@@ -13,7 +13,7 @@ depends=('libxml2' 'openssl' 'libproxy')
makedepends=('intltool')
options=('!libtool' '!emptydirs')
source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('c7e73dfa58c7c49683c93800a3506a0f')
+md5sums=('94245f4bac42a288100becab0b4ca29a')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD
index 1646f0c75..3187681ea 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -1,35 +1,25 @@
-# $Id: PKGBUILD 98594 2010-11-11 17:27:01Z ibiru $
+# $Id: PKGBUILD 145719 2011-12-28 18:26:36Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
# Contributor: shamrok <szamrok@gmail.com>
pkgname=smplayer
-pkgver=0.6.9
-pkgrel=3
+pkgver=0.6.10
+pkgrel=1
pkgdesc="A complete front-end for MPlayer"
arch=('i686' 'x86_64')
url="http://smplayer.sourceforge.net/"
license=('GPL')
-depends=('qt>=4.7.1' 'mplayer')
+depends=('qt' 'mplayer')
+install=smplayer.install
source=(http://downloads.sourceforge.net/sourceforge/smplayer/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('dfe874b386509de5df78537489f95004')
+md5sums=('9f5ee3319bebc0ed5efe636cf7f0efad')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- # remove broken translation
- sed -i "s|translations/smplayer_gl.ts|#translations/smplayer_gl.ts|" src/smplayer.pro
-
make PREFIX=/usr
make PREFIX=${pkgdir}/usr install
-
- install -dm755 ${pkgdir}/usr/share/pixmaps
- ln -s /usr/share/icons/hicolor/64x64/apps/smplayer.png \
- ${pkgdir}/usr/share/pixmaps/
-
- sed -i 's|Exec=smplayer %U|Exec=smplayer %F|' ${pkgdir}/usr/share/applications/smplayer.desktop
- sed -i 's|Exec=smplayer -add-to-playlist %U|Exec=smplayer -add-to-playlist %F|' \
- ${pkgdir}/usr/share/applications/smplayer_enqueue.desktop
}
diff --git a/extra/smplayer/smplayer.install b/extra/smplayer/smplayer.install
new file mode 100644
index 000000000..6481cee07
--- /dev/null
+++ b/extra/smplayer/smplayer.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
index cf07c0b27..63030deb9 100644
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ b/multilib-testing/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61269 2011-12-27 21:40:57Z heftig $
+# $Id: PKGBUILD 61356 2011-12-28 16:49:01Z heftig $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
@@ -9,7 +9,7 @@
_pkgbasename=glibc
pkgname=lib32-$_pkgbasename
pkgver=2.15
-pkgrel=1
+pkgrel=2
_glibcdate=20111227
pkgdesc="GNU C Library for multilib"
arch=('x86_64')
@@ -27,6 +27,8 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda
glibc-2.14-revert-4768ae77.patch
glibc-2.14-reexport-rpc-interface.patch
glibc-2.14-reinstall-nis-rpc-headers.patch
+ glibc-2.15-lddebug-scopes.patch
+ glibc-2.15-revert-c5a0802a.patch
lib32-glibc.conf)
md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
'4dadb9203b69a3210d53514bb46f41c3'
@@ -37,6 +39,8 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
'7da8c554a3b591c7401d7023b1928afc'
'c5de2a946215d647c8af5432ec4b0da0'
'55febbb72139ac7b65757df085024b83'
+ '3c219ddfb619b6df903cac4cc42c611d'
+ '7ae3e426251ae33e73dbad71f9c91378'
'a8f4549c716cd37244fbf1ed059497f8')
build() {
@@ -73,6 +77,14 @@ build() {
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
+ # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223
+ # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (only fedora branch...)
+ patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch
+
+ # revert commit c5a0802a - causes various hangs
+ # https://bugzilla.redhat.com/show_bug.cgi?id=769421
+ patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
+
cd ${srcdir}
mkdir glibc-build
cd glibc-build
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch b/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch
new file mode 100644
index 000000000..808cf8d7c
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch
@@ -0,0 +1,27 @@
+From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@redhat.com>
+Date: Fri, 7 Oct 2011 09:31:27 +0200
+Subject: [PATCH] Horrible workaround for horribly broken software
+
+---
+ elf/rtld.c | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 978c609..8422b9f 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\
+ char *copy = malloc (len);
+ if (copy == NULL)
+ _dl_fatal_printf ("out of memory\n");
+- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
++ l->l_libname->name = memcpy (copy, dsoname, len);
++ if (GLRO(dl_debug_mask))
++ l->l_name = copy;
+ }
+
+ /* Add the vDSO to the object list. */
+--
+1.7.3.4
+
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch b/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
new file mode 100644
index 000000000..f532b95e8
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
@@ -0,0 +1,229 @@
+diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:12.937212834 +0000
++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:42.104222278 +0000
+@@ -137,7 +137,6 @@ __pthread_cond_wait:
+ cmpl $PI_BIT, %eax
+ jne 18f
+
+-90:
+ movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
+ movl %ebp, %edx
+ xorl %esi, %esi
+@@ -151,9 +150,6 @@ __pthread_cond_wait:
+ sete 16(%esp)
+ je 19f
+
+- cmpl $-EAGAIN, %eax
+- je 91f
+-
+ /* Normal and PI futexes dont mix. Use normal futex functions only
+ if the kernel does not support the PI futex functions. */
+ cmpl $-ENOSYS, %eax
+@@ -398,78 +394,6 @@ __pthread_cond_wait:
+ #endif
+ call __lll_unlock_wake
+ jmp 11b
+-
+-91:
+-.LcleanupSTART2:
+- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
+- call it again. */
+-
+- /* Get internal lock. */
+- movl $1, %edx
+- xorl %eax, %eax
+- LOCK
+-#if cond_lock == 0
+- cmpxchgl %edx, (%ebx)
+-#else
+- cmpxchgl %edx, cond_lock(%ebx)
+-#endif
+- jz 92f
+-
+-#if cond_lock == 0
+- movl %ebx, %edx
+-#else
+- leal cond_lock(%ebx), %edx
+-#endif
+-#if (LLL_SHARED-LLL_PRIVATE) > 255
+- xorl %ecx, %ecx
+-#endif
+- cmpl $-1, dep_mutex(%ebx)
+- setne %cl
+- subl $1, %ecx
+- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
+-#if LLL_PRIVATE != 0
+- addl $LLL_PRIVATE, %ecx
+-#endif
+- call __lll_lock_wait
+-
+-92:
+- /* Increment the cond_futex value again, so it can be used as a new
+- expected value. */
+- addl $1, cond_futex(%ebx)
+- movl cond_futex(%ebx), %ebp
+-
+- /* Unlock. */
+- LOCK
+-#if cond_lock == 0
+- subl $1, (%ebx)
+-#else
+- subl $1, cond_lock(%ebx)
+-#endif
+- je 93f
+-#if cond_lock == 0
+- movl %ebx, %eax
+-#else
+- leal cond_lock(%ebx), %eax
+-#endif
+-#if (LLL_SHARED-LLL_PRIVATE) > 255
+- xorl %ecx, %ecx
+-#endif
+- cmpl $-1, dep_mutex(%ebx)
+- setne %cl
+- subl $1, %ecx
+- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
+-#if LLL_PRIVATE != 0
+- addl $LLL_PRIVATE, %ecx
+-#endif
+- call __lll_unlock_wake
+-
+-93:
+- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
+- xorl %ecx, %ecx
+- movl dep_mutex(%ebx), %edi
+- jmp 90b
+-.LcleanupEND2:
+-
+ .size __pthread_cond_wait, .-__pthread_cond_wait
+ versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
+ GLIBC_2_3_2)
+@@ -642,10 +566,6 @@ __condvar_w_cleanup:
+ .long .LcleanupEND-.Lsub_cond_futex
+ .long __condvar_w_cleanup-.LSTARTCODE
+ .uleb128 0
+- .long .LcleanupSTART2-.LSTARTCODE
+- .long .LcleanupEND2-.LcleanupSTART2
+- .long __condvar_w_cleanup-.LSTARTCODE
+- .uleb128 0
+ .long .LcallUR-.LSTARTCODE
+ .long .LENDCODE-.LcallUR
+ .long 0
+Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig
+diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:04:12.941212837 +0000
++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:05:05.155229737 +0000
+@@ -23,7 +23,6 @@
+ #include <lowlevelcond.h>
+ #include <tcb-offsets.h>
+ #include <pthread-pi-defines.h>
+-#include <pthread-errnos.h>
+
+ #include <kernel-features.h>
+
+@@ -137,14 +136,11 @@ __pthread_cond_wait:
+ cmpl $PI_BIT, %eax
+ jne 61f
+
+-90:
+ movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
+ movl $SYS_futex, %eax
+ syscall
+
+ movl $1, %r8d
+- cmpq $-EAGAIN, %rax
+- je 91f
+ #ifdef __ASSUME_REQUEUE_PI
+ jmp 62f
+ #else
+@@ -331,70 +327,6 @@ __pthread_cond_wait:
+
+ 13: movq %r10, %rax
+ jmp 14b
+-
+-91:
+-.LcleanupSTART2:
+- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
+- call it again. */
+- movq 8(%rsp), %rdi
+-
+- /* Get internal lock. */
+- movl $1, %esi
+- xorl %eax, %eax
+- LOCK
+-#if cond_lock == 0
+- cmpxchgl %esi, (%rdi)
+-#else
+- cmpxchgl %esi, cond_lock(%rdi)
+-#endif
+- jz 92f
+-
+-#if cond_lock != 0
+- addq $cond_lock, %rdi
+-#endif
+- cmpq $-1, dep_mutex-cond_lock(%rdi)
+- movl $LLL_PRIVATE, %eax
+- movl $LLL_SHARED, %esi
+- cmovne %eax, %esi
+- callq __lll_lock_wait
+-#if cond_lock != 0
+- subq $cond_lock, %rdi
+-#endif
+-92:
+- /* Increment the cond_futex value again, so it can be used as a new
+- expected value. */
+- incl cond_futex(%rdi)
+- movl cond_futex(%rdi), %edx
+-
+- /* Release internal lock. */
+- LOCK
+-#if cond_lock == 0
+- decl (%rdi)
+-#else
+- decl cond_lock(%rdi)
+-#endif
+- jz 93f
+-
+-#if cond_lock != 0
+- addq $cond_lock, %rdi
+-#endif
+- cmpq $-1, dep_mutex-cond_lock(%rdi)
+- movl $LLL_PRIVATE, %eax
+- movl $LLL_SHARED, %esi
+- cmovne %eax, %esi
+- /* The call preserves %rdx. */
+- callq __lll_unlock_wake
+-#if cond_lock != 0
+- subq $cond_lock, %rdi
+-#endif
+-93:
+- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
+- xorq %r10, %r10
+- movq dep_mutex(%rdi), %r8
+- leaq cond_futex(%rdi), %rdi
+- jmp 90b
+-.LcleanupEND2:
+-
+ .size __pthread_cond_wait, .-__pthread_cond_wait
+ versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
+ GLIBC_2_3_2)
+@@ -547,15 +479,11 @@ __condvar_cleanup1:
+ .uleb128 .LcleanupSTART-.LSTARTCODE
+ .uleb128 .LcleanupEND-.LcleanupSTART
+ .uleb128 __condvar_cleanup1-.LSTARTCODE
+- .uleb128 0
+- .uleb128 .LcleanupSTART2-.LSTARTCODE
+- .uleb128 .LcleanupEND2-.LcleanupSTART2
+- .uleb128 __condvar_cleanup1-.LSTARTCODE
+- .uleb128 0
++ .uleb128 0
+ .uleb128 .LcallUR-.LSTARTCODE
+ .uleb128 .LENDCODE-.LcallUR
+ .uleb128 0
+- .uleb128 0
++ .uleb128 0
+ .Lcstend:
+
+
+Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig
+Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
index 8ecb4bbab..9bbd91765 100644
--- a/testing/glibc/PKGBUILD
+++ b/testing/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145684 2011-12-27 10:22:05Z allan $
+# $Id: PKGBUILD 145698 2011-12-28 08:07:08Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
pkgname=glibc
pkgver=2.15
-pkgrel=1
+pkgrel=2
_glibcdate=20111227
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
@@ -29,6 +29,8 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t
glibc-2.14-revert-4768ae77.patch
glibc-2.14-reexport-rpc-interface.patch
glibc-2.14-reinstall-nis-rpc-headers.patch
+ glibc-2.15-lddebug-scopes.patch
+ glibc-2.15-revert-c5a0802a.patch
nscd
locale.gen.txt
locale-gen)
@@ -41,6 +43,8 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
'7da8c554a3b591c7401d7023b1928afc'
'c5de2a946215d647c8af5432ec4b0da0'
'55febbb72139ac7b65757df085024b83'
+ '3c219ddfb619b6df903cac4cc42c611d'
+ '7ae3e426251ae33e73dbad71f9c91378'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
@@ -88,6 +92,14 @@ build() {
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
+ # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223
+ # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (only fedora branch...)
+ patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch
+
+ # revert commit c5a0802a - causes various hangs
+ # https://bugzilla.redhat.com/show_bug.cgi?id=769421
+ patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
+
install -dm755 ${pkgdir}/etc
touch ${pkgdir}/etc/ld.so.conf
diff --git a/testing/glibc/glibc-2.15-lddebug-scopes.patch b/testing/glibc/glibc-2.15-lddebug-scopes.patch
new file mode 100644
index 000000000..808cf8d7c
--- /dev/null
+++ b/testing/glibc/glibc-2.15-lddebug-scopes.patch
@@ -0,0 +1,27 @@
+From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@redhat.com>
+Date: Fri, 7 Oct 2011 09:31:27 +0200
+Subject: [PATCH] Horrible workaround for horribly broken software
+
+---
+ elf/rtld.c | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 978c609..8422b9f 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\
+ char *copy = malloc (len);
+ if (copy == NULL)
+ _dl_fatal_printf ("out of memory\n");
+- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
++ l->l_libname->name = memcpy (copy, dsoname, len);
++ if (GLRO(dl_debug_mask))
++ l->l_name = copy;
+ }
+
+ /* Add the vDSO to the object list. */
+--
+1.7.3.4
+
diff --git a/testing/glibc/glibc-2.15-revert-c5a0802a.patch b/testing/glibc/glibc-2.15-revert-c5a0802a.patch
new file mode 100644
index 000000000..f532b95e8
--- /dev/null
+++ b/testing/glibc/glibc-2.15-revert-c5a0802a.patch
@@ -0,0 +1,229 @@
+diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:12.937212834 +0000
++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:42.104222278 +0000
+@@ -137,7 +137,6 @@ __pthread_cond_wait:
+ cmpl $PI_BIT, %eax
+ jne 18f
+
+-90:
+ movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
+ movl %ebp, %edx
+ xorl %esi, %esi
+@@ -151,9 +150,6 @@ __pthread_cond_wait:
+ sete 16(%esp)
+ je 19f
+
+- cmpl $-EAGAIN, %eax
+- je 91f
+-
+ /* Normal and PI futexes dont mix. Use normal futex functions only
+ if the kernel does not support the PI futex functions. */
+ cmpl $-ENOSYS, %eax
+@@ -398,78 +394,6 @@ __pthread_cond_wait:
+ #endif
+ call __lll_unlock_wake
+ jmp 11b
+-
+-91:
+-.LcleanupSTART2:
+- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
+- call it again. */
+-
+- /* Get internal lock. */
+- movl $1, %edx
+- xorl %eax, %eax
+- LOCK
+-#if cond_lock == 0
+- cmpxchgl %edx, (%ebx)
+-#else
+- cmpxchgl %edx, cond_lock(%ebx)
+-#endif
+- jz 92f
+-
+-#if cond_lock == 0
+- movl %ebx, %edx
+-#else
+- leal cond_lock(%ebx), %edx
+-#endif
+-#if (LLL_SHARED-LLL_PRIVATE) > 255
+- xorl %ecx, %ecx
+-#endif
+- cmpl $-1, dep_mutex(%ebx)
+- setne %cl
+- subl $1, %ecx
+- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
+-#if LLL_PRIVATE != 0
+- addl $LLL_PRIVATE, %ecx
+-#endif
+- call __lll_lock_wait
+-
+-92:
+- /* Increment the cond_futex value again, so it can be used as a new
+- expected value. */
+- addl $1, cond_futex(%ebx)
+- movl cond_futex(%ebx), %ebp
+-
+- /* Unlock. */
+- LOCK
+-#if cond_lock == 0
+- subl $1, (%ebx)
+-#else
+- subl $1, cond_lock(%ebx)
+-#endif
+- je 93f
+-#if cond_lock == 0
+- movl %ebx, %eax
+-#else
+- leal cond_lock(%ebx), %eax
+-#endif
+-#if (LLL_SHARED-LLL_PRIVATE) > 255
+- xorl %ecx, %ecx
+-#endif
+- cmpl $-1, dep_mutex(%ebx)
+- setne %cl
+- subl $1, %ecx
+- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
+-#if LLL_PRIVATE != 0
+- addl $LLL_PRIVATE, %ecx
+-#endif
+- call __lll_unlock_wake
+-
+-93:
+- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
+- xorl %ecx, %ecx
+- movl dep_mutex(%ebx), %edi
+- jmp 90b
+-.LcleanupEND2:
+-
+ .size __pthread_cond_wait, .-__pthread_cond_wait
+ versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
+ GLIBC_2_3_2)
+@@ -642,10 +566,6 @@ __condvar_w_cleanup:
+ .long .LcleanupEND-.Lsub_cond_futex
+ .long __condvar_w_cleanup-.LSTARTCODE
+ .uleb128 0
+- .long .LcleanupSTART2-.LSTARTCODE
+- .long .LcleanupEND2-.LcleanupSTART2
+- .long __condvar_w_cleanup-.LSTARTCODE
+- .uleb128 0
+ .long .LcallUR-.LSTARTCODE
+ .long .LENDCODE-.LcallUR
+ .long 0
+Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig
+diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:04:12.941212837 +0000
++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:05:05.155229737 +0000
+@@ -23,7 +23,6 @@
+ #include <lowlevelcond.h>
+ #include <tcb-offsets.h>
+ #include <pthread-pi-defines.h>
+-#include <pthread-errnos.h>
+
+ #include <kernel-features.h>
+
+@@ -137,14 +136,11 @@ __pthread_cond_wait:
+ cmpl $PI_BIT, %eax
+ jne 61f
+
+-90:
+ movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
+ movl $SYS_futex, %eax
+ syscall
+
+ movl $1, %r8d
+- cmpq $-EAGAIN, %rax
+- je 91f
+ #ifdef __ASSUME_REQUEUE_PI
+ jmp 62f
+ #else
+@@ -331,70 +327,6 @@ __pthread_cond_wait:
+
+ 13: movq %r10, %rax
+ jmp 14b
+-
+-91:
+-.LcleanupSTART2:
+- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
+- call it again. */
+- movq 8(%rsp), %rdi
+-
+- /* Get internal lock. */
+- movl $1, %esi
+- xorl %eax, %eax
+- LOCK
+-#if cond_lock == 0
+- cmpxchgl %esi, (%rdi)
+-#else
+- cmpxchgl %esi, cond_lock(%rdi)
+-#endif
+- jz 92f
+-
+-#if cond_lock != 0
+- addq $cond_lock, %rdi
+-#endif
+- cmpq $-1, dep_mutex-cond_lock(%rdi)
+- movl $LLL_PRIVATE, %eax
+- movl $LLL_SHARED, %esi
+- cmovne %eax, %esi
+- callq __lll_lock_wait
+-#if cond_lock != 0
+- subq $cond_lock, %rdi
+-#endif
+-92:
+- /* Increment the cond_futex value again, so it can be used as a new
+- expected value. */
+- incl cond_futex(%rdi)
+- movl cond_futex(%rdi), %edx
+-
+- /* Release internal lock. */
+- LOCK
+-#if cond_lock == 0
+- decl (%rdi)
+-#else
+- decl cond_lock(%rdi)
+-#endif
+- jz 93f
+-
+-#if cond_lock != 0
+- addq $cond_lock, %rdi
+-#endif
+- cmpq $-1, dep_mutex-cond_lock(%rdi)
+- movl $LLL_PRIVATE, %eax
+- movl $LLL_SHARED, %esi
+- cmovne %eax, %esi
+- /* The call preserves %rdx. */
+- callq __lll_unlock_wake
+-#if cond_lock != 0
+- subq $cond_lock, %rdi
+-#endif
+-93:
+- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
+- xorq %r10, %r10
+- movq dep_mutex(%rdi), %r8
+- leaq cond_futex(%rdi), %rdi
+- jmp 90b
+-.LcleanupEND2:
+-
+ .size __pthread_cond_wait, .-__pthread_cond_wait
+ versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
+ GLIBC_2_3_2)
+@@ -547,15 +479,11 @@ __condvar_cleanup1:
+ .uleb128 .LcleanupSTART-.LSTARTCODE
+ .uleb128 .LcleanupEND-.LcleanupSTART
+ .uleb128 __condvar_cleanup1-.LSTARTCODE
+- .uleb128 0
+- .uleb128 .LcleanupSTART2-.LSTARTCODE
+- .uleb128 .LcleanupEND2-.LcleanupSTART2
+- .uleb128 __condvar_cleanup1-.LSTARTCODE
+- .uleb128 0
++ .uleb128 0
+ .uleb128 .LcallUR-.LSTARTCODE
+ .uleb128 .LENDCODE-.LcallUR
+ .uleb128 0
+- .uleb128 0
++ .uleb128 0
+ .Lcstend:
+
+
+Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig
+Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej