Date: Sunday, July 27, 2014 @ 02:48:51 Author: dreisner Revision: 218210
archrelease: copy trunk to testing-x86_64 Added: util-linux/repos/testing-x86_64/PKGBUILD (from rev 218209, util-linux/trunk/PKGBUILD) util-linux/repos/testing-x86_64/pam-common (from rev 218209, util-linux/trunk/pam-common) util-linux/repos/testing-x86_64/pam-login (from rev 218209, util-linux/trunk/pam-login) util-linux/repos/testing-x86_64/pam-su (from rev 218209, util-linux/trunk/pam-su) util-linux/repos/testing-x86_64/util-linux.install (from rev 218209, util-linux/trunk/util-linux.install) util-linux/repos/testing-x86_64/uuidd.tmpfiles (from rev 218209, util-linux/trunk/uuidd.tmpfiles) Deleted: util-linux/repos/testing-x86_64/PKGBUILD util-linux/repos/testing-x86_64/pam-common util-linux/repos/testing-x86_64/pam-login util-linux/repos/testing-x86_64/pam-su util-linux/repos/testing-x86_64/util-linux.install util-linux/repos/testing-x86_64/uuidd.tmpfiles --------------------+ PKGBUILD | 190 +++++++++++++++++++++++++-------------------------- pam-common | 12 +-- pam-login | 14 +-- pam-su | 18 ++-- util-linux.install | 42 +++++------ uuidd.tmpfiles | 2 6 files changed, 139 insertions(+), 139 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-07-27 00:48:24 UTC (rev 218209) +++ PKGBUILD 2014-07-27 00:48:51 UTC (rev 218210) @@ -1,95 +0,0 @@ -# $Id$ -# Maintainer: Tom Gundersen <t...@jklm.no> -# Maintainer: Dave Reisner <dreis...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgbase=util-linux -pkgname=(util-linux libutil-linux) -pkgver=2.25 -pkgrel=1 -pkgdesc="Miscellaneous system utilities for Linux" -url="http://www.kernel.org/pub/linux/utils/util-linux/" -arch=('i686' 'x86_64') -makedepends=('systemd' 'python') -license=('GPL2') -options=('strip' 'debug') -source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.25/$pkgname-$pkgver.tar.xz" - uuidd.tmpfiles - pam-login - pam-common - pam-su) -md5sums=('4c78fdef4cb882caafad61e33cafbc14' - 'a39554bfd65cccfd8254bb46922f4a67' - '4368b3f98abd8a32662e094c54e7f9b1' - 'a31374fef2cba0ca34dfc7078e2969e4' - 'fa85e5cce5d723275b14365ba71a8aad') - -build() { - cd "$pkgname-$pkgver" - - ./configure --prefix=/usr \ - --libdir=/usr/lib \ - --bindir=/usr/bin \ - --localstatedir=/run \ - --enable-fs-paths-extra=/usr/bin \ - --enable-raw \ - --enable-vipw \ - --enable-newgrp \ - --enable-chfn-chsh \ - --enable-write \ - --enable-mesg \ - --enable-socket-activation \ - --with-python=3 - - make -} - -package_util-linux() { - conflicts=('util-linux-ng' 'eject') - provides=("util-linux-ng=$pkgver" 'eject') - depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux') - optdepends=('python: python bindings to libmount') - install=util-linux.install - groups=('base' 'base-devel') - backup=(etc/pam.d/chfn - etc/pam.d/chsh - etc/pam.d/login - etc/pam.d/su - etc/pam.d/su-l) - - cd "$pkgname-$pkgver" - - make DESTDIR="${pkgdir}" install - - # setuid chfn and chsh - 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" - - # include tmpfiles fragment for uuidd - # TODO(dreisner): offer this upstream? - install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" - - # usrmove - 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 -} - -package_libutil-linux() { - pkgdesc="util-linux runtime libraries" - provides=('libblkid.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so') - - mv "$srcdir/_libutil-linux"/* "$pkgdir" -} Copied: util-linux/repos/testing-x86_64/PKGBUILD (from rev 218209, util-linux/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-07-27 00:48:51 UTC (rev 218210) @@ -0,0 +1,95 @@ +# $Id$ +# Maintainer: Tom Gundersen <t...@jklm.no> +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgbase=util-linux +pkgname=(util-linux libutil-linux) +pkgver=2.25 +pkgrel=2 +pkgdesc="Miscellaneous system utilities for Linux" +url="http://www.kernel.org/pub/linux/utils/util-linux/" +arch=('i686' 'x86_64') +makedepends=('systemd' 'python') +license=('GPL2') +options=('strip' 'debug') +source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.25/$pkgname-$pkgver.tar.xz" + uuidd.tmpfiles + pam-login + pam-common + pam-su) +md5sums=('4c78fdef4cb882caafad61e33cafbc14' + 'a39554bfd65cccfd8254bb46922f4a67' + '4368b3f98abd8a32662e094c54e7f9b1' + 'a31374fef2cba0ca34dfc7078e2969e4' + 'fa85e5cce5d723275b14365ba71a8aad') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --libdir=/usr/lib \ + --bindir=/usr/bin \ + --localstatedir=/run \ + --enable-fs-paths-extra=/usr/bin \ + --enable-raw \ + --enable-vipw \ + --enable-newgrp \ + --enable-chfn-chsh \ + --enable-write \ + --enable-mesg \ + --enable-socket-activation \ + --with-python=3 + + make +} + +package_util-linux() { + conflicts=('util-linux-ng' 'eject') + provides=("util-linux-ng=$pkgver" 'eject') + depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux') + optdepends=('python: python bindings to libmount') + install=util-linux.install + groups=('base' 'base-devel') + backup=(etc/pam.d/chfn + etc/pam.d/chsh + etc/pam.d/login + etc/pam.d/su + etc/pam.d/su-l) + + cd "$pkgname-$pkgver" + + make DESTDIR="${pkgdir}" install + + # setuid chfn and chsh + 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" + + # include tmpfiles fragment for uuidd + # TODO(dreisner): offer this upstream? + install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" + + # usrmove + 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 +} + +package_libutil-linux() { + pkgdesc="util-linux runtime libraries" + provides=('libblkid.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so') + + mv "$srcdir/_libutil-linux"/* "$pkgdir" +} Deleted: pam-common =================================================================== --- pam-common 2014-07-27 00:48:24 UTC (rev 218209) +++ pam-common 2014-07-27 00:48:51 UTC (rev 218210) @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so Copied: util-linux/repos/testing-x86_64/pam-common (from rev 218209, util-linux/trunk/pam-common) =================================================================== --- pam-common (rev 0) +++ pam-common 2014-07-27 00:48:51 UTC (rev 218210) @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so +password required pam_permit.so Deleted: pam-login =================================================================== --- pam-login 2014-07-27 00:48:24 UTC (rev 218209) +++ pam-login 2014-07-27 00:48:51 UTC (rev 218210) @@ -1,7 +0,0 @@ -#%PAM-1.0 - -auth required pam_securetty.so -auth requisite pam_nologin.so -auth include system-local-login -account include system-local-login -session include system-local-login Copied: util-linux/repos/testing-x86_64/pam-login (from rev 218209, util-linux/trunk/pam-login) =================================================================== --- pam-login (rev 0) +++ pam-login 2014-07-27 00:48:51 UTC (rev 218210) @@ -0,0 +1,7 @@ +#%PAM-1.0 + +auth required pam_securetty.so +auth requisite pam_nologin.so +auth include system-local-login +account include system-local-login +session include system-local-login Deleted: pam-su =================================================================== --- pam-su 2014-07-27 00:48:24 UTC (rev 218209) +++ pam-su 2014-07-27 00:48:51 UTC (rev 218210) @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -# Uncomment the following line to implicitly trust users in the "wheel" group. -#auth sufficient pam_wheel.so trust use_uid -# Uncomment the following line to require a user to be in the "wheel" group. -#auth required pam_wheel.so use_uid -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so Copied: util-linux/repos/testing-x86_64/pam-su (from rev 218209, util-linux/trunk/pam-su) =================================================================== --- pam-su (rev 0) +++ pam-su 2014-07-27 00:48:51 UTC (rev 218210) @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +# Uncomment the following line to implicitly trust users in the "wheel" group. +#auth sufficient pam_wheel.so trust use_uid +# Uncomment the following line to require a user to be in the "wheel" group. +#auth required pam_wheel.so use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so Deleted: util-linux.install =================================================================== --- util-linux.install 2014-07-27 00:48:24 UTC (rev 218209) +++ util-linux.install 2014-07-27 00:48:51 UTC (rev 218210) @@ -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 -} Copied: util-linux/repos/testing-x86_64/util-linux.install (from rev 218209, util-linux/trunk/util-linux.install) =================================================================== --- util-linux.install (rev 0) +++ util-linux.install 2014-07-27 00:48:51 UTC (rev 218210) @@ -0,0 +1,21 @@ +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 +} Deleted: uuidd.tmpfiles =================================================================== --- uuidd.tmpfiles 2014-07-27 00:48:24 UTC (rev 218209) +++ uuidd.tmpfiles 2014-07-27 00:48:51 UTC (rev 218210) @@ -1 +0,0 @@ -d /run/uuidd 0755 uuidd uuidd Copied: util-linux/repos/testing-x86_64/uuidd.tmpfiles (from rev 218209, util-linux/trunk/uuidd.tmpfiles) =================================================================== --- uuidd.tmpfiles (rev 0) +++ uuidd.tmpfiles 2014-07-27 00:48:51 UTC (rev 218210) @@ -0,0 +1 @@ +d /run/uuidd 0755 uuidd uuidd