RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 06-Sep-2011 15:39:53
Branch: HEAD Handle: 2011090613395201
Modified files:
rpm CHANGES configure.ac
rpm/build parsePrep.c
rpm/macros macros.in
rpm/rpmio macro.c rpmmacro.h
Log:
add lrzip support
(blueprint
https://blueprints.launchpad.net/rpm/+spec/rpm5-use-lrzip-as-new-compression-program)
Summary:
Revision Changes Path
1.3673 +2 -0 rpm/CHANGES
2.136 +3 -0 rpm/build/parsePrep.c
2.500 +1 -0 rpm/configure.ac
1.60 +2 -1 rpm/macros/macros.in
2.252 +6 -0 rpm/rpmio/macro.c
2.57 +2 -1 rpm/rpmio/rpmmacro.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3672 -r1.3673 CHANGES
--- rpm/CHANGES 6 Sep 2011 12:43:50 -0000 1.3672
+++ rpm/CHANGES 6 Sep 2011 13:39:52 -0000 1.3673
@@ -1,4 +1,6 @@
HEAD:
+ - devzero2000: add lrzip support
+ (blueprint
https://blueprints.launchpad.net/rpm/+spec/rpm5-use-lrzip-as-new-compression-program)
- devzero2000: merge commit 31d807ffa8cdf91addf7c39fdf9abf6c61d77944
from @rpm.org master branch
- jbj: tests: upgrade to abi-compliance-checker 1.93.7 (modules? docs?).
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePrep.c
============================================================================
$ cvs diff -u -r2.135 -r2.136 parsePrep.c
--- rpm/build/parsePrep.c 12 Apr 2011 07:56:14 -0000 2.135
+++ rpm/build/parsePrep.c 6 Sep 2011 13:39:52 -0000 2.136
@@ -323,6 +323,9 @@
case COMPRESSED_XZ:
t = "%{__xz} -dc";
break;
+ case COMPRESSED_LRZIP:
+ t = "%{__lrzip} -dqo-";
+ break;
case COMPRESSED_ZIP:
#if defined(RPM_VENDOR_OPENPKG) /* use-bsdtar-for-zip-files */
t = "%{__bsdtar} -x -f";
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.499 -r2.500 configure.ac
--- rpm/configure.ac 16 Jun 2011 14:45:25 -0000 2.499
+++ rpm/configure.ac 6 Sep 2011 13:39:52 -0000 2.500
@@ -570,6 +570,7 @@
AC_PATH_PROG(__HG, hg, %{_bindir}/hg, $MYPATH)
AC_PATH_PROG(__ID, id, /usr/bin/id, $MYPATH)
AC_PATH_PROG(__INSTALL, install, /usr/bin/install, $MYPATH)
+AC_PATH_PROG(__LRZIP, lrzip, /usr/bin/lrzip, $MYPATH)
AC_PATH_PROG(__INSTALL_INFO, install-info, /sbin/install-info, $MYPATH)
AC_PATH_PROG(__LDCONFIG, ldconfig, /sbin/ldconfig, $MYPATH)
AC_PATH_PROG(__LN, ln, /bin/ln, $MYPATH)
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
============================================================================
$ cvs diff -u -r1.59 -r1.60 macros.in
--- rpm/macros/macros.in 30 Aug 2011 12:17:06 -0000 1.59
+++ rpm/macros/macros.in 6 Sep 2011 13:39:53 -0000 1.60
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.59 2011/08/30 12:17:06 jbj Exp $
+# $Id: macros.in,v 1.60 2011/09/06 13:39:53 devzero2000 Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -91,6 +91,7 @@
%__ldconfig @__LDCONFIG@
%__ln @__LN@
%__ln_s @LN_S@
+%__lrzip @__LRZIP@
%__lzma @__LZMA@
%__lzop @__LZOP@
%__make @__MAKE@
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
============================================================================
$ cvs diff -u -r2.251 -r2.252 macro.c
--- rpm/rpmio/macro.c 2 Jan 2011 19:30:04 -0000 2.251
+++ rpm/rpmio/macro.c 6 Sep 2011 13:39:53 -0000 2.252
@@ -1353,6 +1353,9 @@
case 6: /* COMPRESSED_XZ */
sprintf(be, "%%__xz -dc '%s'", b);
break;
+ case 7: /* COMPRESSED_LRZIP */
+ sprintf(be, "%%__lrzip -dqo- %s", b);
+ break;
}
b = be;
} else if (STREQ("mkstemp", f, fn)) {
@@ -3033,6 +3036,9 @@
if (magic[0] == (unsigned char) 0xFD && magic[1] == 0x37 &&
magic[2] == 0x7A
&& magic[3] == 0x58 && magic[4] == 0x5A && magic[5] == 0x00)
/* xz */
*compressed = COMPRESSED_XZ;
+ else if ((magic[0] == 'L') && (magic[1] == 'R') &&
+ (magic[2] == 'Z') && (magic[3] == 'I')) /* lrzip */
+ *compressed = COMPRESSED_LRZIP;
else
if ((magic[0] == (unsigned char) 0037 && magic[1] == (unsigned char)
0213) /* gzip */
|| (magic[0] == (unsigned char) 0037 && magic[1] == (unsigned
char) 0236) /* old gzip */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmmacro.h
============================================================================
$ cvs diff -u -r2.56 -r2.57 rpmmacro.h
--- rpm/rpmio/rpmmacro.h 29 Mar 2010 22:05:21 -0000 2.56
+++ rpm/rpmio/rpmmacro.h 6 Sep 2011 13:39:53 -0000 2.57
@@ -208,7 +208,8 @@
COMPRESSED_ZIP = 3, /*!< unzip can handle */
COMPRESSED_LZOP = 4, /*!< lzop can handle */
COMPRESSED_LZMA = 5, /*!< lzma can handle */
- COMPRESSED_XZ = 6 /*!< xz can handle */
+ COMPRESSED_XZ = 6, /*!< xz can handle */
+ COMPRESSED_LRZIP = 7 /*!< lrzip can handle */
} rpmCompressedMagic;
/**
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
