summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-09-10 00:03:51 +0000
committerroot <root@rshg054.dnsready.net>2012-09-10 00:03:51 +0000
commit2a4c41bf2946fad65b14cf1b4ea284ebce0f11f3 (patch)
tree851a0ed5423f6dad7e4b532c6a23f0eaf42aea9b /testing
parentf393cb99c2cc66d9c323fae18bab2c0dd57ac41f (diff)
Mon Sep 10 00:03:51 UTC 2012
Diffstat (limited to 'testing')
-rw-r--r--testing/util-linux/PKGBUILD8
-rw-r--r--testing/util-linux/util-linux.install9
2 files changed, 10 insertions, 7 deletions
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
index 20fc2f60c..be2852273 100644
--- a/testing/util-linux/PKGBUILD
+++ b/testing/util-linux/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 166189 2012-09-05 12:02:06Z dreisner $
+# $Id: PKGBUILD 166506 2012-09-08 13:33:53Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: judd <jvinet@zeroflux.org>
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 @@ package() {
# 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
diff --git a/testing/util-linux/util-linux.install b/testing/util-linux/util-linux.install
index ef6dea117..d1338be46 100644
--- a/testing/util-linux/util-linux.install
+++ b/testing/util-linux/util-linux.install
@@ -5,11 +5,14 @@ post_install() {
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() {