]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
util-linux: Re-enable setting capabilities
authorStefan Schantl <stefan.schantl@ipfire.org>
Mon, 20 Mar 2023 11:39:16 +0000 (12:39 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Mar 2023 18:25:40 +0000 (18:25 +0000)
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
util-linux/util-linux.nm

index f5290c1c8aad2a2407f2ebb92699197222e25c32..fbb17f9016ca40cbe0e0f989b5bebd29bb902718 100644 (file)
@@ -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