Date: Tuesday, November 17, 2020 @ 08:49:17 Author: eworm Revision: 401300
archrelease: copy trunk to staging-x86_64 Added: util-linux/repos/staging-x86_64/60-rfkill.rules (from rev 401299, util-linux/trunk/60-rfkill.rules) util-linux/repos/staging-x86_64/PKGBUILD (from rev 401299, util-linux/trunk/PKGBUILD) util-linux/repos/staging-x86_64/pam-common (from rev 401299, util-linux/trunk/pam-common) util-linux/repos/staging-x86_64/pam-login (from rev 401299, util-linux/trunk/pam-login) util-linux/repos/staging-x86_64/pam-runuser (from rev 401299, util-linux/trunk/pam-runuser) util-linux/repos/staging-x86_64/pam-su (from rev 401299, util-linux/trunk/pam-su) util-linux/repos/staging-x86_64/rfkill-block_.service (from rev 401299, util-linux/trunk/rfkill-block_.service) util-linux/repos/staging-x86_64/rfkill-unblock_.service (from rev 401299, util-linux/trunk/rfkill-unblock_.service) util-linux/repos/staging-x86_64/util-linux.sysusers (from rev 401299, util-linux/trunk/util-linux.sysusers) Deleted: util-linux/repos/staging-x86_64/60-rfkill.rules util-linux/repos/staging-x86_64/PKGBUILD util-linux/repos/staging-x86_64/pam-common util-linux/repos/staging-x86_64/pam-login util-linux/repos/staging-x86_64/pam-runuser util-linux/repos/staging-x86_64/pam-su util-linux/repos/staging-x86_64/rfkill-block_.service util-linux/repos/staging-x86_64/rfkill-unblock_.service util-linux/repos/staging-x86_64/util-linux.sysusers -------------------------+ 60-rfkill.rules | 2 PKGBUILD | 256 +++++++++++++++++++++++----------------------- pam-common | 12 +- pam-login | 14 +- pam-runuser | 8 - pam-su | 18 +-- rfkill-block_.service | 20 +-- rfkill-unblock_.service | 20 +-- util-linux.sysusers | 4 9 files changed, 177 insertions(+), 177 deletions(-) Deleted: 60-rfkill.rules =================================================================== --- 60-rfkill.rules 2020-11-17 08:49:13 UTC (rev 401299) +++ 60-rfkill.rules 2020-11-17 08:49:17 UTC (rev 401300) @@ -1 +0,0 @@ -KERNEL=="rfkill", GROUP="rfkill", MODE="0664" Copied: util-linux/repos/staging-x86_64/60-rfkill.rules (from rev 401299, util-linux/trunk/60-rfkill.rules) =================================================================== --- 60-rfkill.rules (rev 0) +++ 60-rfkill.rules 2020-11-17 08:49:17 UTC (rev 401300) @@ -0,0 +1 @@ +KERNEL=="rfkill", GROUP="rfkill", MODE="0664" Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-11-17 08:49:13 UTC (rev 401299) +++ PKGBUILD 2020-11-17 08:49:17 UTC (rev 401300) @@ -1,128 +0,0 @@ -# Maintainer: Tom Gundersen <t...@jklm.no> -# Maintainer: Dave Reisner <dreis...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgbase=util-linux -pkgname=(util-linux util-linux-libs) -_pkgmajor=2.36 -pkgver=${_pkgmajor} -pkgrel=6 -pkgdesc='Miscellaneous system utilities for Linux' -url='https://github.com/karelzak/util-linux' -arch=('x86_64') -makedepends=('systemd' 'python' 'libcap-ng' 'libxcrypt') -license=('GPL2') -options=('strip') -validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak -source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-$pkgver.tar."{xz,sign} - pam-{login,common,runuser,su} - 'util-linux.sysusers' - '60-rfkill.rules' - 'rfkill-unblock_.service' - 'rfkill-block_.service') -sha256sums=('9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1' - 'SKIP' - '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92' - 'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20' - '95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935' - '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0' - '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3' - '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37' - '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376' - 'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36') - -build() { - cd "$pkgbase-$pkgver" - - # We ship Debian's hardlink in package 'hardlink', Fedora's hardlink was - # merged in util-linux. For now we disable the latter, but let's dicuss - # the details: - # https://bugs.archlinux.org/task/62896 - # https://github.com/karelzak/util-linux/issues/808 - - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ - --localstatedir=/var \ - --enable-usrdir-path \ - --enable-fs-paths-default=/usr/bin:/usr/local/bin \ - --enable-raw \ - --enable-vipw \ - --enable-newgrp \ - --enable-chfn-chsh \ - --enable-write \ - --enable-mesg \ - --disable-hardlink \ - --with-python=3 - - make -} - -package_util-linux() { - conflicts=('rfkill') - provides=('rfkill') - replaces=('rfkill') - depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so' - 'libudev.so' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs' - 'libmagic.so' 'libncursesw.so' 'libreadline.so') - optdepends=('python: python bindings to libmount' - 'words: default dictionary for look') - backup=(etc/pam.d/chfn - etc/pam.d/chsh - etc/pam.d/login - etc/pam.d/runuser - etc/pam.d/runuser-l - etc/pam.d/su - etc/pam.d/su-l) - - cd "$pkgbase-$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 -Dm0644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" - install -m0644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" - install -m0644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" - install -m0644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser" - install -m0644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser-l" - install -m0644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su" - install -m0644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l" - - # TODO(dreisner): offer this upstream? - sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket" - - # adjust for usrmove - # TODO(dreisner): fix configure.ac upstream so that this isn't needed - cd "$pkgdir" - mv usr/sbin/* usr/bin - rmdir usr/sbin - - ### runtime libs are shipped as part of util-linux-libs - rm "$pkgdir"/usr/lib/lib*.{a,so}* - - ### install systemd-sysusers - install -Dm0644 "$srcdir/util-linux.sysusers" \ - "$pkgdir/usr/lib/sysusers.d/util-linux.conf" - - install -Dm0644 "$srcdir/60-rfkill.rules" \ - "$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules" - - install -Dm0644 "$srcdir/rfkill-unblock_.service" \ - "$pkgdir/usr/lib/systemd/system/rfkill-unblock@.service" - install -Dm0644 "$srcdir/rfkill-block_.service" \ - "$pkgdir/usr/lib/systemd/system/rfkill-block@.service" -} - -package_util-linux-libs() { - pkgdesc="util-linux runtime libraries" - provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so') - conflicts=('libutil-linux') - replaces=('libutil-linux') - - make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES -} Copied: util-linux/repos/staging-x86_64/PKGBUILD (from rev 401299, util-linux/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-11-17 08:49:17 UTC (rev 401300) @@ -0,0 +1,128 @@ +# Maintainer: Tom Gundersen <t...@jklm.no> +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgbase=util-linux +pkgname=(util-linux util-linux-libs) +_pkgmajor=2.36 +pkgver=${_pkgmajor}.1 +pkgrel=2 +pkgdesc='Miscellaneous system utilities for Linux' +url='https://github.com/karelzak/util-linux' +arch=('x86_64') +makedepends=('systemd' 'python' 'libcap-ng' 'libxcrypt') +license=('GPL2') +options=('strip') +validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak +source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-$pkgver.tar."{xz,sign} + pam-{login,common,runuser,su} + 'util-linux.sysusers' + '60-rfkill.rules' + 'rfkill-unblock_.service' + 'rfkill-block_.service') +sha256sums=('09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed' + 'SKIP' + '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92' + 'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20' + '95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935' + '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0' + '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3' + '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37' + '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376' + 'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36') + +build() { + cd "$pkgbase-$pkgver" + + # We ship Debian's hardlink in package 'hardlink', Fedora's hardlink was + # merged in util-linux. For now we disable the latter, but let's dicuss + # the details: + # https://bugs.archlinux.org/task/62896 + # https://github.com/karelzak/util-linux/issues/808 + + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib \ + --bindir=/usr/bin \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --enable-usrdir-path \ + --enable-fs-paths-default=/usr/bin:/usr/local/bin \ + --enable-raw \ + --enable-vipw \ + --enable-newgrp \ + --enable-chfn-chsh \ + --enable-write \ + --enable-mesg \ + --disable-hardlink \ + --with-python=3 + + make +} + +package_util-linux() { + conflicts=('rfkill') + provides=('rfkill') + replaces=('rfkill') + depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so' + 'libudev.so' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs' + 'libmagic.so' 'libncursesw.so' 'libreadline.so') + optdepends=('python: python bindings to libmount' + 'words: default dictionary for look') + backup=(etc/pam.d/chfn + etc/pam.d/chsh + etc/pam.d/login + etc/pam.d/runuser + etc/pam.d/runuser-l + etc/pam.d/su + etc/pam.d/su-l) + + cd "$pkgbase-$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 -Dm0644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" + install -m0644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" + install -m0644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" + install -m0644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser" + install -m0644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser-l" + install -m0644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su" + install -m0644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l" + + # TODO(dreisner): offer this upstream? + sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket" + + # adjust for usrmove + # TODO(dreisner): fix configure.ac upstream so that this isn't needed + cd "$pkgdir" + mv usr/sbin/* usr/bin + rmdir usr/sbin + + ### runtime libs are shipped as part of util-linux-libs + rm "$pkgdir"/usr/lib/lib*.{a,so}* + + ### install systemd-sysusers + install -Dm0644 "$srcdir/util-linux.sysusers" \ + "$pkgdir/usr/lib/sysusers.d/util-linux.conf" + + install -Dm0644 "$srcdir/60-rfkill.rules" \ + "$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules" + + install -Dm0644 "$srcdir/rfkill-unblock_.service" \ + "$pkgdir/usr/lib/systemd/system/rfkill-unblock@.service" + install -Dm0644 "$srcdir/rfkill-block_.service" \ + "$pkgdir/usr/lib/systemd/system/rfkill-block@.service" +} + +package_util-linux-libs() { + pkgdesc="util-linux runtime libraries" + provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so') + conflicts=('libutil-linux') + replaces=('libutil-linux') + + make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES +} Deleted: pam-common =================================================================== --- pam-common 2020-11-17 08:49:13 UTC (rev 401299) +++ pam-common 2020-11-17 08:49:17 UTC (rev 401300) @@ -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/staging-x86_64/pam-common (from rev 401299, util-linux/trunk/pam-common) =================================================================== --- pam-common (rev 0) +++ pam-common 2020-11-17 08:49:17 UTC (rev 401300) @@ -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 2020-11-17 08:49:13 UTC (rev 401299) +++ pam-login 2020-11-17 08:49:17 UTC (rev 401300) @@ -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/staging-x86_64/pam-login (from rev 401299, util-linux/trunk/pam-login) =================================================================== --- pam-login (rev 0) +++ pam-login 2020-11-17 08:49:17 UTC (rev 401300) @@ -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-runuser =================================================================== --- pam-runuser 2020-11-17 08:49:13 UTC (rev 401299) +++ pam-runuser 2020-11-17 08:49:17 UTC (rev 401300) @@ -1,4 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so -session include system-login Copied: util-linux/repos/staging-x86_64/pam-runuser (from rev 401299, util-linux/trunk/pam-runuser) =================================================================== --- pam-runuser (rev 0) +++ pam-runuser 2020-11-17 08:49:17 UTC (rev 401300) @@ -0,0 +1,4 @@ +#%PAM-1.0 + +auth sufficient pam_rootok.so +session include system-login Deleted: pam-su =================================================================== --- pam-su 2020-11-17 08:49:13 UTC (rev 401299) +++ pam-su 2020-11-17 08:49:17 UTC (rev 401300) @@ -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/staging-x86_64/pam-su (from rev 401299, util-linux/trunk/pam-su) =================================================================== --- pam-su (rev 0) +++ pam-su 2020-11-17 08:49:17 UTC (rev 401300) @@ -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: rfkill-block_.service =================================================================== --- rfkill-block_.service 2020-11-17 08:49:13 UTC (rev 401299) +++ rfkill-block_.service 2020-11-17 08:49:17 UTC (rev 401300) @@ -1,10 +0,0 @@ -[Unit] -Description=RFKill-Block %I -After=rfkill-unblock@all.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/rfkill block %I - -[Install] -WantedBy=multi-user.target Copied: util-linux/repos/staging-x86_64/rfkill-block_.service (from rev 401299, util-linux/trunk/rfkill-block_.service) =================================================================== --- rfkill-block_.service (rev 0) +++ rfkill-block_.service 2020-11-17 08:49:17 UTC (rev 401300) @@ -0,0 +1,10 @@ +[Unit] +Description=RFKill-Block %I +After=rfkill-unblock@all.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/rfkill block %I + +[Install] +WantedBy=multi-user.target Deleted: rfkill-unblock_.service =================================================================== --- rfkill-unblock_.service 2020-11-17 08:49:13 UTC (rev 401299) +++ rfkill-unblock_.service 2020-11-17 08:49:17 UTC (rev 401300) @@ -1,10 +0,0 @@ -[Unit] -Description=RFKill-Unblock %I -After=rfkill-block@all.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/rfkill unblock %I - -[Install] -WantedBy=multi-user.target Copied: util-linux/repos/staging-x86_64/rfkill-unblock_.service (from rev 401299, util-linux/trunk/rfkill-unblock_.service) =================================================================== --- rfkill-unblock_.service (rev 0) +++ rfkill-unblock_.service 2020-11-17 08:49:17 UTC (rev 401300) @@ -0,0 +1,10 @@ +[Unit] +Description=RFKill-Unblock %I +After=rfkill-block@all.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/rfkill unblock %I + +[Install] +WantedBy=multi-user.target Deleted: util-linux.sysusers =================================================================== --- util-linux.sysusers 2020-11-17 08:49:13 UTC (rev 401299) +++ util-linux.sysusers 2020-11-17 08:49:17 UTC (rev 401300) @@ -1,2 +0,0 @@ -u uuidd 68 -g rfkill - - - Copied: util-linux/repos/staging-x86_64/util-linux.sysusers (from rev 401299, util-linux/trunk/util-linux.sysusers) =================================================================== --- util-linux.sysusers (rev 0) +++ util-linux.sysusers 2020-11-17 08:49:17 UTC (rev 401300) @@ -0,0 +1,2 @@ +u uuidd 68 +g rfkill - - -