util-linux-selinux 2.27.1-1 update

4 files changed, 13 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff4831a8b32a..b9fa5a59a298 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = util-linux-selinux
 	pkgdesc = SELinux aware miscellaneous system utilities for Linux
-	pkgver = 2.27
-	pkgrel = 6
+	pkgver = 2.27.1
+	pkgrel = 1
 	url = https://www.kernel.org/pub/linux/utils/util-linux/
 	arch = i686
 	arch = x86_64
@@ -12,15 +12,13 @@ pkgbase = util-linux-selinux
 	makedepends = libselinux
 	options = strip
 	options = debug
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.27/util-linux-2.27.tar.xz
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.27/util-linux-2.27.tar.sign
-	source = 0001-libmount-monitor-don-t-check-for-regular-mtab.patch
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.27/util-linux-2.27.1.tar.xz
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.27/util-linux-2.27.1.tar.sign
 	source = pam-login
 	source = pam-common
 	source = pam-su
-	md5sums = 5b06bbda9309624ee7add15bc8d8ca22
+	md5sums = 3cd2698d1363a2c64091c2dadc974647
 	md5sums = SKIP
-	md5sums = f9e06605db9107b9c4bb1c48059fe18e
 	md5sums = 4368b3f98abd8a32662e094c54e7f9b1
 	md5sums = a31374fef2cba0ca34dfc7078e2969e4
 	md5sums = fa85e5cce5d723275b14365ba71a8aad
@@ -32,11 +30,11 @@ pkgname = util-linux-selinux
 	depends = libsystemd-selinux
 	depends = libutil-linux-selinux
 	optdepends = python: python bindings to libmount
-	provides = util-linux-ng=2.27
+	provides = util-linux-ng=2.27.1
 	provides = eject
 	provides = zramctl
-	provides = util-linux=2.27-
-	provides = selinux-util-linux=2.27-
+	provides = util-linux=2.27.1-
+	provides = selinux-util-linux=2.27.1-
 	conflicts = util-linux-ng
 	conflicts = eject
 	conflicts = zramctl
@@ -56,6 +54,6 @@ pkgname = libutil-linux-selinux
 	provides = libmount.so
 	provides = libsmartcols.so
 	provides = libuuid.so
-	provides = libutil-linux=2.27-
+	provides = libutil-linux=2.27.1-
 	conflicts = libutil-linux
 
diff --git a/0001-libmount-monitor-don-t-check-for-regular-mtab.patch b/0001-libmount-monitor-don-t-check-for-regular-mtab.patch
deleted file mode 100644
index 5a6372d7882d..000000000000
--- a/0001-libmount-monitor-don-t-check-for-regular-mtab.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 02501746545ef729cefed28b5feb0b4e59c3d34f Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@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@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
-
diff --git a/PKGBUILD b/PKGBUILD
index acafbaf6c2cf..70eded81aa04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 
 pkgbase=util-linux-selinux
 pkgname=(util-linux-selinux libutil-linux-selinux)
-pkgver=2.27
-pkgrel=6
+pkgver=2.27.1
+pkgrel=1
 pkgdesc="SELinux aware miscellaneous system utilities for Linux"
 url="https://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
@@ -23,22 +23,14 @@ makedepends=('systemd' 'python' 'libselinux')
 license=('GPL2')
 options=('strip' 'debug')
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
-source=("https://www.kernel.org/pub/linux/utils/util-linux/v2.27/${pkgname/-selinux}-$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%.?}/${pkgname/-selinux}-$pkgver.tar."{xz,sign}
         pam-{login,common,su})
-md5sums=('5b06bbda9309624ee7add15bc8d8ca22'
+md5sums=('3cd2698d1363a2c64091c2dadc974647'
          'SKIP'
-         'f9e06605db9107b9c4bb1c48059fe18e'
          '4368b3f98abd8a32662e094c54e7f9b1'
          'a31374fef2cba0ca34dfc7078e2969e4'
          'fa85e5cce5d723275b14365ba71a8aad')
 
-prepare() {
-  cd "${pkgbase/-selinux}-$pkgver"
-
-  patch -Np1 <../0001-libmount-monitor-don-t-check-for-regular-mtab.patch
-}
-
 build() {
   cd "${pkgbase/-selinux}-$pkgver"
 
@@ -54,7 +46,6 @@ build() {
               --enable-write \
               --enable-mesg \
               --enable-libmount-force-mountinfo \
-              --enable-socket-activation \
               --with-selinux \
               --with-python=3
 
diff --git a/util-linux.install b/util-linux.install
deleted file mode 100644
index 3fbfc2187d3a..000000000000
--- a/util-linux.install
+++ /dev/null
@@ -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
-}