[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmchecksig.c rpm/rpmio/ rpmpgp.c

2007-11-12 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:   13-Nov-2007 04:54:31
  Branch: HEAD Handle: 2007111303543001

  Modified files:
rpm CHANGES
rpm/lib rpmchecksig.c
rpm/rpmio   rpmpgp.c

  Log:
- jbj: fix the last memory leak with -Kvv, recheck install/query
paths.

  Summary:
RevisionChanges Path
1.1821  +1  -0  rpm/CHANGES
1.177   +6  -3  rpm/lib/rpmchecksig.c
2.66+2  -6  rpm/rpmio/rpmpgp.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1820 -r1.1821 CHANGES
  --- rpm/CHANGES   13 Nov 2007 01:58:46 -  1.1820
  +++ rpm/CHANGES   13 Nov 2007 03:54:30 -  1.1821
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: fix the last memory leak with -Kvv, recheck install/query paths.
   - jbj: functional -Kvv *.xar header-only DSA verify.
   - jbj: disable tagTypeValidate on --addsig and --delsig paths.
   - jbj: remap rpmlog levels to status quo ante.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmchecksig.c
  
  $ cvs diff -u -r1.176 -r1.177 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c 13 Nov 2007 01:54:54 -  1.176
  +++ rpm/lib/rpmchecksig.c 13 Nov 2007 03:54:31 -  1.177
  @@ -1031,7 +1031,7 @@
if (sigh != NULL)
for (hi = headerInitExtension(sigh);
headerNextExtension(hi, she, 0) != 0;
  - /[EMAIL PROTECTED]@*/ xx = pgpSetSig(rpmtsDig(ts), 0, 0, NULL, 0) 
/[EMAIL PROTECTED]@*/)
  + she->p.ptr = headerFreeData(she->p.ptr, she->t))
{
   
   assert(she->p.ptr != NULL);
  @@ -1234,9 +1234,12 @@
}
}
}
  - if (hi != NULL)
  - hi = headerFreeIterator(hi);
  + hi = headerFreeIterator(hi);
she->signature = 0;
  + /* XXX clear the already free'd signature data. */
  +/[EMAIL PROTECTED]@*/
  + xx = pgpSetSig(rpmtsDig(ts), 0, 0, NULL, 0);
  +/[EMAIL PROTECTED]@*/
   
res += res2;
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmpgp.c
  
  $ cvs diff -u -r2.65 -r2.66 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c8 Nov 2007 19:40:41 -   2.65
  +++ rpm/rpmio/rpmpgp.c13 Nov 2007 03:54:31 -  2.66
  @@ -1078,8 +1078,8 @@
   if (dig != NULL) {
   
/* Lose the header tag data. */
  - if (dig->sig)
  - dig->sig = _free(dig->sig);
  + /* XXX this free should be done somewhere else. */
  + dig->sig = _free(dig->sig);
   
/* Dump the signature/pubkey data. */
pgpCleanDig(dig);
  @@ -1155,10 +1155,6 @@
uint32_t sigtag, uint32_t sigtype, const void * sig, uint32_t siglen)
   {
   if (dig != NULL) {
  -#if 0
  - if (dig->sig)
  - dig->sig = _free(dig->sig);
  -#endif
dig->sigtag = sigtag;
dig->sigtype = (sig ? sigtype : 0);
   /[EMAIL PROTECTED] [EMAIL PROTECTED]/
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ TODO

2007-11-12 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:   13-Nov-2007 03:26:44
  Branch: HEAD Handle: 2007111302264400

  Modified files:
rpm TODO

  Log:
- todo++.

  Summary:
RevisionChanges Path
1.11+3  -0  rpm/TODO
  

  patch -p0 <<'@@ .'
  Index: rpm/TODO
  
  $ cvs diff -u -r1.10 -r1.11 TODO
  --- rpm/TODO  12 Nov 2007 18:29:20 -  1.10
  +++ rpm/TODO  13 Nov 2007 02:26:44 -  1.11
  @@ -68,6 +68,9 @@
   - jbj: markReplacedFiles() subtly rewrites header back into rpmdb
with altered RPMTAG_FILESTATES data. get/del/add sequence
is needed instead.
  +- jbj: sign *.rpm, convert to *.xar using txar, DSA verify w my pubkey
  + "works", but not same FC8 package converted using txar and FC8 pubkey
  + verify.
   
 o to be resolved before RPM 5.0.0:
   - rse: NEWS polishing
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES

2007-11-12 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:   13-Nov-2007 02:58:47
  Branch: HEAD Handle: 2007111301584600

  Modified files:
rpm CHANGES

  Log:
- jbj: functional -Kvv *.xar header-only DSA verify.

  Summary:
RevisionChanges Path
1.1820  +1  -0  rpm/CHANGES
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1819 -r1.1820 CHANGES
  --- rpm/CHANGES   13 Nov 2007 01:54:54 -  1.1819
  +++ rpm/CHANGES   13 Nov 2007 01:58:46 -  1.1820
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: functional -Kvv *.xar header-only DSA verify.
   - jbj: disable tagTypeValidate on --addsig and --delsig paths.
   - jbj: remap rpmlog levels to status quo ante.
   - jbj: functional -Kvv *.xar header SHA1 and header+payload MD5 verify.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

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

2007-11-12 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:   13-Nov-2007 02:54:55
  Branch: HEAD Handle: 2007111301545401

  Modified files:
rpm CHANGES
rpm/lib rpmchecksig.c
rpm/rpmdb   signature.c

  Log:
- disable tagTypeValidate on --addsig and --delsig paths.

  Summary:
RevisionChanges Path
1.1819  +1  -0  rpm/CHANGES
1.176   +4  -0  rpm/lib/rpmchecksig.c
1.19+14 -0  rpm/rpmdb/signature.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1818 -r1.1819 CHANGES
  --- rpm/CHANGES   13 Nov 2007 01:36:50 -  1.1818
  +++ rpm/CHANGES   13 Nov 2007 01:54:54 -  1.1819
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: disable tagTypeValidate on --addsig and --delsig paths.
   - jbj: remap rpmlog levels to status quo ante.
   - jbj: functional -Kvv *.xar header SHA1 and header+payload MD5 verify.
   - jbj: eliminate all but 1 of the memory leaks with -Kvv *.xar.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmchecksig.c
  
  $ cvs diff -u -r1.175 -r1.176 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c 13 Nov 2007 01:36:50 -  1.175
  +++ rpm/lib/rpmchecksig.c 13 Nov 2007 01:54:54 -  1.176
  @@ -271,7 +271,9 @@
   
/* Lose the immutable region (if present). */
he->tag = RPMTAG_HEADERSIGNATURES;
  + he->signature = 1;
xx = hge(sigh, he, 0);
  + he->signature = 0;
if (xx) {
HE_t ohe = memset(alloca(sizeof(*ohe)), 0, sizeof(*ohe));
HeaderIterator hi;
  @@ -284,6 +286,7 @@
goto exit;
}
   
  + ohe->signature = 1;
oh = headerCopyLoad(he->p.ptr);
for (hi = headerInitExtension(oh);
headerNextExtension(hi, ohe, 0);
  @@ -295,6 +298,7 @@
}
hi = headerFreeIterator(hi);
oh = headerFree(oh);
  + ohe->signature = 0;
   
sigh = headerFree(sigh);
sigh = headerLink(nh);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/signature.c
  
  $ cvs diff -u -r1.18 -r1.19 signature.c
  --- rpm/rpmdb/signature.c 10 Nov 2007 18:06:43 -  1.18
  +++ rpm/rpmdb/signature.c 13 Nov 2007 01:54:55 -  1.19
  @@ -579,7 +579,9 @@
he->t = RPM_STRING_TYPE;
he->p.str = SHA1;
he->c = 1;
  + he->signature = 1;
xx = hae(sigh, he, 0);
  + he->signature = 0;
if (!xx)
goto exit;
ret = 0;
  @@ -603,7 +605,9 @@
he->t = RPM_BIN_TYPE;
he->p.ptr = pkt;
he->c = pktlen;
  + he->signature = 1;
xx = hae(sigh, he, 0);
  + he->signature = 0;
if (!xx)
goto exit;
ret = 0;
  @@ -628,7 +632,9 @@
he->t = RPM_BIN_TYPE;
he->p.ptr = pkt;
he->c = pktlen;
  + he->signature = 1;
xx = hae(sigh, he, 0);
  + he->signature = 0;
if (!xx)
goto exit;
ret = 0;
  @@ -667,7 +673,9 @@
he->t = RPM_UINT32_TYPE;
he->p.ui32p = &pktlen;
he->c = 1;
  + he->signature = 1;
xx = hae(sigh, he, 0);
  + he->signature = 0;
if (!xx)
break;
ret = 0;
  @@ -681,7 +689,9 @@
he->t = RPM_BIN_TYPE;
he->p.ptr = pkt;
he->c = pktlen;
  + he->signature = 1;
xx = hae(sigh, he, 0);
  + he->signature = 0;
if (!xx)
break;
ret = 0;
  @@ -696,7 +706,9 @@
he->t = RPM_BIN_TYPE;
he->p.ptr = pkt;
he->c = pktlen;
  + he->signature = 1;
xx = hae(sigh, he, 0);
  + he->signature = 0;
if (!xx)
break;
/* XXX Piggyback a header-only RSA signature as well. */
  @@ -715,7 +727,9 @@
he->t = RPM_BIN_TYPE;
he->p.ptr = pkt;
he->c = pktlen;
  + he->signature = 1;
xx = hae(sigh, he, 0);
  + he->signature = 0;
if (!xx)
break;
/* XXX Piggyback a header-only DSA signature as well. */
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/lib/ query.c rpmchecksig.c rpmgi.c

2007-11-12 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:   13-Nov-2007 02:36:50
  Branch: HEAD Handle: 2007111301365000

  Modified files:
rpm CHANGES
rpm/lib query.c rpmchecksig.c rpmgi.c

  Log:
- remap rpmlog levels to status quo ante.

  Summary:
RevisionChanges Path
1.1818  +1  -0  rpm/CHANGES
2.190   +15 -15 rpm/lib/query.c
1.175   +5  -5  rpm/lib/rpmchecksig.c
2.39+1  -1  rpm/lib/rpmgi.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1817 -r1.1818 CHANGES
  --- rpm/CHANGES   13 Nov 2007 01:07:08 -  1.1817
  +++ rpm/CHANGES   13 Nov 2007 01:36:50 -  1.1818
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: remap rpmlog levels to status quo ante.
   - jbj: functional -Kvv *.xar header SHA1 and header+payload MD5 verify.
   - jbj: eliminate all but 1 of the memory leaks with -Kvv *.xar.
   - jbj: add he->signature tagTypeValidate disabler, sigtags no workie.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/query.c
  
  $ cvs diff -u -r2.189 -r2.190 query.c
  --- rpm/lib/query.c   11 Nov 2007 22:07:45 -  2.189
  +++ rpm/lib/query.c   13 Nov 2007 01:36:50 -  2.190
  @@ -502,7 +502,7 @@
   case RPMQV_TRIGGEREDBY:
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, arg, 0);
if (qva->qva_mi == NULL) {
  - rpmlog(RPMLOG_ERR, _("no package triggers %s\n"), arg);
  + rpmlog(RPMLOG_NOTICE, _("no package triggers %s\n"), arg);
res = 1;
} else
res = rpmcliShowMatches(qva, ts);
  @@ -517,7 +517,7 @@
for (i = 0, s = arg; *s && isxdigit(*s); s++, i++)
{};
if (i != 32) {
  - rpmlog(RPMLOG_ERR, _("malformed %s: %s\n"), "pkgid", arg);
  + rpmlog(RPMLOG_NOTICE, _("malformed %s: %s\n"), "pkgid", arg);
return 1;
}
   
  @@ -529,7 +529,7 @@
? RPMTAG_SOURCEPKGID : RPMTAG_PKGID);
qva->qva_mi = rpmtsInitIterator(ts, tag, MD5, sizeof(MD5));
if (qva->qva_mi == NULL) {
  - rpmlog(RPMLOG_ERR, _("no package matches %s: %s\n"),
  + rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"),
"pkgid", arg);
res = 1;
} else
  @@ -540,13 +540,13 @@
for (i = 0, s = arg; *s && isxdigit(*s); s++, i++)
{};
if (i != 40) {
  - rpmlog(RPMLOG_ERR, _("malformed %s: %s\n"), "hdrid", arg);
  + rpmlog(RPMLOG_NOTICE, _("malformed %s: %s\n"), "hdrid", arg);
return 1;
}
   
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_SHA1HEADER, arg, 0);
if (qva->qva_mi == NULL) {
  - rpmlog(RPMLOG_ERR, _("no package matches %s: %s\n"),
  + rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"),
"hdrid", arg);
res = 1;
} else
  @@ -573,7 +573,7 @@
   
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_FILEDIGESTS, digest, dlen);
if (qva->qva_mi == NULL) {
  - rpmlog(RPMLOG_ERR, _("no package matches %s: %s\n"),
  + rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"),
"fileid", arg);
res = 1;
} else
  @@ -602,7 +602,7 @@
}
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_INSTALLTID, &iid, 
sizeof(iid));
if (qva->qva_mi == NULL) {
  - rpmlog(RPMLOG_ERR, _("no package matches %s: %s\n"),
  + rpmlog(RPMLOG_NOTICE, _("no package matches %s: %s\n"),
"tid", arg);
res = 1;
} else
  @@ -613,7 +613,7 @@
   case RPMQV_WHATREQUIRES:
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_REQUIRENAME, arg, 0);
if (qva->qva_mi == NULL) {
  - rpmlog(RPMLOG_ERR, _("no package requires %s\n"), arg);
  + rpmlog(RPMLOG_NOTICE, _("no package requires %s\n"), arg);
res = 1;
} else
res = rpmcliShowMatches(qva, ts);
  @@ -624,7 +624,7 @@
provides_checked = 1;
qva->qva_mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, arg, 0);
if (qva->qva_mi == NULL) {
  - rpmlog(RPMLOG_ERR, _("no package provides %s\n"), arg);
  + rpmlog(RPMLOG_NOTICE, _("no package provides %s\n"), arg);
res = 1;
} else
res = rpmcliShowMatches(qva, ts);
  @@ -658,9 +658,9 @@

[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmchecksig.c rpm/rpmdb/ librpmdb.ver...

2007-11-12 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:   13-Nov-2007 02:07:09
  Branch: HEAD Handle: 2007111301070801

  Modified files:
rpm CHANGES
rpm/lib rpmchecksig.c
rpm/rpmdb   librpmdb.vers

  Log:
- functional -Kvv *.xar header SHA1 and header+payload MD5 verify.

  Summary:
RevisionChanges Path
1.1817  +1  -0  rpm/CHANGES
1.174   +18 -0  rpm/lib/rpmchecksig.c
1.27+2  -0  rpm/rpmdb/librpmdb.vers
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1816 -r1.1817 CHANGES
  --- rpm/CHANGES   13 Nov 2007 00:34:11 -  1.1816
  +++ rpm/CHANGES   13 Nov 2007 01:07:08 -  1.1817
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- jbj: functional -Kvv *.xar header SHA1 and header+payload MD5 verify.
   - jbj: eliminate all but 1 of the memory leaks with -Kvv *.xar.
   - jbj: add he->signature tagTypeValidate disabler, sigtags no workie.
   - jbj: add (tenative) patch to handle cached chroot paths.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmchecksig.c
  
  $ cvs diff -u -r1.173 -r1.174 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c 13 Nov 2007 00:34:11 -  1.173
  +++ rpm/lib/rpmchecksig.c 13 Nov 2007 01:07:08 -  1.174
  @@ -15,7 +15,13 @@
   #include "rpmdb.h"
   #include "rpmgi.h"
   
  +#ifdef WITH_XAR
  +#include "xar.h"
  +#endif
  +#define  _RPMWF_INTERNAL
  +#include 
   #include 
  +
   #include "signature.h"
   #include "debug.h"
   
  @@ -779,6 +785,7 @@
/[EMAIL PROTECTED] fileSystem, internalState @*/
/[EMAIL PROTECTED] fd, *dig, fileSystem, internalState @*/
   {
  +rpmwf wf = fdGetWF(fd);
   HGE_t hge = headerGetExtension;
   HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
   unsigned char buf[4*BUFSIZ];
  @@ -828,6 +835,7 @@
h = headerFree(h);
   }
   
  +if (wf == NULL) {
   /* Read the payload from the package. */
   while ((count = Fread(buf, sizeof(buf[0]), sizeof(buf), fd)) > 0)
dig->nbytes += count;
  @@ -835,6 +843,7 @@
rpmlog(RPMLOG_ERR, _("%s: Fread failed: %s\n"), fn, Fstrerror(fd));
goto exit;
   }
  +}
   
   /* XXX Steal the digest-in-progress from the file handle. */
   for (i = fd->ndigests - 1; i >= 0; i--) {
  @@ -862,6 +871,15 @@
}
   }
   
  +if (wf != NULL) {
  +if (dig->md5ctx)
  + (void) rpmDigestUpdate(dig->md5ctx, wf->h, wf->nh);
  +if ((rc = rpmwfNextXAR(wf)) != RPMRC_OK) return rc;
  +if ((rc = rpmwfPullXAR(wf, "Payload")) != RPMRC_OK) return rc;
  +if (dig->md5ctx)
  + (void) rpmDigestUpdate(dig->md5ctx, wf->p, wf->np);
  +}
  +
   rc = 0;
   
   exit:
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/librpmdb.vers
  
  $ cvs diff -u -r1.26 -r1.27 librpmdb.vers
  --- rpm/rpmdb/librpmdb.vers   11 Nov 2007 23:59:20 -  1.26
  +++ rpm/rpmdb/librpmdb.vers   13 Nov 2007 01:07:09 -  1.27
  @@ -104,6 +104,8 @@
   wrRPM;
   wrXAR;
   rpmwfFree;
  +rpmwfNextXAR;
  +rpmwfPullXAR;
   rpmVerifySignature;
   sqlitevec;
   tagTypeValidate;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmchecksig.c rpm/rpmdb/ header.h pkg...

2007-11-12 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:   13-Nov-2007 01:34:11
  Branch: HEAD Handle: 2007111300341100

  Modified files:
rpm CHANGES
rpm/lib rpmchecksig.c
rpm/rpmdb   header.h pkgio.c rpmwf.c tagname.c

  Log:
- eliminate all but 1 of the memory leaks with -Kvv *.xar.
- add he->signature tagTypeValidate disabler, sigtags no workie.

  Summary:
RevisionChanges Path
1.1816  +2  -0  rpm/CHANGES
1.173   +8  -1  rpm/lib/rpmchecksig.c
1.63+1  -0  rpm/rpmdb/header.h
1.31+2  -0  rpm/rpmdb/pkgio.c
1.6 +3  -1  rpm/rpmdb/rpmwf.c
1.10+1  -0  rpm/rpmdb/tagname.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1815 -r1.1816 CHANGES
  --- rpm/CHANGES   12 Nov 2007 23:58:26 -  1.1815
  +++ rpm/CHANGES   13 Nov 2007 00:34:11 -  1.1816
  @@ -1,4 +1,6 @@
   5.0a1 -> 5.0a2:
  +- jbj: eliminate all but 1 of the memory leaks with -Kvv *.xar.
  +- jbj: add he->signature tagTypeValidate disabler, sigtags no workie.
   - jbj: add (tenative) patch to handle cached chroot paths.
   - jbj: change %system to --with-xar=internal, adding xar_* to loader map.
   - jbj: hmmm, markReplacedFiles() breaks here, todo++. noone will notice.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmchecksig.c
  
  $ cvs diff -u -r1.172 -r1.173 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c 12 Nov 2007 18:29:21 -  1.172
  +++ rpm/lib/rpmchecksig.c 13 Nov 2007 00:34:11 -  1.173
  @@ -966,7 +966,9 @@
   #endif
) {
he->tag = she->tag;
  + he->signature = 1;
xx = hge(sigh, he, 0);
  + he->signature = 0;
xx = pgpPrtPkts(he->p.ptr, he->c, dig, 0);
he->p.ptr = _free(he->p.ptr);
   #if defined(SUPPORT_RPMV3_VERIFY_RSA)
  @@ -1003,6 +1005,7 @@
sprintf(b, "%s:%c", fn, (rpmIsVerbose() ? '\n' : ' ') );
b += strlen(b);
   
  + she->signature = 1;
if (sigh != NULL)
for (hi = headerInitExtension(sigh);
headerNextExtension(hi, she, 0) != 0;
  @@ -1211,6 +1214,7 @@
}
if (hi != NULL)
hi = headerFreeIterator(hi);
  + she->signature = 0;
   
res += res2;
   
  @@ -1301,7 +1305,10 @@
res++;
}
   
  - if (fd != NULL) xx = Fclose(fd);
  + if (fd != NULL) {
  + rpmpkgClean(fd);
  + xx = Fclose(fd);
  + }
   }
   
   gi = rpmgiFree(gi);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.h
  
  $ cvs diff -u -r1.62 -r1.63 header.h
  --- rpm/rpmdb/header.h12 Nov 2007 18:29:21 -  1.62
  +++ rpm/rpmdb/header.h13 Nov 2007 00:34:11 -  1.63
  @@ -186,6 +186,7 @@
   unsigned int freeData: 1;
   unsigned int avail   : 1;
   unsigned int append  : 1;
  +unsigned int signature   : 1;
   };
   typedef struct _HE_s HE_s;
   #endif
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/pkgio.c
  
  $ cvs diff -u -r1.30 -r1.31 pkgio.c
  --- rpm/rpmdb/pkgio.c 12 Nov 2007 13:07:56 -  1.30
  +++ rpm/rpmdb/pkgio.c 13 Nov 2007 00:34:11 -  1.31
  @@ -738,7 +738,9 @@
/* Print package component sizes. */
   
he->tag = RPMSIGTAG_SIZE;
  + he->signature = 1;
xx = hge(sigh, he, 0);
  + he->signature = 0;
if (xx) {
size_t datasize = he->p.ui32p[0];
rc = printSize(fd, sigSize, pad, datasize);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmwf.c
  
  $ cvs diff -u -r1.5 -r1.6 rpmwf.c
  --- rpm/rpmdb/rpmwf.c 12 Nov 2007 23:58:27 -  1.5
  +++ rpm/rpmdb/rpmwf.c 13 Nov 2007 00:34:11 -  1.6
  @@ -111,6 +111,8 @@
   rpmRC rc = RPMRC_OK;
   #ifdef WITH_XAR
   const char * path = xar_get_path(wf->f);
  +#else
  +const char * path = "*** WITHOUT_XAR ***";
   #endif
   char * b = NULL;
   size_t nb = 0;
  @@ -149,7 +151,7 @@
   }
   
   if (_rpmwf_debug)
  -fprintf(stderr, "*** %s %p[%lu]\n", xar_get_path(wf->f), b, (unsigned 
long)nb);
  +fprintf(stderr, "*** %s %p[%lu]\n", path, b, (unsigned long)nb);
   if (!st

[CVS] RPM: rpm/ CHANGES configure.ac devtool.conf rpm/misc/ librpmmisc...

2007-11-12 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:   13-Nov-2007 00:58:27
  Branch: HEAD Handle: 2007111223582601

  Modified files:
rpm CHANGES configure.ac devtool.conf
rpm/misclibrpmmisc.vers
rpm/rpmdb   db3.c rpmwf.c

  Log:
- jbj: add (tenative) patch to handle cached chroot paths.
- jbj: change %system to --with-xar=internal, adding xar_* to loader map.

  Summary:
RevisionChanges Path
1.1815  +2  -0  rpm/CHANGES
2.251   +1  -1  rpm/configure.ac
2.128   +1  -0  rpm/devtool.conf
1.7 +6  -5  rpm/misc/librpmmisc.vers
1.79+12 -1  rpm/rpmdb/db3.c
1.5 +17 -17 rpm/rpmdb/rpmwf.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1814 -r1.1815 CHANGES
  --- rpm/CHANGES   12 Nov 2007 18:29:20 -  1.1814
  +++ rpm/CHANGES   12 Nov 2007 23:58:26 -  1.1815
  @@ -1,4 +1,6 @@
   5.0a1 -> 5.0a2:
  +- jbj: add (tenative) patch to handle cached chroot paths.
  +- jbj: change %system to --with-xar=internal, adding xar_* to loader map.
   - jbj: hmmm, markReplacedFiles() breaks here, todo++. noone will notice.
   - jbj: eliminate headerGetEntryMinMemory(), use 
headerGet{Entry,Extension}.
   - jbj: invent pubkey/pubkey arch/os convention to avoid missing value 
pain.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.250 -r2.251 configure.ac
  --- rpm/configure.ac  12 Nov 2007 14:33:57 -  2.250
  +++ rpm/configure.ac  12 Nov 2007 23:58:26 -  2.251
  @@ -1002,7 +1002,7 @@
   [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
 AC_DEFINE(HAVE_XAR_H, 1, [Have  header])
 fi
  -  AC_MSG_WARN([XAR support is highly experimental])
  +  AC_MSG_WARN([XAR support is under development])
   ], [])
   
   dnl # DMalloc
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.127 -r2.128 devtool.conf
  --- rpm/devtool.conf  12 Nov 2007 14:42:35 -  2.127
  +++ rpm/devtool.conf  12 Nov 2007 23:58:26 -  2.128
  @@ -75,6 +75,7 @@
   --with-sqlite=external \
   --with-beecrypt=external \
   --with-neon=external \
  +--with-xar=internal \
   --with-bzip2=external \
   --with-popt=external \
   --with-keyutils=external \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/misc/librpmmisc.vers
  
  $ cvs diff -u -r1.6 -r1.7 librpmmisc.vers
  --- rpm/misc/librpmmisc.vers  24 Sep 2007 02:38:57 -  1.6
  +++ rpm/misc/librpmmisc.vers  12 Nov 2007 23:58:27 -  1.7
  @@ -1,17 +1,18 @@
   LIBRPMMISC_0
   {
 global:
  -fnmatch;
  -glob;
  -globfree;
  -rpmz_*;
  -lua*;
   db_env_create_rpmdb;
   db_env_set_func_open_rpmdb;
   db_env_set_func_fsync_rpmdb;
   db_strerror_rpmdb;
   db_create_rpmdb;
  +fnmatch;
  +glob;
  +globfree;
  +lua*;
   magic_*;
  +rpmz_*;
  +xar_*;
 local:
   file_*;
   db_*;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/db3.c
  
  $ cvs diff -u -r1.78 -r1.79 db3.c
  --- rpm/rpmdb/db3.c   12 Nov 2007 10:58:33 -  1.78
  +++ rpm/rpmdb/db3.c   12 Nov 2007 23:58:27 -  1.79
  @@ -1339,6 +1339,11 @@
} else {
   assert(rpmdb && rpmdb->db_dbenv);
dbenv = rpmdb->db_dbenv;
  +#define  PLD_CHROOT
  +#ifdef   PLD_CHROOT
  + if (rpmdb->db_chrootDone)
  + dbenv->set_data_dir(dbenv, dbhome);
  +#endif
rpmdb->db_opens++;
}
/[EMAIL PROTECTED]@*/
  @@ -1507,9 +1512,15 @@
dbpath = (!dbi->dbi_use_dbenv && !dbi->dbi_temporary)
? dbfullpath : dbfile;
   #else
  +#ifdef   PLD_CHROOT
  + /* XXX Make dbpath relative. */
  + dbpath = (!dbi->dbi_use_dbenv)
  + ? dbfullpath : dbfile;
  +#else
dbpath = (!dbi->dbi_temporary)
? dbfullpath : dbfile;
  -#endif
  +#endif   /* PLD_CHROOT */
  +#endif   /* HACK */
   
   #if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
rc = (db->open)(db, txnid, dbpath

[CVS] RPM: rpm/ CHANGES TODO rpm/lib/ rpmchecksig.c rpm/rpmdb/ hdrinli...

2007-11-12 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:   12-Nov-2007 19:29:21
  Branch: HEAD Handle: 2007111218292001

  Modified files:
rpm CHANGES TODO
rpm/lib rpmchecksig.c
rpm/rpmdb   hdrinline.h header.c header.h

  Log:
- hmmm, markReplacedFiles() breaks here, todo++. noone will notice.
- eliminate headerGetEntryMinMemory(), use headerGet{Entry,Extension}.
- invent pubkey/pubkey arch/os convention to avoid missing value pain.
- use RPM_I18NSTRING_TYPE where needed for pubkey imports.

  Summary:
RevisionChanges Path
1.1814  +4  -0  rpm/CHANGES
1.10+8  -0  rpm/TODO
1.172   +26 -3  rpm/lib/rpmchecksig.c
1.30+1  -26 rpm/rpmdb/hdrinline.h
1.117   +2  -35 rpm/rpmdb/header.c
1.62+1  -23 rpm/rpmdb/header.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1813 -r1.1814 CHANGES
  --- rpm/CHANGES   12 Nov 2007 14:33:57 -  1.1813
  +++ rpm/CHANGES   12 Nov 2007 18:29:20 -  1.1814
  @@ -1,4 +1,8 @@
   5.0a1 -> 5.0a2:
  +- jbj: hmmm, markReplacedFiles() breaks here, todo++. noone will notice.
  +- jbj: eliminate headerGetEntryMinMemory(), use 
headerGet{Entry,Extension}.
  +- jbj: invent pubkey/pubkey arch/os convention to avoid missing value 
pain.
  +- jbj: use RPM_I18NSTRING_TYPE where needed for pubkey imports.
   - rse: relocate  usage to "system.h", too.
   - rse: relocate  usage to "system.h" and add corresponding 
Autoconf check
   - rse: fix type mismatches between function prototype and function 
definitions related to uint64_t
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/TODO
  
  $ cvs diff -u -r1.9 -r1.10 TODO
  --- rpm/TODO  11 Nov 2007 23:59:19 -  1.9
  +++ rpm/TODO  12 Nov 2007 18:29:20 -  1.10
  @@ -60,6 +60,14 @@
   - jbj: C++ and C have different rules regarding typedef'd enums like 
rpmTag.
The definitions and usage are currently split awkwardly between
rpmtag.h and header.h.
  +- jbj: Heh, --import has *always* used the wrong data type for
  + Summary/Description/Group. The header that carries the pubkey
  + lacks RPMTAG_ARCH/RPMTAG_OS as well. Re-importing all pubkeys is
  + one solution, but perhaps a "just works" slam-dunk hack is needed
  + during --rebuildb, or with header extensions.
  +- jbj: markReplacedFiles() subtly rewrites header back into rpmdb
  + with altered RPMTAG_FILESTATES data. get/del/add sequence
  + is needed instead.
   
 o to be resolved before RPM 5.0.0:
   - rse: NEWS polishing
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmchecksig.c
  
  $ cvs diff -u -r1.171 -r1.172 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c 11 Nov 2007 04:04:26 -  1.171
  +++ rpm/lib/rpmchecksig.c 12 Nov 2007 18:29:21 -  1.172
  @@ -566,17 +566,40 @@
   he->tag = RPMTAG_RELEASE;
   he->p.str = r;
   xx = hae(h, he, 0);
  +
  +/* Add Summary/Description/Group. */
   he->tag = RPMTAG_DESCRIPTION;
   he->p.str = d;
  +#ifdef   BORKED  /* XXX RPM_I18NSTRING_TYPE fixing. */
   xx = hae(h, he, 0);
  +#else
  +xx = headerAddI18NString(h, he->tag, he->p.ptr, "C");
  +#endif
   he->tag = RPMTAG_GROUP;
   he->p.str = group;
  +#ifdef   BORKED  /* XXX RPM_I18NSTRING_TYPE fixing. */
   xx = hae(h, he, 0);
  -he->tag = RPMTAG_LICENSE;
  -he->p.str = license;
  -xx = hae(h, he, 0);
  +#else
  +xx = headerAddI18NString(h, he->tag, he->p.ptr, "C");
  +#endif
   he->tag = RPMTAG_SUMMARY;
   he->p.str = u;
  +#ifdef   BORKED  /* XXX RPM_I18NSTRING_TYPE fixing. */
  +xx = hae(h, he, 0);
  +#else
  +xx = headerAddI18NString(h, he->tag, he->p.ptr, "C");
  +#endif
  +
  +/* Add a "pubkey" arch/os to avoid missing value NULL ptrs. */
  +he->tag = RPMTAG_ARCH;
  +he->p.str = "pubkey";
  +xx = hae(h, he, 0);
  +he->tag = RPMTAG_OS;
  +he->p.str = "pubkey";
  +xx = hae(h, he, 0);
  +
  +he->tag = RPMTAG_LICENSE;
  +he->p.str = license;
   xx = hae(h, he, 0);
   
   he->tag = RPMTAG_SIZE;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrinline.h
  
  $ cvs diff -u -r1.29 -r1.30 hdrinline.h
  ---

[CVS] RPM: xar/ ChangeLog

2007-11-12 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:   12-Nov-2007 18:17:21
  Branch: HEAD Handle: 2007111217172000

  Modified files:
xar ChangeLog

  Log:
update changelog, patches now added upstream

  Summary:
RevisionChanges Path
1.11+5  -0  xar/ChangeLog
  

  patch -p0 <<'@@ .'
  Index: xar/ChangeLog
  
  $ cvs diff -u -r1.10 -r1.11 ChangeLog
  --- xar/ChangeLog 9 Nov 2007 00:00:07 -   1.10
  +++ xar/ChangeLog 12 Nov 2007 17:17:20 -  1.11
  @@ -1,4 +1,9 @@
   devel
  + 2007-11-11 Rob Braun [EMAIL PROTECTED]
  + * lib/archive.c: Add a #define for a mising function in Mac OS X's old 
version of libxml2 from Anders F Björklund.
  + * lib/Makefile.inc.in: Be a little more gnu libtool friendly from 
Anders F Björklund.
  + 2007-11-11 Rob Braun [EMAIL PROTECTED]
  + * lib/archive.c: Some memory leak cleanups from Anders F Björklund.
2007-11-1 Dave Leimbach [EMAIL PROTECTED]
* lib/data.c: fixed a file descriptor leak by adding a close before 
return
* src/xar.1: Added man page text for --extract-subdoc
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: xar/ .cvsignore xar.spec

2007-11-12 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:   12-Nov-2007 18:15:39
  Branch: HEAD Handle: 2007111217153900

  Modified files:
xar .cvsignore
  Removed files:
xar xar.spec

  Log:
remove autogenerated spec file

  Summary:
RevisionChanges Path
1.4 +1  -0  xar/.cvsignore
1.9 +0  -98 xar/xar.spec
  

  patch -p0 <<'@@ .'
  Index: xar/.cvsignore
  
  $ cvs diff -u -r1.3 -r1.4 .cvsignore
  --- xar/.cvsignore12 Sep 2007 14:22:32 -  1.3
  +++ xar/.cvsignore12 Nov 2007 17:15:39 -  1.4
  @@ -18,4 +18,5 @@
   ltmain.sh
   missing
   stamp-h*
  +xar.spec
   xar-*.tar.gz
  @@ .
  rm -f xar/xar.spec <<'@@ .'
  Index: xar/xar.spec
  
  [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

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 15:42:35
  Branch: HEAD Handle: 2007111214423500

  Modified files:
rpm devtool.conf

  Log:
RPM builds just fine under Solaris 10 again

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.126 -r2.127 devtool.conf
  --- rpm/devtool.conf  12 Nov 2007 11:45:09 -  2.126
  +++ rpm/devtool.conf  12 Nov 2007 14:42:35 -  2.127
  @@ -178,7 +178,7 @@
   ##  o 2007-07-17: ix86-solaris9-gcc4.1.2
   ##  o 2007-07-17: sparc64-solaris8-gcc4.1.2
   ##  o 2007-11-12: sparc64-solaris9-gcc4.1.2
  -##  o 2007-07-17: sparc64-solaris10-gcc4.1.2
  +##  o 2007-11-12: sparc64-solaris10-gcc4.1.2
   ##  o 2007-07-17: amd64-solaris10-gcc4.1.2
   ##  o 2007-07-24: ppc-macosx10.4-gcc4.0.1
   ##  o 2007-07-25: ppc-aix5.3-gcc3.3.2
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES configure.ac rpm/rpmio/ md4.c tiger.c rpm/ sys...

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 15:33:57
  Branch: HEAD Handle: 2007111214335700

  Modified files:
rpm CHANGES configure.ac system.h
rpm/rpmio   md4.c tiger.c

  Log:
relocate  usage to system.h, too.

  Summary:
RevisionChanges Path
1.1813  +1  -0  rpm/CHANGES
2.250   +1  -1  rpm/configure.ac
1.6 +0  -4  rpm/rpmio/md4.c
1.7 +0  -4  rpm/rpmio/tiger.c
2.96+3  -0  rpm/system.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1812 -r1.1813 CHANGES
  --- rpm/CHANGES   12 Nov 2007 13:34:04 -  1.1812
  +++ rpm/CHANGES   12 Nov 2007 14:33:57 -  1.1813
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- rse: relocate  usage to "system.h", too.
   - rse: relocate  usage to "system.h" and add corresponding 
Autoconf check
   - rse: fix type mismatches between function prototype and function 
definitions related to uint64_t
   - rse: replace still existing u_int32_t with uint32_t to get building 
under Solaris
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.249 -r2.250 configure.ac
  --- rpm/configure.ac  12 Nov 2007 13:34:04 -  2.249
  +++ rpm/configure.ac  12 Nov 2007 14:33:57 -  2.250
  @@ -475,7 +475,7 @@
   machine/types.h mntent.h sys/mnttab.h sys/systemcfg.h dnl
   sys/param.h sys/mount.h sys/mntctl.h sys/vmount.h dnl
   libio.h err.h mcheck.h limits.h libgen.h float.h dnl
  -glob.h poll.h netinet/in.h arpa/inet.h inttypes.h dnl
  +glob.h poll.h netinet/in.h arpa/inet.h stdint.h inttypes.h dnl
   ])
   
   dnl # GNU gettext support
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/md4.c
  
  $ cvs diff -u -r1.5 -r1.6 md4.c
  --- rpm/rpmio/md4.c   19 Jul 2007 19:07:56 -  1.5
  +++ rpm/rpmio/md4.c   12 Nov 2007 14:33:57 -  1.6
  @@ -10,10 +10,6 @@
*/
   #include "system.h"
   
  -#if defined(HAVE_STDINT_H)
  -#include 
  -#endif
  -
   #include "md4.h"
   #include 
   #include 
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tiger.c
  
  $ cvs diff -u -r1.6 -r1.7 tiger.c
  --- rpm/rpmio/tiger.c 18 Sep 2007 06:47:54 -  1.6
  +++ rpm/rpmio/tiger.c 12 Nov 2007 14:33:57 -  1.7
  @@ -1,9 +1,5 @@
   #include "system.h"
   
  -#if defined(HAVE_STDINT_H)
  -#include 
  -#endif
  -
   #include "tiger.h"
   #include 
   #include 
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/system.h
  
  $ cvs diff -u -r2.95 -r2.96 system.h
  --- rpm/system.h  12 Nov 2007 13:34:04 -  2.95
  +++ rpm/system.h  12 Nov 2007 14:33:57 -  2.96
  @@ -10,6 +10,9 @@
   #endif
   
   #include 
  +#if defined(HAVE_STDINT_H)
  +#include 
  +#endif
   #if defined(HAVE_INTTYPES_H)
   #include 
   #endif
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmdb/ hdrNVR.c hdrfmt.c header.c rpmdb.c

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 14:54:50
  Branch: HEAD Handle: 2007111213544900

  Modified files:
rpm/rpmdb   hdrNVR.c hdrfmt.c header.c rpmdb.c

  Log:
Eliminate the remaining GCC warnings I encountered under FreeBSD/amd64
(but which are *not* FreeBSD specific): the printf(3) format specifier
"%llu" expects an "unsigned long long int" but an "uint64_t" argument
can be just an "unsigned long int" on a true 64-bit platform. On a
32-bit platform "unsigned long int" is usually just 32-bit while
"unsigned long long int" has to be used for the 64-bit type. But
on a true 64-bit platform the "unsigned long int" can be already
64-bit (and be the same as "unsigned long long int"). Hence, one
has to cast the "uint64_t" to the "unsigned long long int" to make
the strict compilers happy, although the effective type sizes do
not really mismatch...

  Summary:
RevisionChanges Path
1.29+1  -1  rpm/rpmdb/hdrNVR.c
1.31+2  -2  rpm/rpmdb/hdrfmt.c
1.116   +1  -1  rpm/rpmdb/header.c
1.205   +1  -1  rpm/rpmdb/rpmdb.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrNVR.c
  
  $ cvs diff -u -r1.28 -r1.29 hdrNVR.c
  --- rpm/rpmdb/hdrNVR.c11 Nov 2007 22:07:46 -  1.28
  +++ rpm/rpmdb/hdrNVR.c12 Nov 2007 13:54:49 -  1.29
  @@ -91,7 +91,7 @@

if (val) {
if (val == numbuf)
  - sprintf(numbuf, "%llu", ival);
  + sprintf(numbuf, "%llu", (unsigned long long)ival);
addMacro(NULL, tagm->macroname, NULL, val, -1);
}
he->p.ptr = _free(he->p.ptr);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/hdrfmt.c
  
  $ cvs diff -u -r1.30 -r1.31 hdrfmt.c
  --- rpm/rpmdb/hdrfmt.c11 Nov 2007 22:07:46 -  1.30
  +++ rpm/rpmdb/hdrfmt.c12 Nov 2007 13:54:49 -  1.31
  @@ -389,7 +389,7 @@
t = memset(alloca(tlen+1), 0, tlen+1);
   /[EMAIL PROTECTED]@*/
if (anint != 0)
  - xx = snprintf(t, tlen, "%llu", anint);
  + xx = snprintf(t, tlen, "%llu", (unsigned long long)anint);
   /[EMAIL PROTECTED]@*/
s = t;
xtag = "integer";
  @@ -577,7 +577,7 @@
int tlen = 64;
t = memset(alloca(tlen+1), 0, tlen+1);
   /[EMAIL PROTECTED]@*/
  - xx = snprintf(t, tlen, "%llu", anint);
  + xx = snprintf(t, tlen, "%llu", (unsigned long long)anint);
   /[EMAIL PROTECTED]@*/
s = t;
xtag = (element >= 0 ? "- " : NULL);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  
  $ cvs diff -u -r1.115 -r1.116 header.c
  --- rpm/rpmdb/header.c11 Nov 2007 22:07:46 -  1.115
  +++ rpm/rpmdb/header.c12 Nov 2007 13:54:49 -  1.116
  @@ -3039,7 +3039,7 @@
   } else if (he->t == RPM_UINT64_TYPE) {
nb = 40;
val = xmalloc(40);
  - snprintf(val, nb, "%llu", data.ui64p[0]);
  + snprintf(val, nb, "%llu", (unsigned long long)data.ui64p[0]);
val[nb-1] = '\0';
   } else if (he->t == RPM_STRING_TYPE) {
const char * s = data.str;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.c
  
  $ cvs diff -u -r1.204 -r1.205 rpmdb.c
  --- rpm/rpmdb/rpmdb.c 11 Nov 2007 22:07:46 -  1.204
  +++ rpm/rpmdb/rpmdb.c 12 Nov 2007 13:54:49 -  1.205
  @@ -2209,7 +2209,7 @@
/[EMAIL PROTECTED]@*/ break;
case RPM_UINT64_TYPE:
for (j = 0; j < he->c; j++) {
  - sprintf(numbuf, "%llu", he->p.ui64p[j]);
  + sprintf(numbuf, "%llu", (unsigned long long)he->p.ui64p[j]);
rc = mireRegexec(mire, numbuf);
if ((!rc && !mire->notmatch) || (rc && mire->notmatch))
anymatch++;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/lib/ rpmal.c

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 14:42:20
  Branch: HEAD Handle: 2007111213422000

  Modified files:
rpm/lib rpmal.c

  Log:
One more ISO-C invalid but in this particular case semantically
acceptable conversions from integers to a pointers:

rpmal.c: In function 'alKey2Num':
rpmal.c:154: warning: cast from pointer to integer of different size
rpmal.c: In function 'alNum2Key':
rpmal.c:163: warning: cast to pointer from integer of different size
rpmal.c: In function 'rpmalMakeIndex':
rpmal.c:673: warning: cast to pointer from integer of different size

Fixed again by using the only really portable ISO-C solution: a "union".

  Summary:
RevisionChanges Path
2.62+7  -3  rpm/lib/rpmal.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmal.c
  
  $ cvs diff -u -r2.61 -r2.62 rpmal.c
  --- rpm/lib/rpmal.c   30 Sep 2007 20:38:25 -  2.61
  +++ rpm/lib/rpmal.c   12 Nov 2007 13:42:20 -  2.62
  @@ -151,7 +151,9 @@
/[EMAIL PROTECTED]/
   {
   /[EMAIL PROTECTED] -temptrans -retalias @*/
  -return ((alNum)pkgKey);
  +union { alKey key; alNum num; } u;
  +u.key = pkgKey;
  +return u.num;
   /[EMAIL PROTECTED] =temptrans =retalias @*/
   }
   
  @@ -160,7 +162,9 @@
/[EMAIL PROTECTED]/
   {
   /[EMAIL PROTECTED] -temptrans -retalias @*/
  -return ((alKey)pkgNum);
  +union { alKey key; alNum num; } u;
  +u.num = pkgNum;
  +return u.key;
   /[EMAIL PROTECTED] =temptrans =retalias @*/
   }
   
  @@ -670,7 +674,7 @@
   ai->k = 0;
   for (i = 0; i < al->size; i++) {
alp = al->list + i;
  - rpmalAddProvides(al, (alKey)i, alp->provides, alp->tscolor);
  + rpmalAddProvides(al, alNum2Key(NULL, (alNum)i), alp->provides, 
alp->tscolor);
   }
   
   /* Reset size to the no. of provides added. */
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES configure.ac rpm/rpmdb/ rpmwf.c rpm/ system.h ...

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 14:34:05
  Branch: HEAD Handle: 2007111213340400

  Modified files:
rpm CHANGES configure.ac system.h
rpm/rpmdb   rpmwf.c
rpm/tools   txar.c

  Log:
relocate  usage to system.h and add corresponding Autoconf
check

  Summary:
RevisionChanges Path
1.1812  +1  -0  rpm/CHANGES
2.249   +1  -1  rpm/configure.ac
1.4 +0  -1  rpm/rpmdb/rpmwf.c
2.95+3  -0  rpm/system.h
2.10+0  -1  rpm/tools/txar.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1811 -r1.1812 CHANGES
  --- rpm/CHANGES   12 Nov 2007 12:30:45 -  1.1811
  +++ rpm/CHANGES   12 Nov 2007 13:34:04 -  1.1812
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- rse: relocate  usage to "system.h" and add corresponding 
Autoconf check
   - rse: fix type mismatches between function prototype and function 
definitions related to uint64_t
   - rse: replace still existing u_int32_t with uint32_t to get building 
under Solaris
   - rse: remove warnings in rpmdb/dbconfig.c when building an SQLite-only 
RPM
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.248 -r2.249 configure.ac
  --- rpm/configure.ac  12 Nov 2007 10:55:48 -  2.248
  +++ rpm/configure.ac  12 Nov 2007 13:34:04 -  2.249
  @@ -475,7 +475,7 @@
   machine/types.h mntent.h sys/mnttab.h sys/systemcfg.h dnl
   sys/param.h sys/mount.h sys/mntctl.h sys/vmount.h dnl
   libio.h err.h mcheck.h limits.h libgen.h float.h dnl
  -glob.h poll.h netinet/in.h arpa/inet.h dnl
  +glob.h poll.h netinet/in.h arpa/inet.h inttypes.h dnl
   ])
   
   dnl # GNU gettext support
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmwf.c
  
  $ cvs diff -u -r1.3 -r1.4 rpmwf.c
  --- rpm/rpmdb/rpmwf.c 11 Nov 2007 15:00:08 -  1.3
  +++ rpm/rpmdb/rpmwf.c 12 Nov 2007 13:34:04 -  1.4
  @@ -1,7 +1,6 @@
   
   #define  RPM2XAR
   #include "system.h"
  -#include 
   #ifdef WITH_XAR
   #include "xar.h"
   #endif
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/system.h
  
  $ cvs diff -u -r2.94 -r2.95 system.h
  --- rpm/system.h  20 Oct 2007 14:09:07 -  2.94
  +++ rpm/system.h  12 Nov 2007 13:34:04 -  2.95
  @@ -10,6 +10,9 @@
   #endif
   
   #include 
  +#if defined(HAVE_INTTYPES_H)
  +#include 
  +#endif
   
   #if defined(__LCLINT__)
   /[EMAIL PROTECTED]@*/
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tools/txar.c
  
  $ cvs diff -u -r2.9 -r2.10 txar.c
  --- rpm/tools/txar.c  11 Nov 2007 18:49:45 -  2.9
  +++ rpm/tools/txar.c  12 Nov 2007 13:34:04 -  2.10
  @@ -1,7 +1,6 @@
   
   #define  RPM2XAR
   #include "system.h"
  -#include 
   #include "xar.h"
   #include 
   #include 
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmio/ rpmsq.c

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 14:22:03
  Branch: HEAD Handle: 2007111213220300

  Modified files:
rpm/rpmio   rpmsq.c

  Log:
Not all C compilers are happy to straight-forward cast a pid_t integer
to a void pointer as this usually can leads to incorrect results:

rpmsq.c: In function 'rpmsqInsert':
rpmsq.c:250: warning: cast to pointer from integer of different size
rpmsq.c:261: warning: cast to pointer from integer of different size
rpmsq.c: In function 'rpmsqRemove':
rpmsq.c:280: warning: cast to pointer from integer of different size
rpmsq.c: In function 'rpmsqEnable':
rpmsq.c:389: warning: cast to pointer from integer of different size
rpmsq.c: In function 'rpmsqFork':
rpmsq.c:442: warning: cast to pointer from integer of different size
rpmsq.c:470: warning: cast to pointer from integer of different size
rpmsq.c:479: warning: cast to pointer from integer of different size
rpmsq.c: In function 'rpmsqWaitUnregister':
rpmsq.c:546: warning: cast to pointer from integer of different size
rpmsq.c:556: warning: cast to pointer from integer of different size
rpmsq.c: In function 'rpmsqWait':
rpmsq.c:567: warning: cast to pointer from integer of different size
rpmsq.c:582: warning: cast to pointer from integer of different size
rpmsq.c:588: warning: cast to pointer from integer of different size

As the result in our case is just an identifier (which AFAIK is
currently mainly used for debugging purposes), the conversion is
fine.  Nevertheless we have to perform some "union" trickery to get
the conversion done without a complaining compiler...

  Summary:
RevisionChanges Path
1.28+14 -2  rpm/rpmio/rpmsq.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsq.c
  
  $ cvs diff -u -r1.27 -r1.28 rpmsq.c
  --- rpm/rpmio/rpmsq.c 8 Nov 2007 20:33:20 -   1.27
  +++ rpm/rpmio/rpmsq.c 12 Nov 2007 13:22:03 -  1.28
  @@ -204,7 +204,13 @@
   
   #define  SAME_THREAD(_a, _b) pthread_equal(((pthread_t)_a), 
((pthread_t)_b))
   
  -#define  ME()((void *)pthread_self())
  +#define ME() __tid2vp(pthread_self())
  +static void *__tid2vp(pthread_t tid)
  +{
  +union { pthread_t tid; void *vp; } u;
  +u.tid = tid;
  +return u.vp;
  +}
   
   #else
   
  @@ -218,7 +224,13 @@
   
   #define  SAME_THREAD(_a, _b) (42)
   
  -#define  ME()(((void *)getpid()))
  +#define ME() __pid2vp(getpid())
  +static void *__pid2vp(pid_t pid)
  +{
  +union { pid_t pid; void *vp; } u;
  +u.pid = pid;
  +return u.vp;
  +}
   
   #endif   /* HAVE_PTHREAD_H */
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/lib/ formats.c rpm/rpmdb/ pkgio.c rpm/rpmio/ rpmmessage...

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 14:07:57
  Branch: HEAD Handle: 2007111213075600

  Modified files:
rpm/lib formats.c
rpm/rpmdb   pkgio.c
rpm/rpmio   rpmmessages.h rpmmg.c

  Log:
fix a few additional type mismatches

  Summary:
RevisionChanges Path
2.118   +1  -1  rpm/lib/formats.c
1.30+2  -2  rpm/rpmdb/pkgio.c
2.17+2  -2  rpm/rpmio/rpmmessages.h
2.5 +1  -1  rpm/rpmio/rpmmg.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/formats.c
  
  $ cvs diff -u -r2.117 -r2.118 formats.c
  --- rpm/lib/formats.c 10 Nov 2007 18:06:42 -  2.117
  +++ rpm/lib/formats.c 12 Nov 2007 13:07:56 -  2.118
  @@ -58,7 +58,7 @@
   rpmTagData fnames = { .ptr = NULL };
   rpmTagData fsizes = { .ptr = NULL };
   rpmTagData p;
  -uint_64 * usages;
  +uint64_t *usages;
   int numFiles;
   int rc = 1;  /* assume error */
   int xx, yy;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/pkgio.c
  
  $ cvs diff -u -r1.29 -r1.30 pkgio.c
  --- rpm/rpmdb/pkgio.c 11 Nov 2007 15:00:08 -  1.29
  +++ rpm/rpmdb/pkgio.c 12 Nov 2007 13:07:56 -  1.30
  @@ -1155,7 +1155,7 @@
   if ((rc = rpmwfNextXAR(wf)) != RPMRC_OK) return rc;
   if ((rc = rpmwfPullXAR(wf, "Header")) != RPMRC_OK) return rc;
   if (_jbj)
  -fprintf(stderr, "==> wf->h %p[%d]\n", wf->h, wf->nh);
  +fprintf(stderr, "==> wf->h %p[%d]\n", wf->h, (int)wf->nh);
   assert(wf->nh > sizeof(block));
   memcpy(block, wf->h, sizeof(block));
   } else {
  @@ -1265,7 +1265,7 @@
   if ((rc = rpmwfNextXAR(wf)) != RPMRC_OK) return rc;
   if ((rc = rpmwfPullXAR(wf, "Header")) != RPMRC_OK) return rc;
   if (_jbj)
  -fprintf(stderr, "==> wf->h %p[%d]\n", wf->h, wf->nh);
  +fprintf(stderr, "==> wf->h %p[%d]\n", wf->h, (int)wf->nh);
   h = headerLoad(wf->h);
   } else {
   h = headerRead(fd);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmmessages.h
  
  $ cvs diff -u -r2.16 -r2.17 rpmmessages.h
  --- rpm/rpmio/rpmmessages.h   25 May 2007 17:36:37 -  2.16
  +++ rpm/rpmio/rpmmessages.h   12 Nov 2007 13:07:56 -  2.17
  @@ -70,8 +70,8 @@
   typedef void * (*rpmCallbackFunction)
(/[EMAIL PROTECTED]@*/ const void * h, 
const rpmCallbackType what, 
  - const unsigned long long amount, 
  - const unsigned long long total,
  + const uint64_t amount, 
  + const uint64_t total,
/[EMAIL PROTECTED]@*/ fnpyKey key,
/[EMAIL PROTECTED]@*/ rpmCallbackData data)
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmmg.c
  
  $ cvs diff -u -r2.4 -r2.5 rpmmg.c
  --- rpm/rpmio/rpmmg.c 11 Oct 2007 13:04:28 -  2.4
  +++ rpm/rpmio/rpmmg.c 12 Nov 2007 13:07:56 -  2.5
  @@ -103,6 +103,6 @@
   t = xstrdup(t);
   
   if (_rpmmg_debug)
  -fprintf(stderr, "--> rpmmgBuffer(%p, %p[%d]) %s\n", mg, b, nb, t);
  +fprintf(stderr, "--> rpmmgBuffer(%p, %p[%d]) %s\n", mg, b, (int)nb, t);
   return t;
   }
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/lib/ fs.c rpmcli.h rpmps.h rpmts.h

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 13:30:46
  Branch: HEAD Handle: 2007111212304501

  Modified files:
rpm CHANGES
rpm/lib fs.c rpmcli.h rpmps.h rpmts.h

  Log:
fix type mismatches between function prototype and function
definitions related to uint64_t

  Summary:
RevisionChanges Path
1.1811  +1  -0  rpm/CHANGES
2.60+3  -3  rpm/lib/fs.c
2.73+4  -4  rpm/lib/rpmcli.h
2.13+1  -1  rpm/lib/rpmps.h
2.86+1  -1  rpm/lib/rpmts.h
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1810 -r1.1811 CHANGES
  --- rpm/CHANGES   12 Nov 2007 10:58:33 -  1.1810
  +++ rpm/CHANGES   12 Nov 2007 12:30:45 -  1.1811
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- rse: fix type mismatches between function prototype and function 
definitions related to uint64_t
   - rse: replace still existing u_int32_t with uint32_t to get building 
under Solaris
   - rse: remove warnings in rpmdb/dbconfig.c when building an SQLite-only 
RPM
   - rse: fix building against external Berkeley-DB under Solaris (where 
-lrt is required)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/fs.c
  
  $ cvs diff -u -r2.59 -r2.60 fs.c
  --- rpm/lib/fs.c  3 Nov 2007 23:44:00 -   2.59
  +++ rpm/lib/fs.c  12 Nov 2007 12:30:46 -  2.60
  @@ -280,10 +280,10 @@
   return 0;
   }
   
  -int rpmGetFilesystemUsage(const char ** fileList, uint_32 * fssizes, int 
numFiles,
  -   uint_64 ** usagesPtr, /[EMAIL PROTECTED]@*/ int flags)
  +int rpmGetFilesystemUsage(const char ** fileList, uint32_t * fssizes, int 
numFiles,
  +   uint64_t ** usagesPtr, /[EMAIL PROTECTED]@*/ int 
flags)
   {
  -uint_64 * usages;
  +uint64_t * usages;
   int i, len, j;
   char * buf, * dirName;
   char * chptr;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmcli.h
  
  $ cvs diff -u -r2.72 -r2.73 rpmcli.h
  --- rpm/lib/rpmcli.h  3 Nov 2007 23:44:00 -   2.72
  +++ rpm/lib/rpmcli.h  12 Nov 2007 12:30:46 -  2.73
  @@ -457,9 +457,9 @@
   /[EMAIL PROTECTED]@*/
   extern int rpmcliHashesTotal;
   /[EMAIL PROTECTED]@*/
  -extern unsigned long long rpmcliProgressCurrent;
  +extern uint64_t rpmcliProgressCurrent;
   /[EMAIL PROTECTED]@*/
  -extern unsigned long long rpmcliProgressTotal;
  +extern uint64_t rpmcliProgressTotal;
   
   /** \ingroup rpmcli
* The rpm CLI generic transaction callback handler.
  @@ -480,8 +480,8 @@
   /[EMAIL PROTECTED]@*/
   void * rpmShowProgress(/[EMAIL PROTECTED]@*/ const void * arg,
const rpmCallbackType what,
  - const unsigned long long amount,
  - const unsigned long long total,
  + const uint64_t amount,
  + const uint64_t total,
/[EMAIL PROTECTED]@*/ fnpyKey key,
/[EMAIL PROTECTED]@*/ void * data)
/[EMAIL PROTECTED] rpmcliHashesCurrent,
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmps.h
  
  $ cvs diff -u -r2.12 -r2.13 rpmps.h
  --- rpm/lib/rpmps.h   20 Oct 2007 04:55:43 -  2.12
  +++ rpm/lib/rpmps.h   12 Nov 2007 12:30:46 -  2.13
  @@ -217,7 +217,7 @@
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ fnpyKey key,
/[EMAIL PROTECTED]@*/ const char * dn, /[EMAIL PROTECTED]@*/ 
const char * bn,
/[EMAIL PROTECTED]@*/ const char * altNEVR,
  - unsigned long long ulong1)
  + uint64_t ulong1)
/[EMAIL PROTECTED] ps @*/;
   
   /**
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmts.h
  
  $ cvs diff -u -r2.85 -r2.86 rpmts.h
  --- rpm/lib/rpmts.h   9 Nov 2007 23:23:59 -   2.85
  +++ rpm/lib/rpmts.h   12 Nov 2007 12:30:46 -  2.86
  @@ -775,7 +775,7 @@
*/
   /[EMAIL PROTECTED]@*/
   void * rpmtsNotify(rpmts ts, rpmte te,
  -rpmCallbackType what, unsigned long long amount, unsigned 
long long total)
  +rpmCallbackType what, uint64_t amount, uint64_t total)
/[EMAIL PROTECTED]/;
   
   /**
  @@ .
_

[CVS] RPM: rpm/ devtool.conf

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 12:45:09
  Branch: HEAD Handle: 2007111211450900

  Modified files:
rpm devtool.conf

  Log:
some updates from latest platform tests

  Summary:
RevisionChanges Path
2.126   +3  -3  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.125 -r2.126 devtool.conf
  --- rpm/devtool.conf  11 Nov 2007 16:49:48 -  2.125
  +++ rpm/devtool.conf  12 Nov 2007 11:45:09 -  2.126
  @@ -163,8 +163,8 @@
   ##  platforms (each one defined by the combination of hardware
   ##  architecture, operating system and compiler):
   ##
  -##  o 2007-07-19: ix86-freebsd6.2-gcc4.2.0
  -##  o 2007-07-19: ix86-freebsd6.2-gcc4.3.0s20070713
  +##  o 2007-11-11: ix86-freebsd6.2-gcc4.2.2
  +##  o 2007-11-11: ix86-freebsd6.2-gcc4.3.0s20071109
   ##  o 2007-07-17: ix86-freebsd6.2-gcc3.4
   ##  o 2007-07-17: amd64-freebsd6.2-gcc4.1.2
   ##  o 2007-07-17: ix86-freebsd7.0-gcc4.1.2
  @@ -177,7 +177,7 @@
   ##  o 2007-07-17: ix86-rhel4-gcc4.1.2
   ##  o 2007-07-17: ix86-solaris9-gcc4.1.2
   ##  o 2007-07-17: sparc64-solaris8-gcc4.1.2
  -##  o 2007-07-17: sparc64-solaris9-gcc4.1.2
  +##  o 2007-11-12: sparc64-solaris9-gcc4.1.2
   ##  o 2007-07-17: sparc64-solaris10-gcc4.1.2
   ##  o 2007-07-17: amd64-solaris10-gcc4.1.2
   ##  o 2007-07-24: ppc-macosx10.4-gcc4.0.1
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ db3.c db_emu.h tjfn.c

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 11:58:33
  Branch: HEAD Handle: 2007111210583300

  Modified files:
rpm CHANGES
rpm/rpmdb   db3.c db_emu.h tjfn.c

  Log:
replace still existing u_int32_t with uint32_t to get building under
Solaris

  Summary:
RevisionChanges Path
1.1810  +2  -0  rpm/CHANGES
1.78+2  -2  rpm/rpmdb/db3.c
1.4 +3  -3  rpm/rpmdb/db_emu.h
1.7 +1  -1  rpm/rpmdb/tjfn.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1809 -r1.1810 CHANGES
  --- rpm/CHANGES   12 Nov 2007 10:55:48 -  1.1809
  +++ rpm/CHANGES   12 Nov 2007 10:58:33 -  1.1810
  @@ -1,4 +1,6 @@
   5.0a1 -> 5.0a2:
  +- rse: replace still existing u_int32_t with uint32_t to get building 
under Solaris
  +- rse: remove warnings in rpmdb/dbconfig.c when building an SQLite-only 
RPM
   - rse: fix building against external Berkeley-DB under Solaris (where 
-lrt is required)
   - rse: fix distribution tarball by adding the missing 
misc/librpmmisc.vers
   - jbj: hmmm, tagno's 261 and 269 are fishy, skip tagTypeValidate for now.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/db3.c
  
  $ cvs diff -u -r1.77 -r1.78 db3.c
  --- rpm/rpmdb/db3.c   9 Nov 2007 22:20:51 -   1.77
  +++ rpm/rpmdb/db3.c   12 Nov 2007 10:58:33 -  1.78
  @@ -251,7 +251,7 @@
* @return   
*/
   static int db3is_alive(/[EMAIL PROTECTED]@*/ DB_ENV *dbenv, pid_t pid, 
/[EMAIL PROTECTED]@*/ db_threadid_t tid,
  - u_int32_t flags)
  + uint32_t flags)
/[EMAIL PROTECTED]/
   {
   int is_alive = 1;/* assume all processes are alive */
  @@ -1100,7 +1100,7 @@
   DB_TXN * txnid = NULL;
   #endif
   DBTYPE dbi_type = DB_UNKNOWN;
  -u_int32_t oflags;
  +uint32_t oflags;
   int _printit;
   
   if (dbip)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/db_emu.h
  
  $ cvs diff -u -r1.3 -r1.4 db_emu.h
  --- rpm/rpmdb/db_emu.h30 Jun 2007 15:55:06 -  1.3
  +++ rpm/rpmdb/db_emu.h12 Nov 2007 10:58:33 -  1.4
  @@ -19,11 +19,11 @@
   };
   
   struct __db_dbt {
  -  u_int32_t  size;
  +  uint32_t   size;
 void   *data;
   
   #define DB_DBT_MALLOC 0x01   /* We malloc the memory and hand off a copy. */
  -  u_int32_t  flags;
  +  uint32_t   flags;
   };
   
   struct __db_env {
  @@ -39,7 +39,7 @@
   };
   
   struct __db_h_stat {
  -  u_int32_t  hash_nkeys;
  +  uint32_t   hash_nkeys;
   };
   
   #define DB_FAST_STAT 11
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/tjfn.c
  
  $ cvs diff -u -r1.6 -r1.7 tjfn.c
  --- rpm/rpmdb/tjfn.c  18 Aug 2007 23:40:36 -  1.6
  +++ rpm/rpmdb/tjfn.c  12 Nov 2007 10:58:33 -  1.7
  @@ -33,7 +33,7 @@
   db_init(const char * home, DB_ENV ** dbenvp)
   {
   DB_ENV * dbenv;
  -u_int32_t flags;
  +uint32_t flags;
   int ret;
   
   if ((ret = db_env_create(&dbenv, 0)) != 0)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmdb/ dbconfig.c

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 11:57:13
  Branch: HEAD Handle: 2007111210571300

  Modified files:
rpm/rpmdb   dbconfig.c

  Log:
remove warnings when building an SQLite-only RPM

  Summary:
RevisionChanges Path
1.48+4  -0  rpm/rpmdb/dbconfig.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/dbconfig.c
  
  $ cvs diff -u -r1.47 -r1.48 dbconfig.c
  --- rpm/rpmdb/dbconfig.c  9 Nov 2007 22:20:51 -   1.47
  +++ rpm/rpmdb/dbconfig.c  12 Nov 2007 10:57:13 -  1.48
  @@ -24,10 +24,14 @@
   /[EMAIL PROTECTED] [EMAIL PROTECTED]/
   
   /[EMAIL PROTECTED]@*/
  +#if defined(WITH_DB)
   static int dbi_use_cursors;
  +#endif
   
   /[EMAIL PROTECTED]@*/
  +#if defined(WITH_DB)
   static int dbi_tear_down;
  +#endif
   
   /[EMAIL PROTECTED] -immediatetrans -exportlocal [EMAIL PROTECTED]/
   /** \ingroup db3
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES configure.ac

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 11:55:48
  Branch: HEAD Handle: 2007111210554800

  Modified files:
rpm CHANGES configure.ac

  Log:
fix building against external Berkeley-DB under Solaris (where -lrt is
required)

  Summary:
RevisionChanges Path
1.1809  +1  -0  rpm/CHANGES
2.248   +5  -0  rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1808 -r1.1809 CHANGES
  --- rpm/CHANGES   12 Nov 2007 08:04:04 -  1.1808
  +++ rpm/CHANGES   12 Nov 2007 10:55:48 -  1.1809
  @@ -1,4 +1,5 @@
   5.0a1 -> 5.0a2:
  +- rse: fix building against external Berkeley-DB under Solaris (where 
-lrt is required)
   - rse: fix distribution tarball by adding the missing 
misc/librpmmisc.vers
   - jbj: hmmm, tagno's 261 and 269 are fishy, skip tagTypeValidate for now.
   - jbj: add tagTypeValidate sanity check before flipping to implicit 
typing.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.247 -r2.248 configure.ac
  --- rpm/configure.ac  11 Nov 2007 15:05:17 -  2.247
  +++ rpm/configure.ac  12 Nov 2007 10:55:48 -  2.248
  @@ -495,6 +495,11 @@
   AC_CHECK_FUNC(getdomainname, [], [ AC_CHECK_LIB(nsl, getdomainname) ])
   AC_CHECK_FUNC(socket,[], [ AC_CHECK_LIB(socket, socket) ])
   
  +dnl # specific functions (for linking against *external* Berkeley-DB under 
Solaris)
  +AC_CHECK_FUNC(fdatasync, [], [ AC_CHECK_LIB(rt, fdatasync) ])
  +AC_CHECK_FUNC(sched_yield,   [], [ AC_CHECK_LIB(rt, sched_yield) ])
  +AC_CHECK_FUNC(clock_gettime, [], [ AC_CHECK_LIB(rt, clock_gettime) ])
  +
   dnl # specific functions (generic)
   AC_CHECK_FUNCS(vsnprintf snprintf)
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/lib/ tar.c

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 11:43:21
  Branch: HEAD Handle: 2007111210432100

  Modified files:
rpm/lib tar.c

  Log:
the %o expects an unsigned integer

  Summary:
RevisionChanges Path
1.5 +3  -3  rpm/lib/tar.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/tar.c
  
  $ cvs diff -u -r1.4 -r1.5 tar.c
  --- rpm/lib/tar.c 30 Sep 2007 20:38:26 -  1.4
  +++ rpm/lib/tar.c 12 Nov 2007 10:43:21 -  1.5
  @@ -398,9 +398,9 @@
   if (fsm->lpath && fsm->lpath[0] != '0')
strncpy(hdr->linkname, fsm->lpath, sizeof(hdr->linkname));
   
  -sprintf(hdr->mode, "%07o", (st->st_mode & ));
  -sprintf(hdr->uid, "%07o", (st->st_uid & 0777));
  -sprintf(hdr->gid, "%07o", (st->st_gid & 0777));
  +sprintf(hdr->mode, "%07o", (unsigned int)(st->st_mode & ));
  +sprintf(hdr->uid, "%07o", (unsigned int)(st->st_uid & 0777));
  +sprintf(hdr->gid, "%07o", (unsigned int)(st->st_gid & 0777));
   
   sprintf(hdr->filesize, "%011o", (unsigned) (st->st_size & 0377));
   sprintf(hdr->mtime, "%011o", (unsigned) (st->st_mtime & 0377));
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/misc/ Makefile.am

2007-11-12 Thread Ralf S. Engelschall 
  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:   12-Nov-2007 09:04:05
  Branch: HEAD Handle: 2007111208040401

  Modified files:
rpm CHANGES
rpm/miscMakefile.am

  Log:
fix distribution tarball by adding the missing misc/librpmmisc.vers

  Summary:
RevisionChanges Path
1.1808  +4  -1  rpm/CHANGES
1.32+1  -0  rpm/misc/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1807 -r1.1808 CHANGES
  --- rpm/CHANGES   11 Nov 2007 23:59:19 -  1.1807
  +++ rpm/CHANGES   12 Nov 2007 08:04:04 -  1.1808
  @@ -1,4 +1,5 @@
  -4.5 -> 5.0:
  +5.0a1 -> 5.0a2:
  +- rse: fix distribution tarball by adding the missing 
misc/librpmmisc.vers
   - jbj: hmmm, tagno's 261 and 269 are fishy, skip tagTypeValidate for now.
   - jbj: add tagTypeValidate sanity check before flipping to implicit 
typing.
   - jbj: fix: "RPMTAG_FILESTATES has RPM_CHAR_TYPE=1 instead of 2".
  @@ -8,6 +9,8 @@
   - jbj: hmmm RPMTAG_FILESTATES has RPM_CHAR_TYPE=1 instead of 2. todo++;
   - jbj: eliminate RPM_CHAR_TYPE, use RPM_UINT8_TYPE instead.
   - jbj: eliminate RPM_NULL_TYPE, use 0 instead.
  +
  +4.5 -> 5.0a1:
   - rse: start providing a high-level NEWS document for RPM 5
   - rse: first cut for properly integrate XAR support into the build 
environment
   - rse: allow RPM to be built without XAR support again
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/misc/Makefile.am
  
  $ cvs diff -u -r1.31 -r1.32 Makefile.am
  --- rpm/misc/Makefile.am  11 Nov 2007 15:05:19 -  1.31
  +++ rpm/misc/Makefile.am  12 Nov 2007 08:04:05 -  1.32
  @@ -7,6 +7,7 @@
-I$(top_srcdir)
   
   EXTRA_DIST = \
  + librpmmisc.vers \
alloca.cbasename.c  err.c   error.c \
fakefork.c  fnmatch.c   getcwd.cgetmntent.c \
getwd.c glob.c  memcmp.c\
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org