Date: Saturday, September 8, 2012 @ 09:33:30 Author: dreisner Revision: 166505
upgpkg: util-linux 2.22-4 - add shadow as dependency - avoid using systemd-tmpfiles - set uuidd's home to / (FS#31435) Modified: util-linux/trunk/PKGBUILD util-linux/trunk/util-linux.install --------------------+ PKGBUILD | 6 +++--- util-linux.install | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-09-08 13:07:20 UTC (rev 166504) +++ PKGBUILD 2012-09-08 13:33:30 UTC (rev 166505) @@ -4,12 +4,12 @@ pkgname=util-linux pkgver=2.22 -pkgrel=3 +pkgrel=4 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/"; arch=('i686' 'x86_64') groups=('base') -depends=('pam') +depends=('pam' 'shadow') makedepends=('bc') # for check() only, change this to checkdepends for pacman 4.1 conflicts=('util-linux-ng' 'eject') provides=("util-linux-ng=${pkgver}" 'eject') @@ -84,7 +84,7 @@ # broken buildsys doesn't include su(1), which means it # isn't even in the dist tarball - # TODO(dreisner): patch for this already sent upstream + # TODO(dreisner): patched upstream install -m644 "$srcdir/su.1" "$pkgdir/usr/share/man/man1/su.1" # include tmpfiles fragment for uuidd Modified: util-linux.install =================================================================== --- util-linux.install 2012-09-08 13:07:20 UTC (rev 166504) +++ util-linux.install 2012-09-08 13:33:30 UTC (rev 166505) @@ -5,11 +5,14 @@ fi if ! getent passwd uuidd >/dev/null; then - useradd -r -s /sbin/nologin -g uuidd uuidd + useradd -r -s /sbin/nologin -d / -g uuidd uuidd fi - # ensure /run/uuidd exists - systemd-tmpfiles --create uuidd.conf + # we don't want use systemd-tmpfiles here because + # the package dependency would create a circular dep. + if [ ! -d run/uuidd ]; then + mkdir run/uuidd + fi } post_upgrade() {
