SOURCES (rpm-4_5): rpm-lzma-tukaani.patch - update from rpm-4_4_9 branch

[glen]

Author: glen                         Date: Sat Oct  4 21:59:03 2008 GMT
Module: SOURCES                       Tag: rpm-4_5
---- Log message:
- update from rpm-4_4_9 branch

---- Files affected:
SOURCES:
   rpm-lzma-tukaani.patch (1.1.2.1.2.1 -> 1.1.2.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/rpm-lzma-tukaani.patch
diff -u SOURCES/rpm-lzma-tukaani.patch:1.1.2.1.2.1 SOURCES/rpm-lzma-tukaani.patch:1.1.2.1.2.2
--- SOURCES/rpm-lzma-tukaani.patch:1.1.2.1.2.1	Tue Aug 19 09:33:30 2008
+++ SOURCES/rpm-lzma-tukaani.patch	Sat Oct  4 23:58:57 2008
@@ -1,10 +1,20 @@
---- rpm-4.5/scripts/rpm2cpio~	2007-06-11 08:56:55.000000000 +0300
-+++ rpm-4.5/scripts/rpm2cpio	2008-08-19 10:31:53.658158936 +0300
-@@ -31,6 +31,6 @@
+--- 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 --format=alone -d ;;
++    *)        dd if="$pkg" ibs=$o skip=1 2>/dev/null | lzma -dc - ;;
      #*)        echo "Unrecognized rpm file: $pkg"; return 1 ;;
  esac
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-lzma-tukaani.patch?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&f=u