[packages/rpm] - add Zstandard support to rpm2cpio (merged with rpm-file-magic-can-be-mixed-case.patch and renamed

[adwol]

commit c25ea576b36229bfcb875b00b1280c6951aaa232
Author: Adam Osuchowski <adwol at pld-linux.org>
Date:   Sun Feb 16 03:12:59 2020 +0100

    - add Zstandard support to rpm2cpio (merged with rpm-file-magic-can-be-mixed-case.patch and renamed to rpm-rpm2cpio.patch)

 rpm-file-magic-can-be-mixed-case.patch => rpm-rpm2cpio.patch | 9 ++++++---
 rpm.spec                                                     | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 9922d2b..f7a904f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -125,7 +125,7 @@ Patch42:	%{name}-pattern_Release.patch
 Patch43:	%{name}-fix-___build_pre-macro.patch
 Patch44:	%{name}-missing-patch-file-fails-build.patch
 Patch45:	%{name}-remove-misleading-missing-patch-message.patch
-Patch46:	%{name}-file-magic-can-be-mixed-case.patch
+Patch46:	%{name}-rpm2cpio.patch
 Patch47:	%{name}-query-always-noisy.patch
 Patch48:	%{name}-verify-ghosts-broken-logic.patch
 Patch49:	%{name}-python-enable-compat-RPMSENSE.patch
diff --git a/rpm-file-magic-can-be-mixed-case.patch b/rpm-rpm2cpio.patch
similarity index 64%
rename from rpm-file-magic-can-be-mixed-case.patch
rename to rpm-rpm2cpio.patch
index 9536124..2303561 100644
--- a/rpm-file-magic-can-be-mixed-case.patch
+++ b/rpm-rpm2cpio.patch
@@ -1,6 +1,7 @@
---- rpm-5.4.10/scripts/rpm2cpio~	2009-03-19 02:01:24.000000000 +0100
-+++ rpm-5.4.10/scripts/rpm2cpio	2012-09-18 23:49:28.261438724 +0200
-@@ -25,13 +25,13 @@
+diff -ruNp rpm-5.4.15.orig/scripts/rpm2cpio rpm-5.4.15/scripts/rpm2cpio
+--- rpm-5.4.15.orig/scripts/rpm2cpio	2009-03-19 02:01:24.000000000 +0100
++++ rpm-5.4.15/scripts/rpm2cpio	2020-02-16 03:00:16.280014173 +0100
+@@ -25,13 +25,15 @@ o=`expr $o + $hdrsize`
  EXTRACTOR="dd if=$pkg ibs=$o skip=1"
  
  COMPRESSION=`($EXTRACTOR |file -) 2>/dev/null`
@@ -14,6 +15,8 @@
 +elif echo $COMPRESSION |grep -qi xz; then
  	DECOMPRESSOR=unxz
 -elif echo $COMPRESSION |grep -q cpio; then
++elif echo $COMPRESSION |grep -qi zstandard; then
++	DECOMPRESSOR=unzstd
 +elif echo $COMPRESSION |grep -qi cpio; then
  	DECOMPRESSOR=cat
  else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/c25ea576b36229bfcb875b00b1280c6951aaa232