From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] pakfire: Add patch for keep or remove sections when
 extracting debuginfo.
Date: Mon, 02 Sep 2019 14:20:16 +0200
Message-ID: <20190902122016.25438-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4534409906575471302=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 pakfire/pakfire.nm                            |  4 +-
 ...e-sections-when-extracting-debuginfo.patch | 46 +++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 pakfire/patches/0002-Add-option-to-keep-or-remove-section=
s-when-extracting-debuginfo.patch

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index b16f07918..6b16b0b39 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -5,7 +5,7 @@
=20
 name       =3D pakfire
 version    =3D 0.9.27
-release    =3D 2
+release    =3D 3
=20
 maintainer =3D Michael Tremer <michael.tremer(a)ipfire.org>
 groups     =3D System/Packaging
@@ -93,7 +93,7 @@ packages
 			%{name} =3D %{thisver}
 			quality-agent =3D %{thisver}
 			cpio
-			elfutils
+			elfutils >=3D 0.170
 		end
 		provides =3D pakfire-build =3D %{thisver}
 		obsoletes =3D pakfire-build < %{thisver}
diff --git a/pakfire/patches/0002-Add-option-to-keep-or-remove-sections-when-=
extracting-debuginfo.patch b/pakfire/patches/0002-Add-option-to-keep-or-remov=
e-sections-when-extracting-debuginfo.patch
new file mode 100644
index 000000000..675e4e856
--- /dev/null
+++ b/pakfire/patches/0002-Add-option-to-keep-or-remove-sections-when-extract=
ing-debuginfo.patch
@@ -0,0 +1,46 @@
+diff --git a/src/scripts/extract-debuginfo.in b/src/scripts/extract-debuginf=
o.in
+index c258ed1..c43cae4 100644
+--- a/src/scripts/extract-debuginfo.in
++++ b/src/scripts/extract-debuginfo.in
+@@ -2,6 +2,7 @@
+ # extract-debuginfo.sh - automagically generate debug info
+ #
+ # Usage: extract-debuginfo.sh [--strict-build-id] [-g] [-r]
++#			      [--keep-section SECTION] [--remove-section SECTION]
+ #			      [builddir]
+ #
+ # The -g flag says to use strip -g instead of full strip on DSOs.
+@@ -25,6 +26,9 @@ strip_r=3Dfalse
+ # Barf on missing build IDs.
+ strict=3Dfalse
+=20
++# keep or remove arguments to eu-strip.
++keep_remove_args=3D
++
+ BUILDDIR=3D.
+ while [ $# -gt 0 ]; do
+ 	case "${1}" in
+@@ -43,6 +47,14 @@ while [ $# -gt 0 ]; do
+ 		-r)
+ 			strip_r=3Dtrue
+ 			;;
++		--keep-section)
++			keep_remove_args=3D"${keep_remove_args} --keep-section $2"
++			shift
++			;;
++		--remove-section)
++			keep_remove_args=3D"${keep_remove_args} --remove-section $2"
++			shift
++			;;
+ 		*)
+ 			BUILDDIR=3D${1}
+ 			shift
+@@ -68,7 +80,7 @@ strip_to_debug() {
+ 				;;
+ 		esac
+=20
+-	eu-strip --remove-comment ${r} ${g} -f "${1}" "${2}" || exit
++	eu-strip --remove-comment ${r} ${g} ${keep_remove_args} -f "${1}" "${2}" |=
| exit
+ 	chmod 444 "${1}" || exit
+ }
+=20
--=20
2.20.1


--===============4534409906575471302==--