From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon, 20 Mar 2023 11:39:16 +0000 (+0100)
Subject: util-linux: Re-enable setting capabilities
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31bc0a598805a8c3ec29535f52fcc92c4d221895;p=people%2Fstevee%2Fipfire-3.x.git

util-linux: Re-enable setting capabilities

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index f5290c1c8..fbb17f901 100644
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -6,7 +6,7 @@
 name       = util-linux
 ver_maj    = 2.38
 version    = %{ver_maj}.1
-release    = 2
+release    = 3
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -83,15 +83,14 @@ build
 		rm -fv %{BUILDROOT}/usr/share/getopt/*.tcsh
 
 		# Set capabilities
-		# XXX: Setting capabilities is currently unusable due to #13010
 		chmod -v -s %{BUILDROOT}%{bindir}/mount
-		#setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/mount
+		setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/mount
 		chmod -v -s %{BUILDROOT}%{bindir}/umount
-		#setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/umount
+		setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/umount
 
 		# su (set right capabilities)
 		chmod -v u-s %{BUILDROOT}%{bindir}/su
-		#setcap cap_setgid,cap_setuid+ep %{BUILDROOT}%{bindir}/su
+		setcap cap_setgid,cap_setuid+ep %{BUILDROOT}%{bindir}/su
 	end
 end