- add header RSA signature (untested, disabled for now).

- don't bother with signing check if 16 bits of hash don't match.
- only V3 signatures for now.

CVS patchset: 5347
CVS date: 2002/03/07 22:54:43

28 files changed, 816 insertions, 792 deletions

diff --git a/CHANGES b/CHANGES
index f022586b0..fae5aeb2c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -89,7 +89,9 @@
 	- display pubkeys in hex when debugging db access.
 	- retrieve pubkey(s) from rpmdb, not from detached signature file.
 	- add header DSA signature.
-	- add header RSA signature (untested).
+	- add header RSA signature (untested, disabled for now).
+`	- don't bother with signing check if 16 bits of hash don't match.
+	- only V3 signatures for now.
 
 4.0.3 -> 4.0.4:
 	- solaris: translate i86pc to i386 (#57182).
@@ -128,7 +130,7 @@
 	- a couple more perl.{prov,req} fiddles.
 	- macro for %files, always include %defattr(), redhat config only.
 	- fix: drop header region when writing repackaged legacy header.
-        - bail on %files macro.
+	- bail on %files macro.
 	- transaction rollbacks are functional.
 	- generate index for pkgid (aka Sigmd5) tag, query/verify by pkgid.
 	- generate index for hdrid (aka Sha1header) tag, query/verify by hdrid.
@@ -556,7 +558,7 @@
 	- fix: (segfault) verify needs rpmdb while query does not.
 	- add calculated nlink field to -qlv output (like ls -al).
 	- detects and builds properly against the new fopencookie API in
-          glibc 2.2.
+	  glibc 2.2.
 	- change popt exec alias in oreder to exec rpm children.
 	- split rpm into 5 pieces along major mode fault lines with popt glue.
 	- turn on new, more complete version of %%configure.
@@ -634,9 +636,9 @@
 	- builds against bzip2 1.0
 	- fix: resurrect symlink unique'ifying property of finger prints.
 	- fix: broken glob test with empty build directory (Geoff Keating).
-        - fix: create per-platform directories correctly.
-        - update brp-* scripts from rpm-4.0, enable in per-platform config.
-        - alpha: add -mieee to default optflags.
+	- fix: create per-platform directories correctly.
+	- update brp-* scripts from rpm-4.0, enable in per-platform config.
+	- alpha: add -mieee to default optflags.
 	- add RPMTAG_OPTFLAGS, configured optflags when package was built.
 	- add RPMTAG_DISTURL for rpmfind-like tools (content unknown yet).
 	- teach brp-compress about /usr/info and /usr/share/info as well.
@@ -971,8 +973,8 @@
 	- preliminary macro environment as side effect of rpmrc parse.
 	- macro handling in rpmlib -- rework include: tag with macro expansion.
 	- first attempt at librpmbuild API.
-        - fixed lib/rpmrc.c to accept include: tags (AdV)
-        - fixed the CHANGES file to reflect that this is 2.9, not 3.0 (AdV)
+	- fixed lib/rpmrc.c to accept include: tags (AdV)
+	- fixed the CHANGES file to reflect that this is 2.9, not 3.0 (AdV)
 	- aggregate system includes into system.h.
 	- rearrange functions to minimize exported routines in librpmbuild API.
 	- generalize cpio I/O to eliminate pipe to exec'd gzip on install.
@@ -1036,7 +1038,7 @@
 	- portable mode_t/pid_t typedefs.
 	- fix check for trailing / in Prefix:
 	- remove 2 character language name assumption.
-        - add /usr/lib/rpm/find-lang.sh (W. L. Estes <wlestes@uncg.edu>)
+	- add /usr/lib/rpm/find-lang.sh (W. L. Estes <wlestes@uncg.edu>)
 	- miscellaneous portability cruft (Eugene Kanter).
 	- Makefile: don't use ln -sf.
 	- getOutputFrom(): fix race between last read on pipe and child death
@@ -1068,7 +1070,7 @@
 	- solaris portability patch resurrection (Steve Sanberg).
 	- permit autogen.sh to work on non "prefix=/usr" hosts.
 	- add %license/%readme virtual file attributes.
-        - align "Build Host:" with other fields.
+	- align "Build Host:" with other fields.
 
 2.5.2 -> 2.5.3:
 	- copy changelog tags to sub-packages just before packaging.
@@ -1153,7 +1155,7 @@
 	- fix typo in %triggerpostun generation
 	- include icons in source packages
 	- headerGetEntry() should return count of 1 when returning
-          strings plucked from i18n strings
+	  strings plucked from i18n strings
 	- do not remove comments in scripts
 	- save/restore existing arch when done with buildarch
 	- copy the I18N table to the source header so i18n stuff works
@@ -1162,14 +1164,14 @@
 	- shared files weren't being handled properly in net shared paths
 
 2.4.108 -> 2.4.109:
-        - remove icons with --rmsource
-        - do dependecy generation on -bl
-        - check files on all packages on -bl
+	- remove icons with --rmsource
+	- do dependecy generation on -bl
+	- check files on all packages on -bl
 	- integrate Jeff Johnson's memleak patches
 	- added OSF1 autodep scripts
 
 2.4.107 -> 2.4.108:
-        - make --clean work with no %setup
+	- make --clean work with no %setup
 	- fixed FSSIZES problem introduced in 2.4.107
 	- fixed search for find-requires.sh
 	- improved solaris autodeps scripts
@@ -1178,7 +1180,7 @@
 2.4.106 -> 2.4.107:
 	- --nomd5 wasn't handled properly
 	- updated configure.in find-req and find-prov checks (Tim Mooney)
-        - make --rmsource actually work
+	- make --rmsource actually work
 	- run postun triggers
 
 2.4.105 -> 2.4.106:
@@ -1243,8 +1245,8 @@
 
 2.4.100 -> 2.4.101:
 	- handle files with spaces (put double quotes around them)
-        - new rpmrc setting, buildshell, can be used to set shell
-          used for build scripts (default is /bin/sh)
+	- new rpmrc setting, buildshell, can be used to set shell
+	  used for build scripts (default is /bin/sh)
 	- fix bug where macros were being improperly set for
 	  Patch: and Source: lines
 	- may use "instchangelog" in rpmrc to limit the maxmium number of 
@@ -1252,11 +1254,11 @@
 	  (-1 means store all of them)
 	- default instchangelog is set to 5
 	- headerRemoveEntry() didn't free the item's data -- this led to
-  	  a slight memory leak when installing packages
-        - implemented generic file relocations at install time
-          (use --relocate <oldpath>=<newpath>, i.e. --relocate /usr=/foo)
-        - added --badreloc flag to force RPM to relocate files which packages
-          haven't advertised as relocateable
+	  a slight memory leak when installing packages
+	- implemented generic file relocations at install time
+	  (use --relocate <oldpath>=<newpath>, i.e. --relocate /usr=/foo)
+	- added --badreloc flag to force RPM to relocate files which packages
+	  haven't advertised as relocateable
 	- fix return code on failed uncompresses in %prep
 	- preliminary handling of bzip2 compressed files
 	- differentiates between big and little endian mips
@@ -1274,9 +1276,9 @@
 
 2.4.12 -> 2.4.99:
 	- added many more i18n strings
-        - merged in large rewrite of build code, which includes the following
+	- merged in large rewrite of build code, which includes the following
 	  changes:
-            - new option --rmsource
+	    - new option --rmsource
 	    - all scripts can now take -p <prog>
 	    - more strict about %package placement and use of main package 
 	      preamble
@@ -1286,7 +1288,7 @@
 	    - Root: is depricated.  Use BuildRoot: instead
 	    - "nosrc" sources arn't deleted when sources are removed
 	    - New tag DocDir: <dir> to set alternate doc dir (default is 
-              /usr/doc)
+	      /usr/doc)
 	    - %doc should work as expected with buildroot, prefix, DocDir:
 	    - all file processing is done before any packaging
 	    - should work with modern patch programs (later than 2.1)
@@ -1294,8 +1296,8 @@
 	    - %define only defines a macro if it starts a line
 	    - script prog entries are now arrays (ie with arguments)
 	    - standard macros: tag names, buildarch, buildos, buildarch_lc, 
-              buildos_lc, PATCHn, SOURCEn, PATCHURLn, SOURCEURLn, sourcedir, 
-              builddir, optflags
+	      buildos_lc, PATCHn, SOURCEn, PATCHURLn, SOURCEURLn, sourcedir, 
+	      builddir, optflags
 	    - deprecate require_distribution, require_icon, require_vendor
 	    - add RPMTAG_FILEDEVICES and RPMTAG_FILEINODES to header
 	    - export variables in scripts
@@ -1364,7 +1366,7 @@
 	- archivesize tag was incorrect for packages with hard links
 	- moved popt into a separate library
 	- directory created with %doc is now name-version (dropped
-          the release)
+	  the release)
 	- added buildarch/buildos macros
 	- added %ghost file option
 	- updated linux.req to only find requirements for exectuable files
@@ -1815,7 +1817,7 @@
 	- -h and -v work for source package >= V2
 	- -h output is much smoother now
 	- new AutoReqProv: tag in spec file can disable automatic
-          require/provide generation
+	  require/provide generation
 	- fixed md5sum problem on big endian machines in a way that's
 	  mostly backwards compatible; this hack will be removed someday
 	- added :fflags tag
@@ -1925,7 +1927,7 @@
 
 2.1.1 -> 2.1.2:
 	- fixed error message for unrelocateable packages
-        - automatic shared lib provides now work with buildprefix
+	- automatic shared lib provides now work with buildprefix
 	- fixed dependency checking during upgrades to work if the
 	  package wasn't previously installed
 	- clean up temp file after signature check
@@ -1936,7 +1938,7 @@
 	- fixed -qi query format 
 
 2.0.11 -> 2.1:
-        - added --requires, --whatrequires, --provides and 
+	- added --requires, --whatrequires, --provides and 
 	  --whatprovides queries
 	- using a string array tag in a queryformat results in every
 	  item in the string being printed out with spaces in between
@@ -1958,7 +1960,7 @@
 	- always do at least an MD5 "signature"
 	  as a result, -K will always tell you something
 	- signatures now include a simple "header+archive size" check
-          just calling readSignature() checks this
+	  just calling readSignature() checks this
 	- --nopgp (with -K) to skip PGP check, just do MD5
 	- allow '#' comments in preamble and %files section
 	- fixed -qsv to print both the states and the file information	
@@ -1991,7 +1993,7 @@
 	  queryFormats
 
 2.0.10 -> 2.0.11:
-        - fixed chmod(symlink) bug (since 2.0.9)
+	- fixed chmod(symlink) bug (since 2.0.9)
 
 2.0.9 -> 2.0.10:
 	- fixed the fix to rpm -q <num> bug
@@ -2028,7 +2030,7 @@
 	  will probably won't be implemented in RPM 2.x anyway
 
 2.0.6 -> 2.0.7:
-        - builds now set umask 022 for all scripts
+	- builds now set umask 022 for all scripts
 	- queries relative paths correctly (thanks to Johnie Stafford)
 	- fixed error codes for failed installs
 	- don't add NULL entry to group index for packages that don't
@@ -2121,7 +2123,7 @@
 
 1.4.2 -> 1.4.3:
 	- added tokens for SPARC, MIPS, PowerPC, and 680x0 architectures
-        - fixed sparc arch, added arch sanity check
+	- fixed sparc arch, added arch sanity check
 
 1.4.1 -> 1.4.2:
 	- added --root to man page, usage, and help messages
diff --git a/lib/package.c b/lib/package.c
index 4b8eda926..bc234bd42 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -337,6 +337,14 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
 	/* Parse the parameters from the OpenPGP packets that will be needed. */
 rpmMessage(RPMMESS_DEBUG, _("========== Header RSA signature\n"));
 	xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
+	/* XXX only V3 signatures for now. */
+	if (ts->dig->signature.version != 3) {
+	    rpmMessage(RPMMESS_WARNING,
+		_("only V3 signatures can be verified, skipping V%u signature"),
+		ts->dig->signature.version);
+	    rc = RPMRC_OK;
+	    goto exit;
+	}
 	/*@fallthrough@*/
     {	void * uh = NULL;
 	int_32 uht;
@@ -357,6 +365,14 @@ rpmMessage(RPMMESS_DEBUG, _("========== Header RSA signature\n"));
 	/* Parse the parameters from the OpenPGP packets that will be needed. */
 rpmMessage(RPMMESS_DEBUG, _("========== Header DSA signature\n"));
 	xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
+	/* XXX only V3 signatures for now. */
+	if (ts->dig->signature.version != 3) {
+	    rpmMessage(RPMMESS_WARNING,
+		_("only V3 signatures can be verified, skipping V%u signature"),
+		ts->dig->signature.version);
+	    rc = RPMRC_OK;
+	    goto exit;
+	}
 	/*@fallthrough@*/
     case RPMSIGTAG_SHA1:
     {	void * uh = NULL;
@@ -380,6 +396,15 @@ rpmMessage(RPMMESS_DEBUG, _("========== Header DSA signature\n"));
 	/* Parse the parameters from the OpenPGP packets that will be needed. */
 rpmMessage(RPMMESS_DEBUG, _("========== Package DSA/RSA signature\n"));
 	xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
+
+	/* XXX only V3 signatures for now. */
+	if (ts->dig->signature.version != 3) {
+	    rpmMessage(RPMMESS_WARNING,
+		_("only V3 signatures can be verified, skipping V%u signature"),
+		ts->dig->signature.version);
+	    rc = RPMRC_OK;
+	    goto exit;
+	}
 	/*@fallthrough@*/
     case RPMSIGTAG_MD5:
 	/* Legacy signatures need the compressed payload in the digest too. */
@@ -445,7 +470,7 @@ rpmMessage(RPMMESS_DEBUG, _("========== Package DSA/RSA signature\n"));
     }
 
 exit:
-    if (rc == 0 && hdrp != NULL) {
+    if (rc == RPMRC_OK && hdrp != NULL) {
 	/* Convert legacy headers on the fly ... */
 	legacyRetrofit(h, l);
 	
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 6580f991b..df152cf8a 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -612,13 +612,26 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 	    if (ts->sig == NULL) /* XXX can't happen */
 		continue;
 
+	    /* Clean up parameters from previous sigtag. */
+	    pgpCleanDig(ts->dig);
+
 	    switch (ts->sigtag) {
+	    case RPMSIGTAG_RSA:
+	    case RPMSIGTAG_DSA:
+	    case RPMSIGTAG_GPG:
 	    case RPMSIGTAG_PGP5:	/* XXX legacy */
 	    case RPMSIGTAG_PGP:
 		if (!(qva->qva_flags & VERIFY_SIGNATURE)) 
 		     continue;
-rpmMessage(RPMMESS_DEBUG, _("========== Package RSA signature\n"));
 		xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
+
+		/* XXX only V3 signatures for now. */
+		if (ts->dig->signature.version != 3) {
+		    rpmError(RPMERR_SIGVFY,
+		_("only V3 signatures can be verified, skipping V%u signature"),
+			ts->dig->signature.version);
+		    continue;
+		}
 		/*@switchbreak@*/ break;
 	    case RPMSIGTAG_SHA1:
 		if (!(qva->qva_flags & VERIFY_DIGEST)) 
@@ -627,24 +640,6 @@ rpmMessage(RPMMESS_DEBUG, _("========== Package RSA signature\n"));
 		if (sigtag == RPMSIGTAG_DSA)
 		    continue;
 		/*@switchbreak@*/ break;
-	    case RPMSIGTAG_RSA:
-		if (!(qva->qva_flags & VERIFY_SIGNATURE)) 
-		     continue;
-rpmMessage(RPMMESS_DEBUG, _("========== Header RSA signature\n"));
-		xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
-		/*@switchbreak@*/ break;
-	    case RPMSIGTAG_DSA:
-		if (!(qva->qva_flags & VERIFY_SIGNATURE)) 
-		     continue;
-rpmMessage(RPMMESS_DEBUG, _("========== Header DSA signature\n"));
-		xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
-		/*@switchbreak@*/ break;
-	    case RPMSIGTAG_GPG:
-		if (!(qva->qva_flags & VERIFY_SIGNATURE)) 
-		     continue;
-rpmMessage(RPMMESS_DEBUG, _("========== Package DSA signature\n"));
-		xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
-		/*@switchbreak@*/ break;
 	    case RPMSIGTAG_LEMD5_2:
 	    case RPMSIGTAG_LEMD5_1:
 	    case RPMSIGTAG_MD5:
diff --git a/lib/signature.c b/lib/signature.c
index accfd8375..7e7bf3c77 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -459,7 +459,7 @@ static int makeGPGSignature(const char * file, /*@out@*/ byte ** pkt,
 
 /*@unchecked@*/
 static unsigned char header_magic[8] = {
-        0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
+	0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
 };
 
 /**
@@ -538,7 +538,7 @@ static int makeHDRSignature(Header sig, const char * file, int_32 sigTag,
 	if (headerWrite(fd, h, HEADER_MAGIC_YES))
 	    goto exit;
 	(void) Fclose(fd);	fd = NULL;
-        if (makeGPGSignature(fn, &pkt, &pktlen, passPhrase)
+	if (makeGPGSignature(fn, &pkt, &pktlen, passPhrase)
 	||  !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
 	    goto exit;
 	ret = 0;
@@ -556,7 +556,7 @@ static int makeHDRSignature(Header sig, const char * file, int_32 sigTag,
 	if (headerWrite(fd, h, HEADER_MAGIC_YES))
 	    goto exit;
 	(void) Fclose(fd);	fd = NULL;
-        if (makePGPSignature(fn, &pkt, &pktlen, passPhrase)
+	if (makePGPSignature(fn, &pkt, &pktlen, passPhrase)
 	||  !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
 	    goto exit;
 	ret = 0;
@@ -604,12 +604,14 @@ int rpmAddSignature(Header sig, const char * file, int_32 sigTag,
 	if (makePGPSignature(file, &pkt, &pktlen, passPhrase)
 	||  !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
 	    break;
+#ifdef	NOTYET	/* XXX needs hdrmd5ctx, like hdrsha1ctx. */
 	/* XXX Piggyback a header-only RSA signature as well. */
 	ret = makeHDRSignature(sig, file, RPMSIGTAG_RSA, passPhrase);
+#endif
 	ret = 0;
 	break;
     case RPMSIGTAG_GPG:
-        if (makeGPGSignature(file, &pkt, &pktlen, passPhrase)
+	if (makeGPGSignature(file, &pkt, &pktlen, passPhrase)
 	||  !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
 	    break;
 	/* XXX Piggyback a header-only DSA signature as well. */
@@ -1046,6 +1048,23 @@ exit:
 }
 
 /**
+ * Convert hex to binary nibble.
+ * @param c            hex character
+ * @return             binary nibble
+ */
+static inline unsigned char nibble(char c)
+	/*@*/
+{
+    if (c >= '0' && c <= '9')
+	return (c - '0');
+    if (c >= 'A' && c <= 'F')
+	return (c - 'A') + 10;
+    if (c >= 'a' && c <= 'f')
+	return (c - 'a') + 10;
+    return 0;
+}
+
+/**
  * Verify PGP (aka RSA/MD5) signature.
  * @param ts		transaction set
  * @retval t		verbose success/failure text
@@ -1085,10 +1104,13 @@ goto exit;
 
     /*@-type@*/ /* FIX: cast? */
     {	DIGEST_CTX ctx = rpmDigestDup(md5ctx);
+	byte signhash16[2];
+	const char * s;
 
 	if (sigp->hash != NULL)
 	    xx = rpmDigestUpdate(ctx, sigp->hash, sigp->hashlen);
-#ifdef	NOTYET
+
+#ifdef	NOTYET	/* XXX not for binary/text doccument signatures. */
 	if (sigp->sigtype == 4) {
 	    int nb = ts->dig->nbytes + sigp->hashlen;
 	    byte trailer[6];
@@ -1099,15 +1121,22 @@ goto exit;
 	    xx = rpmDigestUpdate(ctx, trailer, sizeof(trailer));
 	}
 #endif
+
 	xx = rpmDigestFinal(ctx, (void **)&ts->dig->md5, &ts->dig->md5len, 1);
 
+	/* Compare leading 16 bits of digest for quick check. */
+	s = ts->dig->md5;
+	signhash16[0] = (nibble(s[0]) << 4) | nibble(s[1]);
+	signhash16[1] = (nibble(s[2]) << 4) | nibble(s[3]);
+	if (memcmp(signhash16, sigp->signhash16, sizeof(signhash16))) {
+	    res = RPMSIG_BAD;
+	    goto exit;
+	}
+
     }
     /*@=type@*/
 
     {	const char * prefix = "3020300c06082a864886f70d020505000410";
-#ifdef	NOTYET
-	byte signhash16[2];
-#endif
 	unsigned int nbits = 1024;
 	unsigned int nb = (nbits + 7) >> 3;
 	const char * hexstr;
@@ -1121,20 +1150,11 @@ goto exit;
 	*tt++ = '0'; *tt++ = '0';
 	tt = stpcpy(tt, prefix);
 	tt = stpcpy(tt, ts->dig->md5);
-		
+
 	mp32nzero(&ts->dig->rsahm);	mp32nsethex(&ts->dig->rsahm, hexstr);
 
 	hexstr = _free(hexstr);
 
-	/* XXX compare leading 16 bits of digest for quick check. */
-#ifdef	NOTYET
-	signhash16[0] = (*ts->dig->rsahm.data >> 24) & 0xff;
-	signhash16[1] = (*ts->dig->rsahm.data >> 16) & 0xff;
-	if (memcmp(signhash16, sigp->signhash16, sizeof(signhash16))) {
-	    res = RPMSIG_BAD;
-	    goto exit;
-	}
-#endif
     }
 
     /* Retrieve the matching public key. */
@@ -1202,14 +1222,12 @@ goto exit;
 
     /*@-type@*/ /* FIX: cast? */
     {	DIGEST_CTX ctx = rpmDigestDup(sha1ctx);
-#ifdef	NOTYET
 	byte signhash16[2];
-#endif
 
 	if (sigp->hash != NULL)
 	    xx = rpmDigestUpdate(ctx, sigp->hash, sigp->hashlen);
 
-#ifdef	NOTYET
+#ifdef	NOTYET	/* XXX not for binary/text doccument signatures. */
 	if (sigp->sigtype == 4) {
 	    int nb = ts->dig->nbytes + sigp->hashlen;
 	    byte trailer[6];
@@ -1227,14 +1245,12 @@ goto exit;
 	mp32nzero(&ts->dig->hm);	mp32nsethex(&ts->dig->hm, ts->dig->sha1);
 
 	/* XXX compare leading 16 bits of digest for quick check. */
-#ifdef	NOTYET
 	signhash16[0] = (*ts->dig->hm.data >> 24) & 0xff;
 	signhash16[1] = (*ts->dig->hm.data >> 16) & 0xff;
 	if (memcmp(signhash16, sigp->signhash16, sizeof(signhash16))) {
 	    res = RPMSIG_BAD;
 	    goto exit;
 	}
-#endif
     }
     /*@=type@*/
 
diff --git a/po/cs.po b/po/cs.po
index aa08dc8d1..2bfd9e902 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -1656,21 +1656,26 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: readLead selhalo\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 msgid "========== Header RSA signature\n"
 msgstr ""
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
@@ -2442,35 +2447,27 @@ msgstr "%s: readLead selhalo\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Není dostupný ¾ádný podpis (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr "NENÍ OK"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr " (CHYBÍ KLÍÈ:"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÙVÌRYHODNÝ KLÍÈ:"
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr "OK"
 
@@ -2714,8 +2711,8 @@ msgstr "Starý (pouze interní) podpis! Jak jste to získali!?\n"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Podpisu: velikost(%d)+vata(%d)\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nemohu spustit %s: %s\n"
@@ -2766,57 +2763,57 @@ msgstr "Pøeèteno %d bajtù GPG podpisu\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "©patná %%_signature spec v souboru maker\n"
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Musíte nastavit \"%%_gpg_name\" ve svém makro souboru\n"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musíte nastavit \"%%_pgp_name\" ve svém makro souboru\n"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Velikost hlavièky je pøili¹ velká"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "vynechat pøípadné MD5 souèty"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Chybí podpis\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Podpisu: velikost(%d)+vata(%d)\n"
diff --git a/po/da.po b/po/da.po
index 6807e3adc..3c79c2329 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -1656,22 +1656,27 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: readLead mislykkedes\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 #, fuzzy
 msgid "========== Header RSA signature\n"
 msgstr "========== tsort'er pakker\n"
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
@@ -2461,37 +2466,27 @@ msgstr "%s: readLead mislykkedes\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:620
-#, fuzzy
-msgid "========== Package RSA signature\n"
-msgstr "========== tsort'er pakker\n"
-
-#: lib/rpmchecksig.c:645
-#, fuzzy
-msgid "========== Package DSA signature\n"
-msgstr "========== tsort'er pakker\n"
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr "IKKE O.K."
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr " (MANGLENDE NØGLER:    "
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr " (IKKE-BETROEDE NØGLER:"
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr "O.K."
 
@@ -2736,8 +2731,8 @@ msgstr "Gammel (internt brug) signatur! Hvordan fik du fingre i den!?\n"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signaturstørrelse: %d\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunne ikke udføre %s: %s\n"
@@ -2788,57 +2783,57 @@ msgstr "Fik %d byte GPG-signatur\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Ugyldig angivelse af '%%_signature'-spec i makrofil.\n"
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Du skal angive \"%%_gpg_name\" i din makrofil\n"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Du skal angive \"%%_pgp_name\" i din makrofil\n"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Hovedstørrelse er for stor"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "overspring eventuelle MD5-signaturer"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signaturfyld : %d\n"
@@ -3482,6 +3477,14 @@ msgstr "url-port skal være et tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke oprette %s: %s\n"
 
+#, fuzzy
+#~ msgid "========== Package RSA signature\n"
+#~ msgstr "========== tsort'er pakker\n"
+
+#, fuzzy
+#~ msgid "========== Package DSA signature\n"
+#~ msgstr "========== tsort'er pakker\n"
+
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "Genererer signatur med pgp.\n"
 
diff --git a/po/de.po b/po/de.po
index 6ccb8c772..8b865a29a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -1798,23 +1798,28 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 #, fuzzy
 msgid "========== Header RSA signature\n"
 msgstr "nicht möglich, die Signatur zu lesen"
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 #, fuzzy
 msgid "========== Header DSA signature\n"
 msgstr "nicht möglich, die Signatur zu lesen"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -2639,36 +2644,28 @@ msgstr "%s: »readLead« fehlgeschlagen\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (FEHLENDE SCHLüSSEL)"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr ""
 
@@ -2919,8 +2916,8 @@ msgstr "Alte Signatur (nur intern)!  Wie bist du daran gekommen!?"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Konnte pgp nicht durchführen"
@@ -2976,56 +2973,56 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "alle MD5-Signaturen überspringen"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 83ff40192..d95fdb30a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -1673,23 +1673,28 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: readLead  epäonnistui\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 #, fuzzy
 msgid "========== Header RSA signature\n"
 msgstr "en voinut lukea allekirjoitusta"
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 #, fuzzy
 msgid "========== Header DSA signature\n"
 msgstr "en voinut lukea allekirjoitusta"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
@@ -2496,36 +2501,28 @@ msgstr "%s: readLead  epäonnistui\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr "(PUUTTUVAT AVAIMET)"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr ""
 
@@ -2771,8 +2768,8 @@ msgstr "Vanha (sisäisen käytön) allekirjoitus! Mistä sait sen!?"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "En voinut ajaa pgp:tä"
@@ -2828,56 +2825,56 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ohita MD5-allekirjoitukset"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index b27dfa41b..2847e29ab 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1706,23 +1706,28 @@ msgid "%s: headerRead failed\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 #, fuzzy
 msgid "========== Header RSA signature\n"
 msgstr "      --sign            - genre une signature PGP"
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 #, fuzzy
 msgid "========== Header DSA signature\n"
 msgstr "      --sign            - genre une signature PGP"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -2547,35 +2552,27 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr ""
 
@@ -2818,8 +2815,8 @@ msgstr ""
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -2875,55 +2872,55 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 632ebe6ac..354016283 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -1617,21 +1617,26 @@ msgid "%s: headerRead failed\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 msgid "========== Header RSA signature\n"
 msgstr ""
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2379,35 +2384,27 @@ msgstr ""
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr ""
 
@@ -2648,8 +2645,8 @@ msgstr ""
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
@@ -2700,54 +2697,54 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 8756e0f4a..4ddb7bc7a 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -1624,21 +1624,26 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: Fseek brást: %s\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 msgid "========== Header RSA signature\n"
 msgstr ""
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2395,35 +2400,27 @@ msgstr "%s: Fseek brást: %s\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr ""
 
@@ -2664,8 +2661,8 @@ msgstr ""
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Gat ekki keyrt %s: %s\n"
@@ -2716,54 +2713,54 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index aebf7bc59..f8ed79be4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -1707,23 +1707,28 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 #, fuzzy
 msgid "========== Header RSA signature\n"
 msgstr "¿·¤·¤¤¥Ø¥Ã¥À½ð̾\n"
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 #, fuzzy
 msgid "========== Header DSA signature\n"
 msgstr "¿·¤·¤¤¥Ø¥Ã¥À½ð̾\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
@@ -2556,36 +2561,28 @@ msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó(v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (¥­¡¼¤Îʶ¼º) "
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:"
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr ""
 
@@ -2831,8 +2828,8 @@ msgstr "¸Å¤¤(ÆâÉô¤À¤±¤Î)½ð̾!  ¤É¤¦¤ä¤Ã¤Æ¤½¤ì¤ò¼ê¤Ë¤¤¤ì¤Þ¤·¤¿¤«!?"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "½ð̾¥µ¥¤¥º: %d\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
@@ -2888,57 +2885,57 @@ msgstr "GPG ½ð̾¤Î %d ¥Ð¥¤¥È¤ò¼èÆÀ\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n"
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "¥Ø¥Ã¥À¥µ¥¤¥º¤¬Â礭¤¹¤®¤Þ¤¹"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "MD5 ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "½ð̾¥Ñ¥Ã¥É: %d\n"
diff --git a/po/ko.po b/po/ko.po
index 6d51a8474..02dd2a1b6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 2001-09-07 22:03+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -1648,21 +1648,26 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 msgid "========== Header RSA signature\n"
 msgstr ""
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
@@ -2448,35 +2453,27 @@ msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:"
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr "È®ÀÎ"
 
@@ -2719,8 +2716,8 @@ msgstr "ÀÌÀü (³»ºÎ-¿ë) ¼­¸í!  ¾î¶»°Ô ¾òÀ¸¼Ì½À´Ï±î!?\n"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "¼­¸í: size(%d)+pad(%d)\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s (À»)¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½: %s\n"
@@ -2771,57 +2768,57 @@ msgstr "%d ¹ÙÀÌÆ®ÀÇ GPG ¼­¸íÀ» ¾ò¾ú½À´Ï´Ù\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ ºÎÀûÇÕÇÑ %%_signatureÀÇ ³»¿ëÀÌ ÀÖ½À´Ï´Ù\n"
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ \"%%_gpg_name\" À» ¼³Á¤ÇØ ÁÖ¼Å¾ß ÇÕ´Ï´Ù\n"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ \"%%_pgp_name\" À» ¼³Á¤ÇØ ÁÖ¼Å¾ß ÇÕ´Ï´Ù\n"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Çì´õÀÇ Å©±â°¡ ³Ê¹« Å®´Ï´Ù"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "MD5 ¼­¸íÀº °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "¼­¸í: size(%d)+pad(%d)\n"
diff --git a/po/no.po b/po/no.po
index 01e369ca6..f1067f333 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -1639,21 +1639,26 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: readLead feilet\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 msgid "========== Header RSA signature\n"
 msgstr ""
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread feilet: %s\n"
@@ -2420,35 +2425,27 @@ msgstr "%s: readLead feilet\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr "IKKE OK"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr "OK"
 
@@ -2689,8 +2686,8 @@ msgstr ""
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunne ikke kjøre %s: %s\n"
@@ -2741,56 +2738,56 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "For stor header"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "hopp over MD5-signaturer"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index d555d9373..d4e74e756 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -1690,23 +1690,28 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 #, fuzzy
 msgid "========== Header RSA signature\n"
 msgstr "Nowa sygnatura nag³ówka\n"
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 #, fuzzy
 msgid "========== Header DSA signature\n"
 msgstr "Nowa sygnatura nag³ówka\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
@@ -2513,35 +2518,27 @@ msgstr "%s: readLead nie powiod³o siê\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Sygnatura nie jest dostêpna (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr "NIE DOBRZE"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr " (BRAK KLUCZY:"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr "(NIEWIARYGODNE KLUCZE:"
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr "OK"
 
@@ -2784,8 +2781,8 @@ msgstr "Stara (tylko wewnêtrzna) sygnatura! Sk±d Ty to wzi±³e¶!?"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Rozmiar sygnatury: %d\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nie mo¿na uruchomiæ %s"
@@ -2841,57 +2838,57 @@ msgstr "Mam %d bajtów sygnatury GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "B³êdny %%_signature spec w pliku makra.\n"
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Musisz ustawiæ \"%%_gpg_name\" w pliku swego makra"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musisz ustawiæ \"%%_pgp_name\" w pliku swego makra"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Rozmiar nag³ówka jest zbyt du¿y"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "pomiñ wszelkie sygnatury MD5"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Brak sygnatury\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Blok sygnatury: %d\n"
diff --git a/po/pt.po b/po/pt.po
index cf1fea702..db569b104 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 2000-06-22 01:13+01:00\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires\n"
 "Language-Team: pt <kde@poli.org>\n"
@@ -1642,22 +1642,27 @@ msgid "%s: headerRead failed\n"
 msgstr ":%s: o readLead falhou\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 #, fuzzy
 msgid "========== Header RSA signature\n"
 msgstr "========== a realizar o tsort nos pacotes\n"
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
@@ -2437,37 +2442,27 @@ msgstr ":%s: o readLead falhou\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:620
-#, fuzzy
-msgid "========== Package RSA signature\n"
-msgstr "========== a realizar o tsort nos pacotes\n"
-
-#: lib/rpmchecksig.c:645
-#, fuzzy
-msgid "========== Package DSA signature\n"
-msgstr "========== a realizar o tsort nos pacotes\n"
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr "NÃO-OK"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr " (FALTAM AS CHAVES:"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr " (CHAVES SUSPEITAS:"
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr "OK"
 
@@ -2710,8 +2705,8 @@ msgstr "Assinatura (só interna) antiga! Como é que obteve isto!?\n"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Tamanho da assinatura: %d\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Não consegui executar o %s: %S\n"
@@ -2762,57 +2757,57 @@ msgstr "Obtive %d bytes da assinatura do GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "'Spec' %%_signature inválido no ficheiro de macros\n"
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Precisa definir o \"%%_gpg_name\" no seu ficheiro de macros\n"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Precisa definir o \"%%_pgp_name\" no seu ficheiro de macros\n"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Tamanho do cabeçalho demasiado grande"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ignorar as assinaturas de MD5"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Sem assinatura\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "'Pad' ou preenchimento da assinatura: %d\n"
@@ -3445,6 +3440,14 @@ msgstr "o porto do URL tem de ser um número\n"
 msgid "failed to create %s: %s\n"
 msgstr "não consegui criar o %s: %s\n"
 
+#, fuzzy
+#~ msgid "========== Package RSA signature\n"
+#~ msgstr "========== a realizar o tsort nos pacotes\n"
+
+#, fuzzy
+#~ msgid "========== Package DSA signature\n"
+#~ msgstr "========== a realizar o tsort nos pacotes\n"
+
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "A gerar a assinatura usando o PGP.\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a26c71b51..8c943db8f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 
 #: build.c:36
 #, fuzzy
@@ -1805,24 +1805,29 @@ msgid "%s: headerRead failed\n"
 msgstr "No consegui abrir: %s\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 #, fuzzy
 msgid "========== Header RSA signature\n"
 msgstr "gere assinatura PGP"
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 #, fuzzy
 msgid "========== Header DSA signature\n"
 msgstr "gere assinatura PGP"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
 # , c-format
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -2644,35 +2649,27 @@ msgstr "No consegui abrir: %s\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr ""
 
@@ -2936,8 +2933,8 @@ msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 # , c-format
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
@@ -2993,56 +2990,56 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "desconsidere quaisquer assinaturas MD5"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 07a340a80..630a048c4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -1617,21 +1617,26 @@ msgid "%s: headerRead failed\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 msgid "========== Header RSA signature\n"
 msgstr ""
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2379,35 +2384,27 @@ msgstr ""
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr ""
 
@@ -2648,8 +2645,8 @@ msgstr ""
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
@@ -2700,54 +2697,54 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 634a38a1f..d58589936 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1622,21 +1622,26 @@ msgid "%s: headerRead failed\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 msgid "========== Header RSA signature\n"
 msgstr ""
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2384,35 +2389,27 @@ msgstr ""
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr ""
 
@@ -2653,8 +2650,8 @@ msgstr ""
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
@@ -2705,54 +2702,54 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index cc256d3b9..c88422be0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 2001-08-29 13:55-0400\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team:  Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -1666,21 +1666,26 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 msgid "========== Header RSA signature\n"
 msgstr ""
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
@@ -2455,35 +2460,27 @@ msgstr "%s: ÏÛÉÂËÁ readLead\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: ðÏÄÐÉÓÉ ÎÅÔ (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr "îå Oë"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr " (ïôóõôóô÷õàô ëìàþé:"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr " (îåô äï÷åòéñ ë ëìàþáí:"
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr "Oë"
 
@@ -2727,8 +2724,8 @@ msgstr ""
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÌÎÉÔØ %s: %s\n"
@@ -2779,57 +2776,57 @@ msgstr "ðÏÌÕÞÅÎÏ %d ÂÁÊÔ ÐÏÄÐÉÓÉ GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "îÅ×ÅÒÎÁÑ ÓÐÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ\n"
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_gpg_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "úÁÇÏÌÏ×ÏË ÓÌÉÛËÏÍ ×ÅÌÉË"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ MD5-ÐÏÄÐÉÓÉ"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "ðÏÄÐÉÓÉ ÎÅÔ\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n"
diff --git a/po/sk.po b/po/sk.po
index ef3f096aa..e34987f30 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -1687,23 +1687,28 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 #, fuzzy
 msgid "========== Header RSA signature\n"
 msgstr "Nová hlavièka podpisu\n"
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 #, fuzzy
 msgid "========== Header DSA signature\n"
 msgstr "Nová hlavièka podpisu\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
@@ -2510,35 +2515,27 @@ msgstr "%s: readLead zlyhalo\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Podpis nie je k dispozícii (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr "NIE JE V PORIADKU"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr " (CHÝBAJÚCE K¥ÚÈE):"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÔVERUJE SA K¥ÚÈOM: "
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr "V PORIADKU"
 
@@ -2781,8 +2778,8 @@ msgstr "Starý (iba interný) podpis! Ako ste sa k tomu dostali?!"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Veµkos» podpisu:   %d\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nie je mo¾né spusti» %s"
@@ -2838,57 +2835,57 @@ msgstr "Preèítaný GPG podpis obsahuje %d bajtov\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n"
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Musíte nastavi» \"%%gpg_name\" vo va¹om makro-súbore"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musíte nastavi» \"%%pgp_name\" vo va¹om makro-súbore"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Priveµká hlavièka"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "vynecha» akékoµvek MD5 podpisy"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Podpis nie je k dispozícii\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Doplnenie podpisu: %d\n"
diff --git a/po/sl.po b/po/sl.po
index 2c2fe8fc7..4db5f5b49 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.227 2002/03/07 02:18:28 jbj Exp $
+# $Id: sl.po,v 1.228 2002/03/07 22:55:06 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -1688,23 +1688,28 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 #, fuzzy
 msgid "========== Header RSA signature\n"
 msgstr "Podpis v novi glavi\n"
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 #, fuzzy
 msgid "========== Header DSA signature\n"
 msgstr "Podpis v novi glavi\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -2508,35 +2513,27 @@ msgstr "%s: readLead je bil neuspe¹en\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr "NI DOBRO"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr " (MANJKAJOÈI KLJUÈI:"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEPREVERJENI KLJUÈI:"
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr "V REDU"
 
@@ -2781,8 +2778,8 @@ msgstr "Podpis v (interni) stari obliki! Kje ste ga dobili?"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Dol¾. podpisa : %d\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Ni mo¾no izvesti %s: %s"
@@ -2838,57 +2835,57 @@ msgstr "Prebrano %d bajtov podpisa GnuPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Glava je predolga"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "preskoèi vse podpise MD5"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Podpis manjka\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Dol¾. polnila : %d\n"
diff --git a/po/sr.po b/po/sr.po
index 45750b5b6..04085c744 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -1671,23 +1671,28 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 #, fuzzy
 msgid "========== Header RSA signature\n"
 msgstr "ne mogu da proèitam potpis"
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 #, fuzzy
 msgid "========== Header DSA signature\n"
 msgstr "ne mogu da proèitam potpis"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
@@ -2495,36 +2500,28 @@ msgstr "%s: Neuspeo 'readLead'\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (NEDOSTAJUÆI KLJUÈEVI)"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr ""
 
@@ -2770,8 +2767,8 @@ msgstr "Stari (interni) potpis!  Odakle vam!?"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Ne mogu da izvr¹im PGP"
@@ -2827,56 +2824,56 @@ msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "preskoèi sve MD5 potpise"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 0bb1c32ac..a86396608 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 2001-09-12 14:18+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1650,21 +1650,26 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: readLead misslyckades\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 msgid "========== Header RSA signature\n"
 msgstr ""
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread misslyckades: %s\n"
@@ -2439,35 +2444,27 @@ msgstr "%s: readLead misslyckades\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr "EJ OK"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr " (SAKNADE NYCKLAR:"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr " (EJ BETRODDA NYCKLAR:"
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr "OK"
 
@@ -2712,8 +2709,8 @@ msgstr "Gammal (endast intern) signatur!  Hur fick du tag i den!?\n"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunde inte köra %s: %s\n"
@@ -2764,57 +2761,57 @@ msgstr "Fick %d byte GPG-signatur\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Felaktig %%_signature-spec i makrofil\n"
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Du måste sätta \"%%_gpg_name\" i din makrofil\n"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Du måste sätta \"%%_pgp_name\" i din makrofil\n"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Huvudstorleken för stor"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "hoppa över eventuella MD5-signaturer"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
diff --git a/po/tr.po b/po/tr.po
index fbc2d48f1..21df14ca9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-06 21:16-0500\n"
+"POT-Creation-Date: 2002-03-07 17:53-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -1672,21 +1672,26 @@ msgid "%s: headerRead failed\n"
 msgstr "%s: readLead baþarýsýz\n"
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338 lib/rpmchecksig.c:633
+#: lib/package.c:338
 msgid "========== Header RSA signature\n"
 msgstr ""
 
+#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#, c-format
+msgid "only V3 signatures can be verified, skipping V%u signature"
+msgstr ""
+
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:358 lib/rpmchecksig.c:639
+#: lib/package.c:366
 msgid "========== Header DSA signature\n"
 msgstr ""
 
 #. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:381
+#: lib/package.c:397
 msgid "========== Package DSA/RSA signature\n"
 msgstr ""
 
-#: lib/package.c:390 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread baþarýsýz: %s\n"
@@ -2462,35 +2467,27 @@ msgstr "%s: readLead baþarýsýz\n"
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ýmza bulundurmuyor (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:620
-msgid "========== Package RSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:645
-msgid "========== Package DSA signature\n"
-msgstr ""
-
-#: lib/rpmchecksig.c:778
+#: lib/rpmchecksig.c:773
 msgid "NOT OK"
 msgstr "TAMAM DEÐÝL"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid " (MISSING KEYS:"
 msgstr " (EKSÝK ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:781 lib/rpmchecksig.c:795
+#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:782 lib/rpmchecksig.c:796
+#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
 msgid " (UNTRUSTED KEYS:"
 msgstr " (GÜVENCESÝZ ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:784 lib/rpmchecksig.c:798
+#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:792
+#: lib/rpmchecksig.c:787
 msgid "OK"
 msgstr "Tamam"
 
@@ -2733,8 +2730,8 @@ msgstr "Eski imza !!! Bunu nasýl aldýn!?\n"
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Ýmza: boyut(%d)+iz(%d)\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:675
-#: lib/signature.c:708
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
+#: lib/signature.c:710
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s icra edilemedi: %s\n"
@@ -2785,57 +2782,57 @@ msgstr "GPG imzasýnýn %d baytý alýndý\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:713 lib/signature.c:768
+#: lib/signature.c:715 lib/signature.c:770
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Makro dosyasýnda %%_signature spec geçersiz\n"
 
-#: lib/signature.c:747
+#: lib/signature.c:749
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Makro dosyanýzda \"%%_pgp_name\" tanýmlanmýþ olmalý\n"
 
-#: lib/signature.c:760
+#: lib/signature.c:762
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Makro dosyanýzda \"%%_pgp_name\" belirtmelisiniz\n"
 
-#: lib/signature.c:804
+#: lib/signature.c:806
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Baþlýk çok uzun"
 
-#: lib/signature.c:844
+#: lib/signature.c:846
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:901
+#: lib/signature.c:903
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1063
+#: lib/signature.c:1082
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "tüm MD5 imzalarýný atlar"
 
-#: lib/signature.c:1179
+#: lib/signature.c:1199
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1180
+#: lib/signature.c:1200
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Ýmza yok\n"
 
-#: lib/signature.c:1271
+#: lib/signature.c:1287
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1298
+#: lib/signature.c:1314
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1302
+#: lib/signature.c:1318
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Ýmza: boyut(%d)+iz(%d)\n"
diff --git a/rpm.spec.in b/rpm.spec.in
index e2e8fb074..f7911f6a7 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -656,4 +656,6 @@ fi
 - retrieve pubkey(s) from rpmdb, not from detached signature file.
 - reapply Berkeley DB patch #4491.
 - add header DSA signature.
-- add header RSA signature (untested).
+- add header RSA signature (untested, disabled for now).
+- don't bother with signing check if 16 bits of hash don't match.
+- only V3 signatures for now.
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index a91cad624..817aa53bc 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -369,7 +369,13 @@ int pgpPrtSubType(const byte *h, unsigned int hlen)
 	    /*@switchbreak@*/ break;
 	case PGPSUBTYPE_SIG_CREATE_TIME:
 /*@-mods -mayaliasunique @*/
-	    if (_digp && _digp->tag == PGPTAG_PUBLIC_KEY) {
+#ifdef	DYING
+	    if (_digp && _digp->tag == PGPTAG_PUBLIC_KEY)
+#else
+	    if (_digp && !(_digp->saved & PGPDIG_SAVED_TIME))
+#endif
+	    {
+		_digp->saved |= PGPDIG_SAVED_TIME;
 		memcpy(_digp->time, p+1, sizeof(_digp->time));
 	    }
 /*@=mods =mayaliasunique @*/
@@ -386,7 +392,13 @@ int pgpPrtSubType(const byte *h, unsigned int hlen)
 
 	case PGPSUBTYPE_ISSUER_KEYID:	/* issuer key ID */
 /*@-mods -mayaliasunique @*/
-	    if (_digp && _digp->tag == PGPTAG_PUBLIC_KEY) {
+#ifdef	DYING
+	    if (_digp && _digp->tag == PGPTAG_PUBLIC_KEY)
+#else
+	    if (_digp && !(_digp->saved & PGPDIG_SAVED_ID))
+#endif
+	    {
+		_digp->saved |= PGPDIG_SAVED_ID;
 		memcpy(_digp->signid, p+1, sizeof(_digp->signid));
 	    }
 /*@=mods =mayaliasunique @*/
@@ -992,7 +1004,7 @@ struct pgpDig_s * pgpNewDig(void)
     return dig;
 }
 
-struct pgpDig_s * pgpFreeDig(/*@only@*/ /*@null@*/ struct pgpDig_s * dig)
+void pgpCleanDig(struct pgpDig_s * dig)
 	/*@modifies dig @*/
 {
     if (dig != NULL) {
@@ -1008,12 +1020,35 @@ struct pgpDig_s * pgpFreeDig(/*@only@*/ /*@null@*/ struct pgpDig_s * dig)
 	}
 	/*@=unqualifiedtrans@*/
 
+	memset(&dig->signature, 0, sizeof(dig->signature));
+	memset(&dig->pubkey, 0, sizeof(dig->pubkey));
+
+	dig->md5 = _free(dig->md5);
+	dig->sha1 = _free(dig->sha1);
+	mp32nfree(&dig->hm);
+	mp32nfree(&dig->r);
+	mp32nfree(&dig->s);
+
+	(void) rsapkFree(&dig->rsa_pk);
+	mp32nfree(&dig->m);
+	mp32nfree(&dig->c);
+	mp32nfree(&dig->rsahm);
+    }
+}
+
+struct pgpDig_s * pgpFreeDig(/*@only@*/ /*@null@*/ struct pgpDig_s * dig)
+	/*@modifies dig @*/
+{
+    if (dig != NULL) {
+
+	/* DUmp the signature/pubkey data. */
+	pgpCleanDig(dig);
+
 	/*@-branchstate@*/
 	if (dig->md5ctx != NULL)
 	    (void) rpmDigestFinal(dig->md5ctx, NULL, NULL, 0);
 	/*@=branchstate@*/
 	dig->md5ctx = NULL;
-	dig->md5 = _free(dig->md5);
 
 	/*@-branchstate@*/
 	if (dig->hdrsha1ctx != NULL)
@@ -1026,16 +1061,7 @@ struct pgpDig_s * pgpFreeDig(/*@only@*/ /*@null@*/ struct pgpDig_s * dig)
 	    (void) rpmDigestFinal(dig->sha1ctx, NULL, NULL, 0);
 	/*@=branchstate@*/
 	dig->sha1ctx = NULL;
-	dig->sha1 = _free(dig->sha1);
-
-	mp32nfree(&dig->hm);
-	mp32nfree(&dig->r);
-	mp32nfree(&dig->s);
 
-	(void) rsapkFree(&dig->rsa_pk);
-	mp32nfree(&dig->m);
-	mp32nfree(&dig->c);
-	mp32nfree(&dig->rsahm);
 	dig = _free(dig);
     }
     return dig;
diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h
index e7fa0045a..a121aca10 100644
--- a/rpmio/rpmpgp.h
+++ b/rpmio/rpmpgp.h
@@ -965,6 +965,10 @@ struct pgpDigParams_s {
     byte hashlen;
     byte signhash16[2];
     byte signid[8];
+    byte saved;
+#define	PGPDIG_SAVED_TIME	(1 << 0)
+#define	PGPDIG_SAVED_ID		(1 << 1)
+
 };
 
 /**
@@ -1195,9 +1199,14 @@ struct pgpDig_s * pgpNewDig(void)
 
 /**
  */
+void pgpCleanDig(/*@null@*/ struct pgpDig_s * dig)
+	/*@modifies *dig @*/;
+
+/**
+ */
 /*@only@*/ /*@null@*/
 struct pgpDig_s * pgpFreeDig(/*@only@*/ /*@null@*/ struct pgpDig_s * dig)
-	/*@modifies dig @*/;
+	/*@modifies *dig @*/;
 
 /**
  */