[CVS] RPM: rpm-5_4: rpm/po/ POTFILES.in
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: 20-Jul-2014 02:15:57 Branch: rpm-5_4 Handle: 2014072000151600 Modified files: (Branch: rpm-5_4) rpm/po POTFILES.in Log: - i18n: add additional files. Summary: RevisionChanges Path 1.80.2.1+25 -0 rpm/po/POTFILES.in patch -p0 <<'@@ .' Index: rpm/po/POTFILES.in $ cvs diff -u -r1.80 -r1.80.2.1 POTFILES.in --- rpm/po/POTFILES.in3 Dec 2010 17:40:56 - 1.80 +++ rpm/po/POTFILES.in20 Jul 2014 00:15:16 - 1.80.2.1 @@ -27,8 +27,10 @@ lib/formats.c lib/fs.c lib/fsm.c +lib/libsql.c lib/manifest.c lib/misc.c +lib/order.c lib/poptALL.c lib/poptI.c lib/poptQV.c @@ -58,6 +60,7 @@ rpmdb/header.c rpmdb/header_internal.c rpmdb/legacy.c +rpmdb/libsqldb.c rpmdb/merge.c rpmdb/package.c rpmdb/pkgio.c @@ -66,9 +69,11 @@ rpmdb/rpmdpkg.c rpmdb/rpmevr.c rpmdb/rpmlio.c +rpmdb/rpmmdb.c rpmdb/rpmns.c rpmdb/rpmrepo.c rpmdb/rpmtxn.c +rpmdb/rpmwf.c rpmdb/signature.c rpmdb/sqlite.c rpmdb/tagname.c @@ -82,23 +87,29 @@ rpmio/fts.c rpmio/glob.c rpmio/gzdio.c +rpmio/html-parse.c rpmio/iosm.c +rpmio/libsqlio.c rpmio/lookup3.c +rpmio/lsyck.c rpmio/macro.c rpmio/mire.c rpmio/mongo.c rpmio/mount.c rpmio/poptIO.c rpmio/rpmacl.c +rpmio/rpmasn.c rpmio/rpmaug.c rpmio/rpmbag.c rpmio/rpmbc.c rpmio/rpmbf.c rpmio/rpmcudf.c +rpmio/rpmcvs.c rpmio/rpmdav.c rpmio/rpmdir.c rpmio/rpmficl.c rpmio/rpmgc.c +rpmio/rpmgit.c rpmio/rpmhash.c rpmio/rpmhkp.c rpmio/rpmhook.c @@ -112,6 +123,7 @@ rpmio/rpmmalloc.c rpmio/rpmmg.c rpmio/rpmnss.c +rpmio/rpmodbc.c rpmio/rpmperl.c rpmio/rpmpgp.c rpmio/rpmpython.c @@ -123,12 +135,18 @@ rpmio/rpmsql.c rpmio/rpmsquirrel.c rpmio/rpmssl.c +rpmio/rpmsvn.c rpmio/rpmsw.c rpmio/rpmsx.c rpmio/rpmsyck.c rpmio/rpmtcl.c +rpmio/rpmtpm.c rpmio/rpmuuid.c rpmio/rpmxar.c +rpmio/rpmz.c +rpmio/rpmzlog.c +rpmio/rpmzq.c +rpmio/set.c rpmio/strcasecmp.c rpmio/strtolocale.c rpmio/tar.c @@ -141,6 +159,11 @@ tools/chroot.c tools/cp.c tools/cudftool.c +tools/dbconvert.c +tools/dbsql.c +tools/debugedit.c +tools/hashtab.c +tools/roto.c tools/rpm2cpio.c tools/rpmcache.c tools/rpmcmp.c @@ -151,6 +174,8 @@ tools/rpmkey.c tools/rpmmtree.c tools/rpmrepo.c +tools/rpmspecdump.c tools/rpmwget.c tools/semodule.c tools/spooktool.c +tools/sqlite3.c @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpython.h rpmtpm.c
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: 20-Jul-2014 02:14:15 Branch: rpm-5_4 Handle: 2014072000134034 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmpython.h rpmtpm.c Log: - rpmio: doxygen cruft. Summary: RevisionChanges Path 2.10.2.1+1 -1 rpm/rpmio/rpmpython.h 1.5.2.19+3 -0 rpm/rpmio/rpmtpm.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpython.h $ cvs diff -u -r2.10 -r2.10.2.1 rpmpython.h --- rpm/rpmio/rpmpython.h 7 Apr 2010 03:20:06 - 2.10 +++ rpm/rpmio/rpmpython.h 20 Jul 2014 00:13:40 - 2.10.2.1 @@ -67,7 +67,7 @@ /** * Create and load a python interpreter. - * @param fn python interpreter args (or NULL) + * @param av python interpreter args (or NULL) * @param flags python interpreter flags ((1<<31): use global interpreter) * @return new python interpreter */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmtpm.c $ cvs diff -u -r1.5.2.18 -r1.5.2.19 rpmtpm.c --- rpm/rpmio/rpmtpm.c26 Sep 2013 17:01:54 - 1.5.2.18 +++ rpm/rpmio/rpmtpm.c20 Jul 2014 00:14:14 - 1.5.2.19 @@ -110,6 +110,9 @@ /** * Process object OPTIONS and ARGS. * @param tpmtpm object + * @param ac + * @param av + * @param tbl */ static void rpmtpmInitPopt(rpmtpm tpm, int ac, char ** av, poptOption tbl) /*@modifies tpm @*/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ bson.h iosm.h mire.h rpmaug.h rpmbf.h r...
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: 20-Jul-2014 02:10:32 Branch: rpm-5_4 Handle: 2014072711159 Modified files: (Branch: rpm-5_4) rpm/rpmio bson.h iosm.h mire.h rpmaug.h rpmbf.h rpmhkp.h rpmio.h rpmsql.c rpmsql.h Log: - rpmio: doxygen cruft. Summary: RevisionChanges Path 2.3.4.6 +1 -0 rpm/rpmio/bson.h 1.18.4.2+1 -1 rpm/rpmio/iosm.h 1.32.4.1+3 -3 rpm/rpmio/mire.h 1.9.2.1 +2 -0 rpm/rpmio/rpmaug.h 2.8.4.2 +1 -1 rpm/rpmio/rpmbf.h 2.9.2.2 +3 -1 rpm/rpmio/rpmhkp.h 1.97.2.1+1 -1 rpm/rpmio/rpmio.h 2.59.2.9+155 -5 rpm/rpmio/rpmsql.c 2.27.4.5+7 -7 rpm/rpmio/rpmsql.h patch -p0 <<'@@ .' Index: rpm/rpmio/bson.h $ cvs diff -u -r2.3.4.5 -r2.3.4.6 bson.h --- rpm/rpmio/bson.h 31 Aug 2013 20:29:15 - 2.3.4.5 +++ rpm/rpmio/bson.h 20 Jul 2014 00:07:11 - 2.3.4.6 @@ -675,6 +675,7 @@ * * @param b the BSON object to initialize. * @param data the raw BSON data. + * @param dataSize * @param ownsData when true, bson_ensure_space() may reallocate the block and * bson_destroy() will free it * @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/iosm.h $ cvs diff -u -r1.18.4.1 -r1.18.4.2 iosm.h --- rpm/rpmio/iosm.h 4 Jun 2012 15:10:20 - 1.18.4.1 +++ rpm/rpmio/iosm.h 20 Jul 2014 00:07:35 - 1.18.4.2 @@ -441,7 +441,7 @@ /** * Is the file going to be skipped? - * @param iosm I/O state machine + * @param action file action * @return Is file to be skipped? */ int iosmFileActionSkipped(iosmFileAction action) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/mire.h $ cvs diff -u -r1.32 -r1.32.4.1 mire.h --- rpm/rpmio/mire.h 4 Mar 2010 20:55:32 - 1.32 +++ rpm/rpmio/mire.h 20 Jul 2014 00:07:35 - 1.32.4.1 @@ -184,7 +184,7 @@ /** * Destroy compiled patterns. * @param mire pattern array - * @param nreno of patterns in array + * @param nmire no of patterns in array * @return NULL always */ /*@null@*/ @@ -230,7 +230,7 @@ * Initialize pattern global options (PCRE only). * @param newlinenewline ending identifier * @param caseless should case be ignored? - * @param multline are multiline matches permitted? + * @param multiline are multiline matches permitted? * @param utf8 assume utf8 matching? * @return 0 on success */ @@ -253,7 +253,7 @@ * Compile pattern match. * * @param mire pattern container - * @param valpattern to compile + * @param patternpattern to compile * @return 0 on success */ int mireRegcomp(miRE mire, const char * pattern) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmaug.h $ cvs diff -u -r1.9 -r1.9.2.1 rpmaug.h --- rpm/rpmio/rpmaug.h7 Apr 2010 03:20:06 - 1.9 +++ rpm/rpmio/rpmaug.h20 Jul 2014 00:08:10 - 1.9.2.1 @@ -214,6 +214,7 @@ * Print node paths that match an expression. * @param augaugeas wrapper (NULL uses global interpreter) * @param outouput file (NULL uses stdout) + * @param path node path expression * @return 0 on success, <0 on error */ int rpmaugPrint(/*@null@*/ rpmaug aug, /*@null@*/ FILE * out, const char * path) @@ -229,6 +230,7 @@ /** * Run augeas commands from a buffer. + * @param augaugeas wrapper (NULL uses global interpreter) * @param straugeas commands to run * @retval *resultp output running augeas commands * @return RPMRC_OK on success @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmbf.h $ cvs diff -u -r2.8.4.1 -r2.8.4.2 rpmbf.h --- rpm/rpmio/rpmbf.h 16 Apr 2012 03:21:22 - 2.8.4.1 +++ rpm/rpmio/rpmbf.h 20 Jul 2014 00:08:10 - 2.8.4.2 @@ -188,7 +188,7 @@ /** * Return optimal {m, k} for given n and e. - * @parampopulation e
[CVS] RPM: rpm-5_4: rpm/rpmdb/ fprint.h package.c rpmdpkg.c rpmdpkg.h ...
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: 20-Jul-2014 01:35:27 Branch: rpm-5_4 Handle: 20140719232947264 Modified files: (Branch: rpm-5_4) rpm/rpmdb fprint.h package.c rpmdpkg.c rpmdpkg.h rpmevr.h rpmmdb.c rpmns.c rpmns.h rpmrepo.c rpmrepo.h rpmtag.h Log: - rpmdb: doxygen cruft. Summary: RevisionChanges Path 1.20.4.2+2 -2 rpm/rpmdb/fprint.h 1.2.2.7 +1 -1 rpm/rpmdb/package.c 1.6.8.1 +1 -1 rpm/rpmdb/rpmdpkg.c 1.2.8.1 +1 -1 rpm/rpmdb/rpmdpkg.h 1.11.4.3+4 -4 rpm/rpmdb/rpmevr.h 1.4.2.2 +1 -1 rpm/rpmdb/rpmmdb.c 1.15.2.7+1 -1 rpm/rpmdb/rpmns.c 1.4.6.4 +2 -2 rpm/rpmdb/rpmns.h 1.4.2.2 +6 -1 rpm/rpmdb/rpmrepo.c 1.3.2.2 +1 -1 rpm/rpmdb/rpmrepo.h 1.70.4.10 +2 -2 rpm/rpmdb/rpmtag.h patch -p0 <<'@@ .' Index: rpm/rpmdb/fprint.h $ cvs diff -u -r1.20.4.1 -r1.20.4.2 fprint.h --- rpm/rpmdb/fprint.h28 Feb 2012 20:56:48 - 1.20.4.1 +++ rpm/rpmdb/fprint.h19 Jul 2014 23:29:47 - 1.20.4.2 @@ -147,8 +147,8 @@ /** * Check file for to be installed symlinks in their path, * correct their fingerprint and add it to newht. - * @param ht hash table containing all files fingerprints - * @param newht hash table to add the corrected fingerprints + * @param symlinks hash table containing all files fingerprints + * @param fphash hash table to add the corrected fingerprints * @param fpcfingerprint cache * @param _p transaction element * @param filenr the number of the file we are dealing with @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/package.c $ cvs diff -u -r1.2.2.6 -r1.2.2.7 package.c --- rpm/rpmdb/package.c 5 May 2014 19:44:11 - 1.2.2.6 +++ rpm/rpmdb/package.c 19 Jul 2014 23:30:16 - 1.2.2.7 @@ -1,5 +1,5 @@ /** \ingroup header - * \file lib/package.c + * \file rpmdb/package.c */ #include "system.h" @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmdpkg.c $ cvs diff -u -r1.6 -r1.6.8.1 rpmdpkg.c --- rpm/rpmdb/rpmdpkg.c 1 Jan 2009 18:43:05 - 1.6 +++ rpm/rpmdb/rpmdpkg.c 19 Jul 2014 23:30:52 - 1.6.8.1 @@ -1,5 +1,5 @@ /** \ingroup rpmds - * \file lib/rpmdpkg.c + * \file rpmdb/rpmdpkg.c */ #include "system.h" @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmdpkg.h $ cvs diff -u -r1.2 -r1.2.8.1 rpmdpkg.h --- rpm/rpmdb/rpmdpkg.h 2 Aug 2008 16:36:10 - 1.2 +++ rpm/rpmdb/rpmdpkg.h 19 Jul 2014 23:31:09 - 1.2.8.1 @@ -2,7 +2,7 @@ #define H_RPMDPKG /** \ingroup rpmds - * \file lib/rpmdpkg.h + * \file rpmdb/rpmdpkg.h * Structure(s) and routine(s) used for dpkg EVR parsing and comparison. */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmevr.h $ cvs diff -u -r1.11.4.2 -r1.11.4.3 rpmevr.h --- rpm/rpmdb/rpmevr.h29 May 2012 17:42:29 - 1.11.4.2 +++ rpm/rpmdb/rpmevr.h19 Jul 2014 23:31:40 - 1.11.4.3 @@ -2,7 +2,7 @@ #define H_RPMEVR /** \ingroup rpmds - * \file lib/rpmevr.h + * \file rpmdb/rpmevr.h * Structure(s) and routine(s) used for EVR parsing and comparison. */ @@ -87,7 +87,7 @@ unsigned long Elong; /*!< E converted to integer. */ #endif evrFlags Flags; /*!< EVR comparison flags. */ -const char * F[6]; /*!< Fields: (\1=E, \2=V, \3=T, \4=R, \5=D). */ +const char * F[6]; /*!< Fields: (\\1=E, \\2=V, \\3=T, \\4=R, \\5=D). */ #define RPMEVR_E1 #define RPMEVR_V2 #define RPMEVR_T3 @@ -134,9 +134,9 @@ EVR_t rpmEVRnew(uint32_t Flags, int initialize) /*@*/; -/** \ingroup rpmtd +/** \ingroup rpmds * Destroy an EVR container. - * @paramEVR container + * @param evrEVR container * @return NULL always */ /*@null@*/ @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmmd
[CVS] RPM: rpm-5_4: rpm/lib/ order.c psm.c psm.h rpmfc.h rpmfi.h verif...
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: 20-Jul-2014 01:34:25 Branch: rpm-5_4 Handle: 20140719233106152 Modified files: (Branch: rpm-5_4) rpm/lib order.c psm.c psm.h rpmfc.h rpmfi.h verify.c Log: - lib: doxygen cruft. Summary: RevisionChanges Path 2.8.2.6 +1 -0 rpm/lib/order.c 2.399.2.10 +1 -1 rpm/lib/psm.c 2.81.4.1+1 -0 rpm/lib/psm.h 1.19.4.5+2 -2 rpm/lib/rpmfc.h 2.82.4.2+7 -7 rpm/lib/rpmfi.h 2.201.4.12 +1 -1 rpm/lib/verify.c patch -p0 <<'@@ .' Index: rpm/lib/order.c $ cvs diff -u -r2.8.2.5 -r2.8.2.6 order.c --- rpm/lib/order.c 4 Jun 2012 15:10:11 - 2.8.2.5 +++ rpm/lib/order.c 19 Jul 2014 23:31:06 - 2.8.2.6 @@ -446,6 +446,7 @@ /** * Record next "q <- p" relation (i.e. "p" requires "q"). * @param ts transaction set + * @param al * @param p predecessor (i.e. package that "Requires: q") * @param requires relation * @return 0 always @@ . patch -p0 <<'@@ .' Index: rpm/lib/psm.c $ cvs diff -u -r2.399.2.9 -r2.399.2.10 psm.c --- rpm/lib/psm.c 28 Jun 2013 16:25:47 - 2.399.2.9 +++ rpm/lib/psm.c 19 Jul 2014 23:31:59 - 2.399.2.10 @@ -2126,7 +2126,7 @@ /** * Add fi->states to an install header. * @param ts transaction set - * @param te transaction element + * @param psmpackage state machine * @param fi file info set * @return 0 always */ @@ . patch -p0 <<'@@ .' Index: rpm/lib/psm.h $ cvs diff -u -r2.81 -r2.81.4.1 psm.h --- rpm/lib/psm.h 6 Mar 2010 15:31:29 - 2.81 +++ rpm/lib/psm.h 19 Jul 2014 23:33:03 - 2.81.4.1 @@ -177,6 +177,7 @@ /** * Destroy a package state machine. * @param psmpackage state machine + * @param msg * @return NULL on last dereference */ /*@null@*/ @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmfc.h $ cvs diff -u -r1.19.4.4 -r1.19.4.5 rpmfc.h --- rpm/lib/rpmfc.h 22 Apr 2012 17:07:07 - 1.19.4.4 +++ rpm/lib/rpmfc.h 19 Jul 2014 23:33:24 - 1.19.4.5 @@ -199,7 +199,7 @@ /** * Unreference a file classifier instance. - * @param ds dependency set + * @param fc file classifier * @return NULL if free'd */ /*@unused@*/ /*@null@*/ @@ -210,7 +210,7 @@ /** * Reference a file classifier instance. - * @param ds file classifier + * @param fc file classifier * @return new file classifier reference */ /*@unused@*/ /*@newref@*/ /*@null@*/ @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmfi.h $ cvs diff -u -r2.82.4.1 -r2.82.4.2 rpmfi.h --- rpm/lib/rpmfi.h 4 Jun 2012 15:10:11 - 2.82.4.1 +++ rpm/lib/rpmfi.h 19 Jul 2014 23:33:24 - 2.82.4.2 @@ -211,7 +211,7 @@ /*@only@*/ /*@null@*/ char * fn; /*!< File name buffer, fnlen + 1 bytes. */ -size_t fnlen;/*!< Maximum file name length (without '\0'). */ +size_t fnlen;/*!< Maximum file name length (without NUL). */ size_t astriplen; size_t striplen; @@ -368,7 +368,7 @@ /** * Return maximum file name length from file info set. * @param fi file info set - * @return maximum file name length (not including '\0') + * @return maximum file name length (not including NUL) */ extern size_t rpmfiFNMaxLen(/*@null@*/ rpmfi fi) /*@*/; @@ -858,11 +858,11 @@ /** * Add relocation element to array. - * @retval *relocations relocation array - * @retval *nrelocations no. of elements - * @param oldPathold path - * @param newPathnew path - * @return 0 on success + * @retval *relp relocation array + * @retval *nrelpno. of elements + * @param oldPathold path + * @param newPathnew path + * @return 0 on success */ int rpmfiAddRelocation(rpmRelocation * relp, int * nrelp,
[CVS] RPM: rpm-5_4: rpm/ INSTALL
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: 19-Jul-2014 22:15:32 Branch: rpm-5_4 Handle: 2014071920152800 Modified files: (Branch: rpm-5_4) rpm INSTALL Log: - sanity. Summary: RevisionChanges Path 2.134.2.6 +9 -10 rpm/INSTALL patch -p0 <<'@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.134.2.5 -r2.134.2.6 INSTALL --- rpm/INSTALL 17 Apr 2014 18:44:22 - 2.134.2.5 +++ rpm/INSTALL 19 Jul 2014 20:15:28 - 2.134.2.6 @@ -15,7 +15,7 @@ GNU autoconfmandatory 2.59b 2.69 http://www.gnu.org/software/autoconf/ GNU automakemandatory 1.8 1.14 http://www.gnu.org/software/automake/ GNU libtool mandatory 1.5 2.4.2 http://www.gnu.org/software/libtool/ -GNU gettext mandatory 0.16 0.18.2.1http://www.gnu.org/software/gettext/ +GNU gettext mandatory 0.16 0.18.3.2http://www.gnu.org/software/gettext/ GNU makemandatory - - http://www.gnu.org/software/make/ GNU bashoptional - - http://www.gnu.org/software/bash/ --- - --- --- - @@ -35,22 +35,22 @@ Libtasn.1 mandatory - 2.7 http://www.gnu.org/software/libtasn1/ Neonmandatory 0.27.0 0.30.0 http://www.webdav.org/neon/ PCREmandatory 7.0 8.33http://www.pcre.org/ -Mozilla NSS optional 3.113.15.1 http://www.mozilla.org/projects/security/pki/nss/ +Berkeley-DB [1] mandatory 6.0.30 6.0.30 http://www.oracle.com/database/berkeley-db.html +Mozilla NSS optional 3.113.16.1 http://www.mozilla.org/projects/security/pki/nss/ OpenSSL optional 0.9.8 1.0.0e http://www.openssl.org/ -Berkeley-DB [1] optional 6.0.20 6.0.20 http://www.oracle.com/database/berkeley-db.html +LibTomCrypt optional 1.171.17http://www.libtom.org/ +LibGcrypt optional 1.5.3 1.6.1 http://www.gnupg.org/ SQLite [1] optional 3.3 3.7.0.1 http://www.sqlite.org/ Lua [2] optional 5.2 5.2.2 http://www.lua.org/ ZLiboptional 1.2 1.2.8 http://www.zlib.net/ Bzip2 optional 1.0 1.0.5 http://www.bzip.org/ XZ Utils[3] optional 4.999.9 5.0.4 http://tukaani.org/xz/ File/magic [4] optional 4.005.14ftp://ftp.astron.com/pub/file/ -GNU gettext optional 0.18 0.18.3.1http://www.gnu.org/software/gettext/ +GNU gettext optional 0.18 0.18.3.2http://www.gnu.org/software/gettext/ GNU iconv optional 1.111.11 http://www.gnu.org/software/libiconv/ OSSP uuid optional 1.6.0 1.6.2 http://www.ossp.org/pkg/lib/uuid/ XAR [5] optional 1.5.2 1.5.2 http://code.google.com/p/xar/ -DMalloc optional 5 5.5.2 http://dmalloc.com/ -Electric Fence optional 2.1 2.1.13 http://perens.com/FreeSoftware/ElectricFence/ -Linux KeyUtils optional 1.2 1.2 http://people.redhat.com/~dhowells/keyutils/ +Linux KeyUtils optional 1.2 1.5.9 http://people.redhat.com/~dhowells/keyutils/ System libelf optional - - e.g. http://www.mr511.de/software/english.html CPUInfo optional r143r143https://launchpad.net/cpuinfo --- - --- --- - @@ -58,7 +58,7 @@ [0] m4:NOTICE: Do not use GNU m4 1.4.10, it breaks GNU autoconf. [1] db/sqlite: Berkeley-DB used by RPM. - Building RPM against anything _EXCEPT_ db-5.3.21 + Building RPM against anything _EXCEPT_ db-6.0.30 external Berkeley-DB is not officially supported (but any version of Berkeley-DB since db-4.5.20 will "work"). @@ -88,12 +88,11 @@ --- - --- --- - GNU zip optional - - http://www.gzip.org/ Bzip2 optional - - http://www.bzip.org/ -XZ optional 4.999.9 4.999.9 http://tukaani.org/xz/ +XZ optional - - http://tukaani.org/xz/ GNU tar optional - - http://www.gnu.org/software/tar/ GNU cpiooptional - - http://www.gnu.org/software/cpio/ UnZip optional - - http://www.info-zip.org/UnZip.html GnuPG optional - - http://www.gnupg.
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/lib/ fsm.c
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: 19-Jul-2014 21:05:05 Branch: rpm-5_4 Handle: 2014071919045804 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/lib fsm.c Log: - fsm: fix: set st_ino to handle XFS 64b inodes (PLD). Summary: RevisionChanges Path 1.3501.2.406+1 -0 rpm/CHANGES 2.193.4.7 +2 -0 rpm/lib/fsm.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.405 -r1.3501.2.406 CHANGES --- rpm/CHANGES 19 Jul 2014 19:02:47 - 1.3501.2.405 +++ rpm/CHANGES 19 Jul 2014 19:04:58 - 1.3501.2.406 @@ -1,4 +1,5 @@ 5.4.14 -> 5.4.15: +- jbj: fsm: fix: set st_ino to handle XFS 64b inodes (PLD). - jbj: header: fix: make binary tag length immunes to padding. - jbj: iosm: fix: set st_ino to handle XFS 64b inodes (PLD). - jbj: nss: list compiled in ECC curves. @@ . patch -p0 <<'@@ .' Index: rpm/lib/fsm.c $ cvs diff -u -r2.193.4.6 -r2.193.4.7 fsm.c --- rpm/lib/fsm.c 27 Jun 2013 13:08:04 - 2.193.4.6 +++ rpm/lib/fsm.c 19 Jul 2014 19:05:02 - 2.193.4.7 @@ -900,6 +900,7 @@ if (fi && i >= 0 && i < (int) fi->fc) { mode_t perms = (S_ISDIR(st->st_mode) ? fi->dperms : fi->fperms); mode_t finalMode = (fi->fmodes ? (mode_t)fi->fmodes[i] : perms); + ino_t finalInode = (fi->finodes ? (ino_t)fi->finodes[i] : 0); dev_t finalRdev = (dev_t)(fi->frdevs ? fi->frdevs[i] : 0); rpmuint32_t finalMtime = (fi->fmtimes ? fi->fmtimes[i] : 0); uid_t uid = fi->uid; @@ -939,6 +940,7 @@ && st->st_nlink == 0) st->st_nlink = 1; st->st_rdev = finalRdev; + st->st_ino = finalInode; st->st_mtime = finalMtime; } if (fsm->mapFlags & IOSM_MAP_UID) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmdb/ signature.c
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: 19-Jul-2014 21:03:58 Branch: rpm-5_4 Handle: 2014071919035500 Modified files: (Branch: rpm-5_4) rpm/rpmdb signature.c Log: - sanity. Summary: RevisionChanges Path 1.68.2.9+4 -3 rpm/rpmdb/signature.c patch -p0 <<'@@ .' Index: rpm/rpmdb/signature.c $ cvs diff -u -r1.68.2.8 -r1.68.2.9 signature.c --- rpm/rpmdb/signature.c 5 May 2014 19:44:11 - 1.68.2.8 +++ rpm/rpmdb/signature.c 19 Jul 2014 19:03:55 - 1.68.2.9 @@ -616,11 +616,12 @@ const char * str; switch (res) { case RPMRC_OK: str = "OK"; break; -case RPMRC_FAIL: str = "BAD";break; -case RPMRC_NOKEY:str = "NOKEY"; break; -case RPMRC_NOTTRUSTED: str = "NOTRUSTED"; break; default: case RPMRC_NOTFOUND: str = "UNKNOWN";break; +case RPMRC_FAIL: str = "BAD";break; +case RPMRC_NOTTRUSTED: str = "NOTTRUSTED"; break; +case RPMRC_NOKEY:str = "NOKEY"; break; +case RPMRC_NOSIG:str = "NOSIG"; break; } return str; } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmdb/ header.c
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: 19-Jul-2014 21:02:54 Branch: rpm-5_4 Handle: 2014071919024705 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/rpmdb header.c Log: - header: fix: make binary tag length immunes to padding. Summary: RevisionChanges Path 1.3501.2.405+1 -0 rpm/CHANGES 1.198.2.11 +3 -3 rpm/rpmdb/header.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.404 -r1.3501.2.405 CHANGES --- rpm/CHANGES 19 Jul 2014 18:58:53 - 1.3501.2.404 +++ rpm/CHANGES 19 Jul 2014 19:02:47 - 1.3501.2.405 @@ -1,4 +1,5 @@ 5.4.14 -> 5.4.15: +- jbj: header: fix: make binary tag length immunes to padding. - jbj: iosm: fix: set st_ino to handle XFS 64b inodes (PLD). - jbj: nss: list compiled in ECC curves. - jbj: nss: fix: adjust PQG generation to handle DSA2. @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/header.c $ cvs diff -u -r1.198.2.10 -r1.198.2.11 header.c --- rpm/rpmdb/header.c14 May 2014 23:05:14 - 1.198.2.10 +++ rpm/rpmdb/header.c19 Jul 2014 19:02:52 - 1.198.2.11 @@ -1498,7 +1498,7 @@ (void) memcpy(pe + ril, dataStart, rdl); } else { - count = (rpmTagCount)entry->length; + count = (rpmTagCount)entry->info.count; he->p.ptr = (!minMem ? memcpy(DRD_xmalloc(count), entry->data, count) : entry->data); @@ -2162,7 +2162,7 @@ indexEntry entry = NULL; int rc; -/* Insure that *he is reliably initialized. */ +/* Ensure that *he is reliably initialized. */ memset(he, 0, sizeof(*he)); for (slot = hi->next_index; slot < h->indexUsed; slot++) { @@ -2238,7 +2238,7 @@ if (h == NULL || he == NULL) return 0; /* XXX this is nutty. */ -/* Insure that *he is reliably initialized. */ +/* Ensure that *he is reliably initialized. */ {rpmTag tag = he->tag; memset(he, 0, sizeof(*he)); he->tag = tag; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmio/ iosm.c
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: 19-Jul-2014 20:58:57 Branch: rpm-5_4 Handle: 2014071918585304 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/rpmio iosm.c Log: - iosm: fix: set st_ino to handle XFS 64b inodes (PLD). Summary: RevisionChanges Path 1.3501.2.404+1 -0 rpm/CHANGES 1.43.2.6+2 -0 rpm/rpmio/iosm.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.403 -r1.3501.2.404 CHANGES --- rpm/CHANGES 19 Jul 2014 18:53:55 - 1.3501.2.403 +++ rpm/CHANGES 19 Jul 2014 18:58:53 - 1.3501.2.404 @@ -1,4 +1,5 @@ 5.4.14 -> 5.4.15: +- jbj: iosm: fix: set st_ino to handle XFS 64b inodes (PLD). - jbj: nss: list compiled in ECC curves. - jbj: nss: fix: adjust PQG generation to handle DSA2. - jbj: nss: fix: resurrect rsa signature leading zero bytes. @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/iosm.c $ cvs diff -u -r1.43.2.5 -r1.43.2.6 iosm.c --- rpm/rpmio/iosm.c 27 Jun 2013 13:04:31 - 1.43.2.5 +++ rpm/rpmio/iosm.c 19 Jul 2014 18:58:57 - 1.43.2.6 @@ -955,6 +955,7 @@ if (fi && i >= 0 && i < (int)fi->fc) { mode_t perms = (S_ISDIR(st->st_mode) ? fi->dperms : fi->fperms); mode_t finalMode = (fi->fmodes ? (mode_t)fi->fmodes[i] : perms); + ino_t finalInode = (fi->finodes ? (ino_t)fi->finodes[i] : 0); dev_t finalRdev = (fi->frdevs ? fi->frdevs[i] : 0); rpmuint32_t finalMtime = (fi->fmtimes ? fi->fmtimes[i] : 0); uid_t uid = fi->uid; @@ -994,6 +995,7 @@ && st->st_nlink == 0) st->st_nlink = 1; st->st_rdev = finalRdev; + st->st_ino = finalInode; st->st_mtime = finalMtime; } if (iosm->mapFlags & IOSM_MAP_UID) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmgit.c tasn.c thkp.c
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: 19-Jul-2014 20:56:41 Branch: rpm-5_4 Handle: 2014071918563704 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmgit.c tasn.c thkp.c Log: - sanity. Summary: RevisionChanges Path 2.1.2.47+5 -3 rpm/rpmio/rpmgit.c 2.2.2.1 +0 -1 rpm/rpmio/tasn.c 2.49.2.1+1 -0 rpm/rpmio/thkp.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmgit.c $ cvs diff -u -r2.1.2.46 -r2.1.2.47 rpmgit.c --- rpm/rpmio/rpmgit.c15 May 2014 01:32:01 - 2.1.2.46 +++ rpm/rpmio/rpmgit.c19 Jul 2014 18:56:41 - 2.1.2.47 @@ -474,7 +474,7 @@ { int rc = -1; #if defined(WITH_LIBGIT2) -git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; +git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; if (git->R) {/* XXX leak */ git_repository_free(git->R); @@ -2759,7 +2759,7 @@ int xx; if (_rpmgit_debug) -fprintf(stderr, "==> %s(%p, 0x%x) git %p\n", __FUNCTION__, av, flags, git); +fprintf(stderr, "==> %s(%p, 0x%x) git %p fn %s\n", __FUNCTION__, av, flags, git, fn); if (av == NULL) av = _av; if (opts == NULL) opts = rpmgitOpts; @@ -2780,6 +2780,7 @@ } if (initialize) { + struct stat sb; int xx; git_libgit2_version(&git->major, &git->minor, &git->rev); #ifdef DYING @@ -2789,7 +2790,8 @@ git_repository_open((git_repository **)&git->R, git->repodir)); } #else - xx = rpmgitOpen(git, git->fn); + if (git->fn && Stat(git->fn, &sb) == 0) + xx = rpmgitOpen(git, git->fn); #if 0 assert(xx == 0 && git->R != NULL && git->repodir != NULL); #endif @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/tasn.c $ cvs diff -u -r2.2 -r2.2.2.1 tasn.c --- rpm/rpmio/tasn.c 12 Aug 2010 12:43:01 - 2.2 +++ rpm/rpmio/tasn.c 19 Jul 2014 18:56:37 - 2.2.2.1 @@ -13,7 +13,6 @@ #include "debug.h" - static struct poptOption rpmasnOptionsTable[] = { { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmioAllPoptTable, 0, @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/thkp.c $ cvs diff -u -r2.49 -r2.49.2.1 thkp.c --- rpm/rpmio/thkp.c 24 May 2010 15:40:02 - 2.49 +++ rpm/rpmio/thkp.c 19 Jul 2014 18:56:40 - 2.49.2.1 @@ -76,6 +76,7 @@ case RPMRC_FAIL: return("BAD"); break; case RPMRC_NOTTRUSTED: return("NOTTRUSTED"); break; case RPMRC_NOKEY:return("NOKEY");break; +case RPMRC_NOSIG:return("NOSIG");break; } return("UNKNOWN"); } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmio/ rpmnss.c
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: 19-Jul-2014 20:54:01 Branch: rpm-5_4 Handle: 2014071918535504 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/rpmio rpmnss.c Log: - nss: list compiled in ECC curves. - nss: fix: adjust PQG generation to handle DSA2. - nss: fix: resurrect rsa signature leading zero bytes. Summary: RevisionChanges Path 1.3501.2.403+3 -0 rpm/CHANGES 1.40.2.15 +269 -59rpm/rpmio/rpmnss.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.402 -r1.3501.2.403 CHANGES --- rpm/CHANGES 19 Jul 2014 16:50:15 - 1.3501.2.402 +++ rpm/CHANGES 19 Jul 2014 18:53:55 - 1.3501.2.403 @@ -1,4 +1,7 @@ 5.4.14 -> 5.4.15: +- jbj: nss: list compiled in ECC curves. +- jbj: nss: fix: adjust PQG generation to handle DSA2. +- jbj: nss: fix: resurrect rsa signature leading zero bytes. - jbj: ssl: fix: resurrect rsa signature leading zero bytes. - jbj: ltc: fix: resurrect rsa signature leading zero bytes. - jbj: pgp: add #ifdef's for optional crypto libs (Mark Hatle). @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmnss.c $ cvs diff -u -r1.40.2.14 -r1.40.2.15 rpmnss.c --- rpm/rpmio/rpmnss.c12 May 2014 19:57:19 - 1.40.2.14 +++ rpm/rpmio/rpmnss.c19 Jul 2014 18:53:59 - 1.40.2.15 @@ -660,16 +660,47 @@ { rpmnss nss = (rpmnss) dig->impl; int rc = 0; /* assume failure */ -unsigned _L = 8; +pgpDigParams sigp = pgpGetSignature(dig); +unsigned _J = 8; /* XXX DSA1 1024 bits */ +unsigned _L = 0; unsigned _N = 0; unsigned _seedBytes = 0; +int _passed = 0; +PK11SlotInfo * _slot = NULL; +PQGParams *pqgParams = NULL; +PQGVerify *pqgVfy = NULL; int xx; -if (nss->nbits == 0) nss->nbits = 1024; /* XXX FIXME */ -assert(nss->nbits); -if (nss->qbits == 0) nss->qbits = 160; /* XXX FIXME */ +/* XXX Set the no. of qbits based on the digest being used. */ +if (nss->qbits == 0) +switch (sigp->hash_algo) { +default: /* XXX default */ +case PGPHASHALGO_SHA1: nss->qbits = 160; break; +case PGPHASHALGO_SHA224: nss->qbits = 224; break; +case PGPHASHALGO_SHA256: nss->qbits = 256; break; +case PGPHASHALGO_SHA384: nss->qbits = 384; break; +case PGPHASHALGO_SHA512: nss->qbits = 512; break; +} assert(nss->qbits); +/* XXX Set the no. of nbits for non-truncated digest in use. */ +if (nss->nbits == 0) +switch (nss->qbits) { +default: /* XXX default */ +case 160:nss->nbits = 1024; break; +case 224:nss->nbits = 2048; break; +#ifdef PAINFUL +case 256:nss->nbits = 3072; break; +case 384:nss->nbits = 7680; break; +case 512:nss->nbits = 15360; break; +#else +case 256:nss->nbits = 2048; break; +case 384:nss->nbits = 2048; nss->qbits = 256; break; +case 512:nss->nbits = 2048; nss->qbits = 256; break; +#endif + } +assert(nss->nbits); + /* * Generate PQGParams and PQGVerify structs. * Length of P specified by L. @@ -692,73 +723,73 @@ * L=2048 N=256 * L=3072 N=0 or 256 * if L <= 1024 - * seedBbytes must be in the range [20..256]. + * seedBytes must be in the range [20..256]. * if L >= 1024 - * seedBbytes must be in the range [20..L/16]. + * seedBytes must be in the range [20..L/16]. */ +/* seedBytes == L/8 for probable primes, N/8 for Shawe-Taylor Primes */ -xx = PQG_PBITS_TO_INDEX(nss->nbits); -if (xx >= 0 && xx <= 8) {/* FIPS-186-1 */ - _L = nss->nbits; - _N = 0; /* XXX DSA1 */ - _seedBytes = 0; /* XXX DSA1 */ -} else { /* FIPS-186-3 */ - switch (nss->nbits) { - default:/* XXX sanity */ - case 1024: - _L = 1024; - _N = 160; /* XXX DSA2 */ - _seedBytes = 20; - break; - case 2048: - _L = 2048; - _N = (nss->qbits == 256) ? 256 : 0; /* 256 or 224 */ - _seedBytes = 20;/* XXX FIXME */ - break; - case 3072: - _L = 3072; -
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmio/ rpmssl.c
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: 19-Jul-2014 18:50:18 Branch: rpm-5_4 Handle: 2014071916501104 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/rpmio rpmssl.c Log: - ssl: fix: resurrect rsa signature leading zero bytes. Summary: RevisionChanges Path 1.3501.2.402+1 -0 rpm/CHANGES 2.42.2.13 +42 -2 rpm/rpmio/rpmssl.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.401 -r1.3501.2.402 CHANGES --- rpm/CHANGES 19 Jul 2014 16:48:26 - 1.3501.2.401 +++ rpm/CHANGES 19 Jul 2014 16:50:15 - 1.3501.2.402 @@ -1,4 +1,5 @@ 5.4.14 -> 5.4.15: +- jbj: ssl: fix: resurrect rsa signature leading zero bytes. - jbj: ltc: fix: resurrect rsa signature leading zero bytes. - jbj: pgp: add #ifdef's for optional crypto libs (Mark Hatle). - jbj: rpmlog: export rpmlogRecPriority and rpmlogRecMessage (Jacob Bogusz). @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmssl.c $ cvs diff -u -r2.42.2.12 -r2.42.2.13 rpmssl.c --- rpm/rpmio/rpmssl.c14 May 2014 23:12:29 - 2.42.2.12 +++ rpm/rpmio/rpmssl.c19 Jul 2014 16:50:11 - 2.42.2.13 @@ -509,11 +509,46 @@ rc = 1; break; case PGPPUBKEYALGO_DSA: -if (ssl->nbits == 0) ssl->nbits = 1024; /* XXX FIXME */ + /* XXX Set the no. of qbits based on the digest being used. */ + if (ssl->qbits == 0) + switch (sigp->hash_algo) { + default:/* XXX default */ + case PGPHASHALGO_SHA1: ssl->qbits = 160; break; + case PGPHASHALGO_SHA224:ssl->qbits = 224; break; + case PGPHASHALGO_SHA256:ssl->qbits = 256; break; +#ifdef PAINFUL /* XXX openssl-1.0.1e-16 permits only {160,224,256} */ + case PGPHASHALGO_SHA384:ssl->qbits = 384; break; + case PGPHASHALGO_SHA512:ssl->qbits = 512; break; +#else + case PGPHASHALGO_SHA384:ssl->qbits = 256; break; + case PGPHASHALGO_SHA512:ssl->qbits = 256; break; +#endif + } +assert(ssl->qbits); + + /* XXX Set the no. of nbits for non-truncated digest in use. */ + if (ssl->nbits == 0) + switch (ssl->qbits) { + default:/* XXX default */ + case 160: ssl->nbits = 1024; break; + case 224: ssl->nbits = 2048; break; +#ifdef PAINFUL + case 256: ssl->nbits = 3072; break; + case 384: ssl->nbits = 7680; break; + case 512: ssl->nbits = 15360; break; +#else + case 256: ssl->nbits = 2048; break; + case 384: ssl->nbits = 2048; ssl->qbits = 256; break; + case 512: ssl->nbits = 2048; ssl->qbits = 256; break; +#endif + } assert(ssl->nbits); + if ((ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_DSA, NULL)) == NULL || EVP_PKEY_paramgen_init(ctx) != 1 || EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, ssl->nbits) != 1 + || EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN, + EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS, ssl->qbits, NULL) != 1 || EVP_PKEY_paramgen(ctx, ¶m) != 1) goto exit; EVP_PKEY_CTX_free(ctx); @@ -619,6 +654,7 @@ unsigned int nb = (pend >= p ? (pend - p) : 0); unsigned int mbits = (((8 * (nb - 2)) + 0x1f) & ~0x1f); unsigned char * q; +unsigned int nz; int rc = 0; int xx; @@ -631,7 +667,11 @@ assert(ssl->sig == NULL); ssl->nbits = mbits; ssl->siglen = mbits/8; - ssl->sig = memcpy(xmalloc(nb-2), p+2, nb-2); + ssl->sig = xmalloc(ssl->siglen); + nz = ssl->siglen - (nb - 2); + if (nz) /* XXX resurrect leading zero bytes. */ + memset(ssl->sig, 0, nz); + memcpy(ssl->sig+nz, p+2, nb-2); break; case 20: /* DSA r */ assert(ssl->dsasig == NULL); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmio/ rpmltc.c
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: 19-Jul-2014 18:48:29 Branch: rpm-5_4 Handle: 2014071916482501 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/rpmio rpmltc.c Log: - ltc: fix: resurrect rsa signature leading zero bytes. Summary: RevisionChanges Path 1.3501.2.401+1 -0 rpm/CHANGES 1.2.4.9 +10 -5 rpm/rpmio/rpmltc.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.400 -r1.3501.2.401 CHANGES --- rpm/CHANGES 18 Jul 2014 19:48:01 - 1.3501.2.400 +++ rpm/CHANGES 19 Jul 2014 16:48:26 - 1.3501.2.401 @@ -1,4 +1,5 @@ 5.4.14 -> 5.4.15: +- jbj: ltc: fix: resurrect rsa signature leading zero bytes. - jbj: pgp: add #ifdef's for optional crypto libs (Mark Hatle). - jbj: rpmlog: export rpmlogRecPriority and rpmlogRecMessage (Jacob Bogusz). - jbj: fix: make sure the rpmgi ref is released on gpg invocation errors. @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmltc.c $ cvs diff -u -r1.2.4.8 -r1.2.4.9 rpmltc.c --- rpm/rpmio/rpmltc.c12 May 2014 20:01:14 - 1.2.4.8 +++ rpm/rpmio/rpmltc.c19 Jul 2014 16:48:25 - 1.2.4.9 @@ -375,11 +375,12 @@ { rpmltc ltc = dig->impl; int rc = 0; /* assume failure */ -unsigned char sig[2048]; +unsigned char sig[4096]; /* XXX big enuf */ unsigned long siglen = sizeof(sig); unsigned int dlen; /* XXX DSA */ int _padding = LTC_LTC_PKCS_1_V1_5; /* XXX RSA */ unsigned long saltlen = 0; /* XXX RSA */ +unsigned nz; /* XXX RSA */ int xx; pgpDigParams pubp = pgpGetPubkey(dig); pgpDigParams sigp = pgpGetSignature(dig); @@ -395,7 +396,11 @@ break; case PGPPUBKEYALGO_RSA: assert(ltc->hashIdx >= 0); - xx = mp_to_unsigned_bin_n(ltc->c, sig, &siglen); + siglen = ltc->nbits/8; + nz = siglen - mp_unsigned_bin_size(ltc->c); + if (nz) /* XXX resurrect leading zero bytes. */ + memset(sig, 0, nz); + xx = mp_to_unsigned_bin(ltc->c, sig+nz); xx = rpmltcErr(ltc, "rsa_verify_hash_ex", rsa_verify_hash_ex(sig, siglen, ltc->digest, ltc->digestlen, @@ -550,8 +555,8 @@ case 512: ltc->nbits = 15360; break; #else case 256: ltc->nbits = 2048; break; - case 384: ltc->nbits = 2048; break; - case 512: ltc->nbits = 2048; break; + case 384: ltc->nbits = 2048; ltc->qbits = 256; break; + case 512: ltc->nbits = 2048; ltc->qbits = 256; break; #endif } assert(ltc->nbits); @@ -712,7 +717,7 @@ ltc->digest = _free(ltc->digest); ltc->digestlen = 0; - /* XXX rsa_free(dsa); */ + /* XXX rsa_free( rsa); */ _freeBN(ltc->rsa.N); _freeBN(ltc->rsa.e); _freeBN(ltc->rsa.d); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org