diff options
Diffstat (limited to 'core/util-linux/PKGBUILD')
-rw-r--r-- | core/util-linux/PKGBUILD | 76 |
1 files changed, 54 insertions, 22 deletions
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 1a2d85d4a..ae7784fe6 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,36 +1,59 @@ -# $Id: PKGBUILD 163535 2012-07-15 00:25:36Z tomegun $ +# $Id: PKGBUILD 166963 2012-09-23 12:22:32Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.21.2 -pkgrel=5 +pkgver=2.22 +pkgrel=6 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') groups=('base') -depends=('pam') -conflicts=('util-linux-ng') -provides=("util-linux-ng=${pkgver}") +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') license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz + su.1 + uuidd.tmpfiles pam-login - pam-common) -backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login) + pam-common + pam-su + hwclock-systz.patch) +backup=(etc/pam.d/chfn + etc/pam.d/chsh + etc/pam.d/login + etc/pam.d/su + etc/pam.d/su-l) install=util-linux.install build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../hwclock-systz.patch + + # unbreak --localstatedir + # TODO(dreisner): find out what sami had in mind with these heuristics + sed -i '71,75d' configure.ac + ./autogen.sh + ./configure --prefix=/usr \ --libdir=/usr/lib \ + --localstatedir=/run \ --enable-fs-paths-extra=/usr/bin:/usr/sbin \ - --enable-write \ --enable-raw \ - --disable-wall \ - --enable-new-mount \ - --enable-login-utils + --enable-vipw \ + --enable-newgrp \ + --enable-chfn-chsh \ + --enable-write \ + --enable-mesg \ + --enable-socket-activation + +# --enable-reset \ # part of ncurses +# --enable-last \ # not part of any package +# --enable-line \ # not compat make } @@ -46,20 +69,29 @@ package() { cd "${pkgdir}" - # broken tool, going away in next major release, so just remove it now - rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1} - - # delete stray empty dir, fixed upstream - rm -r usr/share/man/ru - # setuid chfn and chsh - chmod 4755 "$pkgdir"/usr/bin/ch{sh,fn} + chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}} # install PAM files for login-utils install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" + install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su" + install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su-l" + + # broken buildsys doesn't include su(1), which means it + # isn't even in the dist tarball + # TODO(dreisner): patched upstream + install -m644 "$srcdir/su.1" "$pkgdir/usr/share/man/man1/su.1" + + # include tmpfiles fragment for uuidd + # TODO(dreisner): offer this upstream? + install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" } -md5sums=('54ba880f1d66782c2287ee2c898520e9' +md5sums=('ba2d8cc12a937231c80a04f7f7149303' + '7f524538dcf57284a86f03a98e624f04' + 'a39554bfd65cccfd8254bb46922f4a67' '4368b3f98abd8a32662e094c54e7f9b1' - 'a31374fef2cba0ca34dfc7078e2969e4') + 'a31374fef2cba0ca34dfc7078e2969e4' + 'fa85e5cce5d723275b14365ba71a8aad' + '19eaa197a0cfb046661dede2e991120b') |