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-Jun-2010 18:59:18 Branch: rpm-5_3 Handle: 2010062316591701 Modified files: (Branch: rpm-5_3) rpm/rpmdb pkgio.c rpm/rpmio librpmio.vers rpmbc.h rpmdav.c rpmhkp.c rpmhkp.h rpmio.c rpmio_internal.h rpmpgp.h Log: - backport MacOSX fiddle-ups into rpm-5.3.2. Summary: Revision Changes Path 1.105.2.6 +6 -6 rpm/rpmdb/pkgio.c 2.163.2.7 +1 -0 rpm/rpmio/librpmio.vers 2.7.2.2 +0 -2 rpm/rpmio/rpmbc.h 2.116.2.1 +1 -1 rpm/rpmio/rpmdav.c 2.15.2.7 +22 -19 rpm/rpmio/rpmhkp.c 2.7.2.4 +2 -0 rpm/rpmio/rpmhkp.h 1.218.2.4 +3 -0 rpm/rpmio/rpmio.c 2.126.2.1 +0 -2 rpm/rpmio/rpmio_internal.h 2.87.2.7 +2 -2 rpm/rpmio/rpmpgp.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmdb/pkgio.c ============================================================================ $ cvs diff -u -r1.105.2.5 -r1.105.2.6 pkgio.c --- rpm/rpmdb/pkgio.c 23 Jun 2010 06:52:33 -0000 1.105.2.5 +++ rpm/rpmdb/pkgio.c 23 Jun 2010 16:59:18 -0000 1.105.2.6 @@ -223,7 +223,7 @@ break; } if (_rpmhkp_debug) -fprintf(stderr, "\t%s: rpmku %p[%u]\n", __FUNCTION__, hkp->pkt, hkp->pktlen); +fprintf(stderr, "\t%s: rpmku %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); } /* Try rpmdb keyring lookup. */ @@ -278,7 +278,7 @@ hkp->pktlen = 0; } if (_rpmhkp_debug) -fprintf(stderr, "\t%s: rpmdb %p[%u]\n", __FUNCTION__, hkp->pkt, hkp->pktlen); +fprintf(stderr, "\t%s: rpmdb %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); } /* Try autosign package pubkey (if present). */ @@ -292,7 +292,7 @@ pubkeysource = xstrdup("package"); validate = -1; /* XXX rpmhkpValidate is prerequisite for rpmhkpFindKey */ if (_rpmhkp_debug) -fprintf(stderr, "\t%s: auto %p[%u]\n", __FUNCTION__, hkp->pkt, hkp->pktlen); +fprintf(stderr, "\t%s: auto %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); } } @@ -314,7 +314,7 @@ validate = 1; } if (_rpmhkp_debug) -fprintf(stderr, "\t%s: rpmhkp %p[%u]\n", __FUNCTION__, hkp->pkt, hkp->pktlen); +fprintf(stderr, "\t%s: rpmhkp %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); } #ifdef NOTYET @@ -339,7 +339,7 @@ if (hkp->pkt == NULL || hkp->pktlen == 0) goto exit; if (_rpmhkp_debug) -fprintf(stderr, "\t%s: match %p[%u]\n", __FUNCTION__, hkp->pkt, hkp->pktlen); +fprintf(stderr, "\t%s: match %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); /* Split the result into packet array. */ hkp->pkts = _free(hkp->pkts); /* XXX memleaks */ @@ -392,7 +392,7 @@ } (void) rpmkuStorePubkey(sigp, iob); if (_rpmhkp_debug) -fprintf(stderr, "\t%s: rpmku %p[%u]\n", __FUNCTION__, hkp->pkt, hkp->pktlen); +fprintf(stderr, "\t%s: rpmku %p[%u]\n", __FUNCTION__, hkp->pkt, (unsigned) hkp->pktlen); } /* Pubkey packet looks good, save the signer id. */ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/librpmio.vers ============================================================================ $ cvs diff -u -r2.163.2.6 -r2.163.2.7 librpmio.vers --- rpm/rpmio/librpmio.vers 23 Jun 2010 06:48:07 -0000 2.163.2.6 +++ rpm/rpmio/librpmio.vers 23 Jun 2010 16:59:17 -0000 2.163.2.7 @@ -368,6 +368,7 @@ rpmhkpLoadSignature; rpmhkpLookup; rpmhkpNew; + rpmhkpUpdate; rpmhkpValidate; rpmHmacInit; rpmhookArgsFree; @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmbc.h ============================================================================ $ cvs diff -u -r2.7.2.1 -r2.7.2.2 rpmbc.h --- rpm/rpmio/rpmbc.h 18 Jun 2010 17:39:45 -0000 2.7.2.1 +++ rpm/rpmio/rpmbc.h 23 Jun 2010 16:59:17 -0000 2.7.2.2 @@ -5,9 +5,7 @@ * \file rpmio/rpmbc.h */ -#ifdef HAVE_BEECRYPT_API_H #include <beecrypt/api.h> -#endif #include <rpmiotypes.h> #include <rpmpgp.h> @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmdav.c ============================================================================ $ cvs diff -u -r2.116 -r2.116.2.1 rpmdav.c --- rpm/rpmio/rpmdav.c 30 Mar 2010 13:27:39 -0000 2.116 +++ rpm/rpmio/rpmdav.c 23 Jun 2010 16:59:17 -0000 2.116.2.1 @@ -1958,7 +1958,7 @@ /*...@=onlytrans@*/ int rc = 0; -DAVDEBUG(-1, (stderr, "--> %s(%p) rc %d clen %d req %p u %p\n", __FUNCTION__, fd, rc, fd->bytesRemain, fd->req, fd->u)); +DAVDEBUG(-1, (stderr, "--> %s(%p) rc %d clen %d req %p u %p\n", __FUNCTION__, fd, rc, (int)fd->bytesRemain, fd->req, fd->u)); assert(fd->req != NULL); if (fd->req != (void *)-1) { @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmhkp.c ============================================================================ $ cvs diff -u -r2.15.2.6 -r2.15.2.7 rpmhkp.c --- rpm/rpmio/rpmhkp.c 18 Jun 2010 17:39:45 -0000 2.15.2.6 +++ rpm/rpmio/rpmhkp.c 23 Jun 2010 16:59:17 -0000 2.15.2.7 @@ -559,10 +559,10 @@ return rc; } -static int rpmhkpUpdate(/*...@null@*/DIGEST_CTX ctx, const void * data, size_t len) +int rpmhkpUpdate(DIGEST_CTX ctx, const void * data, size_t len) { int rc = rpmDigestUpdate(ctx, data, len); -SPEW((stderr, "*** Update(%5d): %s\n", len, pgpHexStr(data, len))); +SPEW((stderr, "*** Update(%5u): %s\n", (unsigned)len, pgpHexStr(data, len))); return rc; } @@ -1081,32 +1081,35 @@ { if (fp == NULL) fp = stderr; fprintf(stderr, "============\n"); - fprintf(stderr, " LOOKUPS:%10u\n", SUM.lookups); - fprintf(stderr, " PUBKEYS:%10u\n", SUM.certs); - fprintf(stderr, " SIGNATURES:%10u\n", SUM.sigs); + fprintf(stderr, " LOOKUPS:%10u\n", (unsigned) SUM.lookups); + fprintf(stderr, " PUBKEYS:%10u\n", (unsigned) SUM.certs); + fprintf(stderr, " SIGNATURES:%10u\n", (unsigned) SUM.sigs); fprintf(stderr, " PUB bound:%10u\trevoked:%10u\texpired:%10u\n", - SUM.pubbound, SUM.pubrevoked, SUM.keyexpired); + (unsigned) SUM.pubbound, + (unsigned) SUM.pubrevoked, + (unsigned) SUM.keyexpired); fprintf(stderr, " SUB bound:%10u\trevoked:%10u\n", - SUM.subbound, SUM.subrevoked); - fprintf(stderr, " expired:%10u\n", SUM.expired); - fprintf(stderr, " filtered:%10u\n", SUM.filtered); + (unsigned) SUM.subbound, + (unsigned) SUM.subrevoked); + fprintf(stderr, " expired:%10u\n", (unsigned) SUM.expired); + fprintf(stderr, " filtered:%10u\n", (unsigned) SUM.filtered); fprintf(stderr, " DSA:%10u:%-10u\n", - SUM.DSA.good, (SUM.DSA.good+SUM.DSA.bad)); + (unsigned) SUM.DSA.good, (unsigned) (SUM.DSA.good+SUM.DSA.bad)); fprintf(stderr, " RSA:%10u:%-10u\n", - SUM.RSA.good, (SUM.RSA.good+SUM.RSA.bad)); + (unsigned) SUM.RSA.good, (unsigned) (SUM.RSA.good+SUM.RSA.bad)); fprintf(stderr, "HASH:%10u:%-10u\n", - SUM.HASH.good, (SUM.HASH.good+SUM.HASH.bad)); + (unsigned) SUM.HASH.good, (unsigned) (SUM.HASH.good+SUM.HASH.bad)); fprintf(stderr, "AWOL:%10u:%-10u\n", - SUM.AWOL.good, (SUM.AWOL.good+SUM.AWOL.bad)); + (unsigned) SUM.AWOL.good, (unsigned) (SUM.AWOL.good+SUM.AWOL.bad)); fprintf(stderr, "SKIP:%10u:%-10u\n", - SUM.SKIP.good, (SUM.SKIP.good+SUM.SKIP.bad)); + (unsigned) SUM.SKIP.good, (unsigned) (SUM.SKIP.good+SUM.SKIP.bad)); } void _rpmhkpDumpDigParams(const char * msg, pgpDigParams sigp) { fprintf(stderr, "%s: %p\n", msg, sigp); fprintf(stderr, "\t userid: %s\n", sigp->userid); - fprintf(stderr, "\t hash: %p[%u]\n", sigp->hash, sigp->hashlen); + fprintf(stderr, "\t hash: %p[%u]\n", sigp->hash, (unsigned) sigp->hashlen); fprintf(stderr, "\t tag: %02X\n", sigp->tag); fprintf(stderr, "\t version: %02X\n", sigp->version); fprintf(stderr, "\t time: %08X\n", @@ -1127,20 +1130,20 @@ fprintf(stderr, "\t sigtag: 0x%08x\n", dig->sigtag); fprintf(stderr, "\t sigtype: 0x%08x\n", dig->sigtype); - fprintf(stderr, "\t sig: %p[%u]\n", dig->sig, dig->siglen); + fprintf(stderr, "\t sig: %p[%u]\n", dig->sig, (unsigned) dig->siglen); fprintf(stderr, "\t vsflags: 0x%08x\n", dig->vsflags); fprintf(stderr, "\tfindPubkey: %p\n", dig->findPubkey); fprintf(stderr, "\t _ts: %p\n", dig->_ts); fprintf(stderr, "\t ppkts: %p[%u]\n", dig->ppkts, dig->npkts); - fprintf(stderr, "\t nbytes: 0x%08x\n", dig->nbytes); + fprintf(stderr, "\t nbytes: 0x%08x\n", (unsigned) dig->nbytes); fprintf(stderr, "\t sha1ctx: %p\n", dig->sha1ctx); fprintf(stderr, "\thdrsha1ctx: %p\n", dig->hdrsha1ctx); - fprintf(stderr, "\t sha1: %p[%u]\n", dig->sha1, dig->sha1len); + fprintf(stderr, "\t sha1: %p[%u]\n", dig->sha1, (unsigned) dig->sha1len); fprintf(stderr, "\t md5ctx: %p\n", dig->md5ctx); fprintf(stderr, "\t hdrctx: %p\n", dig->hdrctx); - fprintf(stderr, "\t md5: %p[%u]\n", dig->md5, dig->md5len); + fprintf(stderr, "\t md5: %p[%u]\n", dig->md5, (unsigned) dig->md5len); fprintf(stderr, "\t impl: %p\n", dig->impl); _rpmhkpDumpDigParams("PUB", pgpGetPubkey(dig)); @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmhkp.h ============================================================================ $ cvs diff -u -r2.7.2.3 -r2.7.2.4 rpmhkp.h --- rpm/rpmio/rpmhkp.h 23 May 2010 15:29:46 -0000 2.7.2.3 +++ rpm/rpmio/rpmhkp.h 23 Jun 2010 16:59:17 -0000 2.7.2.4 @@ -128,6 +128,8 @@ /*...@*/; void _rpmhkpDumpDig(const char * msg, pgpDig dig) /*...@*/; +int rpmhkpUpdate(/*...@null@*/ DIGEST_CTX ctx, const void * data, size_t len) + /*...@*/; #endif /* _RPMHKP_INTERNAL */ void _rpmhkpPrintStats(/*...@null@*/ FILE * fp) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmio.c ============================================================================ $ cvs diff -u -r1.218.2.3 -r1.218.2.4 rpmio.c --- rpm/rpmio/rpmio.c 22 May 2010 15:36:32 -0000 1.218.2.3 +++ rpm/rpmio/rpmio.c 23 Jun 2010 16:59:17 -0000 1.218.2.4 @@ -877,6 +877,9 @@ #ifdef HAVE_GETADDRINFO /*...@-unrecog@*/ struct addrinfo hints, *res, *res0; +#ifndef NI_MAXSERV +#define NI_MAXSERV 32 +#endif char pbuf[NI_MAXSERV]; int xx; @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmio_internal.h ============================================================================ $ cvs diff -u -r2.126 -r2.126.2.1 rpmio_internal.h --- rpm/rpmio/rpmio_internal.h 21 Mar 2010 00:26:37 -0000 2.126 +++ rpm/rpmio/rpmio_internal.h 23 Jun 2010 16:59:17 -0000 2.126.2.1 @@ -629,11 +629,9 @@ /*...@switchbreak@*/ break; case PGPHASHALGO_SHA1: case PGPHASHALGO_RIPEMD160: -#if defined(HAVE_BEECRYPT_API_H) case PGPHASHALGO_SHA256: case PGPHASHALGO_SHA384: case PGPHASHALGO_SHA512: -#endif assert(dig->sha1ctx == NULL); /*...@-assignexpose -onlytr...@*/ dig->sha1ctx = ctx; @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpgp.h ============================================================================ $ cvs diff -u -r2.87.2.6 -r2.87.2.7 rpmpgp.h --- rpm/rpmio/rpmpgp.h 23 Jun 2010 06:48:07 -0000 2.87.2.6 +++ rpm/rpmio/rpmpgp.h 23 Jun 2010 16:59:17 -0000 2.87.2.7 @@ -66,9 +66,9 @@ rpmuint32_t sigtype; /*!< Package signature data type. */ /*...@relnull@*/ const void * sig; /*!< Package signature. */ - rpmuint32_t siglen; /*!< Package signature length. */ + size_t siglen; /*!< Package signature length. */ const void * pub; /*!< Package pubkey. */ - rpmuint32_t publen; /*!< Package pubkey length. */ + size_t publen; /*!< Package pubkey length. */ pgpVSFlags vsflags; /*!< Digest/signature operation disablers. */ struct rpmop_s dops; /*!< Digest operation statistics. */ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
