On Tue, Sep 6, 2011 at 4:43 PM, Jeff Johnson <n3...@mac.com> wrote: > Could you push all these changes back to the rpm-5_4 branch > too please? That's where the buildbot's are running, and > I am active. > > Otherwise these changes are gonna reside on HEAD until > a ROADMAP or participation exists, and that isn't likely > soon. > > Thanks! > > Done : lzip and lrzip support are in HEAD and in the 5_4 Branch. Tomorrow i will search if there are some my patch that live only in HEAD and i will merge in 5_4 as well. Best Regards
> 73 de Jeff > > On Sep 6, 2011, at 10:41 AM, Pinto Elia wrote: > > > 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 16:41:18 > > Branch: HEAD Handle: 2011090614411701 > > > > Modified files: > > rpm CHANGES configure.ac > > rpm/build parsePrep.c > > rpm/macros macros.in > > rpm/rpmio macro.c rpmmacro.h > > > > Log: > > Add lzip support > > > > Summary: > > Revision Changes Path > > 1.3674 +1 -0 rpm/CHANGES > > 2.137 +3 -0 rpm/build/parsePrep.c > > 2.501 +1 -0 rpm/configure.ac > > 1.61 +2 -1 rpm/macros/macros.in > > 2.253 +6 -0 rpm/rpmio/macro.c > > 2.58 +2 -1 rpm/rpmio/rpmmacro.h > > > ____________________________________________________________________________ > > > > patch -p0 <<'@@ .' > > Index: rpm/CHANGES > > > ============================================================================ > > $ cvs diff -u -r1.3673 -r1.3674 CHANGES > > --- rpm/CHANGES 6 Sep 2011 13:39:52 -0000 1.3673 > > +++ rpm/CHANGES 6 Sep 2011 14:41:17 -0000 1.3674 > > @@ -1,4 +1,5 @@ > > HEAD: > > + - devzero2000: add lzip support > > - devzero2000: add lrzip support > > (blueprint > https://blueprints.launchpad.net/rpm/+spec/rpm5-use-lrzip-as-new-compression-program > ) > > - devzero2000: merge commit > 31d807ffa8cdf91addf7c39fdf9abf6c61d77944 > > @@ . > > patch -p0 <<'@@ .' > > Index: rpm/build/parsePrep.c > > > ============================================================================ > > $ cvs diff -u -r2.136 -r2.137 parsePrep.c > > --- rpm/build/parsePrep.c 6 Sep 2011 13:39:52 -0000 2.136 > > +++ rpm/build/parsePrep.c 6 Sep 2011 14:41:17 -0000 2.137 > > @@ -323,6 +323,9 @@ > > case COMPRESSED_XZ: > > t = "%{__xz} -dc"; > > break; > > + case COMPRESSED_LZIP: > > + t = "%{__lzip} -dc"; > > + break; > > case COMPRESSED_LRZIP: > > t = "%{__lrzip} -dqo-"; > > break; > > @@ . > > patch -p0 <<'@@ .' > > Index: rpm/configure.ac > > > ============================================================================ > > $ cvs diff -u -r2.500 -r2.501 configure.ac > > --- rpm/configure.ac 6 Sep 2011 13:39:52 -0000 2.500 > > +++ rpm/configure.ac 6 Sep 2011 14:41:17 -0000 2.501 > > @@ -571,6 +571,7 @@ > > 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(__LZIP, lzip, /usr/bin/lzip, $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.60 -r1.61 macros.in > > --- rpm/macros/macros.in 6 Sep 2011 13:39:53 -0000 1.60 > > +++ rpm/macros/macros.in 6 Sep 2011 14:41:18 -0000 1.61 > > @@ -1,7 +1,7 @@ > > #/*! \page config_macros Default configuration: @USRLIBRPM@/macros > > # \verbatim > > # > > -# $Id: macros.in,v 1.60 2011/09/06 13:39:53 devzero2000 Exp $ > > +# $Id: macros.in,v 1.61 2011/09/06 14:41:18 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@ > > +%__lzip @__LZIP@ > > %__lrzip @__LRZIP@ > > %__lzma @__LZMA@ > > %__lzop @__LZOP@ > > @@ . > > patch -p0 <<'@@ .' > > Index: rpm/rpmio/macro.c > > > ============================================================================ > > $ cvs diff -u -r2.252 -r2.253 macro.c > > --- rpm/rpmio/macro.c 6 Sep 2011 13:39:53 -0000 2.252 > > +++ rpm/rpmio/macro.c 6 Sep 2011 14:41:18 -0000 2.253 > > @@ -1356,6 +1356,9 @@ > > case 7: /* COMPRESSED_LRZIP */ > > sprintf(be, "%%__lrzip -dqo- %s", b); > > break; > > + case 8: /* COMPRESSED_LZIP */ > > + sprintf(be, "%%__lzip -dc %s", b); > > + break; > > } > > b = be; > > } else if (STREQ("mkstemp", f, fn)) { > > @@ -3036,6 +3039,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] == 'Z') && > > + (magic[2] == 'I') && (magic[3] == 'P')) /* lzip */ > > + *compressed = COMPRESSED_LZIP; > > else if ((magic[0] == 'L') && (magic[1] == 'R') && > > (magic[2] == 'Z') && (magic[3] == 'I')) /* lrzip */ > > *compressed = COMPRESSED_LRZIP; > > @@ . > > patch -p0 <<'@@ .' > > Index: rpm/rpmio/rpmmacro.h > > > ============================================================================ > > $ cvs diff -u -r2.57 -r2.58 rpmmacro.h > > --- rpm/rpmio/rpmmacro.h 6 Sep 2011 13:39:53 -0000 2.57 > > +++ rpm/rpmio/rpmmacro.h 6 Sep 2011 14:41:18 -0000 2.58 > > @@ -209,7 +209,8 @@ > > COMPRESSED_LZOP = 4, /*!< lzop can handle */ > > COMPRESSED_LZMA = 5, /*!< lzma can handle */ > > COMPRESSED_XZ = 6, /*!< xz can handle */ > > - COMPRESSED_LRZIP = 7 /*!< lrzip can handle */ > > + COMPRESSED_LRZIP = 7, /*!< lrzip can handle */ > > + COMPRESSED_LZIP = 8 /*!< lzip can handle */ > > } rpmCompressedMagic; > > > > /** > > @@ . > > ______________________________________________________________________ > > RPM Package Manager http://rpm5.org > > CVS Sources Repository rpm-...@rpm5.org > > ______________________________________________________________________ > RPM Package Manager http://rpm5.org > Developer Communication List rpm-devel@rpm5.org >
