rpms/rpm/F-11 rpm-4.7.0-prtsig.patch,NONE,1.1 rpm.spec,1.347,1.348

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22607

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.0-prtsig.patch 
Log Message:
- fix pgp pubkey signature tag parsing


rpm-4.7.0-prtsig.patch:

--- NEW FILE rpm-4.7.0-prtsig.patch ---
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 3819449..eb5d627 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -638,13 +638,13 @@ static int pgpPrtSigParams(pgpTag tag, uint8_t pubkey_algo, uint8_t sigtype,
     return 0;
 }
 
-static int pgpPrtSig(pgpTag tag, const uint8_t *h, size_t hlen, pgpDig _dig)
+static int pgpPrtSig(pgpTag tag, const uint8_t *h, size_t hlen,
+		     pgpDig _dig, pgpDigParams _digp)
 {
     uint8_t version = h[0];
     uint8_t * p;
     size_t plen;
     int rc;
-    pgpDigParams _digp = _dig ? &_dig->signature : NULL;
 
     switch (version) {
     case 3:
@@ -1170,7 +1170,7 @@ static int pgpPrtPkt(const uint8_t *pkt, size_t pleft,
     h = pkt + 1 + plen;
     switch (tag) {
     case PGPTAG_SIGNATURE:
-	rc = pgpPrtSig(tag, h, hlen, _dig);
+	rc = pgpPrtSig(tag, h, hlen, _dig, _digp);
 	break;
     case PGPTAG_PUBLIC_KEY:
 	/* Get the public key fingerprint. */


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-11/rpm.spec,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -p -r1.347 -r1.348
--- rpm.spec	18 Jun 2009 15:48:01 -0000	1.347
+++ rpm.spec	18 Jun 2009 15:50:15 -0000	1.348
@@ -44,6 +44,7 @@ Patch3: rpm-4.6.0-fedora-specspo.patch
 
 # Patches already in upstream
 Patch200: rpm-4.7.0-findlang-kde3.patch
+Patch201: rpm-4.7.0-prtsig.patch
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
@@ -186,6 +187,7 @@ that will manipulate RPM packages and da
 %patch3 -p1 -b .fedora-specspo
 
 %patch200 -p1 -b .findlang-kde3
+%patch201 -p1 -b .prtsig
 
 %patch300 -p1 -b .extra-prov
 %patch301 -p1 -b .niagara
@@ -401,6 +403,7 @@ exit 0
   - disable libmagic text token checks, it's way too error-prone
   - consistently classify all text as such and include description
 - fix find-lang --with-kde with KDE3 (#466009)
+- fix pgp pubkey signature tag parsing
 
 * Thu Apr 16 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-1
 - update to 4.7.0 final (http://rpm.org/wiki/Releases/4.7.0)