util-linux-selinux 2.34-2 update

2 files changed, 19 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b86cba24a7a..a8ab1a832893 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = util-linux-selinux
 	pkgdesc = SELinux aware miscellaneous system utilities for Linux
-	pkgver = 2.33.2
-	pkgrel = 1
+	pkgver = 2.34
+	pkgrel = 2
 	url = https://github.com/karelzak/util-linux
 	arch = x86_64
 	groups = selinux
@@ -11,8 +11,8 @@ pkgbase = util-linux-selinux
 	makedepends = libcap-ng
 	makedepends = libselinux
 	options = strip
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-2.33.2.tar.xz
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-2.33.2.tar.sign
+	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 = pam-login
 	source = pam-common
 	source = pam-runuser
@@ -22,7 +22,7 @@ pkgbase = util-linux-selinux
 	source = rfkill-unblock_.service
 	source = rfkill-block_.service
 	validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284
-	sha256sums = 631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97
+	sha256sums = 743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5
 	sha256sums = SKIP
 	sha256sums = 993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92
 	sha256sums = fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20
@@ -43,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.33.2-1
-	provides = selinux-util-linux=2.33.2-1
+	provides = util-linux=2.34-2
+	provides = selinux-util-linux=2.34-2
 	conflicts = rfkill
 	conflicts = util-linux
 	conflicts = selinux-util-linux
@@ -64,6 +64,6 @@ pkgname = libutil-linux-selinux
 	provides = libmount.so
 	provides = libsmartcols.so
 	provides = libuuid.so
-	provides = libutil-linux=2.33.2-1
+	provides = libutil-linux=2.34-2
 	conflicts = libutil-linux
 
diff --git a/PKGBUILD b/PKGBUILD
index 72a022687437..1a0433bb3d97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,9 +10,9 @@
 
 pkgbase=util-linux-selinux
 pkgname=(util-linux-selinux libutil-linux-selinux)
-_pkgmajor=2.33
-pkgver=${_pkgmajor}.2
-pkgrel=1
+_pkgmajor=2.34
+pkgver=${_pkgmajor}
+pkgrel=2
 pkgdesc="SELinux aware miscellaneous system utilities for Linux"
 url='https://github.com/karelzak/util-linux'
 arch=('x86_64')
@@ -32,7 +32,7 @@ source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/${pkgbase
         '60-rfkill.rules'
         'rfkill-unblock_.service'
         'rfkill-block_.service')
-sha256sums=('631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97'
+sha256sums=('743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5'
             'SKIP'
             '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
             'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
@@ -46,6 +46,12 @@ sha256sums=('631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97'
 build() {
   cd "${pkgbase/-selinux}-$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 \
@@ -58,6 +64,7 @@ build() {
     --enable-chfn-chsh \
     --enable-write \
     --enable-mesg \
+    --disable-hardlink \
     --with-selinux \
     --with-python=3