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

Dave Reisner dreisner at archlinux.org
Tue Sep 29 00:27:52 UTC 2015


    Date: Tuesday, September 29, 2015 @ 02:27:52
  Author: dreisner
Revision: 247863

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  util-linux/repos/testing-i686/0001-libmount-monitor-don-t-check-for-regular-mtab.patch
    (from rev 247862, util-linux/trunk/0001-libmount-monitor-don-t-check-for-regular-mtab.patch)
  util-linux/repos/testing-i686/PKGBUILD
    (from rev 247862, util-linux/trunk/PKGBUILD)
  util-linux/repos/testing-i686/pam-common
    (from rev 247862, util-linux/trunk/pam-common)
  util-linux/repos/testing-i686/pam-login
    (from rev 247862, util-linux/trunk/pam-login)
  util-linux/repos/testing-i686/pam-su
    (from rev 247862, util-linux/trunk/pam-su)
  util-linux/repos/testing-i686/util-linux.install
    (from rev 247862, util-linux/trunk/util-linux.install)
  util-linux/repos/testing-x86_64/0001-libmount-monitor-don-t-check-for-regular-mtab.patch
    (from rev 247862, util-linux/trunk/0001-libmount-monitor-don-t-check-for-regular-mtab.patch)
  util-linux/repos/testing-x86_64/PKGBUILD
    (from rev 247862, util-linux/trunk/PKGBUILD)
  util-linux/repos/testing-x86_64/pam-common
    (from rev 247862, util-linux/trunk/pam-common)
  util-linux/repos/testing-x86_64/pam-login
    (from rev 247862, util-linux/trunk/pam-login)
  util-linux/repos/testing-x86_64/pam-su
    (from rev 247862, util-linux/trunk/pam-su)
  util-linux/repos/testing-x86_64/util-linux.install
    (from rev 247862, util-linux/trunk/util-linux.install)
Deleted:
  util-linux/repos/testing-i686/0001-libmount-monitor-don-t-check-for-regular-mtab.patch
  util-linux/repos/testing-i686/PKGBUILD
  util-linux/repos/testing-i686/pam-common
  util-linux/repos/testing-i686/pam-login
  util-linux/repos/testing-i686/pam-su
  util-linux/repos/testing-i686/util-linux.install
  util-linux/repos/testing-x86_64/0001-libmount-monitor-don-t-check-for-regular-mtab.patch
  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

-------------------------------------------------------------------------+
 /0001-libmount-monitor-don-t-check-for-regular-mtab.patch               |   90 ++++
 /PKGBUILD                                                               |  198 ++++++++++
 /pam-common                                                             |   12 
 /pam-login                                                              |   14 
 /pam-su                                                                 |   18 
 /util-linux.install                                                     |   24 +
 testing-i686/0001-libmount-monitor-don-t-check-for-regular-mtab.patch   |   45 --
 testing-i686/PKGBUILD                                                   |   99 -----
 testing-i686/pam-common                                                 |    6 
 testing-i686/pam-login                                                  |    7 
 testing-i686/pam-su                                                     |    9 
 testing-i686/util-linux.install                                         |   12 
 testing-x86_64/0001-libmount-monitor-don-t-check-for-regular-mtab.patch |   45 --
 testing-x86_64/PKGBUILD                                                 |   99 -----
 testing-x86_64/pam-common                                               |    6 
 testing-x86_64/pam-login                                                |    7 
 testing-x86_64/pam-su                                                   |    9 
 testing-x86_64/util-linux.install                                       |   12 
 18 files changed, 356 insertions(+), 356 deletions(-)

Deleted: testing-i686/0001-libmount-monitor-don-t-check-for-regular-mtab.patch
===================================================================
--- testing-i686/0001-libmount-monitor-don-t-check-for-regular-mtab.patch	2015-09-29 00:26:51 UTC (rev 247862)
+++ testing-i686/0001-libmount-monitor-don-t-check-for-regular-mtab.patch	2015-09-29 00:27:52 UTC (rev 247863)
@@ -1,45 +0,0 @@
-From 02501746545ef729cefed28b5feb0b4e59c3d34f Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak at redhat.com>
-Date: Fri, 11 Sep 2015 11:19:30 +0200
-Subject: [PATCH] libmount: (monitor) don't check for regular mtab
-
-The monitor supports utab only (as documented). It's application
-responsibility to use libmount in the right way. It's overkill to
-check for valid environment during monitor initialization.
-
-For example systemd checks for regular mtab during boot, it's better
-than try to be smart later in libmount monitor when system is already
-running.
-
-Signed-off-by: Karel Zak <kzak at redhat.com>
----
- libmount/src/monitor.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/libmount/src/monitor.c b/libmount/src/monitor.c
-index cc3854e..ca9e02c 100644
---- a/libmount/src/monitor.c
-+++ b/libmount/src/monitor.c
-@@ -220,7 +220,7 @@ static int userspace_add_watch(struct monitor_entry *me, int *final, int *fd)
- 	assert(me->path);
- 
- 	/*
--	 * libmount uses rename(2) to atomically update utab/mtab, monitor
-+	 * libmount uses rename(2) to atomically update utab, monitor
- 	 * rename changes is too tricky. It seems better to monitor utab
- 	 * lockfile close.
- 	 */
-@@ -399,10 +399,6 @@ int mnt_monitor_enable_userspace(struct libmnt_monitor *mn, int enable, const ch
- 
- 	DBG(MONITOR, ul_debugobj(mn, "allocate new userspace monitor"));
- 
--	/* create a new entry */
--	if (mnt_has_regular_mtab(NULL, NULL))
--		return -ENOSYS;
--
- 	if (!filename)
- 		filename = mnt_get_utab_path();		/* /run/mount/utab */
- 	if (!filename) {
--- 
-2.5.3
-

Copied: util-linux/repos/testing-i686/0001-libmount-monitor-don-t-check-for-regular-mtab.patch (from rev 247862, util-linux/trunk/0001-libmount-monitor-don-t-check-for-regular-mtab.patch)
===================================================================
--- testing-i686/0001-libmount-monitor-don-t-check-for-regular-mtab.patch	                        (rev 0)
+++ testing-i686/0001-libmount-monitor-don-t-check-for-regular-mtab.patch	2015-09-29 00:27:52 UTC (rev 247863)
@@ -0,0 +1,45 @@
+From 02501746545ef729cefed28b5feb0b4e59c3d34f Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak at redhat.com>
+Date: Fri, 11 Sep 2015 11:19:30 +0200
+Subject: [PATCH] libmount: (monitor) don't check for regular mtab
+
+The monitor supports utab only (as documented). It's application
+responsibility to use libmount in the right way. It's overkill to
+check for valid environment during monitor initialization.
+
+For example systemd checks for regular mtab during boot, it's better
+than try to be smart later in libmount monitor when system is already
+running.
+
+Signed-off-by: Karel Zak <kzak at redhat.com>
+---
+ libmount/src/monitor.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/libmount/src/monitor.c b/libmount/src/monitor.c
+index cc3854e..ca9e02c 100644
+--- a/libmount/src/monitor.c
++++ b/libmount/src/monitor.c
+@@ -220,7 +220,7 @@ static int userspace_add_watch(struct monitor_entry *me, int *final, int *fd)
+ 	assert(me->path);
+ 
+ 	/*
+-	 * libmount uses rename(2) to atomically update utab/mtab, monitor
++	 * libmount uses rename(2) to atomically update utab, monitor
+ 	 * rename changes is too tricky. It seems better to monitor utab
+ 	 * lockfile close.
+ 	 */
+@@ -399,10 +399,6 @@ int mnt_monitor_enable_userspace(struct libmnt_monitor *mn, int enable, const ch
+ 
+ 	DBG(MONITOR, ul_debugobj(mn, "allocate new userspace monitor"));
+ 
+-	/* create a new entry */
+-	if (mnt_has_regular_mtab(NULL, NULL))
+-		return -ENOSYS;
+-
+ 	if (!filename)
+ 		filename = mnt_get_utab_path();		/* /run/mount/utab */
+ 	if (!filename) {
+-- 
+2.5.3
+

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2015-09-29 00:26:51 UTC (rev 247862)
+++ testing-i686/PKGBUILD	2015-09-29 00:27:52 UTC (rev 247863)
@@ -1,99 +0,0 @@
-# $Id$
-# 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 libutil-linux)
-pkgver=2.27
-pkgrel=4
-pkgdesc="Miscellaneous system utilities for Linux"
-url="https://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('i686' 'x86_64')
-makedepends=('systemd' 'python')
-license=('GPL2')
-options=('strip' 'debug')
-validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
-source=("https://www.kernel.org/pub/linux/utils/util-linux/v2.27/$pkgbase-$pkgver.tar."{xz,sign}
-        "0001-libmount-monitor-don-t-check-for-regular-mtab.patch"
-        pam-{login,common,su})
-md5sums=('5b06bbda9309624ee7add15bc8d8ca22'
-         'SKIP'
-         'f9e06605db9107b9c4bb1c48059fe18e'
-         '4368b3f98abd8a32662e094c54e7f9b1'
-         'a31374fef2cba0ca34dfc7078e2969e4'
-         'fa85e5cce5d723275b14365ba71a8aad')
-
-prepare() {
-  cd "$pkgbase-$pkgver"
-
-  patch -Np1 <../0001-libmount-monitor-don-t-check-for-regular-mtab.patch
-}
-
-build() {
-  cd "$pkgbase-$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-libmount-force-mountinfo \
-              --with-python=3
-
-  make
-}
-
-package_util-linux() {
-  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
-  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 "$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 -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"
-
-  # 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 sbin usr/sbin
-
-  ### 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' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
-
-  make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
-}

Copied: util-linux/repos/testing-i686/PKGBUILD (from rev 247862, util-linux/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2015-09-29 00:27:52 UTC (rev 247863)
@@ -0,0 +1,99 @@
+# $Id$
+# 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 libutil-linux)
+pkgver=2.27
+pkgrel=5
+pkgdesc="Miscellaneous system utilities for Linux"
+url="https://www.kernel.org/pub/linux/utils/util-linux/"
+arch=('i686' 'x86_64')
+makedepends=('systemd' 'python')
+license=('GPL2')
+options=('strip' 'debug')
+validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
+source=("https://www.kernel.org/pub/linux/utils/util-linux/v2.27/$pkgbase-$pkgver.tar."{xz,sign}
+        "0001-libmount-monitor-don-t-check-for-regular-mtab.patch"
+        pam-{login,common,su})
+md5sums=('5b06bbda9309624ee7add15bc8d8ca22'
+         'SKIP'
+         'f9e06605db9107b9c4bb1c48059fe18e'
+         '4368b3f98abd8a32662e094c54e7f9b1'
+         'a31374fef2cba0ca34dfc7078e2969e4'
+         'fa85e5cce5d723275b14365ba71a8aad')
+
+prepare() {
+  cd "$pkgbase-$pkgver"
+
+  patch -Np1 <../0001-libmount-monitor-don-t-check-for-regular-mtab.patch
+}
+
+build() {
+  cd "$pkgbase-$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-libmount-force-mountinfo \
+              --with-python=3
+
+  make
+}
+
+package_util-linux() {
+  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
+  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 "$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 -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"
+
+  # 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 sbin usr/sbin
+
+  ### 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' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+
+  make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
+}

Deleted: testing-i686/pam-common
===================================================================
--- testing-i686/pam-common	2015-09-29 00:26:51 UTC (rev 247862)
+++ testing-i686/pam-common	2015-09-29 00:27:52 UTC (rev 247863)
@@ -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-i686/pam-common (from rev 247862, util-linux/trunk/pam-common)
===================================================================
--- testing-i686/pam-common	                        (rev 0)
+++ testing-i686/pam-common	2015-09-29 00:27:52 UTC (rev 247863)
@@ -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: testing-i686/pam-login
===================================================================
--- testing-i686/pam-login	2015-09-29 00:26:51 UTC (rev 247862)
+++ testing-i686/pam-login	2015-09-29 00:27:52 UTC (rev 247863)
@@ -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-i686/pam-login (from rev 247862, util-linux/trunk/pam-login)
===================================================================
--- testing-i686/pam-login	                        (rev 0)
+++ testing-i686/pam-login	2015-09-29 00:27:52 UTC (rev 247863)
@@ -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: testing-i686/pam-su
===================================================================
--- testing-i686/pam-su	2015-09-29 00:26:51 UTC (rev 247862)
+++ testing-i686/pam-su	2015-09-29 00:27:52 UTC (rev 247863)
@@ -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-i686/pam-su (from rev 247862, util-linux/trunk/pam-su)
===================================================================
--- testing-i686/pam-su	                        (rev 0)
+++ testing-i686/pam-su	2015-09-29 00:27:52 UTC (rev 247863)
@@ -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: testing-i686/util-linux.install
===================================================================
--- testing-i686/util-linux.install	2015-09-29 00:26:51 UTC (rev 247862)
+++ testing-i686/util-linux.install	2015-09-29 00:27:52 UTC (rev 247863)
@@ -1,12 +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() {
-  post_install
-}

Copied: util-linux/repos/testing-i686/util-linux.install (from rev 247862, util-linux/trunk/util-linux.install)
===================================================================
--- testing-i686/util-linux.install	                        (rev 0)
+++ testing-i686/util-linux.install	2015-09-29 00:27:52 UTC (rev 247863)
@@ -0,0 +1,12 @@
+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() {
+  post_install
+}

Deleted: testing-x86_64/0001-libmount-monitor-don-t-check-for-regular-mtab.patch
===================================================================
--- testing-x86_64/0001-libmount-monitor-don-t-check-for-regular-mtab.patch	2015-09-29 00:26:51 UTC (rev 247862)
+++ testing-x86_64/0001-libmount-monitor-don-t-check-for-regular-mtab.patch	2015-09-29 00:27:52 UTC (rev 247863)
@@ -1,45 +0,0 @@
-From 02501746545ef729cefed28b5feb0b4e59c3d34f Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak at redhat.com>
-Date: Fri, 11 Sep 2015 11:19:30 +0200
-Subject: [PATCH] libmount: (monitor) don't check for regular mtab
-
-The monitor supports utab only (as documented). It's application
-responsibility to use libmount in the right way. It's overkill to
-check for valid environment during monitor initialization.
-
-For example systemd checks for regular mtab during boot, it's better
-than try to be smart later in libmount monitor when system is already
-running.
-
-Signed-off-by: Karel Zak <kzak at redhat.com>
----
- libmount/src/monitor.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/libmount/src/monitor.c b/libmount/src/monitor.c
-index cc3854e..ca9e02c 100644
---- a/libmount/src/monitor.c
-+++ b/libmount/src/monitor.c
-@@ -220,7 +220,7 @@ static int userspace_add_watch(struct monitor_entry *me, int *final, int *fd)
- 	assert(me->path);
- 
- 	/*
--	 * libmount uses rename(2) to atomically update utab/mtab, monitor
-+	 * libmount uses rename(2) to atomically update utab, monitor
- 	 * rename changes is too tricky. It seems better to monitor utab
- 	 * lockfile close.
- 	 */
-@@ -399,10 +399,6 @@ int mnt_monitor_enable_userspace(struct libmnt_monitor *mn, int enable, const ch
- 
- 	DBG(MONITOR, ul_debugobj(mn, "allocate new userspace monitor"));
- 
--	/* create a new entry */
--	if (mnt_has_regular_mtab(NULL, NULL))
--		return -ENOSYS;
--
- 	if (!filename)
- 		filename = mnt_get_utab_path();		/* /run/mount/utab */
- 	if (!filename) {
--- 
-2.5.3
-

Copied: util-linux/repos/testing-x86_64/0001-libmount-monitor-don-t-check-for-regular-mtab.patch (from rev 247862, util-linux/trunk/0001-libmount-monitor-don-t-check-for-regular-mtab.patch)
===================================================================
--- testing-x86_64/0001-libmount-monitor-don-t-check-for-regular-mtab.patch	                        (rev 0)
+++ testing-x86_64/0001-libmount-monitor-don-t-check-for-regular-mtab.patch	2015-09-29 00:27:52 UTC (rev 247863)
@@ -0,0 +1,45 @@
+From 02501746545ef729cefed28b5feb0b4e59c3d34f Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak at redhat.com>
+Date: Fri, 11 Sep 2015 11:19:30 +0200
+Subject: [PATCH] libmount: (monitor) don't check for regular mtab
+
+The monitor supports utab only (as documented). It's application
+responsibility to use libmount in the right way. It's overkill to
+check for valid environment during monitor initialization.
+
+For example systemd checks for regular mtab during boot, it's better
+than try to be smart later in libmount monitor when system is already
+running.
+
+Signed-off-by: Karel Zak <kzak at redhat.com>
+---
+ libmount/src/monitor.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/libmount/src/monitor.c b/libmount/src/monitor.c
+index cc3854e..ca9e02c 100644
+--- a/libmount/src/monitor.c
++++ b/libmount/src/monitor.c
+@@ -220,7 +220,7 @@ static int userspace_add_watch(struct monitor_entry *me, int *final, int *fd)
+ 	assert(me->path);
+ 
+ 	/*
+-	 * libmount uses rename(2) to atomically update utab/mtab, monitor
++	 * libmount uses rename(2) to atomically update utab, monitor
+ 	 * rename changes is too tricky. It seems better to monitor utab
+ 	 * lockfile close.
+ 	 */
+@@ -399,10 +399,6 @@ int mnt_monitor_enable_userspace(struct libmnt_monitor *mn, int enable, const ch
+ 
+ 	DBG(MONITOR, ul_debugobj(mn, "allocate new userspace monitor"));
+ 
+-	/* create a new entry */
+-	if (mnt_has_regular_mtab(NULL, NULL))
+-		return -ENOSYS;
+-
+ 	if (!filename)
+ 		filename = mnt_get_utab_path();		/* /run/mount/utab */
+ 	if (!filename) {
+-- 
+2.5.3
+

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2015-09-29 00:26:51 UTC (rev 247862)
+++ testing-x86_64/PKGBUILD	2015-09-29 00:27:52 UTC (rev 247863)
@@ -1,99 +0,0 @@
-# $Id$
-# 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 libutil-linux)
-pkgver=2.27
-pkgrel=4
-pkgdesc="Miscellaneous system utilities for Linux"
-url="https://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('i686' 'x86_64')
-makedepends=('systemd' 'python')
-license=('GPL2')
-options=('strip' 'debug')
-validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
-source=("https://www.kernel.org/pub/linux/utils/util-linux/v2.27/$pkgbase-$pkgver.tar."{xz,sign}
-        "0001-libmount-monitor-don-t-check-for-regular-mtab.patch"
-        pam-{login,common,su})
-md5sums=('5b06bbda9309624ee7add15bc8d8ca22'
-         'SKIP'
-         'f9e06605db9107b9c4bb1c48059fe18e'
-         '4368b3f98abd8a32662e094c54e7f9b1'
-         'a31374fef2cba0ca34dfc7078e2969e4'
-         'fa85e5cce5d723275b14365ba71a8aad')
-
-prepare() {
-  cd "$pkgbase-$pkgver"
-
-  patch -Np1 <../0001-libmount-monitor-don-t-check-for-regular-mtab.patch
-}
-
-build() {
-  cd "$pkgbase-$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-libmount-force-mountinfo \
-              --with-python=3
-
-  make
-}
-
-package_util-linux() {
-  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
-  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 "$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 -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"
-
-  # 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 sbin usr/sbin
-
-  ### 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' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
-
-  make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
-}

Copied: util-linux/repos/testing-x86_64/PKGBUILD (from rev 247862, util-linux/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2015-09-29 00:27:52 UTC (rev 247863)
@@ -0,0 +1,99 @@
+# $Id$
+# 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 libutil-linux)
+pkgver=2.27
+pkgrel=5
+pkgdesc="Miscellaneous system utilities for Linux"
+url="https://www.kernel.org/pub/linux/utils/util-linux/"
+arch=('i686' 'x86_64')
+makedepends=('systemd' 'python')
+license=('GPL2')
+options=('strip' 'debug')
+validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
+source=("https://www.kernel.org/pub/linux/utils/util-linux/v2.27/$pkgbase-$pkgver.tar."{xz,sign}
+        "0001-libmount-monitor-don-t-check-for-regular-mtab.patch"
+        pam-{login,common,su})
+md5sums=('5b06bbda9309624ee7add15bc8d8ca22'
+         'SKIP'
+         'f9e06605db9107b9c4bb1c48059fe18e'
+         '4368b3f98abd8a32662e094c54e7f9b1'
+         'a31374fef2cba0ca34dfc7078e2969e4'
+         'fa85e5cce5d723275b14365ba71a8aad')
+
+prepare() {
+  cd "$pkgbase-$pkgver"
+
+  patch -Np1 <../0001-libmount-monitor-don-t-check-for-regular-mtab.patch
+}
+
+build() {
+  cd "$pkgbase-$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-libmount-force-mountinfo \
+              --with-python=3
+
+  make
+}
+
+package_util-linux() {
+  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
+  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 "$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 -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"
+
+  # 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 sbin usr/sbin
+
+  ### 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' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+
+  make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
+}

Deleted: testing-x86_64/pam-common
===================================================================
--- testing-x86_64/pam-common	2015-09-29 00:26:51 UTC (rev 247862)
+++ testing-x86_64/pam-common	2015-09-29 00:27:52 UTC (rev 247863)
@@ -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 247862, util-linux/trunk/pam-common)
===================================================================
--- testing-x86_64/pam-common	                        (rev 0)
+++ testing-x86_64/pam-common	2015-09-29 00:27:52 UTC (rev 247863)
@@ -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: testing-x86_64/pam-login
===================================================================
--- testing-x86_64/pam-login	2015-09-29 00:26:51 UTC (rev 247862)
+++ testing-x86_64/pam-login	2015-09-29 00:27:52 UTC (rev 247863)
@@ -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 247862, util-linux/trunk/pam-login)
===================================================================
--- testing-x86_64/pam-login	                        (rev 0)
+++ testing-x86_64/pam-login	2015-09-29 00:27:52 UTC (rev 247863)
@@ -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: testing-x86_64/pam-su
===================================================================
--- testing-x86_64/pam-su	2015-09-29 00:26:51 UTC (rev 247862)
+++ testing-x86_64/pam-su	2015-09-29 00:27:52 UTC (rev 247863)
@@ -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 247862, util-linux/trunk/pam-su)
===================================================================
--- testing-x86_64/pam-su	                        (rev 0)
+++ testing-x86_64/pam-su	2015-09-29 00:27:52 UTC (rev 247863)
@@ -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: testing-x86_64/util-linux.install
===================================================================
--- testing-x86_64/util-linux.install	2015-09-29 00:26:51 UTC (rev 247862)
+++ testing-x86_64/util-linux.install	2015-09-29 00:27:52 UTC (rev 247863)
@@ -1,12 +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() {
-  post_install
-}

Copied: util-linux/repos/testing-x86_64/util-linux.install (from rev 247862, util-linux/trunk/util-linux.install)
===================================================================
--- testing-x86_64/util-linux.install	                        (rev 0)
+++ testing-x86_64/util-linux.install	2015-09-29 00:27:52 UTC (rev 247863)
@@ -0,0 +1,12 @@
+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() {
+  post_install
+}



More information about the arch-commits mailing list