- update from rpm-4_4_9 branch

[packages/rpm.git] / rpm-lzma-tukaani.patch

diff --git a/rpm-lzma-tukaani.patch b/rpm-lzma-tukaani.patch
index f60f236e3c93af08b64b626bad5318991382ac49..c68cb488f6f0bb012f293de197b63e986759477d 100644 (file)
--- a/rpm-lzma-tukaani.patch
+++ b/rpm-lzma-tukaani.patch
@@ -1,12 +1,20 @@
-diff -urN rpm-4.4.9.org/rpmio/rpmio.c rpm-4.4.9/rpmio/rpmio.c
---- rpm-4.4.9.org/rpmio/rpmio.c        2007-03-31 13:33:15.000000000 +0200
-+++ rpm-4.4.9/rpmio/rpmio.c    2007-12-10 12:50:56.678906501 +0100
-@@ -2879,7 +2879,7 @@
-         xx = dup2(fdno, 1);
-         for (i = 3; i < 1024; i++)
-           xx = close(i);
--        if (execl("/usr/bin/lzma", "lzma", "e", "-si", "-so", NULL))
-+        if (execl("/usr/bin/lzma", "lzma", "--format=alone", "-zc", "-", NULL))
-             _exit(1);
-     }
-     return NULL; /* warning */
+--- rpm-4.5/scripts/rpm2cpio   2008-08-19 10:31:53.658158936 +0300
++++ rpm-4.4.9/scripts/rpm2cpio 2008-10-05 00:44:53.976068978 +0300
+@@ -24,13 +24,13 @@
+ o=`expr $o + $hdrsize`
+ 
+-comp=`dd if="$pkg" ibs=$o skip=1 count=1 2>/dev/null \
+-      | dd bs=3 count=1 2>/dev/null`
++comp=$(dd if="$pkg" ibs=$o skip=1 count=1 2>/dev/null \
++      | dd bs=3 count=1 2> /dev/null)
+ 
+-gz="`echo . | awk '{ printf("%c%c", 0x1f, 0x8b); }'`"
++gz="$(echo -en '\037\0213')"
+ 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 ;;
+     # no magic in old lzma format, if unknown we assume that's lzma for now
+-    *)        dd if="$pkg" ibs=$o skip=1 2>/dev/null | lzma d -si -so ;;
++    *)        dd if="$pkg" ibs=$o skip=1 2>/dev/null | lzma -dc - ;;
+     #*)        echo "Unrecognized rpm file: $pkg"; return 1 ;;
+ esac