Thu Jan 12 23:14:51 UTC 2012

6 files changed, 35 insertions, 34 deletions

diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD
index 9387174b8..c86b2f44a 100644
--- a/core/db/PKGBUILD
+++ b/core/db/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142177 2011-11-05 16:31:54Z stephane $
+# $Id: PKGBUILD 146445 2012-01-11 15:20:54Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=db
-pkgver=5.2.36
-pkgrel=2
+pkgver=5.3.15
+pkgrel=1
 pkgdesc="The Berkeley DB embedded database system"
 arch=('i686' 'x86_64')
 url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
@@ -14,7 +14,7 @@ depends=('gcc-libs' 'sh')
 options=('!libtool')
 install=db.install
 source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
-sha1sums=('1a7997e5bcdf504a439f90d9eaed63864806ed5f')
+sha1sums=('7683b632a01ff3543c379a120809a942ec457738')
 
 build() {
   cd "${srcdir}/$pkgname-${pkgver}/build_unix"
@@ -26,7 +26,7 @@ build() {
 package() {
   cd "${srcdir}/$pkgname-${pkgver}/build_unix"
   make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/docs
+  rm -r "${pkgdir}"/usr/docs
   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \
     "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index 642eb2329..cbf7e9c4b 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 142382 2011-11-08 22:05:14Z ronald $
+# $Id: PKGBUILD 146447 2012-01-11 15:20:57Z stephane $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
-pkgver=2.6.39
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.linux-foundation.org/en/Net:Iproute2"
-depends=('perl')
+depends=('glibc' 'db')
 makedepends=('linux-atm')
 optdepends=('linux-atm: ATM support')
 provides=('iproute')
@@ -18,17 +18,17 @@ replaces=('iproute')
 options=('!makeflags')
 backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
 	'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
-source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.gz
-	'iproute2-fhs.patch')
-sha1sums=('9044ad0b4a34a377a54197724373330294d743c7'
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+	iproute2-fhs.patch)
+sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533'
           '2416b11252364d7a6c742eabb4a6924a75637a46')
 
 
 build() {
-  cd $srcdir/iproute2-${pkgver}
-  
+  cd $srcdir/$pkgname-$pkgver
+
   # set correct fhs structure
-  patch -Np1 -i ${srcdir}/iproute2-fhs.patch
+  patch -Np1 -i "$srcdir/iproute2-fhs.patch"
 
   ./configure
 
@@ -36,16 +36,16 @@ build() {
 }
 
 package() {
-  cd $srcdir/iproute2-${pkgver}
+  cd $srcdir/$pkgname-$pkgver
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
 
   # allow loopback to be started before /usr is mounted, this may not be supported in the future
-  mkdir -p ${pkgdir}/sbin
-  mv ${pkgdir}/usr/sbin/ip ${pkgdir}/sbin/ip
-  ln -s /sbin/ip ${pkgdir}/usr/sbin/ip
+  mkdir -p "$pkgdir/sbin"
+  mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+  ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
 
   # libnetlink isn't installed, install it FS#19385
-  install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h
-  install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a
+  install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+  install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
 }
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index c4f93c384..e668cda48 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 140271 2011-10-11 21:27:38Z jgc $
+# $Id: PKGBUILD 146449 2012-01-11 15:21:04Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-# This package spans multiple repositories. 
+# This package spans multiple repositories.
 # Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
 
 #pkgbase=('cyrus-sasl')
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.23
-pkgrel=8
+pkgrel=9
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
-url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
+url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags' '!libtool')
 makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index c8842793d..8351587b4 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145244 2011-12-19 22:50:32Z eric $
+# $Id: PKGBUILD 146451 2012-01-11 15:21:08Z stephane $
 # Maintainer:
 
 pkgbase=openldap
 pkgname=('libldap' 'openldap')
 pkgver=2.4.28
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.openldap.org/"
 license=('custom')
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index 2ac87cd2c..c0f4b4841 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141297 2011-10-28 10:57:26Z tpowa $
+# $Id: PKGBUILD 146453 2012-01-11 15:21:11Z stephane $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
 pkgver=1.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 07a8464b3..de6e057b6 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 145797 2012-01-01 18:30:05Z dreisner $
+# $Id: PKGBUILD 146455 2012-01-11 15:21:16Z stephane $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: kevin <kevin.archlinux.org>
 # Contributor: judd <jvinet.zeroflux.org>
 # Contributor: francois <francois.archlinux.org> 
 pkgname=perl
 pkgver=5.14.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
 license=('GPL' 'PerlArtistic')
@@ -19,7 +19,7 @@ perlbin.csh
 provides.pl
 0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch)
 install=perl.install
-options=('!makeflags' '!purge')
+options=('makeflags' '!purge')
 md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26'
          '5ed2542fdb9a60682f215bd33701e61a'
          '1f0cbbee783e8a6d32f01be5118e0d5e'
@@ -57,7 +57,8 @@ build() {
 
 check() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make test
+  TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness
+#  make test
 }
 
 package() {