From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] stripper: Handle capabilities
Date: Fri, 09 Jul 2021 16:17:43 +0000
Message-ID: <20210709161742.4224-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2881811719878976977=="
List-Id: <development.lists.ipfire.org>

--===============2881811719878976977==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

During the build process, we set capabilities to elevate privileges of
certain progrems (e.g. ping). These have been removed during the build
process because of strip.

This patch collects any capabilities from all files that are being
stripped and restores them after calling strip.

Fixes: #12652
Reported-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 src/stripper | 9 +++++++++
 1 file changed, 9 insertions(+)

Please re-ship ping and etherwake with this patch.

diff --git a/src/stripper b/src/stripper
index ac5f58ca5..e51463c69 100755
--- a/src/stripper
+++ b/src/stripper
@@ -27,6 +27,10 @@ function _strip() {
 		fi
 	done
=20
+	# Fetch any capabilities
+	local capabilities=3D"$(getfattr --no-dereference --name=3D"security.capabi=
lity" \
+		--absolute-names --dump "${file}")"
+
 	local cmd=3D( "${strip}" )
=20
 	case "$(file -bi ${file})" in
@@ -40,6 +44,11 @@ function _strip() {
=20
 	echo "Stripping ${file}..."
 	${cmd[*]} ${file}
+
+	# Restore capabilities
+	if [ -n "${capabilities}" ]; then
+		setfattr --no-dereference --restore=3D<(echo "${capabilities}")
+	fi
 }
=20
 for dir in ${dirs}; do
--=20
2.20.1


--===============2881811719878976977==--