diff options
| -rw-r--r--[-rwxr-xr-x] | abs/core/util-linux/PKGBUILD | 49 | ||||
| -rw-r--r-- | abs/core/util-linux/__changelog | 1 | ||||
| -rw-r--r-- | abs/core/util-linux/util-linux.install | 21 | ||||
| -rw-r--r-- | abs/core/util-linux/uuidd.tmpfiles | 1 |
4 files changed, 23 insertions, 49 deletions
diff --git a/abs/core/util-linux/PKGBUILD b/abs/core/util-linux/PKGBUILD index 0f8936d..64faa1a 100755..100644 --- a/abs/core/util-linux/PKGBUILD +++ b/abs/core/util-linux/PKGBUILD @@ -5,25 +5,25 @@ pkgbase=util-linux pkgname=(util-linux libutil-linux) -pkgver=2.25.2 +pkgver=2.27.1 pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" -url="http://www.kernel.org/pub/linux/utils/util-linux/" +url="https://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') makedepends=('systemd' 'python2') license=('GPL2') options=('strip' 'debug') -source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.25/$pkgname-$pkgver.tar.xz" - uuidd.tmpfiles +validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak +source=("https://www.kernel.org/pub/linux/utils/util-linux/v${pkgver%.?}/$pkgbase-$pkgver.tar."{xz,sign} pam-{login,common,su}) -md5sums=('cab3d7be354000f629bc601238b629b3' - 'a39554bfd65cccfd8254bb46922f4a67' +md5sums=('3cd2698d1363a2c64091c2dadc974647' + 'SKIP' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' 'fa85e5cce5d723275b14365ba71a8aad') build() { - cd "$pkgname-$pkgver" + cd "$pkgbase-$pkgver" ./configure --prefix=/usr \ --libdir=/usr/lib \ @@ -36,18 +36,18 @@ build() { --enable-chfn-chsh \ --enable-write \ --enable-mesg \ - --enable-socket-activation \ + --enable-libmount-force-mountinfo \ --with-python=2 make } package_util-linux() { - conflicts=('util-linux-ng' 'eject') - provides=("util-linux-ng=$pkgver" 'eject') + conflicts=('util-linux-ng' 'eject' 'zramctl') + provides=("util-linux-ng=$pkgver" 'eject' 'zramctl') + replaces=('zramctl') depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux') - optdepends=('python: python bindings to libmount') - install=util-linux.install + optdepends=('python2: python bindings to libmount') groups=('base' 'base-devel') backup=(etc/pam.d/chfn etc/pam.d/chsh @@ -55,9 +55,9 @@ package_util-linux() { etc/pam.d/su etc/pam.d/su-l) - cd "$pkgname-$pkgver" + cd "$pkgbase-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install # setuid chfn and chsh chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}} @@ -66,28 +66,25 @@ package_util-linux() { 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" + install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su" + install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l" - # include tmpfiles fragment for uuidd # TODO(dreisner): offer this upstream? - install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" + sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket" - # usrmove + # adjust for usrmove + # TODO(dreisner): fix configure.ac upstream so that this isn't needed cd "$pkgdir" mv {,usr/}sbin/* usr/bin rmdir sbin usr/sbin - ### create libutil-linux split - rm -rf "$srcdir/_libutil-linux" - install -dm755 "$srcdir"/_libutil-linux/usr/lib - cd "$srcdir"/_libutil-linux - mv "$pkgdir"/usr/lib/lib*.{a,so}* usr/lib + ### runtime libs are shipped as part of libutil-linux + rm "$pkgdir"/usr/lib/lib*.{a,so}* } package_libutil-linux() { pkgdesc="util-linux runtime libraries" - provides=('libblkid.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so') + provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so') - mv "$srcdir/_libutil-linux"/* "$pkgdir" + make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES } diff --git a/abs/core/util-linux/__changelog b/abs/core/util-linux/__changelog index 31b27cd..4e7296e 100644 --- a/abs/core/util-linux/__changelog +++ b/abs/core/util-linux/__changelog @@ -1,3 +1,2 @@ changed python from 3->2 - mv $pkgdir/usr/bin/logger $pkgdir/usr/bin/logger-util-linux diff --git a/abs/core/util-linux/util-linux.install b/abs/core/util-linux/util-linux.install deleted file mode 100644 index 4c0bb10..0000000 --- a/abs/core/util-linux/util-linux.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - # we don't want use systemd-tmpfiles here because - # the package dependency would create a circular dep. - if [ ! -d run/uuidd ]; then - # refer to uid/gid by number to avoid dependency on filesystem - install -o 68 -g 68 -dm755 run/uuidd - fi -} - -post_upgrade() { - if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then - if [ -f /var/lib/hwclock/adjtime ]; then - mv /var/lib/hwclock/adjtime /etc/adjtime - fi - if [ -d /var/lib/hwclock ]; then - rmdir /var/lib/hwclock - fi - fi - - post_install -} diff --git a/abs/core/util-linux/uuidd.tmpfiles b/abs/core/util-linux/uuidd.tmpfiles deleted file mode 100644 index b059cfe..0000000 --- a/abs/core/util-linux/uuidd.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/uuidd 0755 uuidd uuidd |