util-linux-selinux 2.35-1 update

3 files changed, 11 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 802b205fe619..6010a55dc80b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = util-linux-selinux
 	pkgdesc = SELinux aware miscellaneous system utilities for Linux
-	pkgver = 2.34
-	pkgrel = 8
+	pkgver = 2.35
+	pkgrel = 1
 	url = https://github.com/karelzak/util-linux
 	arch = x86_64
 	groups = selinux
@@ -11,9 +11,8 @@ pkgbase = util-linux-selinux
 	makedepends = libcap-ng
 	makedepends = libselinux
 	options = strip
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-2.34.tar.sign
-	source = 0001-lsblk-force-to-print-PKNAME-for-partition.patch
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.tar.xz
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.tar.sign
 	source = pam-login
 	source = pam-common
 	source = pam-runuser
@@ -23,9 +22,8 @@ pkgbase = util-linux-selinux
 	source = rfkill-unblock_.service
 	source = rfkill-block_.service
 	validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284
-	sha256sums = 743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5
+	sha256sums = b3081b560268c1ec3367e035234e91616fa7923a0afc2b1c80a2a6d8b9dfe2c9
 	sha256sums = SKIP
-	sha256sums = cfadc020011f88c028dc50c4e6790f5bae385b881417d917a8706c6ff78613d9
 	sha256sums = 993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92
 	sha256sums = fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20
 	sha256sums = 95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935
@@ -45,8 +43,8 @@ pkgname = util-linux-selinux
 	optdepends = python: python bindings to libmount
 	optdepends = words: default dictionary for look
 	provides = rfkill
-	provides = util-linux=2.34-8
-	provides = selinux-util-linux=2.34-8
+	provides = util-linux=2.35-1
+	provides = selinux-util-linux=2.35-1
 	conflicts = rfkill
 	conflicts = util-linux
 	conflicts = selinux-util-linux
@@ -66,6 +64,6 @@ pkgname = libutil-linux-selinux
 	provides = libmount.so
 	provides = libsmartcols.so
 	provides = libuuid.so
-	provides = libutil-linux=2.34-8
+	provides = libutil-linux=2.35-1
 	conflicts = libutil-linux
 
diff --git a/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/0001-lsblk-force-to-print-PKNAME-for-partition.patch
deleted file mode 100644
index 3fc342b3732a..000000000000
--- a/0001-lsblk-force-to-print-PKNAME-for-partition.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Thu, 27 Jun 2019 09:22:18 +0200
-Subject: [PATCH 1/1] lsblk: force to print PKNAME for partition
-
-PKNAME (parent kernel device name) is based on printed tree according
-to parent -> child relationship. The tree is optional and not printed
-if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old
-versions print the PKNAME also in this case.
-
-Addresses: https://github.com/karelzak/util-linux/issues/813
-Signed-off-by: Karel Zak <kzak@redhat.com>
-Signed-off-by: Christian Hesse <mail@eworm.de>
----
- misc-utils/lsblk.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
-index e95af7af0..3ce6da730 100644
---- a/misc-utils/lsblk.c
-+++ b/misc-utils/lsblk.c
-@@ -1019,6 +1019,9 @@ static void device_to_scols(
- 	DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name));
- 	ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name));
- 
-+	if (!parent && dev->wholedisk)
-+		parent = dev->wholedisk;
-+
- 	/* Do not print device more than one in --list mode */
- 	if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed)
- 		return;
diff --git a/PKGBUILD b/PKGBUILD
index 59a66c8a0586..0b93e5acd12e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,9 +10,9 @@
 
 pkgbase=util-linux-selinux
 pkgname=(util-linux-selinux libutil-linux-selinux)
-_pkgmajor=2.34
+_pkgmajor=2.35
 pkgver=${_pkgmajor}
-pkgrel=8
+pkgrel=1
 pkgdesc="SELinux aware miscellaneous system utilities for Linux"
 url='https://github.com/karelzak/util-linux'
 arch=('x86_64')
@@ -27,15 +27,13 @@ license=('GPL2')
 options=('strip')
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
 source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/${pkgbase/-selinux}-$pkgver.tar."{xz,sign}
-        '0001-lsblk-force-to-print-PKNAME-for-partition.patch'
         pam-{login,common,runuser,su}
         'util-linux.sysusers'
         '60-rfkill.rules'
         'rfkill-unblock_.service'
         'rfkill-block_.service')
-sha256sums=('743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5'
+sha256sums=('b3081b560268c1ec3367e035234e91616fa7923a0afc2b1c80a2a6d8b9dfe2c9'
             'SKIP'
-            'cfadc020011f88c028dc50c4e6790f5bae385b881417d917a8706c6ff78613d9'
             '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
             'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
             '95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935'
@@ -45,12 +43,6 @@ sha256sums=('743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5'
             '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
             'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
 
-prepare() {
-  cd "${pkgbase/-selinux}-$pkgver"
-
-  patch -Np1 < ../0001-lsblk-force-to-print-PKNAME-for-partition.patch
-}
-
 build() {
   cd "${pkgbase/-selinux}-$pkgver"