From: Frank Ch. Eigler <fche@redhat.com>
Date: Wed, 25 Mar 2020 14:55:53 +0000 (-0400)
Subject: PR25583: debuginfod: prefer bsdtar to dpkg for .deb handling
X-Git-Tag: elfutils-0.179~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bde8d7ec3fb1780f8178586533d76a959bde89ab;p=thirdparty%2Felfutils.git

PR25583: debuginfod: prefer bsdtar to dpkg for .deb handling

It turns out a bsdtar subshell can do the job of dpkg-deb.
bsdtar comes from/with libarchive so it should be available
everywhere.

Signed-off-by: Frank Ch. Eigler <fche@redhat.com>
---

diff --git a/config/ChangeLog b/config/ChangeLog
index d1050e2c0..368f959ee 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-25  Frank Ch. Eigler <fche@redhat.com>
+
+	* elfutils.spec.in: *Require: bsdtar instead of dpkg.
+
 2020-03-04  Mark Wielaard  <mark@klomp.org>
 
 	* elfutils.spec.in (package debuginfod): Remove Requires: rpm.
diff --git a/config/elfutils.spec.in b/config/elfutils.spec.in
index ef7fe31fe..6e2436506 100644
--- a/config/elfutils.spec.in
+++ b/config/elfutils.spec.in
@@ -35,9 +35,7 @@ BuildRequires: pkgconfig(libarchive) >= 3.1.2
 BuildRequires: bzip2
 # For the run-debuginfod-find.sh test case in %check for /usr/sbin/ss
 BuildRequires: iproute
-%if 0%{?fedora} >= 20
-BuildRequires: dpkg
-%endif
+BuildRequires: bsdtar
 BuildRequires: curl
 
 %define _gnu %{nil}
@@ -157,9 +155,8 @@ Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
 Requires(pre): shadow-utils
-# To extract .deb files with dpkg-deb --fsys-tarfile
-# Can be Recommends if rpm supports that
-Requires: dpkg
+# To extract .deb files with a bsdtar (= libarchive) subshell
+Requires: bsdtar
 
 %description debuginfod-client
 The elfutils-debuginfod-client package contains shared libraries
diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
index 60d912a37..5e19db517 100644
--- a/debuginfod/ChangeLog
+++ b/debuginfod/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-25  Frank Ch. Eigler <fche@redhat.com>
+
+	* debuginfod.cxx (parse_opt): Associate a bsdtar subshell with
+	the .deb & .ddeb extensions, instead of dpkg-deb.
+
 2020-03-26  Frank Ch. Eigler  <fche@redhat.com>
 
 	* debuginfod-client.c (debuginfod_query_server): Don't
diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index 2f28a877f..c03bbf922 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -429,8 +429,9 @@ parse_opt (int key, char *arg,
       scan_archives[".rpm"]="cat"; // libarchive groks rpm natively
       break;
     case 'U':
-      scan_archives[".deb"]="dpkg-deb --fsys-tarfile";
-      scan_archives[".ddeb"]="dpkg-deb --fsys-tarfile";
+      scan_archives[".deb"]="(bsdtar -O -x -f - data.tar.xz)<";
+      scan_archives[".ddeb"]="(bsdtar -O -x -f - data.tar.xz)<";
+      // .udeb too?
       break;
     case 'Z':
       {
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 5bedd0893..c06d89244 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-26  Frank Ch. Eigler <fche@redhat.com>
+
+	* run-debuginfod-find.sh: Look for bsdtar instead of dpkg.
+
 2020-03-26  Frank Ch. Eigler  <fche@redhat.com>
 
 	* run-debuginfod-find.sh: Check for bsdtar zstd capability
diff --git a/tests/run-debuginfod-find.sh b/tests/run-debuginfod-find.sh
index 4d8d45e8b..cc826f960 100755
--- a/tests/run-debuginfod-find.sh
+++ b/tests/run-debuginfod-find.sh
@@ -371,7 +371,7 @@ wait_ready $PORT2 'thread_busy{role="scan"}' 0
 # have clients contact the new server
 export DEBUGINFOD_URLS=http://127.0.0.1:$PORT2
 
-if type dpkg-deb 2>/dev/null; then
+if type bsdtar 2>/dev/null; then
     # copy in the deb files
     cp -rvp ${abs_srcdir}/debuginfod-debs/*deb D
     kill -USR1 $PID2