[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ hdrNVR.c header.c pkgio.c rpmtag.h ...

2007-11-22 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   23-Nov-2007 08:06:02
  Branch: HEAD Handle: 2007112307060100

  Modified files:
rpm CHANGES
rpm/rpmdb   hdrNVR.c header.c pkgio.c rpmtag.h rpmwf.c rpmwf.h
signature.c
rpm/rpmio   .splintrc rpmio.c rpmio.h rpmio_internal.h
rpmxar.c rpmxar.h

  Log:
- splint fiddles for rpmxar and rpmTag.
- bury timedRead in pkgio.c, eliminate everywhere else.

  Summary:
RevisionChanges Path
1.1873  +2  -0  rpm/CHANGES
1.35+4  -4  rpm/rpmdb/hdrNVR.c
1.129   +17 -5  rpm/rpmdb/header.c
1.55+31 -20 rpm/rpmdb/pkgio.c
1.8 +5  -1  rpm/rpmdb/rpmtag.h
1.16+1  -0  rpm/rpmdb/rpmwf.c
1.8 +11 -2  rpm/rpmdb/rpmwf.h
1.32+3  -3  rpm/rpmdb/signature.c
1.19+1  -1  rpm/rpmio/.splintrc
1.108   +1  -2  rpm/rpmio/rpmio.c
1.64+0  -7  rpm/rpmio/rpmio.h
2.92+4  -4  rpm/rpmio/rpmio_internal.h
2.5 +12 -3  rpm/rpmio/rpmxar.c
2.5 +15 -2  rpm/rpmio/rpmxar.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1872 -r1.1873 CHANGES
  --- rpm/CHANGES   23 Nov 2007 05:34:08 -  1.1872
  +++ rpm/CHANGES   23 Nov 2007 07:06:01 -  1.1873
  @@ -1,4 +1,6 @@
   5.0a2 -> 5.0a3:
  +- jbj: splint fiddles for rpmxar and rpmTag.
  +- jbj: bury timedRead in pkgio.c, eliminate everywhere else.
   - jbj: eliminate (unused) hPTR_t.
   - jbj: hmm, a memory leak, add doco to the TODO file.
   - jbj: eliminate hTAG_t, use "rpmTag *" instead.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrNVR.c
  
  $ cvs diff -u -r1.34 -r1.35 hdrNVR.c
  --- rpm/rpmdb/hdrNVR.c17 Nov 2007 17:57:39 -  1.34
  +++ rpm/rpmdb/hdrNVR.c23 Nov 2007 07:06:01 -  1.35
  @@ -238,7 +238,7 @@
   he->p.ptr = hfd(he->p.ptr, he->t))
   {
/* XXX Translate legacy signature tag values. */
  - switch (he->tag) {
  + switch ((rpmSigTag)he->tag) {
case RPMSIGTAG_SIZE:
he->tag = RPMTAG_SIGSIZE;
/[EMAIL PROTECTED]@*/ break;
  @@ -307,16 +307,16 @@
/* XXX Translate legacy signature tag values. */
switch (he->tag) {
case RPMTAG_SIGSIZE:
  - he->tag = RPMSIGTAG_SIZE;
  + he->tag = (rpmTag) RPMSIGTAG_SIZE;
/[EMAIL PROTECTED]@*/ break;
case RPMTAG_SIGMD5:
  - he->tag = RPMSIGTAG_MD5;
  + he->tag = (rpmTag) RPMSIGTAG_MD5;
/[EMAIL PROTECTED]@*/ break;
case RPMTAG_ARCHIVESIZE:
/* XXX rpm-4.1 and later has archive size in signature header. */
if (noArchiveSize)
continue;
  - he->tag = RPMSIGTAG_PAYLOADSIZE;
  + he->tag = (rpmTag) RPMSIGTAG_PAYLOADSIZE;
/[EMAIL PROTECTED]@*/ break;
case RPMTAG_SHA1HEADER:
case RPMTAG_DSAHEADER:
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  
  $ cvs diff -u -r1.128 -r1.129 header.c
  --- rpm/rpmdb/header.c23 Nov 2007 00:29:47 -  1.128
  +++ rpm/rpmdb/header.c23 Nov 2007 07:06:01 -  1.129
  @@ -27,6 +27,11 @@
   /[EMAIL PROTECTED]@*/
   int _tagcache = 1;   /* XXX Cache tag data persistently? */
   
  +/[EMAIL PROTECTED] Header @*/
  +/[EMAIL PROTECTED] HeaderIterator @*/
  +/[EMAIL PROTECTED] headerSprintfExtension @*/
  +/[EMAIL PROTECTED] headerTagTableEntry @*/
  +
   /[EMAIL PROTECTED] entryInfo @*/
   /[EMAIL PROTECTED] indexEntry @*/
   
  @@ -486,7 +491,7 @@
entryInfo pe,
unsigned char * dataStart,
/[EMAIL PROTECTED]@*/ const unsigned char * dataEnd,
  - int regionid)
  + int32_t regionid)
/[EMAIL PROTECTED] *entry, *dataStart @*/
   {
   rpmTagData p;
  @@ -3319,7 +3324,7 @@
   static char * formatValue(headerSprintfArgs hsa, sprintfTag tag,
uint32_t element)
/[EMAIL PROTECTED] headerCompoundFormats @*/
  - /[EMAIL PROTECTED] hsa, tag, headerCompoundFormats @*/
  + /[EMAIL PROTECTED] hsa, tag @*/
   {
   HE_t vhe = memset(alloca(sizeof(*vhe)), 0, sizeof(*vhe));
   HE_t he = &tag->he;
  @@ -3473,7 +3478,7

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ rpmtag.h

2007-11-22 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   23-Nov-2007 06:34:09
  Branch: HEAD Handle: 2007112305340801

  Modified files:
rpm CHANGES
rpm/rpmdb   rpmtag.h

  Log:
- eliminate (unused) hPTR_t.

  Summary:
RevisionChanges Path
1.1872  +1  -0  rpm/CHANGES
1.7 +27 -31 rpm/rpmdb/rpmtag.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1871 -r1.1872 CHANGES
  --- rpm/CHANGES   23 Nov 2007 00:29:47 -  1.1871
  +++ rpm/CHANGES   23 Nov 2007 05:34:08 -  1.1872
  @@ -1,4 +1,5 @@
   5.0a2 -> 5.0a3:
  +- jbj: eliminate (unused) hPTR_t.
   - jbj: hmm, a memory leak, add doco to the TODO file.
   - jbj: eliminate hTAG_t, use "rpmTag *" instead.
   - jbj: drill rpmTag everywhere needed in header methods.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmtag.h
  
  $ cvs diff -u -r1.6 -r1.7 rpmtag.h
  --- rpm/rpmdb/rpmtag.h23 Nov 2007 00:29:47 -  1.6
  +++ rpm/rpmdb/rpmtag.h23 Nov 2007 05:34:09 -  1.7
  @@ -40,19 +40,19 @@
   
   /** \ingroup header
*/
  -typedef enum rpmTagType_e rpmTagType;
  +typedef enum rpmTagType_e rpmTagType;/*!< tag data type. */
   
   /** \ingroup header
*/
  -typedef union rpmDataType_u rpmTagData;
  +typedef union rpmDataType_u rpmTagData;  /*!< tag data. */
   
   /** \ingroup header
*/
  -typedef uint32_t rpmTagCount;
  +typedef uint32_t rpmTagCount;/*!< tag data element count. */
   
   /** \ingroup header
*/
  -typedef struct _HE_s * HE_t; /* tag container. */
  +typedef struct _HE_s * HE_t; /*!< tag container. */
   
   /** \ingroup header
*/
  @@ -61,10 +61,10 @@
   union rpmDataType_u {
   /[EMAIL PROTECTED]@*/
   void * ptr;
  -uint8_t * ui8p;  /*!< RPM_INT8_TYPE | RPM_CHAR_TYPE */
  -uint16_t * ui16p;/*!< RPM_INT16_TYPE */
  -uint32_t * ui32p;/*!< RPM_INT32_TYPE */
  -uint64_t * ui64p;/*!< RPM_INT64_TYPE */
  +uint8_t * ui8p;  /*!< RPM_UINT8_TYPE | RPM_CHAR_TYPE */
  +uint16_t * ui16p;/*!< RPM_UINT16_TYPE */
  +uint32_t * ui32p;/*!< RPM_UINT32_TYPE */
  +uint64_t * ui64p;/*!< RPM_UINT64_TYPE */
   const char * str;/*!< RPM_STRING_TYPE */
   unsigned char * blob;/*!< RPM_BIN_TYPE */
   const char ** argv;  /*!< RPM_STRING_ARRAY_TYPE */
  @@ -73,10 +73,6 @@
   #endif
   /[EMAIL PROTECTED] [EMAIL PROTECTED]/
   
  -/** \ingroup header
  - */
  -typedef rpmTagData * hPTR_t;
  -
   /[EMAIL PROTECTED] [EMAIL PROTECTED]/
   /** \ingroup header
*/
  @@ -126,25 +122,6 @@
   typedef /[EMAIL PROTECTED]@*/ struct headerSprintfExtension_s * 
headerSprintfExtension;
   
   /**
  - * Automatically generated table of tag name/value pairs.
  - */
  -/[EMAIL PROTECTED]@*/
  -/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
  -extern const struct headerTagTableEntry_s * rpmTagTable;
  -/[EMAIL PROTECTED]@*/
  -
  -/**
  - * Number of entries in rpmTagTable.
  - */
  -/[EMAIL PROTECTED]@*/
  -/[EMAIL PROTECTED]@*/
  -extern const int rpmTagTableSize;
  -
  -/[EMAIL PROTECTED]@*/
  -extern headerTagIndices rpmTags;
  -/[EMAIL PROTECTED]@*/
  -
  -/**
* Pseudo-tags used by the rpmdb and rpmgi iterator API's.
*/
   #define  RPMDBI_PACKAGES 0   /* Installed package headers. */
  @@ -469,6 +446,25 @@
   typedef /[EMAIL PROTECTED]@*/ struct headerTagTableEntry_s * 
headerTagTableEntry;
   
   /**
  + * Automatically generated table of tag name/value pairs.
  + */
  +/[EMAIL PROTECTED]@*/
  +/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
  +extern const struct headerTagTableEntry_s * rpmTagTable;
  +/[EMAIL PROTECTED]@*/
  +
  +/**
  + * Number of entries in rpmTagTable.
  + */
  +/[EMAIL PROTECTED]@*/
  +/[EMAIL PROTECTED]@*/
  +extern const int rpmTagTableSize;
  +
  +/[EMAIL PROTECTED]@*/
  +extern headerTagIndices rpmTags;
  +/[EMAIL PROTECTED]@*/
  +
  +/**
*/
   #if !defined(SWIG)
   struct headerTagIndices_s {
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES TODO rpm/lib/ package.c rpm/rpmdb/ hdrinline.h...

2007-11-22 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   23-Nov-2007 01:29:48
  Branch: HEAD Handle: 2007112300294700

  Modified files:
rpm CHANGES TODO
rpm/lib package.c
rpm/rpmdb   hdrinline.h header.c header.h header_internal.h
rpmtag.h tagname.c

  Log:
- hmm, a memory leak, add doco to the TODO file.
- eliminate hTAG_t, use "rpmTag *" instead.
- drill rpmTag everywhere needed in header methods.

  Summary:
RevisionChanges Path
1.1871  +3  -0  rpm/CHANGES
1.23+16 -0  rpm/TODO
2.192   +3  -0  rpm/lib/package.c
1.38+10 -10 rpm/rpmdb/hdrinline.h
1.128   +15 -15 rpm/rpmdb/header.c
1.72+11 -11 rpm/rpmdb/header.h
1.35+4  -4  rpm/rpmdb/header_internal.h
1.6 +26 -27 rpm/rpmdb/rpmtag.h
1.15+6  -6  rpm/rpmdb/tagname.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1870 -r1.1871 CHANGES
  --- rpm/CHANGES   22 Nov 2007 22:28:13 -  1.1870
  +++ rpm/CHANGES   23 Nov 2007 00:29:47 -  1.1871
  @@ -1,4 +1,7 @@
   5.0a2 -> 5.0a3:
  +- jbj: hmm, a memory leak, add doco to the TODO file.
  +- jbj: eliminate hTAG_t, use "rpmTag *" instead.
  +- jbj: drill rpmTag everywhere needed in header methods.
   - jbj: unsnarl header.h from everything else.
   - jbj: eliminate hRET_t, use rpmTagData instead.
   - jbj: fix: files.c: pass union ptr, not 1st element, address.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/TODO
  
  $ cvs diff -u -r1.22 -r1.23 TODO
  --- rpm/TODO  21 Nov 2007 13:31:37 -  1.22
  +++ rpm/TODO  23 Nov 2007 00:29:47 -  1.23
  @@ -70,6 +70,22 @@
   - jbj: choose between db-4.5.20 and db-4.6.18. db-4.5.20 may have fewer
upgrade/downgrade issues because of the db-4.6.18 DB_HASH change,
but rpm-5.0 already uses DB_BTREE for Packages.
  +- jbj: this memory leak seen with "valgrind rpm -qa" no idea what pkg 
yet:
  + ==5186== 112 bytes in 16 blocks are definitely lost in loss record 2 of 
2
  + ==5186==at 0x4805525: malloc (vg_replace_malloc.c:149)
  + ==5186==by 0x48E3923: formatValue (header.c:3403)
  + ==5186==by 0x48E3FAB: singleSprintf (header.c:3557)
  + ==5186==by 0x48E4C1E: headerSprintf (header.c:3872)
  + ==5186==by 0x487C075: headerSprintf (hdrinline.h:515)
  + ==5186==by 0x487BFFB: queryHeader (query.c:118)
  + ==5186==by 0x487B4A9: showQueryPackage (query.c:162)
  + ==5186==by 0x487C29D: rpmgiShowMatches (query.c:410)
  + ==5186==by 0x487C48D: rpmQueryVerify (query.c:475)
  + ==5186==by 0x487D4AC: rpmcliArgIter (query.c:739)
  + ==5186==by 0x487DB08: rpmcliQuery (query.c:855)
  + ==5186==by 0x46F9: main (rpmqv.c:738)
  +- jbj: rpm-5.0 is almost compilation warning free, some effort to remove
  + the Mickey Mouse warnings that remain should be undertaken.
   
 o to be resolved before RPM 5.0.0:
   - rse: NEWS polishing
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/package.c
  
  $ cvs diff -u -r2.191 -r2.192 package.c
  --- rpm/lib/package.c 22 Nov 2007 19:27:14 -  2.191
  +++ rpm/lib/package.c 23 Nov 2007 00:29:47 -  2.192
  @@ -239,6 +239,9 @@
   /[EMAIL PROTECTED]@*/
   
   switch (she->tag) {
  +default: /* XXX keep gcc quiet. */
  +assert(0);
  + /[EMAIL PROTECTED]@*/ break;
   case RPMSIGTAG_RSA:
/* Parse the parameters from the OpenPGP packets that will be needed. */
xx = pgpPrtPkts(she->p.ptr, she->c, dig, (_print_pkts & rpmIsDebug()));
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrinline.h
  
  $ cvs diff -u -r1.37 -r1.38 hdrinline.h
  --- rpm/rpmdb/hdrinline.h 22 Nov 2007 19:50:18 -  1.37
  +++ rpm/rpmdb/hdrinline.h 23 Nov 2007 00:29:47 -  1.38
  @@ -198,7 +198,7 @@
* @return   1 on success, 0 on failure
*/
   /[EMAIL PROTECTED]@*/ static inline
  -int headerIsEntry(/[EMAIL PROTECTED]@*/ Header h, uint32_t tag)
  +int headerIsEntry(/[EMAIL PROTECTED]@*/ Header h, rpmTag tag)
/[EMAIL PROTECTED] h @*/
   {
   /[EMAIL PROTECTED]@*/
  @@ -361,7 +361,7 @@
* @return

[CVS] RPM: rpm/ devtool.conf

2007-11-22 Thread Anders F. Bj�rklund 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. Björklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   23-Nov-2007 00:37:02
  Branch: HEAD Handle: 2007112223370200

  Modified files:
rpm devtool.conf

  Log:
no need to clean xar explicitly anymore

  Summary:
RevisionChanges Path
2.133   +0  -1  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.132 -r2.133 devtool.conf
  --- rpm/devtool.conf  22 Nov 2007 22:56:17 -  2.132
  +++ rpm/devtool.conf  22 Nov 2007 23:37:02 -  2.133
  @@ -1666,7 +1666,6 @@
   configure () {
   echo "++ cleaning up build environment"
   ( cd ${DEVTOOL_SRCDIR}; make distclean || true ) >/dev/null 2>&1
  -( cd ${DEVTOOL_SRCDIR}/xar; make distclean || true ) >/dev/null 2>&1
   
   echo "++ configuring build environment"
   basemac="`cd $basemac && pwd`"
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmio/ rpmxar.c rpmxar.h

2007-11-22 Thread Anders F. Bj�rklund 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. Björklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   23-Nov-2007 00:05:37
  Branch: HEAD Handle: 2007112223053600

  Modified files:
rpm/rpmio   rpmxar.c rpmxar.h

  Log:
make rpmxar compile (no-op) without xar.h

  Summary:
RevisionChanges Path
2.4 +2  -0  rpm/rpmio/rpmxar.c
2.4 +2  -0  rpm/rpmio/rpmxar.h
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmxar.c
  
  $ cvs diff -u -r2.3 -r2.4 rpmxar.c
  --- rpm/rpmio/rpmxar.c22 Nov 2007 17:55:29 -  2.3
  +++ rpm/rpmio/rpmxar.c22 Nov 2007 23:05:36 -  2.4
  @@ -1,5 +1,7 @@
   #include "system.h"
  +#ifdef HAVE_XAR_H
   #include "xar.h"
  +#endif
   
   #define  _RPMXAR_INTERNAL
   #include 
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmxar.h
  
  $ cvs diff -u -r2.3 -r2.4 rpmxar.h
  --- rpm/rpmio/rpmxar.h22 Nov 2007 17:55:29 -  2.3
  +++ rpm/rpmio/rpmxar.h22 Nov 2007 23:05:36 -  2.4
  @@ -8,9 +8,11 @@
   
   #ifdef   _RPMXAR_INTERNAL
   struct rpmxar_s {
  +#ifdef HAVE_XAR_H
   xar_t x;
   xar_file_t f;
   xar_iter_t i;
  +#endif
   /[EMAIL PROTECTED]@*/
   const char * member; /*!< Current archive member. */
   char * b;/*!< Data buffer. */
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: xar/lib/ Makefile.inc.in

2007-11-22 Thread Anders F. Bj�rklund 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. Björklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: xar  Date:   22-Nov-2007 23:57:24
  Branch: HEAD Handle: 200711572400

  Modified files:
xar/lib Makefile.inc.in

  Log:
fix cleaning twice in a row bug

  Summary:
RevisionChanges Path
1.8 +1  -1  xar/lib/Makefile.inc.in
  

  patch -p0 <<'@@ .'
  Index: xar/lib/Makefile.inc.in
  
  $ cvs diff -u -r1.7 -r1.8 Makefile.inc.in
  --- xar/lib/Makefile.inc.in   18 Nov 2007 23:15:14 -  1.7
  +++ xar/lib/Makefile.inc.in   22 Nov 2007 22:57:24 -  1.8
  @@ -113,7 +113,7 @@
rm -f $(LIBXAR_A) $(LIBXAR_LA)
@rm -f @[EMAIL PROTECTED]/.libs/$(LIBXAR_LNAME)
@rm -f @[EMAIL PROTECTED]/.libs/$(LIBXAR_ANAME)
  - @rmdir @[EMAIL PROTECTED]/.libs
  + @-rmdir @[EMAIL PROTECTED]/.libs
rm -f $(LIBXAR_SRCS:@[EMAIL PROTECTED]@[EMAIL PROTECTED])
rm -f $(LIBXAR_SRCS:@[EMAIL PROTECTED]@[EMAIL PROTECTED])
rm -f $(LIBXAR_SRCS:@[EMAIL PROTECTED]@[EMAIL PROTECTED])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2007-11-22 Thread Anders F. Bj�rklund 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. Björklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   22-Nov-2007 23:56:17
  Branch: HEAD Handle: 200711561700

  Modified files:
rpm devtool.conf

  Log:
no need to clean up TR anymore

  Summary:
RevisionChanges Path
2.132   +0  -5  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.131 -r2.132 devtool.conf
  --- rpm/devtool.conf  18 Nov 2007 22:26:32 -  2.131
  +++ rpm/devtool.conf  22 Nov 2007 22:56:17 -  2.132
  @@ -1740,11 +1740,6 @@
   rm /tmp/rpm-root/etc
   rm /tmp/rpm-root/var
   
  -# remove the "TR" directory, and use "var/spool/repackage"
  -sed -i -e 's,%{_topdir}/TR,%{_var}/spool/repackage,' 
/tmp/rpm-root/usr/local/lib/rpm/macros
  -test -d /tmp/rpm-root/usr/local/src/rpm/TR && rmdir 
/tmp/rpm-root/usr/local/src/rpm/TR
  -mkdir -p /tmp/rpm-root/private/var/local/spool/repackage
  -
   # remove generated/conflicting perl module files and lists
   rm 
/tmp/rpm-root/System/Library/Perl/*/darwin-thread-multi-2level/perllocal.pod
   rm 
/tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/.packlist
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/build/ rpmbuild.h rpm/lib/ depends.c forma...

2007-11-22 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   22-Nov-2007 23:28:18
  Branch: HEAD Handle: 200711281305

  Modified files:
rpm CHANGES
rpm/build   rpmbuild.h
rpm/lib depends.c formats.c fsm.c poptQV.c psm.c query.c
rpmchecksig.c rpmds.c rpmfc.c rpmfi.c rpmgi.c
rpminstall.c rpmrollback.c rpmte.c rpmts.c
transaction.c verify.c
rpm/perlRPM.xs RPM_Files.xs RPM_Header.xs
RPM_PackageIterator.xs RPM_Spec.xs
RPM_Transaction.xs rpmxs.c
rpm/python  rpmdb-py.c rpmps-py.c rpmrc-py.c rpmte-py.c
rpm/rpmdb   hdrfmt.c header.c header.h rpmtag.h tagname.c
rpm/tools   rpmcache.c

  Log:
- unsnarl header.h from everything else.

  Summary:
RevisionChanges Path
1.1870  +1  -0  rpm/CHANGES
2.79+2  -1  rpm/build/rpmbuild.h
1.364   +1  -0  rpm/lib/depends.c
2.120   +1  -0  rpm/lib/formats.c
2.137   +1  -0  rpm/lib/fsm.c
2.47+1  -0  rpm/lib/poptQV.c
2.264   +1  -0  rpm/lib/psm.c
2.193   +1  -0  rpm/lib/query.c
1.194   +1  -0  rpm/lib/rpmchecksig.c
2.83+1  -0  rpm/lib/rpmds.c
1.40+1  -0  rpm/lib/rpmfc.c
2.101   +1  -0  rpm/lib/rpmfi.c
2.43+1  -0  rpm/lib/rpmgi.c
1.183   +1  -0  rpm/lib/rpminstall.c
1.26+1  -0  rpm/lib/rpmrollback.c
2.69+1  -0  rpm/lib/rpmte.c
2.123   +1  -0  rpm/lib/rpmts.c
1.355   +1  -1  rpm/lib/transaction.c
2.178   +1  -0  rpm/lib/verify.c
1.24+4  -4  rpm/perl/RPM.xs
1.7 +4  -5  rpm/perl/RPM_Files.xs
1.14+10 -10 rpm/perl/RPM_Header.xs
1.3 +2  -2  rpm/perl/RPM_PackageIterator.xs
1.5 +2  -4  rpm/perl/RPM_Spec.xs
1.9 +1  -2  rpm/perl/RPM_Transaction.xs
1.6 +5  -4  rpm/perl/rpmxs.c
1.19+1  -0  rpm/python/rpmdb-py.c
1.13+1  -0  rpm/python/rpmps-py.c
1.21+1  -0  rpm/python/rpmrc-py.c
1.23+1  -0  rpm/python/rpmte-py.c
1.37+1  -0  rpm/rpmdb/hdrfmt.c
1.127   +0  -47 rpm/rpmdb/header.c
1.71+1  -234rpm/rpmdb/header.h
1.5 +233 -2 rpm/rpmdb/rpmtag.h
1.14+1  -1  rpm/rpmdb/tagname.c
2.24+1  -0  rpm/tools/rpmcache.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1869 -r1.1870 CHANGES
  --- rpm/CHANGES   22 Nov 2007 19:50:17 -  1.1869
  +++ rpm/CHANGES   22 Nov 2007 22:28:13 -  1.1870
  @@ -1,4 +1,5 @@
   5.0a2 -> 5.0a3:
  +- jbj: unsnarl header.h from everything else.
   - jbj: eliminate hRET_t, use rpmTagData instead.
   - jbj: fix: files.c: pass union ptr, not 1st element, address.
   - jbj: eliminate hTYP_t and hCNT_t typedefs everywhere.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/rpmbuild.h
  
  $ cvs diff -u -r2.78 -r2.79 rpmbuild.h
  --- rpm/build/rpmbuild.h  21 Nov 2007 13:31:37 -  2.78
  +++ rpm/build/rpmbuild.h  22 Nov 2007 22:28:14 -  2.79
  @@ -6,7 +6,8 @@
*  This is the *only* module users of librpmbuild should need to include.
*/
   
  -#include "rpmcli.h"
  +#include 
  +#include 
   
   /* and it shouldn't need these :-( */
   #include "stringbuf.h"
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/depends.c
  
  $ cvs diff -u -r1.363 -r1.364 depends.c
  --- rpm/lib/depends.c 22 Nov 2007 18:50:25 -  1.363
  +++ rpm/lib/depends.c 22 Nov 2007 22:28:14 -  1.364
  @@ -5,6 +5,7 @@
   #include "system.h"
   
   #include "rpmio_internal.h"  /* XXX PGPHASHALGO_MD5 */
  +#include 
   #include   /* XXX rpmcliPackagesTotal */
   
   #include /* XXX 
rpmExpand("%{_dependency_whiteout}" */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/formats.c
  
  $ cvs diff -u -r2.119 -r2.120 formats.c
  --- rpm/lib/formats.c 19 Nov 2007 18:57:54 -  2.119
  +++ rpm/lib/formats.c 22 Nov 2007 22:28:14 -  2.120
  @@ -7,6 +7,7

[CVS] RPM: rpm/ CHANGES rpm/build/ files.c rpm/rpmdb/ hdrinline.h head...

2007-11-22 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   22-Nov-2007 20:50:19
  Branch: HEAD Handle: 2007112219501701

  Modified files:
rpm CHANGES
rpm/build   files.c
rpm/rpmdb   hdrinline.h header.c header.h

  Log:
- eliminate hRET_t, use rpmTagData instead.
- fix: files.c: pass union ptr, not 1st element, address.

  Summary:
RevisionChanges Path
1.1869  +2  -0  rpm/CHANGES
1.290   +1  -1  rpm/build/files.c
1.37+3  -4  rpm/rpmdb/hdrinline.h
1.126   +3  -3  rpm/rpmdb/header.c
1.70+3  -4  rpm/rpmdb/header.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1868 -r1.1869 CHANGES
  --- rpm/CHANGES   22 Nov 2007 19:27:13 -  1.1868
  +++ rpm/CHANGES   22 Nov 2007 19:50:17 -  1.1869
  @@ -1,4 +1,6 @@
   5.0a2 -> 5.0a3:
  +- jbj: eliminate hRET_t, use rpmTagData instead.
  +- jbj: fix: files.c: pass union ptr, not 1st element, address.
   - jbj: eliminate hTYP_t and hCNT_t typedefs everywhere.
   - jbj: fix: python: pass pgpDig, not rpmts, as 1st arg to  headerCheck.
   - jbj: fix: python: include pkgio.h for rpmpkgRead prototype.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/files.c
  
  $ cvs diff -u -r1.289 -r1.290 files.c
  --- rpm/build/files.c 19 Nov 2007 17:07:46 -  1.289
  +++ rpm/build/files.c 22 Nov 2007 19:50:18 -  1.290
  @@ -2536,7 +2536,7 @@
   /[EMAIL PROTECTED]@*/
 if (!spec->sourceHdrInit) {
   for (hi = headerInitIterator(spec->packages->header);
  - headerNextIterator(hi, &he->tag, &he->t, &he->p.ptr, &he->c);
  + headerNextIterator(hi, &he->tag, &he->t, &he->p, &he->c);
he->p.ptr = headerFreeData(he->p.ptr, he->t))
   {
switch (he->tag) {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrinline.h
  
  $ cvs diff -u -r1.36 -r1.37 hdrinline.h
  --- rpm/rpmdb/hdrinline.h 22 Nov 2007 19:27:14 -  1.36
  +++ rpm/rpmdb/hdrinline.h 22 Nov 2007 19:50:18 -  1.37
  @@ -363,7 +363,7 @@
   /[EMAIL PROTECTED]@*/ static inline
   int headerGetEntry(Header h, uint32_t tag,
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ rpmTagType 
* type,
  - /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ hRET_t * p,
  + /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ rpmTagData 
* p,
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ rpmTagCount 
* c)
/[EMAIL PROTECTED] *type, *p, *c @*/
   {
  @@ -568,12 +568,11 @@
   int headerNextIterator(HeaderIterator hi,
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ hTAG_t tag,
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ rpmTagType * type,
  - /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const void * p,
  + /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ rpmTagData * p,
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ rpmTagCount * c)
/[EMAIL PROTECTED] hi, *tag, *type, *p, *c @*/
   {
  -hRET_t **q = (void *)&p;
  -return hdrVec->hdrnextiter(hi, tag, type, *q, c);
  +return hdrVec->hdrnextiter(hi, tag, type, p, c);
   }
   
   /** \ingroup header
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  
  $ cvs diff -u -r1.125 -r1.126 header.c
  --- rpm/rpmdb/header.c22 Nov 2007 19:27:14 -  1.125
  +++ rpm/rpmdb/header.c22 Nov 2007 19:50:18 -  1.126
  @@ -1758,7 +1758,7 @@
   static
   int headerGetExtension(Header h, uint32_t tag,
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ rpmTagType 
* type,
  - /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ hRET_t * p,
  + /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ rpmTagData 
* p,
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ rpmTagCount 
* c)
/[EMAIL PROTECTED] headerCompoundFormats @*/
/[EMAIL PROTECTED] *type, *p, *c @*/
  @@ -1863,7 +1863,7 @@
   static
   int headerGetEntry(Header h, uint32_t tag,
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ rpmTagType 
* type,
  - /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ hRET_t * p,
  + /[EMAIL PROTECTED]@*

[CVS] RPM: rpm/ CHANGES rpm/lib/ package.c rpm/python/ header-py.c rpm...

2007-11-22 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   22-Nov-2007 20:27:15
  Branch: HEAD Handle: 2007112219271301

  Modified files:
rpm CHANGES
rpm/lib package.c
rpm/python  header-py.c rpmts-py.c
rpm/rpmdb   hdrinline.h header.c header.h pkgio.c

  Log:
- eliminate hTYP_t and hCNT_t typedefs everywhere.
- fix: python: pass pgpDig, not rpmts, as 1st arg to  headerCheck.
- fix: python: include pkgio.h for rpmpkgRead prototype.
- fix: package.c: pass pointer to msg, not NULL, calling rpmpkgRead.

  Summary:
RevisionChanges Path
1.1868  +4  -0  rpm/CHANGES
2.191   +1  -1  rpm/lib/package.c
1.81+1  -0  rpm/python/header-py.c
1.79+5  -1  rpm/python/rpmts-py.c
1.36+4  -4  rpm/rpmdb/hdrinline.h
1.125   +7  -7  rpm/rpmdb/header.c
1.69+6  -8  rpm/rpmdb/header.h
1.54+1  -1  rpm/rpmdb/pkgio.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1867 -r1.1868 CHANGES
  --- rpm/CHANGES   22 Nov 2007 18:50:24 -  1.1867
  +++ rpm/CHANGES   22 Nov 2007 19:27:13 -  1.1868
  @@ -1,4 +1,8 @@
   5.0a2 -> 5.0a3:
  +- jbj: eliminate hTYP_t and hCNT_t typedefs everywhere.
  +- jbj: fix: python: pass pgpDig, not rpmts, as 1st arg to  headerCheck.
  +- jbj: fix: python: include pkgio.h for rpmpkgRead prototype.
  +- jbj: fix: package.c: pass pointer to msg, not NULL, calling rpmpkgRead.
   - jbj: eliminate rpm peculier int typedefs, use stdint types instead.
   - jbj: convert all remaining uses of int_XY to stdint types.
   - jbj: revert HEADER_XARALLOCATED gloopiness.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/package.c
  
  $ cvs diff -u -r2.190 -r2.191 package.c
  --- rpm/lib/package.c 22 Nov 2007 18:50:25 -  2.190
  +++ rpm/lib/package.c 22 Nov 2007 19:27:14 -  2.191
  @@ -205,7 +205,7 @@
   nb = -fd->stats->ops[FDSTAT_READ].bytes;
   {const char item[] = "Header";
msg = NULL;
  - rc = rpmpkgRead(item, fd, &h, msg);
  + rc = rpmpkgRead(item, fd, &h, &msg);
if (rc != RPMRC_OK) {
rpmlog(RPMLOG_ERR, "%s: %s: %s\n", fn, item, msg);
msg = _free(msg);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/header-py.c
  
  $ cvs diff -u -r1.80 -r1.81 header-py.c
  --- rpm/python/header-py.c22 Nov 2007 18:50:27 -  1.80
  +++ rpm/python/header-py.c22 Nov 2007 19:27:14 -  1.81
  @@ -9,6 +9,7 @@
   
   #include "legacy.h"
   #include "header_internal.h" /* XXX HEADERFLAG_ALLOCATED */
  +#include "pkgio.h"   /* XXX rpmpkgRead */
   
   #include "rpmts.h"   /* XXX rpmtsCreate/rpmtsFree */
   #define  _RPMEVR_INTERNAL
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/rpmts-py.c
  
  $ cvs diff -u -r1.78 -r1.79 rpmts-py.c
  --- rpm/python/rpmts-py.c 22 Nov 2007 18:50:27 -  1.78
  +++ rpm/python/rpmts-py.c 22 Nov 2007 19:27:14 -  1.79
  @@ -949,6 +949,7 @@
   const char * msg = NULL;
   const void * uh;
   int uc;
  +pgpDig dig;
   rpmRC rpmrc;
   char * kwlist[] = {"headers", NULL};
   
  @@ -969,7 +970,9 @@
   uh = PyString_AsString(blob);
   uc = PyString_Size(blob);
   
  -rpmrc = headerCheck(s->ts, uh, uc, &msg);
  +dig = pgpDigNew(rpmtsVSFlags(s->ts));
  +rpmrc = headerCheck(dig, uh, uc, &msg);
  +dig = pgpDigFree(dig);
   
   switch (rpmrc) {
   case RPMRC_OK:
  @@ -978,6 +981,7 @@
break;
   
   case RPMRC_NOKEY:
  + /* XXX note "availaiable", the script kiddies need the misspelling. */
PyErr_SetString(pyrpmError, "public key not availaiable");
break;
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrinline.h
  
  $ cvs diff -u -r1.35 -r1.36 hdrinline.h
  --- rpm/rpmdb/hdrinline.h 21 Nov 2007 00:25:04 -  1.35
  +++ rpm/rpmdb/hdrinline.h 22 Nov 2007 19:27:14 -  1.36
  @@ -362,9 +362,9 @@
*/
   /[EMAIL PROTECTED]@*/ static inline
   int headerGetEntry(Header h, uint32_t tag,
  - /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ hTYP_t type,
  +

[CVS] RPM: rpm/ CHANGES rpm/build/ pack.c parseChangelog.c rpm/lib/ de...

2007-11-22 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   22-Nov-2007 19:50:28
  Branch: HEAD Handle: 2007112218502404

  Modified files:
rpm CHANGES
rpm/build   pack.c parseChangelog.c
rpm/lib depends.c fsm.c package.c poptI.c query.c rpmal.c
rpmchecksig.c rpmds.c rpmds.h rpmfc.c rpmfc.h
transaction.c verify.c
rpm/python  header-py.c rpmts-py.c
rpm/rpmdb   dbconfig.c hdrfmt.c header.c header.h
header_internal.c header_internal.h pkgio.c
rpmdb.c rpmwf.c sqlite.c
rpm/tools   rpmcache.c

  Log:
- eliminate rpm peculier int typedefs, use stdint types instead.
- convert all remaining uses of int_XY to stdint types.
- revert HEADER_XARALLOCATED gloopiness.

  Summary:
RevisionChanges Path
1.1867  +3  -0  rpm/CHANGES
2.254   +6  -5  rpm/build/pack.c
2.36+1  -1  rpm/build/parseChangelog.c
1.363   +15 -15 rpm/lib/depends.c
2.136   +1  -1  rpm/lib/fsm.c
2.190   +4  -4  rpm/lib/package.c
2.39+2  -2  rpm/lib/poptI.c
2.192   +3  -3  rpm/lib/query.c
2.64+8  -8  rpm/lib/rpmal.c
1.193   +2  -2  rpm/lib/rpmchecksig.c
2.82+9  -9  rpm/lib/rpmds.c
2.64+3  -3  rpm/lib/rpmds.h
1.39+3  -3  rpm/lib/rpmfc.c
1.6 +1  -1  rpm/lib/rpmfc.h
1.354   +20 -20 rpm/lib/transaction.c
2.177   +2  -2  rpm/lib/verify.c
1.80+6  -6  rpm/python/header-py.c
1.78+6  -6  rpm/python/rpmts-py.c
1.51+2  -2  rpm/rpmdb/dbconfig.c
1.36+1  -1  rpm/rpmdb/hdrfmt.c
1.124   +15 -19 rpm/rpmdb/header.c
1.68+0  -12 rpm/rpmdb/header.h
1.17+2  -2  rpm/rpmdb/header_internal.c
1.34+1  -2  rpm/rpmdb/header_internal.h
1.53+1  -1  rpm/rpmdb/pkgio.c
1.217   +4  -4  rpm/rpmdb/rpmdb.c
1.15+1  -1  rpm/rpmdb/rpmwf.c
1.25+3  -3  rpm/rpmdb/sqlite.c
2.23+1  -1  rpm/tools/rpmcache.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1866 -r1.1867 CHANGES
  --- rpm/CHANGES   22 Nov 2007 17:55:28 -  1.1866
  +++ rpm/CHANGES   22 Nov 2007 18:50:24 -  1.1867
  @@ -1,4 +1,7 @@
   5.0a2 -> 5.0a3:
  +- jbj: eliminate rpm peculier int typedefs, use stdint types instead.
  +- jbj: convert all remaining uses of int_XY to stdint types.
  +- jbj: revert HEADER_XARALLOCATED gloopiness.
   - jbj: functional (and leak free) -Kvv of both *.rpm and *.xar.
   - jbj: revert xar handling to rpmio model, buffer handling in rpmxar.
   - jbj: fix: add RPMRC_FAIL where needed using -Kvv.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/pack.c
  
  $ cvs diff -u -r2.253 -r2.254 pack.c
  --- rpm/build/pack.c  20 Nov 2007 22:39:00 -  2.253
  +++ rpm/build/pack.c  22 Nov 2007 18:50:25 -  2.254
  @@ -602,7 +602,7 @@
   HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
   FD_t fd = NULL;
   FD_t ifd = NULL;
  -int_32 count;
  +uint32_t count;
   uint32_t sigtag;
   const char * sigtarget;
   const char * rpmio_flags = NULL;
  @@ -887,14 +887,16 @@
   }

   /* Write the payload into the package. */
  -while ((count = Fread(buf, sizeof(buf[0]), sizeof(buf), ifd)) > 0) {
  - if (count == -1) {
  +while ((xx = Fread(buf, sizeof(buf[0]), sizeof(buf), ifd)) > 0) {
  + if (xx <= -1 || Ferror(ifd)) {
rpmlog(RPMLOG_ERR, _("Unable to read payload from %s: %s\n"),
 sigtarget, Fstrerror(ifd));
rc = RPMRC_FAIL;
goto exit;
}
  - if (Fwrite(buf, sizeof(buf[0]), count, fd) != count) {
  + count = (uint32_t) xx;
  + xx = Fwrite(buf, sizeof(buf[0]), count, fd);
  + if ((uint32_t)xx != count || Ferror(fd)) {
rpmlog(RPMLOG_ERR, _("Unable to write payload to %s: %s\n"),
 fileName, Fstrerror(fd));
rc = RPMRC_FAIL;
  @@ -909,7 +911,6 @@
   
   /* XXX Fish the pkgid out of the signature header. */
   if (sigh != NULL && pkgidp != NULL) {
  - int xx;
he->tag = RPMSIGTAG_MD5;

[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmchecksig.c rpm/rpmdb/ pkgio.c rpmw...

2007-11-22 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   22-Nov-2007 18:55:29
  Branch: HEAD Handle: 2007112217552801

  Modified files:
rpm CHANGES
rpm/lib rpmchecksig.c
rpm/rpmdb   pkgio.c rpmwf.c
rpm/rpmio   librpmio.vers rpmio.c rpmxar.c rpmxar.h

  Log:
- functional (and leak free) -Kvv of both *.rpm and *.xar.
- revert xar handling to rpmio model, buffer handling in rpmxar.
- fix: add RPMRC_FAIL where needed using -Kvv.

  Summary:
RevisionChanges Path
1.1866  +3  -0  rpm/CHANGES
1.192   +9  -1  rpm/lib/rpmchecksig.c
1.52+8  -36 rpm/rpmdb/pkgio.c
1.14+4  -2  rpm/rpmdb/rpmwf.c
2.19+1  -0  rpm/rpmio/librpmio.vers
1.107   +3  -0  rpm/rpmio/rpmio.c
2.3 +65 -16 rpm/rpmio/rpmxar.c
2.3 +18 -4  rpm/rpmio/rpmxar.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1865 -r1.1866 CHANGES
  --- rpm/CHANGES   21 Nov 2007 21:58:46 -  1.1865
  +++ rpm/CHANGES   22 Nov 2007 17:55:28 -  1.1866
  @@ -1,4 +1,7 @@
   5.0a2 -> 5.0a3:
  +- jbj: functional (and leak free) -Kvv of both *.rpm and *.xar.
  +- jbj: revert xar handling to rpmio model, buffer handling in rpmxar.
  +- jbj: fix: add RPMRC_FAIL where needed using -Kvv.
   - jbj: functional (and leak free) queries of both *.rpm and *.xar.
   - jbj: transparently recognize XAR magic when reading.
   - jbj: eliminate rpmpkgClean, rpmxar memory free on Fclose instead.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmchecksig.c
  
  $ cvs diff -u -r1.191 -r1.192 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c 21 Nov 2007 21:58:47 -  1.191
  +++ rpm/lib/rpmchecksig.c 22 Nov 2007 17:55:29 -  1.192
  @@ -779,6 +779,7 @@
/[EMAIL PROTECTED] fileSystem, internalState @*/
/[EMAIL PROTECTED] fd, fileSystem, internalState @*/
   {
  +rpmxar xar = fdGetXAR(fd);
   pgpDig dig = fdGetDig(fd);
   HGE_t hge = headerGetExtension;
   HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
  @@ -813,6 +814,7 @@
if (!xx || he->p.ptr == NULL) {
h = headerFree(h);
rpmlog(RPMLOG_ERR, _("%s: headerGetEntry failed\n"), fn);
  + rc = RPMRC_FAIL;
goto exit;
}
(void) headerGetMagic(NULL, &hmagic, &nmagic);
  @@ -829,11 +831,17 @@
h = headerFree(h);
   }
   
  +if (xar != NULL) {
  +if ((xx = rpmxarNext(xar)) != 0) return RPMRC_FAIL;
  +if ((xx = rpmxarPull(xar, "Payload")) != 0) return RPMRC_FAIL;
  +}
  +
   /* Read the payload from the package. */
   while ((count = Fread(buf, sizeof(buf[0]), sizeof(buf), fd)) > 0)
dig->nbytes += count;
  -if (count < 0) {
  +if (count < 0 || Ferror(fd)) {
rpmlog(RPMLOG_ERR, _("%s: Fread failed: %s\n"), fn, Fstrerror(fd));
  + rc = RPMRC_FAIL;
goto exit;
   }
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/pkgio.c
  
  $ cvs diff -u -r1.51 -r1.52 pkgio.c
  --- rpm/rpmdb/pkgio.c 21 Nov 2007 21:58:47 -  1.51
  +++ rpm/rpmdb/pkgio.c 22 Nov 2007 17:55:29 -  1.52
  @@ -498,10 +498,11 @@
   
   /* With XAR, read lead from a xar archive file called "Lead". */
   if (xar != NULL) {
  - void *b;
  - size_t nb;
  + void *b = NULL;
  + size_t nb = 0;
if ((xx = rpmxarNext(xar)) != 0)return RPMRC_FAIL;
  - if ((xx = rpmxarPull(xar, "Lead", &b, &nb)) != 0) return RPMRC_FAIL;
  + if ((xx = rpmxarPull(xar, "Lead")) != 0) return RPMRC_FAIL;
  + (void) rpmxarSwapBuf(xar, NULL, 0, &b, &nb);
if (nb != sizeof(*l)) {
b = _free(b);
(void) snprintf(buf, sizeof(buf),
  @@ -663,8 +664,6 @@
   rpmRC rc = RPMRC_FAIL;   /* assume failure */
   int xx;
   uint32_t i;
  -unsigned char * bh = NULL;
  -size_t nbh = 0;
   
   buf[0] = '\0';
   if (sighp)
  @@ -673,16 +672,13 @@
   memset(block, 0, sizeof(block));
   if (xar != NULL) {
   if ((xx = rpmxarNext(xar)) != 0) return RPMRC_FAIL;
  -if ((xx = rpmxarPull(xar, "Signature", &bh, &nbh)) != 0) return 
RPMRC_FAIL;
  -assert(nbh > sizeof(block));
  -memcpy(block, bh, sizeof(block));
  -} else {
  +if ((xx = rpmxarPull(xa

[CVS] RPM: rpm/perl/t/ 03.header.t

2007-11-22 Thread Olivier Thauvin 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Olivier Thauvin
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   22-Nov-2007 10:02:51
  Branch: HEAD Handle: 2007112209025100

  Modified files:
rpm/perl/t  03.header.t

  Log:
- int32 tag type does no longer exists, using uint32 in test instead

  Summary:
RevisionChanges Path
1.4 +2  -2  rpm/perl/t/03.header.t
  

  patch -p0 <<'@@ .'
  Index: rpm/perl/t/03.header.t
  
  $ cvs diff -u -r1.3 -r1.4 03.header.t
  --- rpm/perl/t/03.header.t15 Aug 2007 00:46:07 -  1.3
  +++ rpm/perl/t/03.header.t22 Nov 2007 09:02:51 -  1.4
  @@ -57,9 +57,9 @@
   my $header = rpm2header("test-rpm-1.0-1.noarch.rpm");
   $header->removetag('name');
   ok(!$header->hastag('name'), "tag name were removed");
  -$header->addtag('epoch', 'int32', 1);
  +$header->addtag('epoch', 'uint32', 1);
   is($header->tag('epoch'), 1, "can add a tag");
   $header->removetag('vendor');
  -$header->addtag('vendor', 'int32', 1, 2);
  +$header->addtag('vendor', 'uint32', 1, 2);
   is(scalar($header->tag('vendor')), 2, "can add tag w/ multiple value");
   }
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmconstant/ rpmh2tbl

2007-11-22 Thread Olivier Thauvin 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Olivier Thauvin
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   22-Nov-2007 10:02:00
  Branch: HEAD Handle: 200711220902

  Modified files:
rpm/rpmconstant rpmh2tbl

  Log:
- RPMTAG_* were moved from rpmlib.h to rpmtag.h

  Summary:
RevisionChanges Path
1.7 +4  -2  rpm/rpmconstant/rpmh2tbl
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmconstant/rpmh2tbl
  
  $ cvs diff -u -r1.6 -r1.7 rpmh2tbl
  --- rpm/rpmconstant/rpmh2tbl  19 Nov 2007 17:07:47 -  1.6
  +++ rpm/rpmconstant/rpmh2tbl  22 Nov 2007 09:02:00 -  1.7
  @@ -15,7 +15,7 @@
   ##- along with this program; if not, write to the Free Software
   ##- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
USA.
   #
  -# $Id: rpmh2tbl,v 1.6 2007/11/19 17:07:47 jbj Exp $
  +# $Id: rpmh2tbl,v 1.7 2007/11/22 09:02:00 nanardon Exp $
   
   my @availlabletables;
   
  @@ -31,10 +31,12 @@
   '^(RPMTRANS_TYPE_[\w_]+)' => 'rpmtsType',
   '^(RPMTS_OP_[\w_]+)' => 'rpmtsOpX',
   },
  +'rpmtag.h' => {
  +'^(RPMTAG_[\w_]+)' => 'rpmTag',
  +},
   'rpmlib.h' => {
   '^(RPMDBI_[\w_]+)' => 'rpmdbi',
   '^_?(RPMSENSE_[\w_]+)' => 'rpmsenseflags',
  -'^(RPMTAG_[\w_]+)' => 'rpmTag',
   '^(RPMRC_[\w_]+)' => 'rpmRC',
   '^(RPMFILE_[^(STATE_)][\w_]+)' => 'rpmfileAttrs',
   '^(RPMFILE_STATE_[\w_]+)' => 'rpmfileState',
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org