[rpm/f17] - teach rpm2cpio about XZ, fix error exit on unknown compression (#746376)

[Panu Matilainen]

commit 5b931dd2455a90e9b38ed1bf3b5134afba398920
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Mar 27 08:16:21 2013 +0200

    - teach rpm2cpio about XZ, fix error exit on unknown compression (#746376)

 rpm-4.9.x-rpm2cpio-foo.patch |   17 +++++++++++++++++
 rpm.spec                     |    3 +++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/rpm-4.9.x-rpm2cpio-foo.patch b/rpm-4.9.x-rpm2cpio-foo.patch
new file mode 100644
index 0000000..9a0ce85
--- /dev/null
+++ b/rpm-4.9.x-rpm2cpio-foo.patch
@@ -0,0 +1,17 @@
+diff --git a/scripts/rpm2cpio.sh b/scripts/rpm2cpio.sh
+index b03ee36..57c47bb 100755
+--- a/scripts/rpm2cpio.sh
++++ b/scripts/rpm2cpio.sh
+@@ -28,9 +28,11 @@ comp=`dd if="$pkg" ibs=$o skip=1 count=1 2>/dev/null \
+ 
+ gz="`echo . | awk '{ printf("%c%c", 0x1f, 0x8b); }'`"
+ lzma="`echo . | awk '{ printf("%cLZ", 0xff); }'`"
++xz="`echo . | awk '{ printf("%c7z", 0xfd); }'`"
+ case "$comp" in
+     BZh)      dd if="$pkg" ibs=$o skip=1 2>/dev/null | bunzip2 ;;
+     "$gz"*)   dd if="$pkg" ibs=$o skip=1 2>/dev/null | gunzip ;;
++    "$xz"*)   dd if="$pkg" ibs=$o skip=1 2>/dev/null | xzcat ;;
+     "$lzma"*) dd if="$pkg" ibs=$o skip=1 2>/dev/null | unlzma ;;
+-    *)        echo "Unrecognized rpm file: $pkg"; return 1 ;;
++    *)        echo "Unrecognized rpm file: $pkg"; exit 1 ;;
+ esac
diff --git a/rpm.spec b/rpm.spec
index 1584ac5..346ff67 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -61,6 +61,7 @@ Patch109: rpm-4.9.x-tstest-fileinfo.patch
 Patch110: rpm-4.9.1.2-ppc64p7.patch
 Patch111: rpm-4.9.x-db-einval.patch
 Patch112: rpm-4.9.x-doc-quotes.patch
+Patch113: rpm-4.9.x-rpm2cpio-foo.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -251,6 +252,7 @@ packages on a system.
 %patch110 -p1 -b .ppc64p7
 %patch111 -p1 -b .db-einval
 %patch112 -p1 -b .doc-quotes
+%patch113 -p1 -b .rpm2cpio.foo
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -489,6 +491,7 @@ exit 0
 - armv7hl and armv7hnl should not have -mthumb (#901901)
 - force _host_vendor to redhat to better match toolchain etc (#893381)
 - make double-quoting work for special %%doc (#928110)
+- teach rpm2cpio about XZ, fix error exit on unknown compression (#746376)
 
 * Mon May 07 2012 Panu Matilainen <pmatilai at redhat.com> - 4.9.1.3-7
 - Fall back to private db environment on filesystems not supporting mmap()