[CVS] RPM: xar/include/ config.h.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: xar Date: 24-May-2008 16:16:43 Branch: HEAD Handle: 2008052414164300 Removed files: xar/include config.h.in Log: remove auto-generated file from CVS Summary: RevisionChanges Path 1.7 +0 -199xar/include/config.h.in rm -f xar/include/config.h.in <<'@@ .' Index: xar/include/config.h.in [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 24-May-2008 16:21:53 Branch: HEAD Handle: 2008052414215300 Modified files: rpm devtool.conf Log: Errr.. NO: An explicit -d :pserver:[EMAIL PROTECTED]:/cvs is wrong, because this prevents RPM 5 developers from committing changes in sub-directories. By just using "cvs" without "-d" one gets the right behaviour: CVS uses the repository which originally was used for checking out the RPM base directory. For RPM 5 developers this is via CVS-over-SSH and for others this is CVS-via-pserver. So, remove this recent change here. Summary: RevisionChanges Path 2.227 +8 -8 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.226 -r2.227 devtool.conf --- rpm/devtool.conf 23 May 2008 20:40:06 - 2.226 +++ rpm/devtool.conf 24 May 2008 14:21:53 - 2.227 @@ -17,19 +17,19 @@ release=`eval echo \\$${release}` if [ ".${release}" = . ]; then if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then -echo "===> ${name} (cvs -d :pserver:[EMAIL PROTECTED]:/cvs up HEAD)" -( cd ${DEVTOOL_SRCDIR}/${name} && cvs -d :pserver:[EMAIL PROTECTED]:/cvs -q up -A -P -d ) +echo "===> ${name} (cvs up HEAD)" +( cd ${DEVTOOL_SRCDIR}/${name} && cvs -q up -A -P -d ) else -echo "===> ${name} (cvs -d :pserver:[EMAIL PROTECTED]:/cvs co HEAD)" -( cd ${DEVTOOL_SRCDIR} && cvs -d :pserver:[EMAIL PROTECTED]:/cvs co -A -d ${name} ${name} ) +echo "===> ${name} (cvs co HEAD)" +( cd ${DEVTOOL_SRCDIR} && cvs co -A -d ${name} ${name} ) fi else if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then -echo "===> ${name} (cvs -d :pserver:[EMAIL PROTECTED]:/cvs up ${release})" -( cd ${DEVTOOL_SRCDIR}/${name} && cvs -d :pserver:[EMAIL PROTECTED]:/cvs -q up -P -d -r${release} ) +echo "===> ${name} (cvs up ${release})" +( cd ${DEVTOOL_SRCDIR}/${name} && cvs -q up -P -d -r${release} ) else -echo "===> ${name} (cvs -d :pserver:[EMAIL PROTECTED]:/cvs co ${release})" -( cd ${DEVTOOL_SRCDIR} && cvs -d :pserver:[EMAIL PROTECTED]:/cvs co -r${release} -d ${name} ${name} ) +echo "===> ${name} (cvs co ${release})" +( cd ${DEVTOOL_SRCDIR} && cvs co -r${release} -d ${name} ${name} ) fi fi echo "<=== ${name}" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: lzma/ autogen.sh
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: lzma Date: 24-May-2008 16:22:29 Branch: HEAD Handle: 2008052414222900 Modified files: lzmaautogen.sh Log: fix typo Summary: RevisionChanges Path 1.2 +1 -1 lzma/autogen.sh patch -p0 <<'@@ .' Index: lzma/autogen.sh $ cvs diff -u -r1.1.1.1 -r1.2 autogen.sh --- lzma/autogen.sh 27 Apr 2008 12:09:50 - 1.1.1.1 +++ lzma/autogen.sh 24 May 2008 14:22:29 - 1.2 @@ -2,7 +2,7 @@ set -e -x -# autooint copies all kinds of crap even though we have told in +# autopoint copies all kinds of crap even though we have told in # configure.ac that we don't want the intl directory. It is able # to omit the intl directory but still copies the m4 files needed # only by the stuff in the non-existing intl directory. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: file/ autogen.sh rpm/ INSTALL autogen.sh devtool.conf xar/ ...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: xar rpm file zlibDate: 24-May-2008 16:31:05 Branch: HEAD Handle: 2008052414310302 Modified files: fileautogen.sh rpm INSTALL autogen.sh devtool.conf xar autogen.sh zlibautogen.sh Log: use latest GNU libtool 2.2.4 to build RPM 5 (rpm5.org tarball rolling environment is updated to reflect this, too) Summary: RevisionChanges Path 1.38+2 -2 file/autogen.sh 2.101 +1 -1 rpm/INSTALL 2.93+2 -2 rpm/autogen.sh 2.228 +1 -1 rpm/devtool.conf 1.12+2 -2 xar/autogen.sh 1.16+2 -2 zlib/autogen.sh patch -p0 <<'@@ .' Index: file/autogen.sh $ cvs diff -u -r1.37 -r1.38 autogen.sh --- file/autogen.sh 9 Apr 2008 12:31:53 - 1.37 +++ file/autogen.sh 24 May 2008 14:31:04 - 1.38 @@ -3,14 +3,14 @@ # configure the requirements AMV="automake (GNU automake) 1.10" ACV="autoconf (GNU Autoconf) 2.62" -LTV="libtoolize (GNU libtool) 2.2.2" +LTV="libtoolize (GNU libtool) 2.2.4" GTT="gettextize (GNU gettext-tools) 0.17" USAGE=" To build RPM from plain CVS sources the following installed developer tools are mandatory: GNU automake 1.10 GNU autoconf 2.62 -GNU libtool 2.2.2 +GNU libtool 2.2.4 GNU gettext 0.17 " @@ . patch -p0 <<'@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.100 -r2.101 INSTALL --- rpm/INSTALL 23 May 2008 11:48:45 - 2.100 +++ rpm/INSTALL 24 May 2008 14:31:03 - 2.101 @@ -14,7 +14,7 @@ GNU m4 [0] mandatory 1.4.0 1.4.11 http://www.gnu.org/software/m4/ GNU autoconfmandatory 2.59b 2.62 http://www.gnu.org/software/autoconf/ GNU automakemandatory 1.8 1.10 http://www.gnu.org/software/automake/ -GNU libtool mandatory 1.5 2.2.2 http://www.gnu.org/software/libtool/ +GNU libtool mandatory 1.5 2.2.4 http://www.gnu.org/software/libtool/ GNU gettext mandatory 0.160.17 http://www.gnu.org/software/gettext/ --- - --- --- - @@ . patch -p0 <<'@@ .' Index: rpm/autogen.sh $ cvs diff -u -r2.92 -r2.93 autogen.sh --- rpm/autogen.sh28 Apr 2008 16:40:28 - 2.92 +++ rpm/autogen.sh24 May 2008 14:31:03 - 2.93 @@ -3,14 +3,14 @@ # configure the requirements AMV="automake (GNU automake) 1.10" ACV="autoconf (GNU Autoconf) 2.62" -LTV="libtoolize (GNU libtool) 2.2.2" +LTV="libtoolize (GNU libtool) 2.2.4" GTT="gettextize (GNU gettext-tools) 0.17" USAGE=" To build RPM from plain CVS sources the following installed developer tools are mandatory: GNU automake 1.10 GNU autoconf 2.62 -GNU libtool 2.2.2 +GNU libtool 2.2.4 GNU gettext 0.17 " @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.227 -r2.228 devtool.conf --- rpm/devtool.conf 24 May 2008 14:21:53 - 2.227 +++ rpm/devtool.conf 24 May 2008 14:31:03 - 2.228 @@ -214,7 +214,7 @@ v_m4="1.4.11" v_autoconf="2.62" v_automake="1.10" -v_libtool="2.2.2" +v_libtool="2.2.4" v_gettext="0.17" # third-party library distribution versions @@ . patch -p0 <<'@@ .' Index: xar/autogen.sh $ cvs diff -u -r1.11 -r1.12 autogen.sh --- xar/autogen.sh9 Apr 2008 12:31:53 - 1.11 +++ xar/autogen.sh24 May 2008 14:31:05 - 1.12 @@ -3,14 +3,14 @@ # configure the requirements AMV="automake (GNU automake) 1.10" ACV="autoconf (GNU Autoconf) 2.62" -LTV="libtoolize (GNU libtool) 2.2.2" +LTV="libtoolize (GNU libtool) 2.2.4" GTT="gettextize (GNU gettext-tools) 0.17" USAGE=" To build RPM from plain CVS sources the following installed developer tools are mandatory: GNU automake 1.10 GNU autoconf 2.62 -GNU libtool 2.2.2 +GNU libtool 2.2.4 GNU gettext 0.17 " @@ . patch -p0 <<'@@ .' I
[CVS] RPM: lzma/m4/ .cvsignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: lzma Date: 24-May-2008 16:32:05 Branch: HEAD Handle: 2008052414320500 Modified files: lzma/m4 .cvsignore Log: ignore more auto-generated files Summary: RevisionChanges Path 1.2 +5 -0 lzma/m4/.cvsignore patch -p0 <<'@@ .' Index: lzma/m4/.cvsignore $ cvs diff -u -r1.1 -r1.2 .cvsignore --- lzma/m4/.cvsignore27 Apr 2008 12:25:12 - 1.1 +++ lzma/m4/.cvsignore24 May 2008 14:32:05 - 1.2 @@ -28,3 +28,8 @@ wchar_t.m4 wint_t.m4 xsize.m4 +libtool.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +lt~obsolete.m4 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: xar/include/ .cvsignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: xar Date: 24-May-2008 16:32:39 Branch: HEAD Handle: 2008052414323800 Modified files: xar/include .cvsignore Log: ignore auto-generated file Summary: RevisionChanges Path 1.3 +1 -0 xar/include/.cvsignore patch -p0 <<'@@ .' Index: xar/include/.cvsignore $ cvs diff -u -r1.2 -r1.3 .cvsignore --- xar/include/.cvsignore22 Jan 2008 22:09:35 - 1.2 +++ xar/include/.cvsignore24 May 2008 14:32:38 - 1.3 @@ -1,6 +1,7 @@ Makefile Makefile.in config.h +config.h.in stamp-h1 stamp-h2 xar.h @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 24-May-2008 16:37:03 Branch: HEAD Handle: 2008052414370300 Modified files: rpm configure.ac Log: BeeCrypt is linked externally only (specified by 'yes,external') so, no need to specifiy the not-existing subdir Summary: RevisionChanges Path 2.299 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.298 -r2.299 configure.ac --- rpm/configure.ac 20 May 2008 09:18:29 - 2.298 +++ rpm/configure.ac 24 May 2008 14:37:03 - 2.299 @@ -973,7 +973,7 @@ RPM_CHECK_LIB( [BeeCrypt], [beecrypt], [beecrypt], [mpfprintln], [beecrypt/api.h], -[yes,external], [beecrypt], +[yes,external], [], [], [ AC_MSG_ERROR([mandatory BeeCrypt library not found]) ]) dnl # Mozilla NSS @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES acinclude.m4
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 24-May-2008 18:43:36 Branch: HEAD Handle: 2008052416433600 Modified files: rpm CHANGES acinclude.m4 Log: add support for "lib-config" and "lib.pc" in RPM_CHECK_LIB Autoconf macro (this is required in preparation to build against GCrypt out-of-the-box) Summary: RevisionChanges Path 1.2364 +1 -0 rpm/CHANGES 2.23+48 -14 rpm/acinclude.m4 patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2363 -r1.2364 CHANGES --- rpm/CHANGES 23 May 2008 16:29:38 - 1.2363 +++ rpm/CHANGES 24 May 2008 16:43:36 - 1.2364 @@ -1,5 +1,6 @@ 5.1.0 -> 5.2a0: +- rse: add support for "lib-config" and "lib.pc" in RPM_CHECK_LIB - jbj: debuginfo: refactor 2 existing upgrade policy rules before adding a new contextually sensitive rule for -debuginfo packages. - jbj: debuginfo: add general rpmdbCount() to get number of items for @@ . patch -p0 <<'@@ .' Index: rpm/acinclude.m4 $ cvs diff -u -r2.22 -r2.23 acinclude.m4 --- rpm/acinclude.m4 9 Nov 2007 07:17:25 - 2.22 +++ rpm/acinclude.m4 24 May 2008 16:43:36 - 2.23 @@ -55,8 +55,8 @@ dnl ##against it. dnl ## dnl ##It especially supports the following particular features: -dnl ##- is aware of old-style -config style scripts -dnl ##- is aware of new-style pkg-config(1) .pc configuration files +dnl ##- is aware of old-style [lib]-config style scripts +dnl ##- is aware of new-style pkg-config(1) [lib].pc configuration files dnl ##- searches under standard sub-directories "include", "lib", etc. dnl ##- searches under arbitrary sub-areas of a tree like ".libs", etc. dnl ##- searches in standard system locations (implicitly) @@ -228,7 +228,7 @@ ]) elif test ".${__rcl_location}" = .external; then dnl # detection of library in arbitrary external location -if (pkg-config --exists $2) 2>/dev/null; then +if (pkg-config --exists $2 || pkg-config --exists lib$2) 2>/dev/null; then dnl # via pkg-config(1) script in PATH m4_define([__rcl_query_pkgconfig], [ __rcl_flags="`($][1 --$][2) 2>/dev/null`" @@ -237,13 +237,21 @@ $][3="${$][3} ${__rcl_flags}" fi ]) -__rcl_query_pkgconfig([pkg-config $2], [cflags-only-I], [CPPFLAGS]) -__rcl_query_pkgconfig([pkg-config $2], [cflags-only-other], [CFLAGS]) -__rcl_query_pkgconfig([pkg-config $2], [libs-only-other], [LDFLAGS]) -__rcl_query_pkgconfig([pkg-config $2], [libs-only-l], [LIBS]) -__rcl_result_hint="external: via pkg-config $2" +if (pkg-config --exists $2) 2>/dev/null; then +__rcl_query_pkgconfig([pkg-config $2], [cflags-only-I], [CPPFLAGS]) +__rcl_query_pkgconfig([pkg-config $2], [cflags-only-other], [CFLAGS]) +__rcl_query_pkgconfig([pkg-config $2], [libs-only-other], [LDFLAGS]) +__rcl_query_pkgconfig([pkg-config $2], [libs-only-l], [LIBS]) +__rcl_result_hint="external: via pkg-config $2" +else +__rcl_query_pkgconfig([pkg-config lib$2], [cflags-only-I], [CPPFLAGS]) +__rcl_query_pkgconfig([pkg-config lib$2], [cflags-only-other], [CFLAGS]) +__rcl_query_pkgconfig([pkg-config lib$2], [libs-only-other], [LDFLAGS]) +__rcl_query_pkgconfig([pkg-config lib$2], [libs-only-l], [LIBS]) +__rcl_result_hint="external: via pkg-config lib$2" +fi break -elif test ".`($2-config --version) 2>/dev/null`" != .; then +elif test ".`($2-config --version; lib$2-config --version) 2>/dev/null`" != .; then dnl # via conf
[CVS] RPM: rpm/ CHANGES rpm/rpmio/ poptIO.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 24-May-2008 18:44:52 Branch: HEAD Handle: 2008052416445101 Modified files: rpm CHANGES rpm/rpmio poptIO.c Log: more robust argument checking for CLI option --usecrypto Summary: RevisionChanges Path 1.2365 +1 -0 rpm/CHANGES 1.25+24 -4 rpm/rpmio/poptIO.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2364 -r1.2365 CHANGES --- rpm/CHANGES 24 May 2008 16:43:36 - 1.2364 +++ rpm/CHANGES 24 May 2008 16:44:52 - 1.2365 @@ -1,5 +1,6 @@ 5.1.0 -> 5.2a0: +- rse: more robust argument checking for CLI option --usecrypto - rse: add support for "lib-config" and "lib.pc" in RPM_CHECK_LIB - jbj: debuginfo: refactor 2 existing upgrade policy rules before adding a new contextually sensitive rule for -debuginfo packages. @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/poptIO.c $ cvs diff -u -r1.24 -r1.25 poptIO.c --- rpm/rpmio/poptIO.c2 Apr 2008 21:56:47 - 1.24 +++ rpm/rpmio/poptIO.c24 May 2008 16:44:51 - 1.25 @@ -241,22 +241,42 @@ #else val = xstrdup(arg); #endif /* NOTYET */ + if (!xstrcasecmp(val, "beecrypt") || !xstrcasecmp(val, "bc")) { #if defined(WITH_BEECRYPT) - if (!xstrcasecmp(val, "beecrypt") || !xstrcasecmp(val, "bc")) pgpImplVecs = &rpmbcImplVecs; +#else +rpmlog(RPMLOG_ERR, "BeeCrypt (\"beecrypt\") based cryptography implementation not available\n"); +exit(EXIT_FAILURE); #endif +} + else if (!xstrcasecmp(val, "gcrypt") || !xstrcasecmp(val, "gc")) { #if defined(WITH_GCRYPT) - if (!xstrcasecmp(val, "gcrypt") || !xstrcasecmp(val, "gc")) pgpImplVecs = &rpmgcImplVecs; +#else +rpmlog(RPMLOG_ERR, "GCrypt (\"gcrypt\") based cryptography implementation not available\n"); +exit(EXIT_FAILURE); #endif +} + else if (!xstrcasecmp(val, "NSS")) { #if defined(WITH_NSS) - if (!xstrcasecmp(val, "NSS")) pgpImplVecs = &rpmnssImplVecs; +#else +rpmlog(RPMLOG_ERR, "Mozilla NSS (\"nss\") based cryptography implementation not available\n"); +exit(EXIT_FAILURE); #endif +} + else if (!xstrcasecmp(val, "OpenSSL") || !xstrcasecmp(val, "ssl")) { #if defined(WITH_SSL) - if (!xstrcasecmp(val, "OpenSSL") || !xstrcasecmp(val, "ssl")) pgpImplVecs = &rpmsslImplVecs; +#else +rpmlog(RPMLOG_ERR, "OpenSSL (\"openssl\") based cryptography implementation not available\n"); +exit(EXIT_FAILURE); #endif +} +else { +rpmlog(RPMLOG_ERR, "cryptography implementation \"%s\" not known\n", val); +exit(EXIT_FAILURE); +} val = _free(val); } break; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES configure.ac rpm/rpmio/ Makefile.am rpmgc.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 24-May-2008 18:47:01 Branch: HEAD Handle: 2008052416465902 Modified files: rpm CHANGES configure.ac rpm/rpmio Makefile.am rpmgc.c Log: allow one to build against the GCrypt based crypto implementation out-of-the-box Summary: RevisionChanges Path 1.2366 +1 -0 rpm/CHANGES 2.300 +8 -0 rpm/configure.ac 1.174 +2 -2 rpm/rpmio/Makefile.am 2.4 +38 -0 rpm/rpmio/rpmgc.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2365 -r1.2366 CHANGES --- rpm/CHANGES 24 May 2008 16:44:52 - 1.2365 +++ rpm/CHANGES 24 May 2008 16:46:59 - 1.2366 @@ -1,5 +1,6 @@ 5.1.0 -> 5.2a0: +- rse: allow one to build against the GCrypt based crypto implementation out-of-the-box - rse: more robust argument checking for CLI option --usecrypto - rse: add support for "lib-config" and "lib.pc" in RPM_CHECK_LIB - jbj: debuginfo: refactor 2 existing upgrade policy rules before @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.299 -r2.300 configure.ac --- rpm/configure.ac 24 May 2008 14:37:03 - 2.299 +++ rpm/configure.ac 24 May 2008 16:46:59 - 2.300 @@ -976,6 +976,14 @@ [yes,external], [], [], [ AC_MSG_ERROR([mandatory BeeCrypt library not found]) ]) +dnl # GCrypt +RPM_CHECK_LIB( +[GCrypt], [gcrypt], +[gcrypt], [gcry_pk_verify], [gcrypt.h], +[no,external], [], +[ AC_DEFINE(WITH_GCRYPT, 1, [Define if building with GCrypt]) +], []) + dnl # Mozilla NSS RPM_CHECK_LIB( [Mozilla NSS], [nss], @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.173 -r1.174 Makefile.am --- rpm/rpmio/Makefile.am 11 May 2008 12:36:45 - 1.173 +++ rpm/rpmio/Makefile.am 24 May 2008 16:47:01 - 1.174 @@ -56,7 +56,7 @@ pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX) pkginc_HEADERS = \ - argv.h envvar.h fts.h mire.h rpmbc.h rpmcb.h rpmdav.h \ + argv.h envvar.h fts.h mire.h rpmbc.h rpmcb.h rpmdav.h rpmgc.h \ rpmhash.h rpmio.h rpmio-stub.h rpmlog.h rpmmacro.h rpmmg.h \ rpmnss.h rpmpgp.h rpmsq.h rpmssl.h rpmsw.h rpmurl.h rpmxar.h \ stringbuf.h ugid.h rpmuuid.h @@ -72,7 +72,7 @@ iosm.c lzdio.c macro.c mire.c mount.c \ md2.c md4.c poptIO.c rmd128.c rmd160.c rmd256.c rmd320.c sha224.c \ salsa10.c salsa20.c tiger.c \ - rpmbc.c rpmdav.c rpmhash.c rpmhook.c rpmio.c rpmio-stub.c \ + rpmbc.c rpmdav.c rpmgc.c rpmhash.c rpmhook.c rpmio.c rpmio-stub.c \ rpmlog.c rpmlua.c rpmmalloc.c rpmmg.c rpmnss.c rpmpgp.c \ rpmrpc.c rpmsq.c rpmssl.c rpmsw.c rpmxar.c \ strcasecmp.c stringbuf.c strtolocale.c tar.c url.c ugid.c rpmuuid.c @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmgc.c $ cvs diff -u -r2.3 -r2.4 rpmgc.c --- rpm/rpmio/rpmgc.c 6 Dec 2007 01:50:48 - 2.3 +++ rpm/rpmio/rpmgc.c 24 May 2008 16:47:01 - 2.4 @@ -4,9 +4,15 @@ #include "system.h" #include + #define _RPMGC_INTERNAL +#if defined(WITH_GCRYPT) #define _RPMPGP_INTERNAL #include +#else +#include /* XXX DIGEST_CTX */ +#endif + #include "debug.h" /[EMAIL PROTECTED] pgpDig @*/ @@ -20,6 +26,7 @@ extern int _pgp_print; /[EMAIL PROTECTED]@*/ +#if defined(WITH_GCRYPT) static void rpmgcDump(const char * msg, gcry_sexp_t sexp) { @@ -31,12 +38,14 @@ fprintf(stderr, "== %s:\n%s", msg, buf); return; } +#endif /** * Convert hex to binary nibble. * @param chex character * @return binary nibble */ +#if defined(WITH_GCRYPT) static unsigned char nibble(char c) /[EMAIL PROTECTED]/ @@ -49,11 +58,13 @@ return (unsigned char)((int)(c - 'a') + 10); return (unsigned char) '\0'; } +#endif static int rpmgcSetRSA(/[EMAIL PROTECTED]@*/ DIGEST_CTX ctx, pgpDig dig, pgpDigParams sigp) /[EMAIL PROTECTED] ctx, dig @*/ { +#if defined(WITH_GCRYPT) rpmgc gc = dig->impl; unsigned
[CVS] RPM: rpm/ CHANGES configure.ac rpm/rpmio/ rpmpgp.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 24-May-2008 18:53:30 Branch: HEAD Handle: 2008052416532900 Modified files: rpm CHANGES configure.ac rpm/rpmio rpmpgp.c Log: 1. implicitly choose one of BeeCrypt/GCrypt/NSS/OpenSSL as the crypto implementation 2. add an Autoconf --with-usecrypto={beecrypt,gcrypt,nss,openssl} build-time option 3. explicitly let one to force one of BeeCrypt/GCrypt/NSS/OpenSSL as the crypto implementation via Autoconf option --with-usecrypto. Summary: RevisionChanges Path 1.2367 +3 -0 rpm/CHANGES 2.301 +15 -0 rpm/configure.ac 2.91+18 -2 rpm/rpmio/rpmpgp.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2366 -r1.2367 CHANGES --- rpm/CHANGES 24 May 2008 16:46:59 - 1.2366 +++ rpm/CHANGES 24 May 2008 16:53:29 - 1.2367 @@ -1,5 +1,8 @@ 5.1.0 -> 5.2a0: +- rse: explicitly let one to force one of BeeCrypt/GCrypt/NSS/OpenSSL as the crypto implementation +- rse: implicitly choose one of BeeCrypt/GCrypt/NSS/OpenSSL as the crypto implementation +- rse: add an Autoconf --with-usecrypto={beecrypt,gcrypt,nss,openssl} build-time option - rse: allow one to build against the GCrypt based crypto implementation out-of-the-box - rse: more robust argument checking for CLI option --usecrypto - rse: add support for "lib-config" and "lib.pc" in RPM_CHECK_LIB @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.300 -r2.301 configure.ac --- rpm/configure.ac 24 May 2008 16:46:59 - 2.300 +++ rpm/configure.ac 24 May 2008 16:53:29 - 2.301 @@ -999,6 +999,21 @@ [ AC_DEFINE(WITH_SSL, 1, [Define if building with OpenSSL]) ], []) +dnl # select default Cryptography implementation to use (default for CLI option --usecrypto) +AC_ARG_WITH([usecrypto], +AS_HELP_STRING( +[--with-usecrypto=ID], +[use particular default for --usecrypto option ("beecrypt", "gcrypt", "nss", "openssl")] +), [ +case "`echo $withval | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`" in +beecrypt | bc ) AC_DEFINE(USE_CRYPTO_BEECRYPT, 1, [Define to 1 for using BeeCryptas default cryptography library]) ;; +gcrypt | gc ) AC_DEFINE(USE_CRYPTO_GCRYPT, 1, [Define to 1 for using GCrypt as default cryptography library]) ;; +nss ) AC_DEFINE(USE_CRYPTO_NS, 1, [Define to 1 for using Mozilla NSS as default cryptography library]) ;; +openssl | ssl ) AC_DEFINE(USE_CRYPTO_OPENSSL, 1, [Define to 1 for using OpenSSL as default cryptography library]) ;; +* ) AC_MSG_ERROR([invalid cryptography library identifier specified for --with-usecrypto option]) ;; +esac +]) + dnl # Neon RPM_CHECK_LIB( [Neon], [neon], @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpgp.c $ cvs diff -u -r2.90 -r2.91 rpmpgp.c --- rpm/rpmio/rpmpgp.c17 Mar 2008 09:50:02 - 2.90 +++ rpm/rpmio/rpmpgp.c24 May 2008 16:53:29 - 2.91 @@ -24,10 +24,26 @@ /[EMAIL PROTECTED]@*/ pgpImplVecs_t * pgpImplVecs = -#if defined(WITH_NSS) +/* explicit selection (order DOES NOT matter here) */ +#if defined(USE_CRYPTO_BEECRYPT) && defined(WITH_BEECRYPT) + &rpmbcImplVecs; +#elif defined(USE_CRYPTO_GCRYPT) && defined(WITH_GCRYPT) + &rpmgcImplVecs; +#elif defined(USE_CRYPTO_NSS) && defined(WITH_NSS) &rpmnssImplVecs; -#else +#elif defined(USE_CRYPTO_OPENSSL) && defined(WITH_SSL) + &rpmsslImplVecs; +/* implict selection (order DOES matter) */ +#elif defined(WITH_BEECRYPT) &rpmbcImplVecs; +#elif defined(WITH_GCRYPT) + &rpmgcImplVecs; +#elif defined(WITH_NSS) + &rpmnssImplVecs; +#elif defined(WITH_SSL) + &rpmsslImplVecs; +#else +#error INTERNAL ERROR: no suitable Cryptography library available #endif /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ poptIO.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 24-May-2008 18:58:28 Branch: HEAD Handle: 2008052416582800 Modified files: rpm/rpmio poptIO.c Log: I see no reason why one wishes to macro expand the --usecrypto argument, but even if there is a reason there is already the code under NOTYET, so no need to do it twice Summary: RevisionChanges Path 1.26+1 -1 rpm/rpmio/poptIO.c patch -p0 <<'@@ .' Index: rpm/rpmio/poptIO.c $ cvs diff -u -r1.25 -r1.26 poptIO.c --- rpm/rpmio/poptIO.c24 May 2008 16:44:51 - 1.25 +++ rpm/rpmio/poptIO.c24 May 2008 16:58:28 - 1.26 @@ -234,7 +234,7 @@ break; #endif /* NOTYET */ case POPT_CRYPTO: - { const char *val = rpmExpand(arg, NULL); + { const char *val; #ifdef NOTYET rpmioConfigured(); val = rpmExpand(arg, NULL); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: file/ autogen.sh rpm/ CHANGES autogen.sh devtool.c...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: xar rpm file zlibDate: 24-May-2008 20:24:24 Branch: rpm-5_1 Handle: 2008052418242301 Modified files: (Branch: rpm-5_1) fileautogen.sh rpm CHANGES autogen.sh devtool.conf xar autogen.sh zlibautogen.sh Log: upgraded build environment to GNU libtool 2.2.4 Summary: RevisionChanges Path 1.36.2.2+2 -2 file/autogen.sh 1.2288.2.30 +1 -0 rpm/CHANGES 2.90.2.2+2 -2 rpm/autogen.sh 2.205.2.8 +1 -1 rpm/devtool.conf 1.10.2.2+2 -2 xar/autogen.sh 1.14.2.2+2 -2 zlib/autogen.sh patch -p0 <<'@@ .' Index: file/autogen.sh $ cvs diff -u -r1.36.2.1 -r1.36.2.2 autogen.sh --- file/autogen.sh 11 Apr 2008 20:27:20 - 1.36.2.1 +++ file/autogen.sh 24 May 2008 18:24:23 - 1.36.2.2 @@ -3,14 +3,14 @@ # configure the requirements AMV="automake (GNU automake) 1.10" ACV="autoconf (GNU Autoconf) 2.62" -LTV="libtoolize (GNU libtool) 2.2.2" +LTV="libtoolize (GNU libtool) 2.2.4" GTT="gettextize (GNU gettext-tools) 0.17" USAGE=" To build RPM from plain CVS sources the following installed developer tools are mandatory: GNU automake 1.10 GNU autoconf 2.62 -GNU libtool 2.2.2 +GNU libtool 2.2.4 GNU gettext 0.17 " @@ . patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2288.2.29 -r1.2288.2.30 CHANGES --- rpm/CHANGES 20 May 2008 17:52:52 - 1.2288.2.29 +++ rpm/CHANGES 24 May 2008 18:24:23 - 1.2288.2.30 @@ -1,4 +1,5 @@ 5.1.1 -> 5.1.2: +- rse: upgraded build environment to GNU libtool 2.2.4 - afb: standalone: file "magic" was installed in wrong directory - jbj: add toplevel lcov-foo Makefile targets. Current coverage at http://wraptastic.org/pub/jbj/rpm-5.1.DEVEL-lcov @@ . patch -p0 <<'@@ .' Index: rpm/autogen.sh $ cvs diff -u -r2.90.2.1 -r2.90.2.2 autogen.sh --- rpm/autogen.sh11 Apr 2008 20:27:19 - 2.90.2.1 +++ rpm/autogen.sh24 May 2008 18:24:23 - 2.90.2.2 @@ -3,14 +3,14 @@ # configure the requirements AMV="automake (GNU automake) 1.10" ACV="autoconf (GNU Autoconf) 2.62" -LTV="libtoolize (GNU libtool) 2.2.2" +LTV="libtoolize (GNU libtool) 2.2.4" GTT="gettextize (GNU gettext-tools) 0.17" USAGE=" To build RPM from plain CVS sources the following installed developer tools are mandatory: GNU automake 1.10 GNU autoconf 2.62 -GNU libtool 2.2.2 +GNU libtool 2.2.4 GNU gettext 0.17 " @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.205.2.7 -r2.205.2.8 devtool.conf --- rpm/devtool.conf 20 May 2008 17:52:52 - 2.205.2.7 +++ rpm/devtool.conf 24 May 2008 18:24:23 - 2.205.2.8 @@ -211,7 +211,7 @@ v_m4="1.4.11" v_autoconf="2.62" v_automake="1.10" -v_libtool="2.2.2" +v_libtool="2.2.4" v_gettext="0.17" # third-party library distribution versions @@ . patch -p0 <<'@@ .' Index: xar/autogen.sh $ cvs diff -u -r1.10.2.1 -r1.10.2.2 autogen.sh --- xar/autogen.sh11 Apr 2008 20:27:20 - 1.10.2.1 +++ xar/autogen.sh24 May 2008 18:24:23 - 1.10.2.2 @@ -3,14 +3,14 @@ # configure the requirements AMV="automake (GNU automake) 1.10" ACV="autoconf (GNU Autoconf) 2.62" -LTV="libtoolize (GNU libtool) 2.2.2" +LTV="libtoolize (GNU libtool) 2.2.4" GTT="gettextize (GNU gettext-tools) 0.17" USAGE=" To build RPM from plain CVS sources the following installed developer tools are mandatory: GNU automake 1.10 GNU autoconf 2.62 -GNU libtool 2.2.2 +GNU libtool 2.2.4 GNU gettext 0.17 " @@ . patch -p0 <<'@@ .' Index: zlib/autogen.sh $ cvs diff -u -r1.14.2.1 -r1.14.2.2 autogen.sh --- zlib/autogen.sh 11 Apr 2008 20:27:20 - 1.14.2.1 +++ zlib/autogen.sh 24 May 2008 18:2
[CVS] RPM: rpm-5_1: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 24-May-2008 21:04:13 Branch: rpm-5_1 Handle: 2008052419041200 Modified files: (Branch: rpm-5_1) rpm CHANGES Log: RPM 5.1.2 finally released, so open CHANGELOG for 5.1.3 Summary: RevisionChanges Path 1.2288.2.31 +2 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2288.2.30 -r1.2288.2.31 CHANGES --- rpm/CHANGES 24 May 2008 18:24:23 - 1.2288.2.30 +++ rpm/CHANGES 24 May 2008 19:04:12 - 1.2288.2.31 @@ -1,3 +1,5 @@ +5.1.2 -> 5.1.3: + 5.1.1 -> 5.1.2: - rse: upgraded build environment to GNU libtool 2.2.4 - afb: standalone: file "magic" was installed in wrong directory @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 24-May-2008 21:11:27 Branch: HEAD Handle: 2008052419112700 Modified files: rpm CHANGES Log: for a more complete history tracking, merge in the CHANGELOG entries of 5.0 and 5.1 branches since the official branch fork points but clearly mark the FORK POINTs as such Summary: RevisionChanges Path 1.2368 +148 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2367 -r1.2368 CHANGES --- rpm/CHANGES 24 May 2008 16:53:29 - 1.2367 +++ rpm/CHANGES 24 May 2008 19:11:27 - 1.2368 @@ -110,6 +110,78 @@ = +5.1.1 -> 5.1.2: +- rse: upgraded build environment to GNU libtool 2.2.4 +- afb: standalone: file "magic" was installed in wrong directory +- jbj: add toplevel lcov-foo Makefile targets. Current coverage at + http://wraptastic.org/pub/jbj/rpm-5.1.DEVEL-lcov +- jbj: add --enable-build-gcov for CFLAGS -fprofile-arcs -ftest-coverage. +- jbj: hot-wire a top level "make check". noisy sanity check atm, todo++. +- jbj: backport top level tests/* for "make check". No tests in Makefile + SUBDIRS targets yet ... +- jbj: rpmrepo: add doxygen markup throughout, adjust splint annotations. +- jbj: update i18n from Translation Project. +- jbj: update po/POTFILES.in +- jbj: rpmuuid: add i18n to error messages. +- jbj: fix: rpm-python h['filenames'] needs tagName(0x54aafb71) to + return "Filenames" in order to find the filepathsTag extension. +- jbj: add a missing newline to a debug message. +- jbj: revert rpmtsOpenDB on --checksig path, rely on the lazy open + in rpmtsFindPubkey instead. +- jbj: fix: rpm -qp returns NOKEY because rpmdb is not yet open. Do a lazy + open in rpmtsFindPubkey. +- jbj: python: fix: insure that ts.setProbFilter() return is initialized. +- jbj: fix: --triggers segfault, don't depend on he->p.ptr = NULL after + headerGet() failed return. +- jbj: add RPMTAG_PACKAGESTAT, and store persistently in a rpmdb Header. +- jbj: disable loop unraveling error msgs for now. better needs to be done. +- jbj: rpmrepo: achieve {primary,filelists,other}.xml spew parity w createrepo. +- jbj: rpmrepo: compute origin *.rpm file digest while reading. +- jbj: preserve stat(2) & digest through headerReload(). +- jbj: get rid of copy-n-paste typos, add "l" type markers to rpmtag.h. +- jbj: add RPMTAG_PACKAGEDIGEST extension as RPM_STRING_TYPE. +- jbj: add digest of origin *.rpm to Header internal store. +- jbj: add RPMTAG_PACKAGESIZE extension as RPM_UINT64_TYPE. +- jbj: rework RPMTAG_PACKAGETIME extension as RPM_UINT64_TYPE. +- jbj: rework header{Get,Set}Time as header{Get,Stat}Statbuf methods. +- jbj: add stat(2) of origin *.rpm to Header internal store. +- jbj: permit file digests through (e.g.) :stat format extension. +- jbj: add :uuid format. UUIDv5 URI design & tag type coercion todo++. +- jbj: fix: blessed NUL termination for Readlink return. +- jbj: retrofit v5 UUID's for hdrid/pkgid digests as tag extensions. +- jbj: retrofit v1 UUID's for time stamps as tag extensions. +- jbj: replace "diskstat" tag with :stat format extension instead. +- jbj: add :digest format. +- jbj: generalize :utf8 to :iconv iconv(3) conversions. +- jbj: permit :base64 encoding to be applied to all tag data types. +- jbj: fix: use rpmlog instead of rpmError for messages. +- glen: print error when makeTempPath fails due missing temp dir + +5.1.0 -> 5.1.1: +- jbj: permit firefox debugging by creating an empty dir (#444310). +- jbj: header: free tag data on error retrurn with damaged data. +- rpm.org: rpmsw: insure that time has passed while calibrating (#435309). +- jbj: header: fix: avoid double free with damaged data (#442761). +- afb: fix VPATH builds finding rpmversion.h (in build) +- afb: fix parallel build of rpmdigest (automake quirk) +- jbj: rpmte: revert to individual tags instead of RPMTAG_NVRA. +- afb: macosx: fix thinko in previous xar linking workaround + +5.1b2 -> 5.1.0: +- jbj: rpmte: fix: snip ".arch" from "-release", same NEVRA check broke. +- nkukard: support building under Li