util-linux 2.35_rc1

system/base/util-linux/files/0001-lsblk-force-to-print-PKNAME-for-partition.patch

@@ -0,0 +1,31 @@
+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;

system/base/util-linux/pspec.xml

@@ -13,7 +13,7 @@
         <IsA>library</IsA>
         <Summary>Various useful Linux utilities</Summary>
         <Description>The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function.</Description>
-        <Archive sha1sum="66e1eaeedfb3137b1e583d038a4a3f404474ded1" type="tarxz">https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-2.31.1.tar.xz</Archive>
+        <Archive sha1sum="36757c996c9c7ff4150b8ee26fc51255279de14f" type="tarxz">https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35-rc1.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>zlib-devel</Dependency>
             <Dependency>eudev-devel</Dependency>
@@ -23,10 +23,12 @@
             <Dependency>ncurses-devel</Dependency>
             <Dependency>libcap-ng-devel</Dependency>
             <Dependency>pam-devel</Dependency>
+			<Dependency>libpcre2-devel</Dependency>
             <!-- <Dependency releaseFrom="2">utempter-devel</Dependency>-->
         </BuildDependencies>
         <Patches>
              <Patch level="1">upstream/util-linux-ng-2.21-login-lastlog.patch</Patch>
+<!-- 			 <Patch level="1">0001-lsblk-force-to-print-PKNAME-for-partition.patch</Patch> -->
              <!--Patch level="1">upstream/0001-sfdisk-support-empty-label-use-case.patch  </Patch-->
          </Patches>
     </Source>
@@ -43,6 +45,7 @@
             <Dependency>eudev</Dependency>
             <!--<Dependency>utempter</Dependency>-->
             <Dependency>libcap-ng</Dependency>
+			<Dependency>libpcre2</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -127,8 +130,13 @@
         <BuildType>emul32</BuildType>
         <BuildDependencies>
             <Dependency>ncurses-32bit</Dependency>
+			<Dependency>libpcre2-32bit</Dependency>
+			<Dependency>libutil-linux-devel</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>
+			<Dependency>ncurses-32bit</Dependency>
+			<Dependency>libpcre2-32bit</Dependency>
+			<Dependency>libutil-linux-devel</Dependency>
         </RuntimeDependencies>
         <Replaces>
             <Package>libblkid-32bit</Package>
@@ -140,6 +148,13 @@
     </Package>
 
     <History>
+		<Update release="12">
+            <Date>2019-12-25</Date>
+            <Version>2.35_rc1</Version>
+            <Comment>Version bump</Comment>
+            <Name>Idris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
         <Update release="11">
             <Date>2019-03-17</Date>
             <Version>2.31.1</Version>