RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 16-Jul-2017 06:44:27
Branch: rpm-5_4 Handle: 2017071604442700
Modified files: (Branch: rpm-5_4)
rpm/scripts rpm2cpio
rpm/tools rpm2cpio.c
Log:
- zstd: add to rpm2cpio.
Summary:
Revision Changes Path
1.6.6.2 +2 -0 rpm/scripts/rpm2cpio
2.11.2.4 +2 -0 rpm/tools/rpm2cpio.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/scripts/rpm2cpio
============================================================================
$ cvs diff -u -r1.6.6.1 -r1.6.6.2 rpm2cpio
--- rpm/scripts/rpm2cpio 2 Apr 2015 12:57:42 -0000 1.6.6.1
+++ rpm/scripts/rpm2cpio 16 Jul 2017 04:44:27 -0000 1.6.6.2
@@ -31,6 +31,8 @@
DECOMPRESSOR=bunzip2
elif echo $COMPRESSION |grep -q xz; then
DECOMPRESSOR=unxz
+elif echo $COMPRESSION |grep -q zstd; then
+ DECOMPRESSOR=unxz
elif echo $COMPRESSION |grep -q cpio; then
DECOMPRESSOR=cat
else
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpm2cpio.c
============================================================================
$ cvs diff -u -r2.11.2.3 -r2.11.2.4 rpm2cpio.c
--- rpm/tools/rpm2cpio.c 16 May 2017 21:22:05 -0000 2.11.2.3
+++ rpm/tools/rpm2cpio.c 16 Jul 2017 04:44:27 -0000 2.11.2.4
@@ -129,6 +129,8 @@
t = stpcpy(t, ".lzdio");
if (!strcmp(payload_compressor, "xz"))
t = stpcpy(t, ".xzdio");
+ if (!strcmp(payload_compressor, "zstd"))
+ t = stpcpy(t, ".zstdio");
he->p.ptr = _free(he->p.ptr);
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
