[arch-commits] Commit in util-linux/repos (11 files)

Christian Hesse eworm at archlinux.org
Fri Feb 12 15:00:15 UTC 2021


    Date: Friday, February 12, 2021 @ 15:00:15
  Author: eworm
Revision: 407882

archrelease: copy trunk to testing-x86_64

Added:
  util-linux/repos/testing-x86_64/
  util-linux/repos/testing-x86_64/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch
    (from rev 407881, util-linux/trunk/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch)
  util-linux/repos/testing-x86_64/60-rfkill.rules
    (from rev 407881, util-linux/trunk/60-rfkill.rules)
  util-linux/repos/testing-x86_64/PKGBUILD
    (from rev 407881, util-linux/trunk/PKGBUILD)
  util-linux/repos/testing-x86_64/pam-common
    (from rev 407881, util-linux/trunk/pam-common)
  util-linux/repos/testing-x86_64/pam-login
    (from rev 407881, util-linux/trunk/pam-login)
  util-linux/repos/testing-x86_64/pam-runuser
    (from rev 407881, util-linux/trunk/pam-runuser)
  util-linux/repos/testing-x86_64/pam-su
    (from rev 407881, util-linux/trunk/pam-su)
  util-linux/repos/testing-x86_64/rfkill-block_.service
    (from rev 407881, util-linux/trunk/rfkill-block_.service)
  util-linux/repos/testing-x86_64/rfkill-unblock_.service
    (from rev 407881, util-linux/trunk/rfkill-unblock_.service)
  util-linux/repos/testing-x86_64/util-linux.sysusers
    (from rev 407881, util-linux/trunk/util-linux.sysusers)

--------------------------------------------------------------------+
 0001-libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch |   37 ++
 60-rfkill.rules                                                    |    1 
 PKGBUILD                                                           |  128 ++++++++++
 pam-common                                                         |    6 
 pam-login                                                          |    7 
 pam-runuser                                                        |    4 
 pam-su                                                             |    9 
 rfkill-block_.service                                              |   10 
 rfkill-unblock_.service                                            |   10 
 util-linux.sysusers                                                |    2 
 10 files changed, 214 insertions(+)

Copied: util-linux/repos/testing-x86_64/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch (from rev 407881, util-linux/trunk/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch)
===================================================================
--- testing-x86_64/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch	                        (rev 0)
+++ testing-x86_64/0001-libmount-don-t-use-symfollow-for-helpers-on-user-mounts.patch	2021-02-12 15:00:15 UTC (rev 407882)
@@ -0,0 +1,37 @@
+From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak at redhat.com>
+Date: Thu, 19 Nov 2020 09:49:16 +0100
+Subject: libmount: don't use "symfollow" for helpers on user mounts
+
+Addresses: https://github.com/karelzak/util-linux/issues/1193
+Signed-off-by: Karel Zak <kzak at redhat.com>
+---
+ libmount/src/context_mount.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
+index 8c394c1ff..dd1786176 100644
+--- a/libmount/src/context_mount.c
++++ b/libmount/src/context_mount.c
+@@ -415,6 +415,9 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
+ 		 * string, because there is nothing like MS_EXEC (we only have
+ 		 * MS_NOEXEC in mount flags and we don't care about the original
+ 		 * mount string in libmount for VFS options).
++		 *
++		 * This use-case makes sense for MS_SECURE flags only (see
++		 * mnt_optstr_get_flags() and mnt_context_merge_mflags()).
+ 		 */
+ 		if (!(cxt->mountflags & MS_NOEXEC))
+ 			mnt_optstr_append_option(optstr, "exec", NULL);
+@@ -422,11 +425,8 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr)
+ 			mnt_optstr_append_option(optstr, "suid", NULL);
+ 		if (!(cxt->mountflags & MS_NODEV))
+ 			mnt_optstr_append_option(optstr, "dev", NULL);
+-		if (!(cxt->mountflags & MS_NOSYMFOLLOW))
+-			mnt_optstr_append_option(optstr, "symfollow", NULL);
+ 	}
+ 
+-
+ 	if (cxt->flags & MNT_FL_SAVED_USER)
+ 		rc = mnt_optstr_set_option(optstr, "user", cxt->orig_user);
+ 	if (rc)

Copied: util-linux/repos/testing-x86_64/60-rfkill.rules (from rev 407881, util-linux/trunk/60-rfkill.rules)
===================================================================
--- testing-x86_64/60-rfkill.rules	                        (rev 0)
+++ testing-x86_64/60-rfkill.rules	2021-02-12 15:00:15 UTC (rev 407882)
@@ -0,0 +1 @@
+KERNEL=="rfkill", GROUP="rfkill", MODE="0664"

Copied: util-linux/repos/testing-x86_64/PKGBUILD (from rev 407881, util-linux/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2021-02-12 15:00:15 UTC (rev 407882)
@@ -0,0 +1,128 @@
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgbase=util-linux
+pkgname=(util-linux util-linux-libs)
+_pkgmajor=2.36
+pkgver=${_pkgmajor}.2
+pkgrel=1
+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=('f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f'
+            '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 at .service"
+  install -Dm0644 "$srcdir/rfkill-block_.service" \
+    "$pkgdir/usr/lib/systemd/system/rfkill-block at .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/testing-x86_64/pam-common (from rev 407881, util-linux/trunk/pam-common)
===================================================================
--- testing-x86_64/pam-common	                        (rev 0)
+++ testing-x86_64/pam-common	2021-02-12 15:00:15 UTC (rev 407882)
@@ -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

Copied: util-linux/repos/testing-x86_64/pam-login (from rev 407881, util-linux/trunk/pam-login)
===================================================================
--- testing-x86_64/pam-login	                        (rev 0)
+++ testing-x86_64/pam-login	2021-02-12 15:00:15 UTC (rev 407882)
@@ -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

Copied: util-linux/repos/testing-x86_64/pam-runuser (from rev 407881, util-linux/trunk/pam-runuser)
===================================================================
--- testing-x86_64/pam-runuser	                        (rev 0)
+++ testing-x86_64/pam-runuser	2021-02-12 15:00:15 UTC (rev 407882)
@@ -0,0 +1,4 @@
+#%PAM-1.0
+
+auth    sufficient pam_rootok.so
+session include    system-login

Copied: util-linux/repos/testing-x86_64/pam-su (from rev 407881, util-linux/trunk/pam-su)
===================================================================
--- testing-x86_64/pam-su	                        (rev 0)
+++ testing-x86_64/pam-su	2021-02-12 15:00:15 UTC (rev 407882)
@@ -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

Copied: util-linux/repos/testing-x86_64/rfkill-block_.service (from rev 407881, util-linux/trunk/rfkill-block_.service)
===================================================================
--- testing-x86_64/rfkill-block_.service	                        (rev 0)
+++ testing-x86_64/rfkill-block_.service	2021-02-12 15:00:15 UTC (rev 407882)
@@ -0,0 +1,10 @@
+[Unit]
+Description=RFKill-Block %I
+After=rfkill-unblock at all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/rfkill block %I
+
+[Install]
+WantedBy=multi-user.target

Copied: util-linux/repos/testing-x86_64/rfkill-unblock_.service (from rev 407881, util-linux/trunk/rfkill-unblock_.service)
===================================================================
--- testing-x86_64/rfkill-unblock_.service	                        (rev 0)
+++ testing-x86_64/rfkill-unblock_.service	2021-02-12 15:00:15 UTC (rev 407882)
@@ -0,0 +1,10 @@
+[Unit]
+Description=RFKill-Unblock %I
+After=rfkill-block at all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/rfkill unblock %I
+
+[Install]
+WantedBy=multi-user.target

Copied: util-linux/repos/testing-x86_64/util-linux.sysusers (from rev 407881, util-linux/trunk/util-linux.sysusers)
===================================================================
--- testing-x86_64/util-linux.sysusers	                        (rev 0)
+++ testing-x86_64/util-linux.sysusers	2021-02-12 15:00:15 UTC (rev 407882)
@@ -0,0 +1,2 @@
+u uuidd 68
+g rfkill - - -


More information about the arch-commits mailing list