Wed May 18 22:46:11 UTC 2011

12 files changed, 179 insertions, 57 deletions

diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD
index bfee4e73f..e177e74f5 100644
--- a/core/acl/PKGBUILD
+++ b/core/acl/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 105458 2011-01-09 04:03:58Z stephane $
+# $Id: PKGBUILD 123916 2011-05-14 10:31:07Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=acl
-pkgver=2.2.49
-pkgrel=2
+pkgver=2.2.51
+pkgrel=1
 pkgdesc="Access control list utilities, libraries and headers"
 arch=('i686' 'x86_64')
 url="http://savannah.nongnu.org/projects/acl"
 license=('LGPL')
-depends=('attr>=2.4.41')
+depends=('attr>=2.4.46')
 replaces=('xfsacl')
 provides=('xfsacl')
 conflicts=('xfsacl')
 options=('!libtool')
-source=(http://mirrors.zerg.biz/nongnu/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
-sha256sums=('b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5')
+source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
+sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}"/${pkgname}-${pkgver}
 
   export INSTALL_USER=root INSTALL_GROUP=root 
   ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib
@@ -28,6 +28,7 @@ package() {
 
   make DIST_ROOT="${pkgdir}" install install-lib install-dev
 
-  rm ${pkgdir}/lib/libacl.a
+  # tidy up
+  rm -f ${pkgdir}/lib/libacl.a
   chmod 0755 ${pkgdir}/lib/libacl.so.*.*.*
 }
diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD
index f8b942259..30f3ad81a 100644
--- a/core/attr/PKGBUILD
+++ b/core/attr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 115738 2011-03-20 22:30:28Z allan $
+# $Id: PKGBUILD 123916 2011-05-14 10:31:07Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=attr
-pkgver=2.4.44
-pkgrel=3
+pkgver=2.4.46
+pkgrel=1
 pkgdesc="Extended attribute support library for ACL support"
 arch=('i686' 'x86_64')
-url="http://oss.sgi.com/projects/xfs/"
+url="http://savannah.nongnu.org/projects/attr"
 license=('LGPL')
 depends=('glibc') 
 makedepends=('gettext')
@@ -13,32 +13,25 @@ replaces=('xfsattr')
 provides=('xfsattr')
 conflicts=('xfsattr')
 options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/attr/attr-${pkgver}.src.tar.gz)
-sha256sums=('e01fa00686072a02dddf994e6217be950f51c1dc0852ad2e210c48b6e8de793a')
+source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz)
+sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f')
 
 build() {
-  cd $srcdir/attr-$pkgver 
+  cd "${srcdir}"/${pkgname}-${pkgver}
   
-  # prevent binaries being owned by nobody:nobody
-  sed -i 's#-o $(PKG_USER) -g $(PKG_GROUP)##' include/buildmacros
-  
-  autoconf
-  ./configure --prefix=/usr 
-  sed -i -e 's/man2//g' man/Makefile
+  export INSTALL_USER=root INSTALL_GROUP=root
+  ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib
   make
 }
 
 package() {
-  cd $srcdir/attr-$pkgver
-  make prefix=${pkgdir}/usr install install-lib install-dev
-
-  # tidy up
-  cd "${pkgdir}"
+  cd "${srcdir}"/${pkgname}-${pkgver}
 
-  install -dm755 lib
-  mv -v usr/lib/libattr.so* lib/
-  ln -sv ../../lib/libattr.so.1 usr/lib/libattr.so
+  make DIST_ROOT="${pkgdir}" install install-lib install-dev
 
-  mv -v usr/libexec/libattr.{a,la} usr/lib/
-  rm -rvf usr/libexec
+  # tidy up
+  rm -f "${pkgdir}"/lib/libattr.a
+  chmod 0755 "${pkgdir}"/lib/libattr.so.*.*.*
+  # remove conflicting manpages
+  rm -rf "${pkgdir}"/usr/share/man/man2
 }
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 67006a82a..0da5b0175 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 103928 2010-12-23 22:10:05Z thomas $
+# $Id: PKGBUILD 123894 2011-05-14 09:00:27Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=cryptsetup
-pkgver=1.2.0
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
         encrypt_hook
 	encrypt_install)
-sha256sums=('411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea'
+sha256sums=('c675059a25061851dcaf9732a2118d75585097c8fbb3985026526988e8d76394'
             '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc'
             '8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a')
 
diff --git a/core/libgssglue/PKGBUILD b/core/libgssglue/PKGBUILD
index 85ed0d2e0..493598561 100644
--- a/core/libgssglue/PKGBUILD
+++ b/core/libgssglue/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 102146 2010-12-06 09:49:56Z allan $
+# $Id: PKGBUILD 123644 2011-05-12 06:23:26Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libgssglue
 pkgver=0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Exports a gssapi interface which calls other random gssapi libraries"
 arch=('i686' 'x86_64')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
@@ -15,7 +15,7 @@ options=('!libtool')
 source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz
         gssapi_mech.conf)
 md5sums=('ce1b4c758e6de01b712d154c5c97e540'
-         '234b9cca75a33af98eda3f1683756879')
+         '080be866717e4e06fa6f7d6f43cb395a')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/core/libgssglue/gssapi_mech.conf b/core/libgssglue/gssapi_mech.conf
index f71aca08e..9a832ee1b 100644
--- a/core/libgssglue/gssapi_mech.conf
+++ b/core/libgssglue/gssapi_mech.conf
@@ -15,8 +15,8 @@
 # library                               initialization function
 # ================================      ==========================
 # The MIT K5 gssapi library, use special function for initialization.
-#/usr/lib/libgssapi_krb5.so             mechglue_internal_krb5_init
-/usr/lib/libgssapi.so            mechglue_internal_krb5_init
+/usr/lib/libgssapi_krb5.so             mechglue_internal_krb5_init
+#/usr/lib/libgssapi.so            mechglue_internal_krb5_init
 #
 # The SPKM3 gssapi library function.  Use the function spkm3_gss_initialize.
 # /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so    spkm3_gss_initialize
diff --git a/core/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff b/core/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff
new file mode 100644
index 000000000..e75499e8e
--- /dev/null
+++ b/core/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff
@@ -0,0 +1,17 @@
+Do not issue an error message when unable to remove .cache on read-only fs.
+===================================================================
+RCS file: /cvs/lvm2/LVM2/lib/filters/filter-persistent.c,v
+retrieving revision 1.49
+retrieving revision 1.50
+diff -u -r1.49 -r1.50
+--- LVM2/lib/filters/filter-persistent.c	2011/04/22 12:05:33	1.49
++++ LVM2/lib/filters/filter-persistent.c	2011/05/12 12:42:48	1.50
+@@ -108,7 +108,7 @@
+ 			log_very_verbose("Obtaining device list from "
+ 					 "udev. Removing obolete %s.",
+ 					 pf->file);
+-			if (unlink(pf->file) < 0)
++			if (unlink(pf->file) < 0 && errno != EROFS)
+ 				log_sys_error("unlink", pf->file);
+ 		}
+ 		return 1;
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 3a946ff04..e7129b765 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109502 2011-02-10 10:44:18Z eric $
+# $Id: PKGBUILD 123786 2011-05-13 00:53:49Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.84
+pkgver=2.02.85
 _pkgverlvm=${pkgver}
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -14,15 +14,21 @@ groups=('base')
 conflicts=('mkinitcpio<0.5.99')
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
         lvm2_install
-        lvm2_hook)
-md5sums=('8b4e0897ee48f02c0dff11940e44e23b' 'e29bc80d636ed17b617d9b384a5f3aa0'\
-         '7103e3fef1180478811ac4e32aec540d')
-sha1sums=('6d92f4474f93c7d3824a0eb3469c7e4f9ef8f1d4' '662fc54ce291fd79bd09701e4c3e10854f325282'\
-         '769767d84c73674cbb68c765460e57c428c314a0')
+        lvm2_hook
+        Be-quiet-on-removing-cache-on-read-only-fs.diff)
+md5sums=('91785ca438e5ce679dd3a386b183d552'
+         'e29bc80d636ed17b617d9b384a5f3aa0'
+         'cf05f2c7281e24269ea9dcc6b4e106ba'
+         '6db89da27928d2415a8e26cd0a842712')
+sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7'
+          '662fc54ce291fd79bd09701e4c3e10854f325282'
+          '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440'
+          '6d7dd04be291d7537235704c816a701fd5beacc0')
 
 build() {
   cd "${srcdir}/LVM2.${_pkgverlvm}"
   sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
+  patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff
   unset LDFLAGS
   ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
     --includedir=/usr/include --with-usrlibdir=/usr/lib \
diff --git a/core/lvm2/lvm2_hook b/core/lvm2/lvm2_hook
index d6d1c1f94..86d2ea582 100644
--- a/core/lvm2/lvm2_hook
+++ b/core/lvm2/lvm2_hook
@@ -18,6 +18,7 @@ run_hook ()
         [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
 
         msg "Activating logical volumes..."
+        [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit
         eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
     fi
 }
diff --git a/core/lzo2/PKGBUILD b/core/lzo2/PKGBUILD
index 4f2889baf..b9aa75ad5 100644
--- a/core/lzo2/PKGBUILD
+++ b/core/lzo2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 100405 2010-11-23 12:35:30Z stephane $
+# $Id: PKGBUILD 122309 2011-05-03 18:52:51Z tpowa $
 # Contributor: Low Kian Seong <fastmail_low@speedymail.org>
 # Maintainer: dorphell <dorphell@archlinux.org>
 pkgname=lzo2
-pkgver=2.04
+pkgver=2.05
 pkgrel=1
 pkgdesc="Portable lossless data compression library"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('glibc')
 source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz)
 options=(!libtool)
-sha1sums=('f5bf5c7ae4116e60513e5788d156ef78946677e7')
+md5sums=('c67cda5fa191bab761c7cb06fe091e36')
 
 build() {
   cd "${srcdir}/lzo-${pkgver}"
diff --git a/core/udev/01-settle.patch b/core/udev/01-settle.patch
new file mode 100644
index 000000000..88e23d2a2
--- /dev/null
+++ b/core/udev/01-settle.patch
@@ -0,0 +1,68 @@
+From 2738ec2cf721db0c0deac2ba0abdc73cf7739e9f Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay.sievers@vrfy.org>
+Date: Mon, 16 May 2011 13:17:48 +0200
+Subject: [PATCH 1/7] udevd: create queue file before daemonizing to reliably
+ block 'settle'
+
+---
+ udev/udevd.c |   22 ++++++++++++----------
+ 1 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/udev/udevd.c b/udev/udevd.c
+index be4b071..258d787 100644
+--- a/udev/udevd.c
++++ b/udev/udevd.c
+@@ -1408,6 +1408,13 @@ int main(int argc, char *argv[])
+ 
+ 	udev_monitor_set_receive_buffer_size(monitor, 128*1024*1024);
+ 
++	/* create queue file before signalling 'ready', to make sure we block 'settle' */
++	udev_queue_export = udev_queue_export_new(udev);
++	if (udev_queue_export == NULL) {
++		err(udev, "error creating queue file\n");
++		goto exit;
++	}
++
+ 	if (daemonize) {
+ 		pid_t pid;
+ 		int fd;
+@@ -1421,8 +1428,8 @@ int main(int argc, char *argv[])
+ 			rc = 4;
+ 			goto exit;
+ 		default:
+-			rc = 0;
+-			goto exit;
++			rc = EXIT_SUCCESS;
++			goto exit_keep_queue;
+ 		}
+ 
+ 		setsid();
+@@ -1521,12 +1528,6 @@ int main(int argc, char *argv[])
+ 		goto exit;
+ 	}
+ 
+-	udev_queue_export = udev_queue_export_new(udev);
+-	if (udev_queue_export == NULL) {
+-		err(udev, "error creating queue file\n");
+-		goto exit;
+-	}
+-
+ 	memset(&ep_ctrl, 0, sizeof(struct epoll_event));
+ 	ep_ctrl.events = EPOLLIN;
+ 	ep_ctrl.data.fd = fd_ctrl;
+@@ -1708,9 +1709,10 @@ int main(int argc, char *argv[])
+ 		}
+ 	}
+ 
+-	udev_queue_export_cleanup(udev_queue_export);
+-	rc = 0;
++	rc = EXIT_SUCCESS;
+ exit:
++	udev_queue_export_cleanup(udev_queue_export);
++exit_keep_queue:
+ 	if (fd_ep >= 0)
+ 		close(fd_ep);
+ 	worker_list_cleanup(udev);
+-- 
+1.7.5.1
+
diff --git a/core/udev/02-settle.patch b/core/udev/02-settle.patch
new file mode 100644
index 000000000..4bcb7fdde
--- /dev/null
+++ b/core/udev/02-settle.patch
@@ -0,0 +1,29 @@
+From 12f79fb0b9c919787d8a7d4307895d3d6b4b029b Mon Sep 17 00:00:00 2001
+From: Nix <nix@esperi.org.uk>
+Date: Mon, 16 May 2011 22:51:38 +0200
+Subject: [PATCH 7/7] libudev: queue - accept NULL passed into
+ udev_queue_export_cleanup()
+
+---
+ libudev/libudev-queue-private.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c
+index 0dcf9b0..6e13d8a 100644
+--- a/libudev/libudev-queue-private.c
++++ b/libudev/libudev-queue-private.c
+@@ -104,9 +104,10 @@ void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export)
+ {
+ 	char filename[UTIL_PATH_SIZE];
+ 
++	if (udev_queue_export == NULL)
++		return;
+ 	util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.tmp", NULL);
+ 	unlink(filename);
+-
+ 	util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.bin", NULL);
+ 	unlink(filename);
+ }
+-- 
+1.7.5.1
+
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index 44c2cf9d7..d596361c9 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123587 2011-05-11 16:38:57Z tomegun $
+# $Id: PKGBUILD 124183 2011-05-17 13:17:56Z tomegun $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
@@ -7,7 +7,7 @@
 pkgbase="udev"
 pkgname=('udev' 'udev-compat')
 pkgver=168
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 license=('GPL')
@@ -19,10 +19,15 @@ source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.ta
         80-drivers.rules 
         81-arch.rules 
         load-modules.sh 
-        cdsymlinks.sh)
+        cdsymlinks.sh
+	01-settle.patch
+	02-settle.patch)
 
 build() {
   cd $srcdir/$pkgbase-$pkgver
+  # fix https://bugs.archlinux.org/task/24288
+  patch -Np1 -i ../01-settle.patch
+  patch -Np1 -i ../02-settle.patch
   ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\
               --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system
   make
@@ -109,8 +114,10 @@ package_udev-compat() {
   install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d
   install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
 }
-md5sums=('4a466078532ab5dd5c35acc3ea2ec9a1'
-         '4427855146513a4703ab5c7eb8a0156e'
-         'f17c99779173ddc79f866cf3a5de5e68'
-         'f91fddc67609b45b244a624977c4247b'
-         '2e808ee78d237c478b57af2a68d43769')
+sha256sums=('9ddc43173cf7b397c8cc01d26d644932ff2c2259b3a5eea7be90db96a28080e2'
+            '0cb99cc7cea92238dd6b19a4c104c3b9e9f744c6b9d6b4382c7cd22be18c98f9'
+            '377c13f20de32776107dddc8324f599f31320e8dd1185e3282856aee5cb08499'
+            'c6b41afb24e8f496064d8baad844697a6515cea1b7e0389054cd8a2053477377'
+            'cc0d281926bf2f1ac816c0060a2afc59444ddf0f8dab6e2d9924a2a7c8de4a13'
+            '70d2fd079901bf9940c4811ec91634da0d8b3425ebcdbffeba5a73cb616be650'
+            'fe9d1aafb1a620108790d82960577de4eb757450c35a146475aed3f5e9356f1a')