From cc248c235033d3cbe760caff5959c43401c0fa4f Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Wed, 14 Aug 2019 18:28:48 -0400
Subject: upgpkg: nonsystemd/util-linux 2.34-3.nonsystemd1

Signed-off-by: David P <megver83@parabola.nu>
---
 ...lsblk-force-to-print-PKNAME-for-partition.patch | 31 ++++++++++++++++++++++
 nonsystemd/util-linux/PKGBUILD                     | 25 +++++++++++++----
 2 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 nonsystemd/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch

(limited to 'nonsystemd/util-linux')

diff --git a/nonsystemd/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/nonsystemd/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch
new file mode 100644
index 000000000..3fc342b37
--- /dev/null
+++ b/nonsystemd/util-linux/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;
diff --git a/nonsystemd/util-linux/PKGBUILD b/nonsystemd/util-linux/PKGBUILD
index f6052a257..fe06042e5 100644
--- a/nonsystemd/util-linux/PKGBUILD
+++ b/nonsystemd/util-linux/PKGBUILD
@@ -5,32 +5,46 @@
 
 pkgbase=util-linux
 pkgname=(util-linux libutil-linux)
-_pkgmajor=2.33
-pkgver=${_pkgmajor}.1
-pkgrel=2
+_pkgmajor=2.34
+pkgver=${_pkgmajor}
+pkgrel=3
 pkgrel+=.nonsystemd1
 pkgdesc="Miscellaneous system utilities for Linux"
-url="https://www.kernel.org/pub/linux/utils/util-linux/"
+url="https://github.com/karelzak/util-linux"
 arch=('x86_64' 'i686' 'armv7h')
 makedepends=('udev' 'python' 'libcap-ng')
 license=('GPL2')
 options=('strip' 'debug')
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
 source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-$pkgver.tar."{xz,sign}
+        '0001-lsblk-force-to-print-PKNAME-for-partition.patch'
         pam-{login,common,su}
         'util-linux.sysusers'
         '60-rfkill.rules')
-sha256sums=('c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21'
+sha256sums=('743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5'
             'SKIP'
+            'cfadc020011f88c028dc50c4e6790f5bae385b881417d917a8706c6ff78613d9'
             '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
             'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
             '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0'
             '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
             '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37')
 
+prepare() {
+  cd "$pkgbase-$pkgver"
+
+  patch -Np1 < ../0001-lsblk-force-to-print-PKNAME-for-partition.patch
+}
+
 build() {
   cd "$pkgbase-$pkgver"
 
+  # We ship Debian's hardlink in package 'hardlink', Fedora's hardlink was
+  # merged in util-linux. For now we disable the latter, but let's dicuss
+  # the details:
+  # https://bugs.archlinux.org/task/62896
+  # https://github.com/karelzak/util-linux/issues/808
+
   ./configure \
     --prefix=/usr \
     --libdir=/usr/lib \
@@ -43,6 +57,7 @@ build() {
     --enable-chfn-chsh \
     --enable-write \
     --enable-mesg \
+    --disable-hardlink \
     --with-python=3 \
     --with-systemd=no \
     --with-systemdsystemunitdir=no
-- 
cgit v1.2.3