Date: Tuesday, November 3, 2015 @ 03:16:50 Author: dreisner Revision: 250039
upgpkg: util-linux 2.27.1-1 Modified: util-linux/trunk/PKGBUILD Deleted: util-linux/trunk/0001-libmount-monitor-don-t-check-for-regular-mtab.patch ----------------------------------------------------------+ 0001-libmount-monitor-don-t-check-for-regular-mtab.patch | 45 ------------- PKGBUILD | 16 +--- 2 files changed, 4 insertions(+), 57 deletions(-) Deleted: 0001-libmount-monitor-don-t-check-for-regular-mtab.patch =================================================================== --- 0001-libmount-monitor-don-t-check-for-regular-mtab.patch 2015-11-02 22:34:54 UTC (rev 250038) +++ 0001-libmount-monitor-don-t-check-for-regular-mtab.patch 2015-11-03 02:16:50 UTC (rev 250039) @@ -1,45 +0,0 @@ -From 02501746545ef729cefed28b5feb0b4e59c3d34f Mon Sep 17 00:00:00 2001 -From: Karel Zak <[email protected]> -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 <[email protected]> ---- - 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 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-11-02 22:34:54 UTC (rev 250038) +++ PKGBUILD 2015-11-03 02:16:50 UTC (rev 250039) @@ -5,8 +5,8 @@ pkgbase=util-linux pkgname=(util-linux libutil-linux) -pkgver=2.27 -pkgrel=6 +pkgver=2.27.1 +pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="https://www.kernel.org/pub/linux/utils/util-linux/"; arch=('i686' 'x86_64') @@ -14,22 +14,14 @@ 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" +source=("https://www.kernel.org/pub/linux/utils/util-linux/v${pkgver%.?}/$pkgbase-$pkgver.tar."{xz,sign} pam-{login,common,su}) -md5sums=('5b06bbda9309624ee7add15bc8d8ca22' +md5sums=('3cd2698d1363a2c64091c2dadc974647' '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"
