diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-18 17:12:10 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-18 17:12:10 +0100 |
| commit | fb5b6b28f363547abcbfa026fcae050236861425 (patch) | |
| tree | 850e29f1f9f42ada20e1c6818316988505970dae /core/util-linux | |
| parent | 67eabbfbd9364ee57f122c9ec9a03dd61bba850b (diff) | |
| parent | ab63d8d49f68847a68c2ba0014bf0d3338cb3df6 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ettercap/PKGBUILD
community/mplayer2/PKGBUILD
community/nginx/PKGBUILD
community/pidgin-libnotify/PKGBUILD
core/util-linux/PKGBUILD
extra/aspell-pt/PKGBUILD
extra/glpk/PKGBUILD
extra/libgdiplus/PKGBUILD
extra/llvm/PKGBUILD
extra/mesa/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/texmacs/PKGBUILD
Diffstat (limited to 'core/util-linux')
| -rw-r--r-- | core/util-linux/PKGBUILD | 7 | ||||
| -rw-r--r-- | core/util-linux/util-linux.install | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 890fbef6b..b514c875d 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 169791 2012-10-29 11:02:48Z tomegun $ +# $Id: PKGBUILD 171469 2012-11-17 23:02:13Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.22.1 -pkgrel=2 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64' 'mips64el') groups=('base') depends=('pam' 'shadow' 'coreutils' 'glibc') -# makedepends=('bc') # for check() only, change this to checkdepends for pacman 4.1 -makedepends=('bc' 'git') # for check() only, change this to checkdepends for pacman 4.1 +# checkdepends=('bc') conflicts=('util-linux-ng' 'eject') provides=("util-linux-ng=${pkgver}" 'eject') license=('GPL2') diff --git a/core/util-linux/util-linux.install b/core/util-linux/util-linux.install index 969a4aecf..4c0bb107c 100644 --- a/core/util-linux/util-linux.install +++ b/core/util-linux/util-linux.install @@ -2,7 +2,8 @@ post_install() { # we don't want use systemd-tmpfiles here because # the package dependency would create a circular dep. if [ ! -d run/uuidd ]; then - install -o uuidd -g uuidd -dm755 run/uuidd + # refer to uid/gid by number to avoid dependency on filesystem + install -o 68 -g 68 -dm755 run/uuidd fi } |