- create RFC-2440 OpenPGP API in rpmio.

- display signature packets before exec'ing gpg/pgp when verifying.

CVS patchset: 5090
CVS date: 2001/09/29 17:44:45

53 files changed, 1660 insertions, 1485 deletions

diff --git a/.lclintrc b/.lclintrc
index 3d492e265..98015773b 100644
--- a/.lclintrc
+++ b/.lclintrc
@@ -1,4 +1,4 @@
--I. -I./build -I./lib -I./rpmdb -I./rpmio -I./popt -DHAVE_CONFIG_H -D_GNU_SOURCE -D_REENTRANT
+-I. -I./build -I./lib -I./rpmdb -I./rpmio -I./beecrypt -I./popt -DHAVE_CONFIG_H -D_GNU_SOURCE -D_REENTRANT
 
 #+partial
 #+forcehints
diff --git a/CHANGES b/CHANGES
index 2e7752847..1b5c32264 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,11 @@
 	- loosely wire beecrypt library into rpm.
 	- drop rpmio/base64.[ch] in favor of beecrypt.
 	- drop lib/md5*.[ch] files in favor of beecrypt.
-	- legacy: drop brokenMD5 support (rrpm-2.3.3 to rpm-2.3.8 on sparc).
+	- legacy: drop brokenMD5 support (rpm-2.3.3 to rpm-2.3.8 on sparc).
 	- eliminate DYING code.
 	- bind beecrypt md5/sha1 underneath rpmio.
+	- create RFC-2440 OpenPGP API in rpmio.
+	- display signature packets before exec'ing gpg/pgp when verifying.
 
 4.0.3 -> 4.0.4:
 
diff --git a/Doxyfile.in b/Doxyfile.in
index 2700c40ad..afdd30389 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -417,6 +417,7 @@ INPUT                  = \
 	@top_srcdir@/rpmio/rpmmacro.h \
 	@top_srcdir@/rpmio/rpmmalloc.c \
 	@top_srcdir@/rpmio/rpmmessages.h \
+	@top_srcdir@/rpmio/rpmpgp.c \
 	@top_srcdir@/rpmio/rpmpgp.h \
 	@top_srcdir@/rpmio/rpmrpc.c \
 	@top_srcdir@/rpmio/rpmurl.h \
diff --git a/beecrypt/config.gnu.h.in b/beecrypt/config.gnu.h.in
index d33dbd846..bf2818f3b 100644
--- a/beecrypt/config.gnu.h.in
+++ b/beecrypt/config.gnu.h.in
@@ -193,8 +193,12 @@
 #undef HAVE_LIBTHREAD
 
 /* Name of package */
+#if !defined(PACKAGE)
 #undef PACKAGE
+#endif
 
 /* Version number of package */
+#if !defined(VERSION)
 #undef VERSION
+#endif
 
diff --git a/beecrypt/dldp.h b/beecrypt/dldp.h
index d93d391d2..9f2caf7d2 100644
--- a/beecrypt/dldp.h
+++ b/beecrypt/dldp.h
@@ -120,7 +120,7 @@ int  dldp_pEqual(const dldp_p* a, const dldp_p* b)
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int dldp_pgoqMake(dldp_p* dp, randomGeneratorContext* rgc, uint32 psize, uint32 qsize, int cofactor)
 	/*@modifies dp->p, dp->q, dp->r, dp->g, dp->n, rgc @*/;
 
@@ -138,7 +138,7 @@ int dldp_pgoqGenerator(dldp_p* dp, randomGeneratorContext* rgc)
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int  dldp_pgoqValidate(const dldp_p*, randomGeneratorContext* rgc, int cofactor)
 	/*@modifies rgc @*/;
 
@@ -149,7 +149,7 @@ int  dldp_pgoqValidate(const dldp_p*, randomGeneratorContext* rgc, int cofactor)
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int dldp_pgonMake(dldp_p* dp, randomGeneratorContext* rgc, uint32 psize, uint32 qsize)
 	/*@modifies dp->p, dp->q, dp->r, dp->g, dp->n, rgc @*/;
 
@@ -167,7 +167,7 @@ int dldp_pgonGenerator(dldp_p* dp, randomGeneratorContext* rgc)
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int  dldp_pgonValidate(const dldp_p* dp, randomGeneratorContext* rgc)
 	/*@modifies rgc @*/;
 
diff --git a/beecrypt/elgamal.h b/beecrypt/elgamal.h
index cb08ae00f..8af14163a 100644
--- a/beecrypt/elgamal.h
+++ b/beecrypt/elgamal.h
@@ -36,25 +36,25 @@ extern "C" {
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int elgv1sign(const mp32barrett* p, const mp32barrett* n, const mp32number* g, randomGeneratorContext*, const mp32number* hm, const mp32number* x, mp32number* r, mp32number* s)
 	/*@modifies r, s */;
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int elgv3sign(const mp32barrett* p, const mp32barrett* n, const mp32number* g, randomGeneratorContext*, const mp32number* hm, const mp32number* x, mp32number* r, mp32number* s)
 	/*@modifies r, s */;
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int elgv1vrfy(const mp32barrett* p, const mp32barrett* n, const mp32number* g, const mp32number* hm, const mp32number* y, const mp32number* r, const mp32number* s)
 	/*@*/;
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int elgv3vrfy(const mp32barrett* p, const mp32barrett* n, const mp32number* g, const mp32number* hm, const mp32number* y, const mp32number* r, const mp32number* s)
 	/*@*/;
 
diff --git a/beecrypt/rsa.h b/beecrypt/rsa.h
index 9e80427e1..b0941b381 100644
--- a/beecrypt/rsa.h
+++ b/beecrypt/rsa.h
@@ -36,7 +36,7 @@ extern "C" {
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int rsapri   (const rsakp* kp, const mp32number* m, mp32number* c)
 	/*@modifies c */;
 
@@ -48,7 +48,7 @@ int rsapricrt(const rsakp* kp, const mp32number* m, mp32number* c)
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int rsavrfy  (const rsapk* pk, const mp32number* m, const mp32number* c)
 	/*@*/;
 
diff --git a/beecrypt/rsakp.h b/beecrypt/rsakp.h
index 403d97219..1e34a2d32 100644
--- a/beecrypt/rsakp.h
+++ b/beecrypt/rsakp.h
@@ -50,19 +50,19 @@ extern "C" {
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int rsakpMake(rsakp* kp, randomGeneratorContext* rgc, int nsize)
 	/*@modifies kp, rgc @*/;
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int rsakpInit(rsakp* kp)
 	/*@modifies kp @*/;
 
 /**
  */
-BEEDLLAPI
+BEEDLLAPI /*@unused@*/
 int rsakpFree(rsakp* kp)
 	/*@modifies kp @*/;
 
diff --git a/beecrypt/sha256.h b/beecrypt/sha256.h
index 8d49b27f7..7e8626261 100644
--- a/beecrypt/sha256.h
+++ b/beecrypt/sha256.h
@@ -48,14 +48,13 @@ extern "C" {
  */
 /*@observer@*/ /*@checkedstrict@*/ extern BEEDLLAPI const hashFunction sha256;
 
+/*@-exportlocal@*/
 /** \ingroup HASH_sha256_m
  */
-/*@-exportlocal@*/
 BEEDLLAPI
 void sha256Process(sha256Param* p)
 	/*@globals internalState @*/
 	/*@modifies p, internalState @*/;
-/*@=exportlocal@*/
 
 /** \ingroup HASH_sha256_m
  */
@@ -76,6 +75,7 @@ BEEDLLAPI
 int  sha256Digest (sha256Param* p, /*@out@*/ uint32* data)
 	/*@globals internalState @*/
 	/*@modifies p, data, internalState @*/;
+/*@=exportlocal@*/
 
 #ifdef __cplusplus
 }
diff --git a/build/rpmbuild.h b/build/rpmbuild.h
index 476812405..ca48b5fb4 100644
--- a/build/rpmbuild.h
+++ b/build/rpmbuild.h
@@ -77,6 +77,7 @@ typedef enum rpmParseState_e {
 #ifdef __cplusplus
 extern "C" {
 #endif
+/*@-redecl@*/
 
 /** \ingroup rpmbuild
  * Destroy uid/gid caches.
@@ -90,7 +91,7 @@ void freeNames(void)
  * @param		user id
  * @return		cached user name
  */
-/*@observer@*/ const char * getUname(uid_t uid)	/*@*/;
+extern /*@observer@*/ const char * getUname(uid_t uid)	/*@*/;
 
 /** \ingroup rpmbuild
  * Return cached user name.
@@ -98,7 +99,7 @@ void freeNames(void)
  * @param		user name
  * @return		cached user name
  */
-/*@observer@*/ const char * getUnameS(const char * uname)	/*@*/;
+extern /*@observer@*/ const char * getUnameS(const char * uname)	/*@*/;
 
 /** \ingroup rpmbuild
  * Return cached user id.
@@ -114,7 +115,7 @@ uid_t getUidS(const char * uname)	/*@*/;
  * @param		group id
  * @return		cached group name
  */
-/*@observer@*/ const char * getGname(gid_t gid)		/*@*/;
+extern /*@observer@*/ const char * getGname(gid_t gid)		/*@*/;
 
 /** \ingroup rpmbuild
  * Return cached group name.
@@ -122,7 +123,7 @@ uid_t getUidS(const char * uname)	/*@*/;
  * @param		group name
  * @return		cached group name
  */
-/*@observer@*/ const char * getGnameS(const char * gname)	/*@*/;
+extern /*@observer@*/ const char * getGnameS(const char * gname)	/*@*/;
 
 /** \ingroup rpmbuild
  * Return cached group id.
@@ -136,13 +137,13 @@ gid_t getGidS(const char * gname)	/*@*/;
  * Return build hostname.
  * @return		build hostname
  */
-/*@observer@*/ const char * const buildHost(void)	/*@*/;
+extern /*@observer@*/ const char * const buildHost(void)	/*@*/;
 
 /** \ingroup rpmbuild
  * Return build time stamp.
  * @return		build time stamp
  */
-/*@observer@*/ int_32 * const getBuildTime(void)	/*@*/;
+extern /*@observer@*/ int_32 * const getBuildTime(void)	/*@*/;
 
 /** \ingroup rpmbuild
  * Read next line from spec file.
@@ -495,6 +496,7 @@ int packageSources(Spec spec)
 		spec->sourceRpmName,
 		fileSystem @*/;
 
+/*@=redecl@*/
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4353baf80..7390e1e69 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES = \
 	-I$(top_srcdir)/build \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
+	-I$(top_srcdir)/beecrypt \
 	-I$(top_srcdir)/popt \
 	@INCPATH@
 
diff --git a/lib/misc.h b/lib/misc.h
index c4df521ab..87858a612 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -12,9 +12,7 @@
 #include "header.h"
 #include "ugid.h"
 
-typedef unsigned char byte;
-typedef unsigned int uint32;
-typedef int (*md5func)(const char * fn, /*@out@*/ byte * digest);
+typedef int (*md5func)(const char * fn, /*@out@*/ unsigned char * digest);
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 0fd06593a..ca2ecd979 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -215,7 +215,9 @@ typedef enum rpmTag_e {
     RPMTAG_SIGGPG	        = RPMTAG_SIG_BASE+6,
     RPMTAG_SIGPGP5	        = RPMTAG_SIG_BASE+7,	/*!< internal */
 
+/*@-enummemuse@*/
     RPMTAG_BADSHA1HEADER	= RPMTAG_SIG_BASE+8,	/*!< internal */
+/*@=enummemuse@*/
     RPMTAG_SHA1HEADER		= RPMTAG_SIG_BASE+9,
 
     RPMTAG_NAME  		= 1000,
@@ -301,7 +303,9 @@ typedef enum rpmTag_e {
     RPMTAG_CHANGELOGTIME	= 1080,
     RPMTAG_CHANGELOGNAME	= 1081,
     RPMTAG_CHANGELOGTEXT	= 1082,
+/*@-enummemuse@*/
     RPMTAG_BROKENMD5		= 1083, /*!< internal - obsolete */
+/*@=enummemuse@*/
     RPMTAG_PREREQ		= 1084, /*!< internal */
     RPMTAG_PREINPROG		= 1085,
     RPMTAG_POSTINPROG		= 1086,
diff --git a/lib/signature.c b/lib/signature.c
index b56a312b3..ea1c80228 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -20,6 +20,7 @@
 #include <rpmlib.h>
 #include <rpmmacro.h>	/* XXX for rpmGetPath() */
 
+#include "rpmpgp.h"
 #include "misc.h"	/* XXX for dosetenv() and makeTempFile() */
 #include "rpmlead.h"
 #include "signature.h"
@@ -533,6 +534,9 @@ verifyPGPSignature(const char * datafile, const void * sig, int count,
     if (pgpVer == PGP_5)
 	res = RPMSIG_BAD;
 
+    if (rpmIsVerbose())
+	(void) pgpPrtPkt(sig);
+
     /* Write out the signature */
 #ifdef	DYING
   { const char *tmppath = rpmGetPath("%{_tmppath}", NULL);
@@ -645,6 +649,9 @@ verifyGPGSignature(const char * datafile, const void * sig, int count,
     FILE *file;
     int res = RPMSIG_OK;
   
+    if (rpmIsVerbose())
+	(void) pgpPrtPkt(sig);
+
     /* Write out the signature */
 #ifdef	DYING
   { const char *tmppath = rpmGetPath("%{_tmppath}", NULL);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d92bd8d2a..250243482 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -63,6 +63,7 @@ rpmio/macro.c
 rpmio/rpmio.c
 rpmio/rpmlog.c
 rpmio/rpmmalloc.c
+rpmio/rpmpgp.c
 rpmio/rpmrpc.c
 rpmio/ugid.c
 rpmio/url.c
diff --git a/po/cs.po b/po/cs.po
index b9141ce03..7407c0c11 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3318,124 +3318,124 @@ msgstr "Neznámý systém: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Zkontaktujte prosím rpm-list@redhat.com\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr "není obyčejný soubor -- přeskakuji kontrolu velikosti\n"
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 "Předpokl. délka: %12d = hlavička(%d)+signatura(%d)+výplň(%d)+data(%d)\n"
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Aktuální délka: %12d\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr "Chybí podpis\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr "Starý PGP podpis\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Starý (pouze interní) podpis! Jak jste to získali!?\n"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Podpisu: velikost(%d)+vata(%d)\n"
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Nemohu spustit pgp (%s)\n"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr "pgp selhalo\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr "pgp selhalo při zápisu podpisu\n"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Velikost podpisu PGP: %d\n"
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr "nemohu číst podpis\n"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Přečteno %d bajtů PGP podpisu\n"
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr "Nemohu spustit gpg\n"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr "gpg selhalo\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr "gpg selhalo při zápisu podpisu\n"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Velikost GPG podpisu: %d\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Přečteno %d bajtů GPG podpisu\n"
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr "Generuji PGP podpis.\n"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr "Generuji GPG podpis.\n"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Nemohu spustit pgp. Vynechte kontrolu PGP pomocí --nopgp.\n"
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Nelze spustit gpg. Vynechte kontrolu GPG pomocí --nogpg.\n"
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr "Nemohu spustit pgp\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "©patná %%_signature spec v souboru maker\n"
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, 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:831
+#: lib/signature.c:838
 #, 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"
diff --git a/po/da.po b/po/da.po
index c83f912ec..8671ca25c 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3346,123 +3346,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Kontakt venligst rpm-list@redhat.com (pĺ engelsk)\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr "filen er ikke regulćr -- overspringer střrrelsestjek\n"
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "Forventet střrrelse: %12d = indled(%d)+sign(%d)+fyld(%d)+data(%d)\n"
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Faktisk střrrelse: %12d\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr "Gammel PGP-signatur\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Gammel (internt brug) signatur! Hvordan fik du fingre i den!?\n"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signaturstřrrelse: %d\n"
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Kunne ikke křre pgp (%s)\n"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr "pgp fejlede\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr "pgp kunne ikke skrive signatur\n"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP-signaturstřrrelse: %d\n"
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr "kunne ikke lćse signaturen\n"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Fik %d byte af PGP-signatur\n"
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr "Kunne ikke křre gpg\n"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr "gpg fejlede\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr "gpg kunne ikke skrive signaturen\n"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG-signaturstřrrelse: %d\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Fik %d byte GPG-signatur\n"
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr "Genererer signatur med pgp.\n"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr "Genererer signatur med gpg.\n"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Kunne ikke křre pgp. Brug --nopgp for at overspringe PGP-tjek.\n"
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Kunne ikke křre gpg. Brug --nogpg for at overspringe GPG-tjek.\n"
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr "Kunne ikke křre pgp\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Ugyldig angivelse af '%%_signature'-spec i makrofil.\n"
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, 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:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Du skal angive \"%%_pgp_name\" i din makrofil\n"
diff --git a/po/de.po b/po/de.po
index a66044c1b..d71b6ac09 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3583,137 +3583,137 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "PGP-Signatur generieren"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Alte Signatur (nur intern)!  Wie bist du daran gekommen!?"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Konnte pgp nicht durchführen"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp fehlgeschlagen"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nicht möglich, die Signatur zu lesen"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Konnte pgp nicht durchführen"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "pgp fehlgeschlagen"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "PGP-Signatur generieren"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "PGP-Signatur generieren"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Konnte pgp nicht aufrufen.  Überspring die PGP-Checks mit --nopgp."
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Konnte pgp nicht aufrufen.  Überspring die PGP-Checks mit --nopgp."
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Konnte pgp nicht durchführen"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, 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:831
+#: lib/signature.c:838
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
diff --git a/po/en_RN.po b/po/en_RN.po
index 103c58fd1..83576637f 100644
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3258,123 +3258,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 103c58fd1..83576637f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3258,123 +3258,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 103c58fd1..83576637f 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3258,123 +3258,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 5a5b31290..6bd6acf3e 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -3421,137 +3421,137 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Vanha (sisäisen käytön) allekirjoitus! Mistä sait sen!?"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "En voinut ajaa pgp:tä"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp epäonnistui"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "en voinut lukea allekirjoitusta"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "En voinut ajaa pgp:tä"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "pgp epäonnistui"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "En voinut ajaa pgp:tä. Käytä --nopgpg ohittaaksesi PGP-tarkistus"
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "En voinut ajaa pgp:tä. Käytä --nopgpg ohittaaksesi PGP-tarkistus"
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "En voinut ajaa pgp:tä"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, 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:831
+#: lib/signature.c:838
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
diff --git a/po/fr.po b/po/fr.po
index 42d32e7c0..ebff6947a 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3488,133 +3488,133 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "La construction a chou.\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "La construction a chou.\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 94d13cd51..df7f3debc 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3253,123 +3253,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 103c58fd1..83576637f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3258,123 +3258,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 103c58fd1..83576637f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3258,123 +3258,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 6f559ce6e..2de640a6e 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3278,123 +3278,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Gat ekki keyrt pgp (%s)\n"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr "pgp brást\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr "pgp gat ekki lesiđ undirskriftina\n"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr "get ekki lesiđ undirskriftina\n"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr "Gat ekki keyrt gpg\n"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr "ggp brást\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr "gpg get ekki lesiđ undirskriftina\n"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr "Gat ekki keyrt pgp\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 103c58fd1..83576637f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3258,123 +3258,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 3ea610a69..2483af726 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -88,7 +88,7 @@ msgstr "ĄżˇĽĄ˛ĄĂĄČ %s ÍѤ˺îŔ®Ăć\n"
 # build root [BuildRoot]
 # net share [ĄÍĄĂĄČ¶¦Í­]
 # reloate [şĆÇŰĂÖ/°ÜĆ°¤ą¤ë]
-# $Id: ja.po,v 1.171 2001/09/26 14:45:52 jbj Exp $
+# $Id: ja.po,v 1.172 2001/09/29 17:44:48 jbj Exp $
 #: rpm.c:227
 #, c-format
 msgid "rpm: %s\n"
@@ -3470,140 +3470,140 @@ msgstr "ÉÔĚŔ¤ĘĄ·ĄąĄĆĄŕ: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "rpm-list@redhat.com ¤ËϢÍí¤ň˛Ľ¤µ¤¤\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 "ĄŐĄˇĄ¤Ąë¤Ď°ěČ̤ΥեˇĄ¤Ąë¤Ç¤Ď¤˘¤ę¤Ţ¤»¤ó -- ĄµĄ¤ĄşĄÁĄ§ĄĂĄŻ¤ňĄąĄ­ĄĂĄ×¤·¤Ţ¤ą\n"
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "˝đĚľĄµĄ¤Ąş: %d\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr "˝đĚľ¤Ď¤˘¤ę¤Ţ¤»¤ó\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr "¸Ĺ¤¤ PGP ˝đĚľ\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "¸Ĺ¤¤(ĆâÉô¤Ŕ¤±¤Î)˝đĚľ!  ¤É¤¦¤ä¤Ă¤Ć¤˝¤ě¤ňĽę¤Ë¤¤¤ě¤Ţ¤·¤ż¤«!?"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "˝đĚľĄµĄ¤Ąş: %d\n"
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "pgp ¤ňĽÂąÔ¤Ç¤­¤Ţ¤»¤ó(%s)"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp ĽşÇÔ"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp ¤¬˝đĚľ¤ň˝ń¤­ąţ¤ŕ¤Î¤ËĽşÇÔ¤·¤Ţ¤·¤ż"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP ˝đĚľĄµĄ¤Ąş: %s\n"
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "˝đĚľ¤ňĆɤळ¤Č¤¬¤Ç¤­¤Ţ¤»¤ó"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "PGP ˝đĚľ¤Î %d ĄĐĄ¤ĄČ¤ňĽčĆŔ\n"
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "gpg ¤ňĽÂąÔ¤Ç¤­¤Ţ¤»¤ó"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg ĽşÇÔ"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg ¤¬˝đĚľ¤ň˝ń¤­ąţ¤ŕ¤Î¤ËĽşÇÔ¤·¤Ţ¤·¤ż"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, fuzzy, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG ˝đĚľĄµĄ¤Ąş: %s\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, fuzzy, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "GPG ˝đĚľ¤Î %d ĄĐĄ¤ĄČ¤ňĽčĆŔ\n"
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "PGP ¤ň»ČÍѤ·¤Ć˝đĚľ¤ÎŔ¸Ŕ®Ăć\n"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "GPG ¤ň»ČÍѤ·¤Ć˝đĚľ¤ÎŔ¸Ŕ®Ăć\n"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 "pgp ¤ňĽÂąÔ¤Ç¤­¤Ţ¤»¤ó¤Ç¤·¤żˇŁ\n"
 "PGP ĄÁĄ§ĄĂĄŻ¤ňĄąĄ­ĄĂĄ×¤ą¤ë¤ż¤á¤Ë --nopgp ¤ň»ČÍѤ·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ"
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 "gpg ¤ňĽÂąÔ¤Ç¤­¤Ţ¤»¤ó¤Ç¤·¤żˇŁ\n"
 "GPG ĄÁĄ§ĄĂĄŻ¤ňĄąĄ­ĄĂĄ×¤ą¤ë¤ż¤á¤Ë --nogpg ¤ň»ČÍѤ·¤Ć¤Ż¤Ŕ¤µ¤¤ˇŁ"
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "pgp ¤ňĽÂąÔ¤Ç¤­¤Ţ¤»¤ó"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "ĄŢĄŻĄíĄŐĄˇĄ¤ĄëĂć¤Î̵¸ú¤Ę %%_signature ˇŁ\n"
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "ĄŢĄŻĄíĄŐĄˇĄ¤Ąë¤Ë \"%%_pgp_name\" ¤ňŔßÄꤷ¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó"
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "ĄŢĄŻĄíĄŐĄˇĄ¤Ąë¤Ë \"%%_pgp_name\" ¤ňŔßÄꤷ¤Ę¤±¤ě¤Đ¤Ę¤ę¤Ţ¤»¤ó"
diff --git a/po/ko.po b/po/ko.po
index 4409ee37a..b1b41e227 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3327,127 +3327,127 @@ msgstr "ľË Ľö ľř´Â ˝Ă˝şĹŰ: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "rpm-list@redhat.com Ŕ¸·Î ż¬¶ôÁֽñ⠹ٶř´Ď´Ů\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr "ĆÄŔĎŔĚ żĂąŮ¸ŁÁö(regular) ľĘ˝Ŕ´Ď´Ů -- żë·® °Ë»ç¸¦ »ý·«ÇŐ´Ď´Ů\n"
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "żą»ó(Expected) żë·®: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr " ˝ÇÁ¦ żë·®: %12d\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr "Ľ­¸íŔĚ ľř˝Ŕ´Ď´Ů\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr "ŔĚŔü PGP Ľ­¸í\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "ŔĚŔü (ł»şÎ-żë) Ľ­¸í!  ľî¶»°Ô ľňŔ¸ĽĚ˝Ŕ´Ď±î!?\n"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Ľ­¸í: size(%d)+pad(%d)\n"
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "pgp (%s) (Ŕ»)¸¦ ˝ÇÇŕÇŇ Ľö ľř˝Ŕ´Ď´Ů\n"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr "pgpżˇ ˝ÇĆĐÇÔ\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr "pgp Ľ­¸íŔ» ŔŰĽşÇϴµĄ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP Ľ­¸í żë·®: %d\n"
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr "Ľ­¸íŔ» ŔĐŔ» Ľö ľř˝Ŕ´Ď´Ů\n"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "%d ąŮŔĚĆ®ŔÇ PGP Ľ­¸íŔ» ľňľú˝Ŕ´Ď´Ů\n"
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr "gpg¸¦ ˝ÇÇŕÇŇ Ľö ľř˝Ŕ´Ď´Ů\n"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr "gpgżˇ ˝ÇĆĐÇÔ\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr "gpg Ľ­¸íŔ» ŔŰĽşÇϴµĄ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG Ľ­¸í żë·®: %d\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "%d ąŮŔĚĆ®ŔÇ GPG Ľ­¸íŔ» ľňľú˝Ŕ´Ď´Ů\n"
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr "PGP¸¦ »çżëÇĎż© Ľ­¸íŔ» »ýĽşÇŐ´Ď´Ů.\n"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr "GPG¸¦ »çżëÇĎż© Ľ­¸íŔ» »ýĽşÇŐ´Ď´Ů.\n"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 "pgp¸¦ ˝ÇÇŕÇŇ Ľö ľř˝Ŕ´Ď´Ů.  PGP °Ë»ç¸¦ »ý·«ÇϽ÷Á¸é, --nopgp żÉĽÇŔ» ŔĚżëÇϽʽĂ"
 "żä.\n"
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 "gpg¸¦ ˝ÇÇŕÇŇ Ľö ľř˝Ŕ´Ď´Ů.  GPG °Ë»ç¸¦ »ý·«ÇϽ÷Á¸é, --nogpg żÉĽÇŔ» ŔĚżëÇϽʽĂ"
 "żä.\n"
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr "pgp¸¦ ˝ÇÇŕÇŇ Ľö ľř˝Ŕ´Ď´Ů\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "¸ĹĹ©·Î ĆÄŔĎżˇ şÎŔűÇŐÇŃ %%_signatureŔÇ ł»żëŔĚ ŔÖ˝Ŕ´Ď´Ů\n"
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "¸ĹĹ©·Î ĆÄŔĎżˇ \"%%_gpg_name\" Ŕ» ĽłÁ¤ÇŘ ÁÖĽĹľß ÇŐ´Ď´Ů\n"
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "¸ĹĹ©·Î ĆÄŔĎżˇ \"%%_pgp_name\" Ŕ» ĽłÁ¤ÇŘ ÁÖĽĹľß ÇŐ´Ď´Ů\n"
diff --git a/po/no.po b/po/no.po
index 43744a9e8..8012a76f6 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3308,123 +3308,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 0bcfb9317..e5e515ba5 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3422,135 +3422,135 @@ msgstr "Nieznany system: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Skontaktuj się, proszę, z rpm-list@redhat.com\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr "plik nieregularny -- sprawdzanie rozmiaru pominięte\n"
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Rozmiar sygnatury: %d\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr "Brak sygnatury\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr "Stara sygnatura PGP\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Stara (tylko wewnętrzna) sygnatura! Sk±d Ty to wzi±łe¶!?"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Rozmiar sygnatury: %d\n"
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Nie można uruchomić pgp"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp nie powiodło się"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "zapisanie sygnatury przez pgp nie powiodło się"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "rozmiar sygnatury PGP: %d\n"
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nie można odczytać sygnatury"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Mam %d bajtów sygnatury PGP\n"
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Nie można uruchomić gpg"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg nie powiodło się"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "zapisanie sygnatury przez gpg nie powiodło się"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "rozmiar sygnatury GPG: %d\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Mam %d bajtów sygnatury GPG\n"
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "Generowanie sygnatury: %d\n"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "Generowanie sygnatury: %d\n"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Nie można uruchomić pgp. Użyj --nopgp aby pomin±ć sprawdz. PGP"
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Nie można uruchomić gpg. Użyj --nopgp aby pomin±ć sprawdz. GPG"
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Nie można uruchomić pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Błędny %%_signature spec w pliku makra.\n"
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, 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:831
+#: lib/signature.c:838
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musisz ustawić \"%%_pgp_name\" w pliku swego makra"
diff --git a/po/pt.po b/po/pt.po
index 81bcd9c9a..e6cb33837 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3313,123 +3313,123 @@ msgstr "Sistema desconhecido: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Por favor contacte o rpm-list@redhat.com\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr "o ficheiro năo é normal -- a ignorar a verificaçăo do tamanho\n"
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "Esperado um tamanho: %12d = início(%d)+assin.(%d)+'pad'(%d)+dados(%d)\n"
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Tamanho real: %12d\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr "Sem assinatura\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr "Assinatura PGP antiga\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Assinatura (só interna) antiga! Como é que obteve isto!?\n"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Tamanho da assinatura: %d\n"
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Năo consigo executar o pgp (%s)\n"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr "o pgp falhou\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr "o pgp năo conseguiu gravar a assinatura\n"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "tamanho da assinatura do PGP: %d\n"
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr "incapaz de ler a assinatura\n"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Obtive %d bytes da assinatura PGP\n"
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr "Năo consegui executar o gpg\n"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr "o gpg falhou\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr "o gpg năo conseguiu gravar a assinatura\n"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Tamanho da assinatura do GPG: %d\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Obtive %d bytes da assinatura do GPG\n"
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr "A gerar a assinatura usando o PGP.\n"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr "A gerar a assinatura usando o PGP.\n"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Năo consegui correr o pgp. Use o --nopgp para ignorar as verificaçőes de PGP.\n"
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Năo consegui correr o gpg. Use o --nogpg para ignorar as verificaçőes de GPG.\n"
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr "Năo consegui executar o pgp\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "'Spec' %%_signature inválido no ficheiro de macros\n"
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, 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:831
+#: lib/signature.c:838
 #, 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"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e3f734d8d..2fcdb80ff 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\n"
 
 # , c-format
 #: build.c:36
@@ -3618,136 +3618,136 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 # , c-format
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "Construo falhou.\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
 # , c-format
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "Construo falhou.\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
 # , c-format
-#: lib/signature.c:782
+#: lib/signature.c:789
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 41bfa7516..aa3e1ddd3 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3253,123 +3253,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 63d0af07c..c27992514 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3258,123 +3258,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index f905c2c0a..0ebd5327b 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3338,128 +3338,128 @@ msgstr "îĹÉÚ×ĹÓÔÎÁŃ ÓÉÓÔĹÍÁ: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "ó×ŃÖÉÔĹÓŘ Ó rpm-list@redhat.com\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr "ÎĹĎÂŮŢÎŮĘ ĆÁĘĚ -- ĐŇĎĐŐÓËÁŔ ĐŇĎ×ĹŇËŐ ŇÁÚÍĹŇÁ\n"
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "ďÖÉÄÁĹÍŮĘ ŇÁÚÍĹŇ: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "ćÁËÔÉŢĹÓËÉĘ ŇÁÚÍĹŇ: %12d\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr "đĎÄĐÉÓÉ ÎĹÔ\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr "óÔÁŇÁŃ ĐĎÄĐÉÓŘ PGP\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 "óÔÁŇÁŃ (ÔĎĚŘËĎ ÄĚŃ ×ÎŐÔŇĹÎÎĹÇĎ ÉÓĐĎĚŘÚĎ×ÁÎÉŃ) ĐĎÄĐÉÓŘ! çÄĹ ×Ů üôď ×ÚŃĚÉ!?\n"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "đĎÄĐÉÓŘ: ŇÁÚÍĹŇ(%d)+ÚÁĐĎĚÎĹÎÉĹ(%d)\n"
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "î×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ pgp (%s)\n"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr "ĎŰÉÂËÁ pgp\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr "ĎŰÉÂËÁ pgp ĐŇÉ ÚÁĐÉÓÉ ĐĎÄĐÉÓÉ\n"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "ňÁÚÍĹŇ ĐĎÄĐÉÓÉ PGP: %d\n"
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢĹÓÔŘ ĐĎÄĐÉÓŘ\n"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "đĎĚŐŢĹÎĎ %d ÂÁĘÔ ĐĎÄĐÉÓÉ PGP\n"
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ gpg\n"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr "ĎŰÉÂËÁ gpg\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr "ĎŰÉÂËÁ gpg ĐŇÉ ÚÁĐÉÓÉ ĐĎÄĐÉÓÉ\n"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "ňÁÚÍĹŇ ĐĎÄĐÉÓÉ GPG: %d\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "đĎĚŐŢĹÎĎ %d ÂÁĘÔ ĐĎÄĐÉÓÉ GPG\n"
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr "çĹÎĹŇÉŇŐĹÔÓŃ ĐĎÄĐÉÓŘ PGP.\n"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr "çĹÎĹŇÉŇŐĹÔÓŃ ĐĎÄĐÉÓŘ GPG.\n"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 "î×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ pgp. éÓĐĎĚŘÚŐĘÔĹ --nopgp ŢÔĎÂŮ ĐŇĎĐŐÓÔÉÔŘ ĐŇĎ×ĹŇËŐ PGP "
 "ĐĎÄĐÉÓĹĘ.\n"
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 "îĹ×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ gpg. éÓĐĎĚŘÚŐĘÔĹ --nogpg ŢÔĎÂŮ ĐŇĎĐŐÓÔÉÔŘ ĐŇĎ×ĹŇËŐ GPG "
 "ĐĎÄĐÉÓĹĘ.\n"
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ pgp\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "îĹ×ĹŇÎÁŃ ÓĐĹĂÉĆÉËÁĂÉŃ %%_signature × ÍÁËŇĎĆÁĘĚĹ\n"
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "÷Ů ÄĎĚÖÎŮ ŐÓÔÁÎĎ×ÉÔŘ \"%%_gpg_name\" × ×ÁŰĹÍ ÍÁËŇĎĆÁĘĚĹ\n"
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "÷Ů ÄĎĚÖÎŮ ŐÓÔÁÎĎ×ÉÔŘ \"%%_pgp_name\" × ×ÁŰĹÍ ÍÁËŇĎĆÁĘĚĹ\n"
diff --git a/po/sk.po b/po/sk.po
index 886b1935b..c5c4d66f4 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3428,135 +3428,135 @@ msgstr "Neznámy systém: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Kontaktujte prosím rpm-list@redhat.com\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr "nejde o beľný súbor - kontrola veµkosti vynechaná\n"
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Veµkos» podpisu:   %d\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr "Podpis nie je k dispozícii\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr "Starý PGP podpis\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Starý (iba interný) podpis! Ako ste sa k tomu dostali?!"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Veµkos» podpisu:   %d\n"
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Nie je moľné spusti» pgp"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp zlyhalo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp sa nepodarilo zapísa» podpis"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Veµkos» PGP podpisu: %d\n"
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nie je moľné prečíta» podpis"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Prečítaný PGP podpis obsahuje %d bajtov\n"
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Nie je moľné spusti» gpg"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg zlyhalo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg sa nepodarilo zapísa» podpis"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Veµkos» GPG podpisu: %d\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Prečítaný GPG podpis obsahuje %d bajtov\n"
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "Vytvára sa PGP podpis: %d\n"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "Vytvára sa PGP podpis: %d\n"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Nie je moľné spusti» pgp. Pouľite --nopgp pre vynechanie PGP kontrol."
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Nie je moľné spusti» gpg. Pouľite --nogpg pre vynechanie GPG kontrol."
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Nie je moľné spusti» pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Chybná ąpecifikácia %%_signature v makro-súbore.\n"
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, 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:831
+#: lib/signature.c:838
 #, 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"
diff --git a/po/sl.po b/po/sl.po
index 3056b70da..3472ed769 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.156 2001/09/26 14:45:59 jbj Exp $
+# $Id: sl.po,v 1.157 2001/09/29 17:44:51 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3416,133 +3416,133 @@ msgstr "Neznan sistem: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Prosimo, piąite na rpm-list@redhat.com\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n"
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Dolľ. podpisa : %d\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr "Podpis manjka\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr "Stari podpis PGP\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Podpis v (interni) stari obliki! Kje ste ga dobili?"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Dolľ. podpisa : %d\n"
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Ni moľno pognati pgp (%s)"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp je bil neuspeąen"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp je bil neuspeąen pri zapisu podpisa"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Dolľ. podpisa PGP: %d\n"
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "branje podpisa je bilo neuspeąno"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Prebrano %d bajtov podpisa PGP\n"
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Ni moľno pognati gpg"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg je bil neuspeąen"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg je boil neuspeąen pri zapisu podpisa"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Dolľ. podpisa GnuPG: %d\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Prebrano %d bajtov podpisa GnuPG\n"
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr "Ustvarjanje podpisa s PGP.\n"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr "Ustvarjanje podpisa z GnuPG.\n"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Ni moľno pognati pgp. Preverjanja PGP lahko preskočite z --nopgp"
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Ni moľno pognati gpg. Preverjanja GnuPG lahko preskočite z --nogpg"
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Ni moľno pognati pgp"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
diff --git a/po/sr.po b/po/sr.po
index 76f3e40cb..25d4edce8 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -3406,137 +3406,137 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "napravi PGP potpis"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Stari (interni) potpis!  Odakle vam!?"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, fuzzy, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Ne mogu da izvrąim PGP"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "PGP omanuo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "PGP nije uspeo da zapiąe potpis"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "ne mogu da pročitam potpis"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 #, fuzzy
 msgid "Couldn't exec gpg\n"
 msgstr "Ne mogu da izvrąim PGP"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "PGP omanuo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "PGP nije uspeo da zapiąe potpis"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 #, fuzzy
 msgid "Generating signature using PGP.\n"
 msgstr "napravi PGP potpis"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 #, fuzzy
 msgid "Generating signature using GPG.\n"
 msgstr "napravi PGP potpis"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 #, fuzzy
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr "Ne mogu da pokrenem pgp. Koristite --nopgp da preskočite PGP proveru."
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 #, fuzzy
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr "Ne mogu da pokrenem pgp. Koristite --nopgp da preskočite PGP proveru."
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 #, fuzzy
 msgid "Couldn't exec pgp\n"
 msgstr "Ne mogu da izvrąim PGP"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, 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:831
+#: lib/signature.c:838
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Morate podesiti \"pgp_name:\" u vaąoj rpmrc datoteci"
diff --git a/po/sv.po b/po/sv.po
index 01b4f2b1f..36fba6b95 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3307,127 +3307,127 @@ msgstr "Okänt system: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Var vänlig kontakta rpm-list@redhat.com\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr "filen är inte en vanlig fil -- hoppar över storlekskontroll\n"
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 "Förväntad storlek: %12d = inledning(%d)+signaturer(%d)+utfyllnad(%d)+data(%"
 "d)\n"
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Faktisk storlek: %12d\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr "Gammal PGP-signatur\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Gammal (endast intern) signatur!  Hur fick du tag i den!?\n"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "Kunde inte köra pgp (%s)\n"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr "pgp misslyckades\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr "pgp misslyckades att skriva en signatur\n"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP signaturstorlek: %d\n"
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr "kan inte läsa signaturen\n"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Fick %d byte PGP-signatur\n"
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr "Kunde inte köra gpg\n"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr "gpg misslyckades\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr "gpg kunde inte skriva signatur\n"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG-signaturstorlek: %d\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Fick %d byte GPG-signatur\n"
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr "Genererar signatur med PGP.\n"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr "Genererar signatur med GPG.\n"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 "Kunde inte köra pgp.  Använd --nopgp för att hoppa över PGP-kontroll.\n"
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 "Kunde inte köra gpg.  Använd --nogpg för att hoppa över GPG-kontroll.\n"
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr "Kunde inte köra pgp\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Felaktig %%_signature-spec i makrofil\n"
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, 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:831
+#: lib/signature.c:838
 #, 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"
diff --git a/po/tr.po b/po/tr.po
index 93196f118..2ae3af9ef 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: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3345,125 +3345,125 @@ msgstr "Bilinmeyen sistem: %s\n"
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr "Lütfen rpm-list@redhat.com listesine üye olun\n"
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr "dosya normal deđil -- uzunluk denetimi atlanýyor\n"
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "gereken boyut: %12d = (%d)uç+(%d)imza+(%d)iz+(%d)veri\n"
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Gerçek boyut: %12d\n"
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr "Ýmza yok\n"
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr "Eski PGP imzasý\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Eski imza !!! Bunu nasýl aldýn!?\n"
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Ýmza: boyut(%d)+iz(%d)\n"
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr "pgp çalýţtýrýlamadý (%s)\n"
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr "pgp hata verdi\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr "pgp imzasýnýn yazýlmasý baţarýsýz\n"
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP imza uzunluđu: %d\n"
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr "imza okunamadý\n"
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "GPG imzasýnýn %d baytý alýndý\n"
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr "gpg çalýţtýrýlamadý\n"
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr "gpg hata verdi\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr "imzanýn yazýlmasý sýrasýnda gpg hata verdi\n"
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG imza uzunluđu: %d\n"
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "GPG imzasýnýn %d baytý alýndý\n"
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr "PGP kullanarak imza üretiliyor.\n"
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr "GPG kullanýlarak imza üretiliyor.\n"
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 "pgp çalýţtýrýlamadý. PGP kontrollerini atlamak için --nopgp kullanýn.\n"
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 "gpg çalýţtýrýlamadý. GPG kontrollerini atlamak için --nogpg kullanýn.\n"
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr "pgp çalýţtýrýlamadý\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Makro dosyasýnda %%_signature spec geçersiz\n"
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, 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:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Makro dosyanýzda \"%%_pgp_name\" belirtmelisiniz\n"
diff --git a/po/uk.po b/po/uk.po
index 103c58fd1..83576637f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3258,123 +3258,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 103c58fd1..83576637f 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3258,123 +3258,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 103c58fd1..83576637f 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3258,123 +3258,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 103c58fd1..83576637f 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-09-26 10:44-0400\n"
+"POT-Creation-Date: 2001-09-29 13:34-0400\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"
@@ -3258,123 +3258,123 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: lib/signature.c:122
+#: lib/signature.c:123
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:130
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:134
+#: lib/signature.c:135
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:154
+#: lib/signature.c:155
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:158
+#: lib/signature.c:159
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:223
+#: lib/signature.c:224
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:283
+#: lib/signature.c:284
 #, c-format
 msgid "Couldn't exec pgp (%s)\n"
 msgstr ""
 
-#: lib/signature.c:296
+#: lib/signature.c:297
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:303
+#: lib/signature.c:304
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:308
+#: lib/signature.c:309
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:321 lib/signature.c:403
+#: lib/signature.c:322 lib/signature.c:404
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:326
+#: lib/signature.c:327
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:365 lib/signature.c:753
+#: lib/signature.c:366 lib/signature.c:760
 msgid "Couldn't exec gpg\n"
 msgstr ""
 
-#: lib/signature.c:378
+#: lib/signature.c:379
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:385
+#: lib/signature.c:386
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:390
+#: lib/signature.c:391
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:408
+#: lib/signature.c:409
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:436
+#: lib/signature.c:437
 msgid "Generating signature using PGP.\n"
 msgstr ""
 
-#: lib/signature.c:442
+#: lib/signature.c:443
 msgid "Generating signature using GPG.\n"
 msgstr ""
 
-#: lib/signature.c:525 lib/signature.c:600
+#: lib/signature.c:526 lib/signature.c:604
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
 msgstr ""
 
-#: lib/signature.c:690
+#: lib/signature.c:697
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
 msgstr ""
 
-#: lib/signature.c:782
+#: lib/signature.c:789
 msgid "Couldn't exec pgp\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:786 lib/signature.c:839
+#: lib/signature.c:793 lib/signature.c:846
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:819
+#: lib/signature.c:826
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:831
+#: lib/signature.c:838
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
diff --git a/rpm.spec b/rpm.spec
index 8de1613d4..81a3efb28 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -514,6 +514,8 @@ fi
 - loosely wire beecrypt library into rpm.
 - drop rpmio/base64.[ch] in favor of beecrypt versions.
 - drop lib/md5*.[ch] files in favor of beecrypt.
-- legacy: drop brokenMD5 support (rrpm-2.3.3 to rpm-2.3.8 on sparc).
+- legacy: drop brokenMD5 support (rpm-2.3.3 to rpm-2.3.8 on sparc).
 - eliminate DYING code.
 - bind beecrypt md5/sha1 underneath rpmio.
+- create RFC-2440 OpenPGP API in rpmio.
+- display signature packets before exec'ing gpg/pgp when verifying.
diff --git a/rpm.spec.in b/rpm.spec.in
index 623af5bfe..83bcb5b99 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -514,6 +514,8 @@ fi
 - loosely wire beecrypt library into rpm.
 - drop rpmio/base64.[ch] in favor of beecrypt versions.
 - drop lib/md5*.[ch] files in favor of beecrypt.
-- legacy: drop brokenMD5 support (rrpm-2.3.3 to rpm-2.3.8 on sparc).
+- legacy: drop brokenMD5 support (rpm-2.3.3 to rpm-2.3.8 on sparc).
 - eliminate DYING code.
 - bind beecrypt md5/sha1 underneath rpmio.
+- create RFC-2440 OpenPGP API in rpmio.
+- display signature packets before exec'ing gpg/pgp when verifying.
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index cca7a0ec5..cec28c849 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -24,9 +24,8 @@ LIBS +=	-lrt -lpthread
 BEECRYPTLOBJS = $(shell cat $(top_builddir)/beecrypt/listobjs)
 
 lib_LTLIBRARIES = librpmio.la
-librpmio_la_SOURCES = rpmrpc.c rpmio.c url.c macro.c \
-	digest.c strcasecmp.c stubs.c \
-	ugid.c rpmmalloc.c rpmlog.c
+librpmio_la_SOURCES = digest.c macro.c rpmio.c rpmlog.c rpmmalloc.c \
+	rpmpgp.c rpmrpc.c strcasecmp.c stubs.c url.c ugid.c
 librpmio_la_LDFLAGS = -release @VERSION@
 librpmio_la_LIBADD = $(BEECRYPTLOBJS)
 librpmio_la_DEPENDENCIES = .created
diff --git a/rpmio/digest.c b/rpmio/digest.c
index 847d5612c..13a3b9236 100644
--- a/rpmio/digest.c
+++ b/rpmio/digest.c
@@ -4,10 +4,10 @@
 
 #include "system.h"
 #include "rpmio_internal.h"
-#include "beecrypt/beecrypt.h"
-#include "beecrypt/md5.h"
-#include "beecrypt/fips180.h"
-#include "beecrypt/sha256.h"
+#include "beecrypt.h"
+#include "md5.h"
+#include "endianness.h"
+#include "fips180.h"
 #include "debug.h"
 
 #ifdef	SHA_DEBUG
@@ -30,7 +30,7 @@ struct DIGEST_CTX_s {
 	/*@modifies param @*/;	/*!< Digest initialize. */
     int (*Update) (void * param, const byte * data, int len)
 	/*@modifies param @*/;	/*!< Digest transform. */
-    int (*Digest) (void * param, uint32 * data)
+    int (*Digest) (void * param, /*@out@*/ uint32 * digest)
 	/*@modifies param, digest @*/;	/*!< Digest finish. */
 };
 
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
new file mode 100644
index 000000000..2290ef5ae
--- /dev/null
+++ b/rpmio/rpmpgp.c
@@ -0,0 +1,524 @@
+/** \ingroup rpmio signature
+ * \file rpmio/rpmpgp.c
+ * Routines to handle RFC-2440 detached signatures.
+ */
+
+#include "system.h"
+#include "rpmpgp.h"
+#include "debug.h"
+
+/*@-readonlytrans@*/
+/* This is the unarmored RPM-GPG-KEY public key. */
+const char * redhatPubKeyDSA = "\
+mQGiBDfqVDgRBADBKr3Bl6PO8BQ0H8sJoD6p9U7Yyl7pjtZqioviPwXP+DCWd4u8\n\
+HQzcxAZ57m8ssA1LK1Fx93coJhDzM130+p5BG9mYSWShLabR3N1KXdXQYYcowTOM\n\
+GxdwYRGr1Spw8QydLhjVfU1VSl4xt6bupPbWJbyjkg5Z3P7BlUOUJmrx3wCgobNV\n\
+EDGaWYJcch5z5B1of/41G8kEAKii6q7Gu/vhXXnLS6m15oNnPVybyngiw/23dKjS\n\
+ZVG7rKANEK2mxg1VB+vc/uUc4k49UxJJfCZg1gu1sPFV3GSa+Y/7jsiLktQvCiLP\n\
+lncQt1dV+ENmHR5BdIDPWDzKBVbgWnSDnqQ6KrZ7T6AlZ74VMpjGxxkWU6vV2xsW\n\
+XCLPA/9P/vtImA8CZN3jxGgtK5GGtDNJ/cMhhuv5tnfwFg4b/VGo2Jr8mhLUqoIb\n\
+E6zeGAmZbUpdckDco8D5fiFmqTf5+++pCEpJLJkkzel/32N2w4qzPrcRMCiBURES\n\
+PjCLd4Y5rPoU8E4kOHc/4BuHN903tiCsCPloCrWsQZ7UdxfQ5LQiUmVkIEhhdCwg\n\
+SW5jIDxzZWN1cml0eUByZWRoYXQuY29tPohVBBMRAgAVBQI36lQ4AwsKAwMVAwID\n\
+FgIBAheAAAoJECGRgM3bQqYOsBQAnRVtg7B25Hm11PHcpa8FpeddKiq2AJ9aO8sB\n\
+XmLDmPOEFI75mpTrKYHF6rkCDQQ36lRyEAgAokgI2xJ+3bZsk8jRA8ORIX8DH05U\n\
+lMH27qFYzLbT6npXwXYIOtVn0K2/iMDj+oEB1Aa2au4OnddYaLWp06v3d+XyS0t+\n\
+5ab2ZfIQzdh7wCwxqRkzR+/H5TLYbMG+hvtTdylfqIX0WEfoOXMtWEGSVwyUsnM3\n\
+Jy3LOi48rQQSCKtCAUdV20FoIGWhwnb/gHU1BnmES6UdQujFBE6EANqPhp0coYoI\n\
+hHJ2oIO8ujQItvvNaU88j/s/izQv5e7MXOgVSjKe/WX3s2JtB/tW7utpy12wh1J+\n\
+JsFdbLV/t8CozUTpJgx5mVA3RKlxjTA+On+1IEUWioB+iVfT7Ov/0kcAzwADBQf9\n\
+E4SKCWRand8K0XloMYgmipxMhJNnWDMLkokvbMNTUoNpSfRoQJ9EheXDxwMpTPwK\n\
+ti/PYrrL2J11P2ed0x7zm8v3gLrY0cue1iSba+8glY+p31ZPOr5ogaJw7ZARgoS8\n\
+BwjyRymXQp+8Dete0TELKOL2/itDOPGHW07SsVWOR6cmX4VlRRcWB5KejaNvdrE5\n\
+4XFtOd04NMgWI63uqZc4zkRa+kwEZtmbz3tHSdRCCE+Y7YVP6IUf/w6YPQFQriWY\n\
+FiA6fD10eB+BlIUqIw80VgjsBKmCwvKkn4jg8kibXgj4/TzQSx77uYokw1EqQ2wk\n\
+OZoaEtcubsNMquuLCMWijYhGBBgRAgAGBQI36lRyAAoJECGRgM3bQqYOhyYAnj7h\n\
+VDY/FJAGqmtZpwVp9IlitW5tAJ4xQApr/jNFZCTksnI+4O1765F7tA==\n\
+";
+
+/* This is the unarmored RPM-PGP-KEY public key. */
+const char * redhatPubKeyRSA = "\
+mQCNAzEpXjUAAAEEAKG4/V9oUSiDc9wIge6Bmg6erDGCLzmFyioAho8kDIJSrcmi\n\
+F9qTdPq+fj726pgW1iSb0Y7syZn9Y2lgQm5HkPODfNi8eWyTFSxbr8ygosLRClTP\n\
+xqHVhtInGrfZNLoSpv1LdWOme0yOpOQJnghdOMzKXpgf5g84vaUg6PHLopv5AAUR\n\
+tCpSZWQgSGF0IFNvZnR3YXJlLCBJbmMuIDxyZWRoYXRAcmVkaGF0LmNvbT6JAJUD\n\
+BRAyA5tUoyDApfg4JKEBAUzSA/9QdcVsu955vVyZDk8uvOXWV0X3voT9B3aYMFvj\n\
+UNHUD6F1VFruwQHVKbGJEq1o5MOA6OXKR3vJZStXEMF47TWXJfQaflgl8ywZTH5W\n\
++eMlKau6Nr0labUV3lmsAE4Vsgu8NCkzIrp2wNVbeW2ZAXtrKswV+refLquUhp7l\n\
+wMpH9IkAdQMFEDGttkRNdXhbO1TgGQEBAGoC/j6C22PqXIyqZc6fG6J6Jl/T5kFG\n\
+xH1pKIzua5WCDDugAgnuOJgywa4pegT4UqwEZiMTAlwT6dmG1CXgKB+5V7lnCjDc\n\
+JZLni0iztoe08ig6fJrjNGXljf7KYXzgwBftQokAlQMFEDMQzo2MRVM9rfPulQEB\n\
+pLoD/1/MWv3u0Paiu14XRvDrBaJ7BmG2/48bA5vKOzpvvoNRO95YS7ZEtqErXA7Y\n\
+DRO8+C8f6PAILMk7kCk4lNMscS/ZRzu5+J8cv4ejsFvxgJBBU3Zgp8AWdWOpvZ0I\n\
+wW//HoDUGhOxlEtymljIMFBkj4SysHWhCBUfA9Xy86kouTJQiQCVAwUQMxDOQ50a\n\
+feTWLUSJAQFnYQQAkt9nhMTeioREB1DvJt+vsFyOj//o3ThqK5ySEP3dgj62iaQp\n\
+JrBmAe5XZPw25C/TXAf+x27H8h2QbKgq49VtsElFexc6wO+uq85fAPDdyE+2XyNE\n\
+njGZkY/TP2F/jTB0sAwJO+xFCHmSYkcBjzxK/2LMD+O7rwp2UCUhhl9QhhqJAJUD\n\
+BRAx5na6pSDo8cuim/kBARmjA/4lDVnV2h9KiNabp9oE38wmGgu5m5XgUHW8L6du\n\
+iQDnwO5IgXN2vDpKGxbgtwv6iYYmGd8IRQ66uJvOsxSv3OR7J7LkCHuI2b/s0AZn\n\
+c79DZaJ2ChUCZlbNQBMeEdrFWif9NopY+d5+2tby1onu9XOFMMvomxL3NhctElYR\n\
+HC8Xw4kAlQMFEDHmdTtURTdEKY1MpQEBEtEEAMZbp1ZFrjiHkj2aLFC1S8dGRbSH\n\
+GUdnLP9qLPFgmWekp9E0o8ZztALGVdqPfPF3N/JJ+AL4IMrfojd7+eZKw36Mdvtg\n\
+dPI+Oz4sxHDbDynZ2qspD9Om5yYuxuz/Xq+9nO2IlsAnEYw3ag3cxat0kvxpOPRe\n\
+Yy+vFpgfDNizr3MgiQBVAwUQMXNMXCjtrosVMemRAQEDnwH7BsJrnnh91nI54LAK\n\
+Gcq3pr8ld0PAtWJmNRGQvUlpEMXUSnu59j2P1ogPNjL3PqKdVxk5Jqgcr8TPQMf3\n\
+V4fqXokAlQMFEDFy+8YiEmsRQ3LyzQEB+TwD/03QDslXLg5F3zj4zf0yI6ikT0be\n\
+5OhZv2pnkb80qgdHzFRxBOYmSoueRKdQJASd8F9ue4b3bmf/Y7ikiY0DblvxcXB2\n\
+sz1Pu8i2Zn9u8SKuxNIoVvM8/STRVkgPfvL5QjAWMHT9Wvg81XcI2yXJzrt/2f2g\n\
+mNpWIvVOOT85rVPIiQCVAwUQMVPRlBlzviMjNHElAQG1nwP/fpVX6nKRWJCSFeB7\n\
+leZ4lb+y1uMsMVv0n7agjJVw13SXaA267y7VWCBlnhsCemxEugqEIkI4lu/1mgtw\n\
+WPWSE0BOIVjj0AA8zp2T0H3ZCCMbiFAFJ1P2Gq2rKr8QrOb/08oH1lEzyz0j/jKh\n\
+qiXAxdlB1wojQB6yLbHvTIe3rZGJAHUDBRAxKetfzauiKSJ6LJEBAed/AvsEiGgj\n\
+TQzhsZcUuRNrQpV0cDGH9Mpril7P7K7yFIzju8biB+Cu6nEknSOHlMLl8usObVlk\n\
+d8Wf14soHC7SjItiGSKtI8JhauzBJPl6fDDeyHGsJKo9f9adKeBMCipCFOuJAJUD\n\
+BRAxKeqWRHFTaIK/x+0BAY6eA/4m5X4gs1UwOUIRnljo9a0cVs6ITL554J9vSCYH\n\
+Zzd87kFwdf5W1Vd82HIkRzcr6cp33E3IDkRzaQCMVw2me7HePP7+4Ry2q3EeZMbm\n\
+NE++VzkxjikzpRb2+F5nGB2UdsElkgbXinswebiuOwOrocLbz6JFdDsJPcT5gVfi\n\
+z15FuA==\n\
+";
+
+struct pgpValTbl_s pgpSigTypeTbl[] = {
+    { PGPSIGTYPE_BINARY,	"Signature of a binary document" },
+    { PGPSIGTYPE_TEXT,		"Signature of a canonical text document" },
+    { PGPSIGTYPE_STANDALONE,	"Standalone signature" },
+    { PGPSIGTYPE_GENERIC_CERT,	"Generic certification of a User ID and Public Key" },
+    { PGPSIGTYPE_PERSONA_CERT,	"Persona certification of a User ID and Public Key" },
+    { PGPSIGTYPE_CASUAL_CERT,	"Casual certification of a User ID and Public Key" },
+    { PGPSIGTYPE_POSITIVE_CERT,	"Positive certification of a User ID and Public Key" },
+    { PGPSIGTYPE_SUBKEY_BINDING,"Subkey Binding Signature" },
+    { PGPSIGTYPE_SIGNED_KEY,	"Signature directly on a key" },
+    { PGPSIGTYPE_KEY_REVOKE,	"Key revocation signature" },
+    { PGPSIGTYPE_SUBKEY_REVOKE,	"Subkey revocation signature" },
+    { PGPSIGTYPE_CERT_REVOKE,	"Certification revocation signature" },
+    { PGPSIGTYPE_TIMESTAMP,	"Timestamp signature" },
+    { -1,			"Unknown signature type" },
+};
+
+struct pgpValTbl_s pgpPubkeyTbl[] = {
+    { PGPPUBKEYALGO_RSA,	"RSA" },
+    { PGPPUBKEYALGO_RSA_ENCRYPT,"RSA(Encrypt-Only)" },
+    { PGPPUBKEYALGO_RSA_SIGN,	"RSA(Sign-Only)" },
+    { PGPPUBKEYALGO_ELGAMAL_ENCRYPT,"Elgamal(Encrypt-Only)" },
+    { PGPPUBKEYALGO_DSA,	"DSA" },
+    { PGPPUBKEYALGO_EC,		"Elliptic Curve" },
+    { PGPPUBKEYALGO_ECDSA,	"ECDSA" },
+    { PGPPUBKEYALGO_ELGAMAL,	"Elgamal" },
+    { PGPPUBKEYALGO_DH,		"Diffie-Hellman (X9.42)" },
+    { -1,			"Unknown public key algorithm" },
+};
+
+struct pgpValTbl_s pgpSymkeyTbl[] = {
+    { PGPSYMKEYALGO_PLAINTEXT,	"Plaintext" },
+    { PGPSYMKEYALGO_IDEA,	"IDEA" },
+    { PGPSYMKEYALGO_TRIPLE_DES,	"Triple-DES" },
+    { PGPSYMKEYALGO_CAST5,	"CAST5" },
+    { PGPSYMKEYALGO_BLOWFISH,	"BLOWFISH" },
+    { PGPSYMKEYALGO_SAFER,	"SAFER" },
+    { PGPSYMKEYALGO_DES_SK,	"DES/SK" },
+    { PGPSYMKEYALGO_AES_128,	"AES(128-bit key)" },
+    { PGPSYMKEYALGO_AES_192,	"AES(192-bit key)" },
+    { PGPSYMKEYALGO_AES_256,	"AES(256-bit key)" },
+    { PGPSYMKEYALGO_TWOFISH,	"TWOFISH" },
+    { -1,			"Unknown symmetric key algorithm" },
+};
+
+struct pgpValTbl_s pgpCompressionTbl[] = {
+    { PGPCOMPRESSALGO_NONE,	"Uncompressed" },
+    { PGPCOMPRESSALGO_ZIP,	"ZIP" },
+    { PGPCOMPRESSALGO_ZLIB, 	"ZLIB" },
+    { -1,			"Unknown compression algorithm" },
+};
+
+struct pgpValTbl_s pgpHashTbl[] = {
+    { PGPHASHALGO_MD5,		"MD5" },
+    { PGPHASHALGO_SHA1,		"SHA1" },
+    { PGPHASHALGO_RIPEMD160,	"RIPEMD160" },
+    { PGPHASHALGO_MD2,		"MD2" },
+    { PGPHASHALGO_TIGER192,	"TIGER192" },
+    { PGPHASHALGO_HAVAL_5_160,	"HAVAL-5-160" },
+    { -1,			"Unknown hash algorithm" },
+};
+
+/*@-exportlocal -exportheadervar@*/
+struct pgpValTbl_s pgpKeyServerPrefsTbl[] = {
+    { 0x80,			"No-modify" },
+    { -1,			"Unknown key server preference" },
+};
+/*@=exportlocal =exportheadervar@*/
+
+struct pgpValTbl_s pgpSubTypeTbl[] = {
+    { PGPSUBTYPE_SIG_CREATE_TIME,"signature creation time" },
+    { PGPSUBTYPE_SIG_EXPIRE_TIME,"signature expiration time" },
+    { PGPSUBTYPE_EXPORTABLE_CERT,"exportable certification" },
+    { PGPSUBTYPE_TRUST_SIG,	"trust signature" },
+    { PGPSUBTYPE_REGEX,		"regular expression" },
+    { PGPSUBTYPE_REVOCABLE,	"revocable" },
+    { PGPSUBTYPE_KEY_EXPIRE_TIME,"key expiration time" },
+    { PGPSUBTYPE_BACKWARD_COMPAT,"placeholder for backward compatibility" },
+    { PGPSUBTYPE_PREFER_SYMKEY,	"preferred symmetric algorithms" },
+    { PGPSUBTYPE_REVOKE_KEY,	"revocation key" },
+    { PGPSUBTYPE_ISSUER_KEYID,	"issuer key ID" },
+    { PGPSUBTYPE_NOTATION,	"notation data" },
+    { PGPSUBTYPE_PREFER_HASH,	"preferred hash algorithms" },
+    { PGPSUBTYPE_PREFER_COMPRESS,"preferred compression algorithms" },
+    { PGPSUBTYPE_KEYSERVER_PREFERS,"key server preferences" },
+    { PGPSUBTYPE_PREFER_KEYSERVER,"preferred key server" },
+    { PGPSUBTYPE_PRIMARY_USERID,"primary user id" },
+    { PGPSUBTYPE_POLICY_URL,	"policy URL" },
+    { PGPSUBTYPE_KEY_FLAGS,	"key flags" },
+    { PGPSUBTYPE_SIGNER_USERID,	"signer's user id" },
+    { PGPSUBTYPE_REVOKE_REASON,	"reason for revocation" },
+    { PGPSUBTYPE_INTERNAL_100,	"internal subpkt type 100" },
+    { PGPSUBTYPE_INTERNAL_101,	"internal subpkt type 101" },
+    { PGPSUBTYPE_INTERNAL_102,	"internal subpkt type 102" },
+    { PGPSUBTYPE_INTERNAL_103,	"internal subpkt type 103" },
+    { PGPSUBTYPE_INTERNAL_104,	"internal subpkt type 104" },
+    { PGPSUBTYPE_INTERNAL_105,	"internal subpkt type 105" },
+    { PGPSUBTYPE_INTERNAL_106,	"internal subpkt type 106" },
+    { PGPSUBTYPE_INTERNAL_107,	"internal subpkt type 107" },
+    { PGPSUBTYPE_INTERNAL_108,	"internal subpkt type 108" },
+    { PGPSUBTYPE_INTERNAL_109,	"internal subpkt type 109" },
+    { PGPSUBTYPE_INTERNAL_110,	"internal subpkt type 110" },
+    { -1,			"Unknown signature subkey type" },
+};
+
+struct pgpValTbl_s pgpPktTbl[] = {
+    { PGPPKT_PUBLIC_SESSION_KEY,"Public-Key Encrypted Session Key" },
+    { PGPPKT_SIGNATURE,		"Signature" },
+    { PGPPKT_SYMMETRIC_SESSION_KEY,"Symmetric-Key Encrypted Session Key" },
+    { PGPPKT_ONEPASS_SIGNATURE,	"One-Pass Signature" },
+    { PGPPKT_SECRET_KEY,	"Secret Key" },
+    { PGPPKT_PUBLIC_KEY,	"Public Key" },
+    { PGPPKT_SECRET_SUBKEY,	"Secret Subkey" },
+    { PGPPKT_COMPRESSED_DATA,	"Compressed Data" },
+    { PGPPKT_SYMMETRIC_DATA,	"Symmetrically Encrypted Data" },
+    { PGPPKT_MARKER,		"Marker" },
+    { PGPPKT_LITERAL_DATA,	"Literal Data" },
+    { PGPPKT_TRUST,		"Trust" },
+    { PGPPKT_USER_ID,		"User ID" },
+    { PGPPKT_PUBLIC_SUBKEY,	"Public Subkey" },
+    { PGPPKT_PRIVATE_60,	"Private #60" },
+    { PGPPKT_PRIVATE_61,	"Private #61" },
+    { PGPPKT_PRIVATE_62,	"Private #62" },
+    { PGPPKT_PRIVATE_63,	"Private #63" },
+    { -1,			"Unknown packet tag" },
+};
+/*@=readonlytrans@*/
+
+void pgpPrtVal(const char * pre, pgpValTbl vs, byte val)
+{
+    if (pre && *pre)
+	fprintf(stderr, "%s", pre);
+    fprintf(stderr, "%s(%u)", pgpValStr(vs, val), (unsigned)val);
+}
+
+
+int pgpPrtPktSigV3(pgpPkt pkt, const byte *h, unsigned int hlen)
+{
+    pgpPktSigV3 v = (pgpPktSigV3)h;
+    byte *p;
+    unsigned plen;
+    time_t t;
+    int i;
+
+    pgpPrtVal("", pgpPktTbl, pkt);
+    if (v->version != 3) {
+	fprintf(stderr, " version(%u) != 3\n", (unsigned)v->version);
+	return 1;
+    }
+    if (v->hashlen != 5) {
+	fprintf(stderr, " hashlen(%u) != 5\n", (unsigned)v->hashlen);
+	return 1;
+    }
+    pgpPrtVal(" ", pgpPubkeyTbl, v->pubkey_algo);
+    pgpPrtVal(" ", pgpHashTbl, v->hash_algo);
+
+    pgpPrtVal(" ", pgpSigTypeTbl, v->sigtype);
+
+    t = pgpGrab(v->time, sizeof(v->time));
+fprintf(stderr, " time %08x %-24.24s", (unsigned)t, ctime(&t));
+fprintf(stderr, " signer keyid %02x%02x%02x%02x%02x%02x%02x%02x",
+	(unsigned)v->signer[0], (unsigned)v->signer[1],
+	(unsigned)v->signer[2], (unsigned)v->signer[3],
+	(unsigned)v->signer[4], (unsigned)v->signer[5],
+	(unsigned)v->signer[6], (unsigned)v->signer[7]);
+    plen = pgpGrab(v->signhash16, sizeof(v->signhash16));
+fprintf(stderr, " signhash16 %04x", plen);
+fprintf(stderr, "\n");
+
+    p = &v->data[0];
+    for (i = 0; p < &h[hlen]; i++, p += pgpMpiLen(p))
+	fprintf(stderr, "%7d %s\n", i, pgpMpiStr(p));
+
+    return 0;
+}
+
+int pgpPrtSubType(const byte *h, unsigned int hlen)
+{
+    const byte *p = h;
+    unsigned plen;
+    int i;
+
+    while (hlen > 0) {
+	if (*p < 192) {
+	    plen = *p++;
+	    hlen -= 1;
+	} else if (*p < 255) {
+	    plen = ((p[0] - 192) << 8) + p[1] + 192;
+	    p += 2;
+	    hlen -= 2;
+	} else {
+	    p++;
+	    plen = pgpGrab(p, 4);
+	    p += 4;
+	    hlen -= 5;
+	}
+	pgpPrtVal("    ", pgpSubTypeTbl, p[0]);
+	switch (*p) {
+	case PGPSUBTYPE_PREFER_SYMKEY:	/* preferred symmetric algorithms */
+	    for (i = 1; i < plen; i++)
+		pgpPrtVal(" ", pgpSymkeyTbl, p[i]);
+	    fprintf(stderr, "\n");
+	    break;
+	case PGPSUBTYPE_PREFER_HASH:	/* preferred hash algorithms */
+	    for (i = 1; i < plen; i++)
+		pgpPrtVal(" ", pgpHashTbl, p[i]);
+	    fprintf(stderr, "\n");
+	    break;
+	case PGPSUBTYPE_PREFER_COMPRESS:/* preferred compression algorithms */
+	    for (i = 1; i < plen; i++)
+		pgpPrtVal(" ", pgpCompressionTbl, p[i]);
+	    fprintf(stderr, "\n");
+	    break;
+	case PGPSUBTYPE_KEYSERVER_PREFERS:/* key server preferences */
+	    for (i = 1; i < plen; i++)
+		pgpPrtVal(" ", pgpKeyServerPrefsTbl, p[i]);
+	    fprintf(stderr, "\n");
+	    break;
+	case PGPSUBTYPE_SIG_CREATE_TIME:
+	case PGPSUBTYPE_SIG_EXPIRE_TIME:
+	case PGPSUBTYPE_KEY_EXPIRE_TIME:
+	    fprintf(stderr, " %s", pgpHexStr(p+1, plen-1));
+	    if ((plen - 1) == 4) {
+		time_t t = pgpGrab(p+1, plen-1);
+		fprintf(stderr, " %-24.24s", ctime(&t));
+	    }
+	    fprintf(stderr, "\n");
+	    break;
+
+	case PGPSUBTYPE_ISSUER_KEYID:	/* issuer key ID */
+	case PGPSUBTYPE_EXPORTABLE_CERT:
+	case PGPSUBTYPE_TRUST_SIG:
+	case PGPSUBTYPE_REGEX:
+	case PGPSUBTYPE_REVOCABLE:
+	case PGPSUBTYPE_BACKWARD_COMPAT:
+	case PGPSUBTYPE_REVOKE_KEY:
+	case PGPSUBTYPE_NOTATION:
+	case PGPSUBTYPE_PREFER_KEYSERVER:
+	case PGPSUBTYPE_PRIMARY_USERID:
+	case PGPSUBTYPE_POLICY_URL:
+	case PGPSUBTYPE_KEY_FLAGS:
+	case PGPSUBTYPE_SIGNER_USERID:
+	case PGPSUBTYPE_REVOKE_REASON:
+	case PGPSUBTYPE_INTERNAL_100:
+	case PGPSUBTYPE_INTERNAL_101:
+	case PGPSUBTYPE_INTERNAL_102:
+	case PGPSUBTYPE_INTERNAL_103:
+	case PGPSUBTYPE_INTERNAL_104:
+	case PGPSUBTYPE_INTERNAL_105:
+	case PGPSUBTYPE_INTERNAL_106:
+	case PGPSUBTYPE_INTERNAL_107:
+	case PGPSUBTYPE_INTERNAL_108:
+	case PGPSUBTYPE_INTERNAL_109:
+	case PGPSUBTYPE_INTERNAL_110:
+	default:
+	    fprintf(stderr, " %s", pgpHexStr(p+1, plen-1));
+	    fprintf(stderr, "\n");
+	    break;
+	}
+	p += plen;
+	hlen -= plen;
+    }
+    return 0;
+}
+
+int pgpPrtPktSigV4(pgpPkt pkt, const byte *h, unsigned int hlen)
+{
+    pgpPktSigV4 v = (pgpPktSigV4)h;
+    byte * p;
+    unsigned plen;
+    int i;
+
+    pgpPrtVal("", pgpPktTbl, pkt);
+    if (v->version != 4) {
+	fprintf(stderr, " version(%u) != 4\n", (unsigned)v->version);
+	return 1;
+    }
+    pgpPrtVal(" ", pgpPubkeyTbl, v->pubkey_algo);
+    pgpPrtVal(" ", pgpHashTbl, v->hash_algo);
+
+    pgpPrtVal(" ", pgpSigTypeTbl, v->sigtype);
+fprintf(stderr, "\n");
+
+    p = &v->hashlen[0];
+    plen = pgpGrab(v->hashlen, sizeof(v->hashlen));
+    p += 2;
+fprintf(stderr, "   hash[%u] -- %s\n", plen, pgpHexStr(p, plen));
+    (void) pgpPrtSubType(p, plen);
+    p += plen;
+    plen = pgpGrab(p,2);
+    p += 2;
+fprintf(stderr, " unhash[%u] -- %s\n", plen, pgpHexStr(p, plen));
+    (void) pgpPrtSubType(p, plen);
+    p += plen;
+    plen = pgpGrab(p,2);
+    p += 2;
+fprintf(stderr, " signhash16 %04x\n", plen);
+
+    for (i = 0; p < &h[hlen]; i++, p += pgpMpiLen(p))
+	fprintf(stderr, "%7d %s\n", i, pgpMpiStr(p));
+
+    return 0;
+}
+
+int pgpPrtPktSig(pgpPkt pkt, const byte *h, unsigned int hlen)
+{
+    byte version = *h;
+    switch (version) {
+    case 3:
+	(void) pgpPrtPktSigV3(pkt, h, hlen);
+	break;
+    case 4:
+	(void) pgpPrtPktSigV4(pkt, h, hlen);
+	break;
+    }
+    return 0;
+}
+
+int pgpPrtKeyV3(pgpPkt pkt, const byte *h, unsigned int hlen)
+{
+    pgpPktKeyV3 v = (pgpPktKeyV3)h;
+    byte * p;
+    unsigned plen;
+    time_t t;
+    int i;
+
+    pgpPrtVal("", pgpPktTbl, pkt);
+    if (v->version != 3) {
+	fprintf(stderr, " version(%u) != 3\n", (unsigned)v->version);
+	return 1;
+    }
+    t = pgpGrab(v->time, sizeof(v->time));
+fprintf(stderr, " time %08x %-24.24s", (unsigned)t, ctime(&t));
+    pgpPrtVal(" ", pgpPubkeyTbl, v->pubkey_algo);
+
+    plen = pgpGrab(v->valid, sizeof(v->valid));
+    if (plen != 0)
+	fprintf(stderr, " valid %u days", plen);
+
+fprintf(stderr, "\n");
+
+    p = &v->data[0];
+    for (i = 0; p < &h[hlen]; i++, p += pgpMpiLen(p))
+	fprintf(stderr, "%7d %s\n", i, pgpMpiStr(p));
+
+    return 0;
+}
+
+int pgpPrtKeyV4(pgpPkt pkt, const byte *h, unsigned int hlen)
+{
+    pgpPktKeyV4 v = (pgpPktKeyV4)h;
+    byte * p;
+    time_t t;
+    int i;
+
+    pgpPrtVal("", pgpPktTbl, pkt);
+    if (v->version != 4) {
+	fprintf(stderr, " version(%u) != 4\n", (unsigned)v->version);
+	return 1;
+    }
+    t = pgpGrab(v->time, sizeof(v->time));
+fprintf(stderr, " time %08x %-24.24s", (unsigned)t, ctime(&t));
+    pgpPrtVal(" ", pgpPubkeyTbl, v->pubkey_algo);
+fprintf(stderr, "\n");
+
+    p = &v->data[0];
+    for (i = 0; p < &h[hlen]; i++, p += pgpMpiLen(p))
+	fprintf(stderr, "%7d %s\n", i, pgpMpiStr(p));
+
+    return 0;
+}
+
+int pgpPrtKey(pgpPkt pkt, const byte *h, unsigned int hlen)
+{
+    byte version = *h;
+    switch (version) {
+    case 3:
+	(void) pgpPrtKeyV3(pkt, h, hlen);
+	break;
+    case 4:
+	(void) pgpPrtKeyV4(pkt, h, hlen);
+	break;
+    }
+    return 0;
+}
+
+int pgpPrtUserID(pgpPkt pkt, const byte *h, unsigned int hlen)
+{
+    pgpPrtVal("", pgpPktTbl, pkt);
+fprintf(stderr, " \"%*s\"\n", (int)hlen, (const char *)h);
+    return 0;
+}
+
+int pgpPrtPkt(const byte *p)
+{
+    unsigned int val = *p;
+    unsigned int mark = (val >> 7) & 0x1;
+    unsigned int nmark = (val >> 6) & 0x1;
+    pgpPkt pkt = (val >> 2) & 0xf;
+    unsigned int plen = (1 << (val & 0x3));
+    const byte *h;
+    unsigned int hlen = 0;
+    unsigned int i;
+
+    /* XXX can't deal with these. */
+    if (!mark || nmark || plen > 8)
+	return -1;
+
+    for (i = 1; i <= plen; i++)
+	hlen = (hlen << 8) | p[i];
+
+    h = p + plen + 1;
+    switch (pkt) {
+    case PGPPKT_SIGNATURE:
+	(void) pgpPrtPktSig(pkt, h, hlen);
+	break;
+    case PGPPKT_PUBLIC_KEY:
+    case PGPPKT_PUBLIC_SUBKEY:
+    case PGPPKT_SECRET_KEY:
+    case PGPPKT_SECRET_SUBKEY:
+	(void) pgpPrtKey(pkt, h, hlen);
+	break;
+    case PGPPKT_USER_ID:
+	(void) pgpPrtUserID(pkt, h, hlen);
+	break;
+    case PGPPKT_RESERVED:
+    case PGPPKT_PUBLIC_SESSION_KEY:
+    case PGPPKT_SYMMETRIC_SESSION_KEY:
+    case PGPPKT_COMPRESSED_DATA:
+    case PGPPKT_SYMMETRIC_DATA:
+    case PGPPKT_MARKER:
+    case PGPPKT_LITERAL_DATA:
+    case PGPPKT_TRUST:
+    case PGPPKT_PRIVATE_60:
+    case PGPPKT_PRIVATE_61:
+    case PGPPKT_PRIVATE_62:
+    case PGPPKT_PRIVATE_63:
+    default:
+	pgpPrtVal("", pgpPktTbl, pkt);
+	fprintf(stderr, " plen %02x hlen %x\n", plen, hlen);
+	break;
+    }
+
+    return plen+hlen+1;
+}
diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h
index 02d632950..fbb14ec77 100644
--- a/rpmio/rpmpgp.h
+++ b/rpmio/rpmpgp.h
@@ -12,6 +12,14 @@
 
 #include "beecrypt.h"
 
+/*@-typeuse -fielduse@*/
+/**
+ */
+typedef const struct pgpValTbl_s {
+    int val;
+    const char * str;
+} * pgpValTbl;
+ 
 /**
  * 4.3. Packet Tags
  * 
@@ -19,27 +27,32 @@
  * old format headers can only have tags less than 16, whereas new
  * format headers can have tags as great as 63.
  */
-typedef enum pgpKeyPkt_e {
-    PGPKEYPKT_RESERVED		=  0, /*!< Reserved/Invalid */
-    PGPKEYPKT_PUBLIC_SESSION_KEY=  1, /*!< Public-Key Encrypted Session Key */
-    PGPKEYPKT_SIGNATURE		=  2, /*!< Signature */
-    PGPKEYPKT_SYMMETRIC_SESSION_KEY=3,/*!< Symmetric-Key Encrypted Session Key*/
-    PGPKEYPKT_ONEPASS_SIGNATURE	=  4, /*!< One-Pass Signature */
-    PGPKEYPKT_SECRET_KEY	=  5, /*!< Secret Key */
-    PGPKEYPKT_PUBLIC_KEY	=  6, /*!< Public Key */
-    PGPKEYPKT_SECRET_SUBKEY	=  7, /*!< Secret Subkey */
-    PGPKEYPKT_COMPRESSED_DATA	=  8, /*!< Compressed Data */
-    PGPKEYPKT_SYMMETRIC_DATA	=  9, /*!< Symmetrically Encrypted Data */
-    PGPKEYPKT_MARKER		= 10, /*!< Marker */
-    PGPKEYPKT_LITERAL_DATA	= 11, /*!< Literal Data */
-    PGPKEYPKT_TRUST		= 12, /*!< Trust */
-    PGPKEYPKT_USER_ID		= 13, /*!< User ID */
-    PGPKEYPKT_PUBLIC_SUBKEY	= 14, /*!< Public Subkey */
-    PGPKEYPKT_PRIVATE_60	= 60, /*!< Private or Experimental Values */
-    PGPKEYPKT_PRIVATE_61	= 61, /*!< Private or Experimental Values */
-    PGPKEYPKT_PRIVATE_62	= 62, /*!< Private or Experimental Values */
-    PGPKEYPKT_PRIVATE_63	= 63, /*!< Private or Experimental Values */
-} pgpKeyPkt;
+typedef enum pgpPkt_e {
+    PGPPKT_RESERVED		=  0, /*!< Reserved/Invalid */
+    PGPPKT_PUBLIC_SESSION_KEY	=  1, /*!< Public-Key Encrypted Session Key */
+    PGPPKT_SIGNATURE		=  2, /*!< Signature */
+    PGPPKT_SYMMETRIC_SESSION_KEY=  3, /*!< Symmetric-Key Encrypted Session Key*/
+    PGPPKT_ONEPASS_SIGNATURE	=  4, /*!< One-Pass Signature */
+    PGPPKT_SECRET_KEY		=  5, /*!< Secret Key */
+    PGPPKT_PUBLIC_KEY		=  6, /*!< Public Key */
+    PGPPKT_SECRET_SUBKEY	=  7, /*!< Secret Subkey */
+    PGPPKT_COMPRESSED_DATA	=  8, /*!< Compressed Data */
+    PGPPKT_SYMMETRIC_DATA	=  9, /*!< Symmetrically Encrypted Data */
+    PGPPKT_MARKER		= 10, /*!< Marker */
+    PGPPKT_LITERAL_DATA		= 11, /*!< Literal Data */
+    PGPPKT_TRUST		= 12, /*!< Trust */
+    PGPPKT_USER_ID		= 13, /*!< User ID */
+    PGPPKT_PUBLIC_SUBKEY	= 14, /*!< Public Subkey */
+    PGPPKT_PRIVATE_60		= 60, /*!< Private or Experimental Values */
+    PGPPKT_PRIVATE_61		= 61, /*!< Private or Experimental Values */
+    PGPPKT_PRIVATE_62		= 62, /*!< Private or Experimental Values */
+    PGPPKT_PRIVATE_63		= 63, /*!< Private or Experimental Values */
+} pgpPkt;
+
+/**
+ */
+/*@unused@*/
+extern struct pgpValTbl_s pgpPktTbl[];
 
 /**
  * 5.1. Public-Key Encrypted Session Key Packets (Tag 1)
@@ -110,6 +123,11 @@ typedef enum pgpSigType_e {
 } pgpSigType;
 
 /**
+ */
+/*@unused@*/
+extern struct pgpValTbl_s pgpSigTypeTbl[];
+
+/**
  * 9.1. Public Key Algorithms
  *
 \verbatim
@@ -145,6 +163,11 @@ typedef enum pgpPubkeyAlgo_e {
 } pgpPubkeyAlgo;
 
 /**
+ */
+/*@unused@*/
+extern struct pgpValTbl_s pgpPubkeyTbl[];
+
+/**
  * 9.2. Symmetric Key Algorithms
  *
 \verbatim
@@ -183,6 +206,11 @@ typedef enum pgpSymkeyAlgo_e {
 } pgpSymkeyAlgo;
 
 /**
+ */
+/*@unused@*/
+extern struct pgpValTbl_s pgpSymkeyTbl[];
+
+/**
  * 9.3. Compression Algorithms
  *
 \verbatim
@@ -204,6 +232,11 @@ typedef enum pgpCompressAlgo_e {
 } pgpCompressAlgo;
 
 /**
+ */
+/*@unused@*/
+extern struct pgpValTbl_s pgpCompressionTbl[];
+
+/**
  * 9.4. Hash Algorithms
  *
 \verbatim
@@ -233,6 +266,11 @@ typedef enum pgpHashAlgo_e {
 } pgpHashAlgo;
 
 /**
+ */
+/*@unused@*/
+extern struct pgpValTbl_s pgpHashTbl[];
+
+/**
  * 5.2.2. Version 3 Signature Packet Format
  * 
  * The body of a version 3 Signature Packet contains:
@@ -253,7 +291,7 @@ typedef enum pgpHashAlgo_e {
  *   - MPI of DSA value r.
  *   - MPI of DSA value s.
  */
-typedef struct pgpSigPktV3_s {
+typedef struct pgpPktSigV3_s {
     byte version;	/*!< version number (3). */
     byte hashlen;	/*!< length of following hashed material. MUST be 5. */
     byte sigtype;	/*!< signature type. */
@@ -263,7 +301,7 @@ typedef struct pgpSigPktV3_s {
     byte hash_algo;	/*!< hash algorithm. */
     byte signhash16[2];	/*!< left 16 bits of signed hash value. */
     byte data[1];	/*!< One or more multi-precision integers. */
-} * pgpSigPktV3;
+} * pgpPktSigV3;
 
 /**
  * 5.2.3. Version 4 Signature Packet Format
@@ -286,14 +324,14 @@ typedef struct pgpSigPktV3_s {
  *   - Two-octet field holding left 16 bits of signed hash value.
  *   - One or more multi-precision integers comprising the signature.
  */
-typedef struct pgpSigPktV4_s {
+typedef struct pgpPktSigV4_s {
     byte version;	/*!< version number (4). */
     byte sigtype;	/*!< signature type. */
     byte pubkey_algo;	/*!< public key algorithm. */
     byte hash_algo;	/*!< hash algorithm. */
     byte hashlen[2];	/*!< length of following hashed material. */
     byte data[1];	/*!< Hashed subpacket data. (zero or more subpackets) */
-} * pgpSigPktV4;
+} * pgpPktSigV4;
 
 /**
  * 5.2.3.1. Signature Subpacket Specification
@@ -361,7 +399,7 @@ typedef struct pgpSigPktV4_s {
  * marked critical but is unknown to the evaluating software, the
  * evaluator SHOULD consider the signature to be in error.
  */
-typedef enum pgpSubpktType_e {
+typedef enum pgpSubType_e {
     PGPSUBTYPE_SIG_CREATE_TIME	=   2, /*!< signature creation time */
     PGPSUBTYPE_SIG_EXPIRE_TIME	=   3, /*!< signature expiration time */
     PGPSUBTYPE_EXPORTABLE_CERT	=   4, /*!< exportable certification */
@@ -394,7 +432,12 @@ typedef enum pgpSubpktType_e {
     PGPSUBTYPE_INTERNAL_108	= 108, /*!< internal or user-defined */
     PGPSUBTYPE_INTERNAL_109	= 109, /*!< internal or user-defined */
     PGPSUBTYPE_INTERNAL_110	= 110, /*!< internal or user-defined */
-} pgpSubpktType;
+} pgpSubType;
+
+/**
+ */
+/*@unused@*/
+extern struct pgpValTbl_s pgpSubTypeTbl[];
 
 /**
  * 5.2. Signature Packet (Tag 2)
@@ -416,10 +459,10 @@ typedef enum pgpSubpktType_e {
  * message that is encrypted to a V3 key, it is reasonable to create a
  * V3 signature.
  */
-typedef union pgpSigPkt_u {
-    struct pgpSigPktV3_s v3;
-    struct pgpSigPktV4_s v4;
-} * pgpSigPkt;
+typedef union pgpPktSig_u {
+    struct pgpPktSigV3_s v3;
+    struct pgpPktSigV4_s v4;
+} * pgpPktSig;
 
 /**
  * 5.3. Symmetric-Key Encrypted Session-Key Packets (Tag 3)
@@ -449,9 +492,9 @@ typedef union pgpSigPkt_u {
  *     with the string-to-key object.
  *
  */
-typedef struct pgpSymkeyPkt_s {
+typedef struct pgpPktSymkey_s {
     byte version;	/*!< version number (4). */
-} * pgpSymkeyPkt;
+} * pgpPktSymkey;
 
 /**
  * 5.4. One-Pass Signature Packets (Tag 4)
@@ -482,9 +525,9 @@ typedef struct pgpSymkeyPkt_s {
  * packet and the final signature packet corresponds to the first one-
  * pass packet.
  */
-typedef struct pgpOnepassPkt_s {
+typedef struct pgpPktOnepass_s {
     byte version;	/*!< version number (3). */
-} * pgpOnepassPkt;
+} * pgpPktOnepass;
 
 /**
  * 5.5.1. Key Packet Variants
@@ -558,13 +601,13 @@ typedef struct pgpOnepassPkt_s {
  * of key IDs and fingerprints.
  *
  */
-typedef struct pgpKeyV3_s {
+typedef struct pgpPktKeyV3_s {
     byte version;	/*!< version number (3). */
     byte time[4];	/*!< time that the key was created. */
     byte valid[2];	/*!< time in days that this key is valid. */
     byte pubkey_algo;	/*!< public key algorithm. */
     byte data[1];	/*!< One or more multi-precision integers. */
-} * pgpKeyV3;
+} * pgpPktKeyV3;
 
 /**
  * The version 4 format is similar to the version 3 format except for
@@ -597,12 +640,12 @@ typedef struct pgpKeyV3_s {
  *         secret).
  *
  */
-typedef struct pgpKeyV4_s {
+typedef struct pgpPktKeyV4_s {
     byte version;	/*!< version number (4). */
     byte time[4];	/*!< time that the key was created. */
     byte pubkey_algo;	/*!< public key algorithm. */
     byte data[1];	/*!< One or more multi-precision integers. */
-} * pgpKeyV4;
+} * pgpPktKeyV4;
 
 /**
  * 5.5.3. Secret Key Packet Formats
@@ -789,23 +832,167 @@ typedef struct pgpKeyV4_s {
  * If it is text, it is encoded in UTF-8.
  *
  */
-typedef struct pgpUidPkt_s {
+typedef struct pgpPktUid_s {
     byte userid[1];
-} * pgpUidPkt;
+} * pgpPktUid;
 
 /**
  */
-typedef struct pgpValStr_s {
-    int val;
-    const char * str;
-} * pgpValStr;
- 
+/*@unused@*/
+extern const char * redhatPubKeyDSA;
+
+/**
+ */
+/*@unused@*/
+extern const char * redhatPubKeyRSA;
+/*@=typeuse =fielduse@*/
+
+/*@-fcnuse@*/
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/**
+ */
+/*@unused@*/ static inline
+unsigned int pgpGrab(const byte *s, int nbytes)
+	/*@*/
+{
+    unsigned int i = 0;
+    int nb = (nbytes <= sizeof(i) ? nbytes : sizeof(i));
+    while (nb--)
+	i = (i << 8) | *s++;
+    return i;
+}
+
+/**
+ */
+/*@unused@*/ static inline
+unsigned int pgpMpiBits(const byte *p)
+	/*@*/
+{
+    return ((p[0] << 8) | p[1]);
+}
+
+/**
+ */
+/*@unused@*/ static inline
+unsigned int pgpMpiLen(const byte *p)
+	/*@*/
+{
+    return (2 + ((pgpMpiBits(p)+7)>>3));
+}
+	
+/**
+ */
+/*@unused@*/ static inline
+char * pgpHexCvt(/*@returned@*/ char *t, const byte *s, int nbytes)
+	/*@modifies *t @*/
+{
+    static char hex[] = "0123456789abcdef";
+    while (nbytes-- > 0) {
+	unsigned int i;
+	i = *s++;
+	*t++ = hex[ (i >> 4) & 0xf ];
+	*t++ = hex[ (i     ) & 0xf ];
+    }
+    *t = '\0';
+    return t;
+}
+
+/**
+ */
+/*@unused@*/ static inline /*@observer@*/
+char * pgpHexStr(const byte *p, unsigned int plen)
+	/*@*/
+{
+    static char prbuf[2048];
+    char *t = prbuf;
+    t = pgpHexCvt(t, p, plen);
+    return prbuf;
+}
+
+/**
+ */
+/*@unused@*/ static inline /*@observer@*/
+const char * pgpMpiStr(const byte *p)
+	/*@*/
+{
+    static char prbuf[2048];
+    char *t = prbuf;
+    sprintf(t, "[%u]: ", pgpGrab(p, 2));
+    t += strlen(t);
+    t = pgpHexCvt(t, p+2, pgpMpiLen(p)-2);
+    return prbuf;
+}
+
+/**
+ */
+/*@unused@*/ static inline /*@observer@*/
+const char * pgpValStr(pgpValTbl vs, byte val)
+	/*@*/
+{
+    do {
+	if (vs->val == val)
+	    break;
+    } while ((++vs)->val != -1);
+    return vs->str;
+}
+
+/*@-exportlocal@*/
+/**
+ */
+void pgpPrtVal(const char * pre, pgpValTbl vs, byte val)
+	/*@modifies fileSystem @*/;
+
+/**
+ */
+int pgpPrtPktSigV3(pgpPkt pkt, const byte *h, unsigned int hlen)
+	/*@modifies fileSystem @*/;
+
+/**
+ */
+int pgpPrtSubType(const byte *h, unsigned int hlen)
+	/*@modifies fileSystem @*/;
+
+/**
+ */
+int pgpPrtPktSigV4(pgpPkt pkt, const byte *h, unsigned int hlen)
+	/*@modifies fileSystem @*/;
+
+/**
+ */
+int pgpPrtPktSig(pgpPkt pkt, const byte *h, unsigned int hlen)
+	/*@modifies fileSystem @*/;
+
+/**
+ */
+int pgpPrtKeyV3(pgpPkt pkt, const byte *h, unsigned int hlen)
+	/*@modifies fileSystem @*/;
+
+/**
+ */
+int pgpPrtKeyV4(pgpPkt pkt, const byte *h, unsigned int hlen)
+	/*@modifies fileSystem @*/;
+
+/**
+ */
+int pgpPrtKey(pgpPkt pkt, const byte *h, unsigned int hlen)
+	/*@modifies fileSystem @*/;
+
+/**
+ */
+int pgpPrtUserID(pgpPkt pkt, const byte *h, unsigned int hlen)
+	/*@modifies fileSystem @*/;
+/*@=exportlocal@*/
+
+/**
+ */
+int pgpPrtPkt(const byte *p);
+
 #ifdef __cplusplus
 }
 #endif
+/*@=fcnuse@*/
 
 #endif	/* H_RPMPGP */
diff --git a/rpmio/tkey.c b/rpmio/tkey.c
index a37d6048a..dc25e36cf 100644
--- a/rpmio/tkey.c
+++ b/rpmio/tkey.c
@@ -1,577 +1,18 @@
 /** \ingroup rpmio signature
  * \file rpmio/tkey.c
+ * Routines to handle RFC-2440 detached signatures.
  */
 
 static int _debug = 0;
 
 #include "system.h"
+#include "rpmio.h"
 #include "rpmpgp.h"
 #include "base64.h"
 #include "debug.h"
 
 #include <stdio.h>
 
-static inline int grab(const byte *s, int nbytes)
-{
-    int i = 0;
-    int nb = (nbytes <= sizeof(i) ? nbytes : sizeof(i));
-    while (nb--)
-	i = (i << 8) | *s++;
-    return i;
-}
-
-static inline int mpi_nbits(const byte *p) { return ((p[0] << 8) | p[1]); }
-static inline int mpi_len(const byte *p) { return (2 + ((mpi_nbits(p)+7)>>3)); }
-	
-static char * pr_pfmt(char *t, const byte *s, int nbytes)
-{
-    static char hex[] = "0123456789abcdef";
-    while (nbytes-- > 0) {
-	*t++ = hex[ (*s >> 4) & 0xf ];
-	*t++ = hex[ (*s++   ) & 0xf ];
-    }
-    *t = '\0';
-    return t;
-}
-
-static char prbuf[2048];
-
-static char * pr_hex(const byte *p, unsigned plen)
-{
-    char *t = prbuf;
-
-    t = pr_pfmt(t, p, plen);
-    return prbuf;
-}
-
-static const char * pr_mpi(const byte *p)
-{
-    char *t = prbuf;
-
-    sprintf(t, "[%d]: ", grab(p, 2));
-    t += strlen(t);
-    t = pr_pfmt(t, p+2, mpi_len(p)-2);
-    return prbuf;
-}
-
-static const char * valstr(pgpValStr vs, byte val)
-{
-    do {
-	if (vs->val == val)
-	    break;
-    } while ((++vs)->val != -1);
-    return vs->str;
-}
-
-static void pr_valstr(const char * pre, pgpValStr vs, byte val)
-{
-    if (pre && *pre)
-	fprintf(stderr, "%s", pre);
-    fprintf(stderr, "%s(%d)", valstr(vs, val), val);
-}
-
-static struct pgpValStr_s sigtypeVals[] = {
-    { PGPSIGTYPE_BINARY,	"Signature of a binary document" },
-    { PGPSIGTYPE_TEXT,		"Signature of a canonical text document" },
-    { PGPSIGTYPE_STANDALONE,	"Standalone signature" },
-    { PGPSIGTYPE_GENERIC_CERT,	"Generic certification of a User ID and Public Key" },
-    { PGPSIGTYPE_PERSONA_CERT,	"Persona certification of a User ID and Public Key" },
-    { PGPSIGTYPE_CASUAL_CERT,	"Casual certification of a User ID and Public Key" },
-    { PGPSIGTYPE_POSITIVE_CERT,	"Positive certification of a User ID and Public Key" },
-    { PGPSIGTYPE_SUBKEY_BINDING,"Subkey Binding Signature" },
-    { PGPSIGTYPE_SIGNED_KEY,	"Signature directly on a key" },
-    { PGPSIGTYPE_KEY_REVOKE,	"Key revocation signature" },
-    { PGPSIGTYPE_SUBKEY_REVOKE,	"Subkey revocation signature" },
-    { PGPSIGTYPE_CERT_REVOKE,	"Certification revocation signature" },
-    { PGPSIGTYPE_TIMESTAMP,	"Timestamp signature" },
-    { -1,			"Unknown signature type" },
-};
-
-static struct pgpValStr_s pubkeyVals[] = {
-    { PGPPUBKEYALGO_RSA,	"RSA" },
-    { PGPPUBKEYALGO_RSA_ENCRYPT,"RSA(Encrypt-Only)" },
-    { PGPPUBKEYALGO_RSA_SIGN,	"RSA(Sign-Only)" },
-    { PGPPUBKEYALGO_ELGAMAL_ENCRYPT,"Elgamal(Encrypt-Only)" },
-    { PGPPUBKEYALGO_DSA,	"DSA" },
-    { PGPPUBKEYALGO_EC,		"Elliptic Curve" },
-    { PGPPUBKEYALGO_ECDSA,	"ECDSA" },
-    { PGPPUBKEYALGO_ELGAMAL,	"Elgamal" },
-    { PGPPUBKEYALGO_DH,		"Diffie-Hellman (X9.42)" },
-    { -1,			"Unknown public key algorithm" },
-};
-
-static struct pgpValStr_s symkeyVals[] = {
-    { PGPSYMKEYALGO_PLAINTEXT,	"Plaintext" },
-    { PGPSYMKEYALGO_IDEA,	"IDEA" },
-    { PGPSYMKEYALGO_TRIPLE_DES,	"Triple-DES" },
-    { PGPSYMKEYALGO_CAST5,	"CAST5" },
-    { PGPSYMKEYALGO_BLOWFISH,	"BLOWFISH" },
-    { PGPSYMKEYALGO_SAFER,	"SAFER" },
-    { PGPSYMKEYALGO_DES_SK,	"DES/SK" },
-    { PGPSYMKEYALGO_AES_128,	"AES(128-bit key)" },
-    { PGPSYMKEYALGO_AES_192,	"AES(192-bit key)" },
-    { PGPSYMKEYALGO_AES_256,	"AES(256-bit key)" },
-    { PGPSYMKEYALGO_TWOFISH,	"TWOFISH" },
-    { -1,			"Unknown symmetric key algorithm" },
-};
-
-static struct pgpValStr_s compressionVals[] = {
-    { PGPCOMPRESSALGO_NONE,	"Uncompressed" },
-    { PGPCOMPRESSALGO_ZIP,	"ZIP" },
-    { PGPCOMPRESSALGO_ZLIB, 	"ZLIB" },
-    { -1,			"Unknown compression algorithm" },
-};
-
-static struct pgpValStr_s hashVals[] = {
-    { PGPHASHALGO_MD5,		"MD5" },
-    { PGPHASHALGO_SHA1,		"SHA1" },
-    { PGPHASHALGO_RIPEMD160,	"RIPEMD160" },
-    { PGPHASHALGO_MD2,		"MD2" },
-    { PGPHASHALGO_TIGER192,	"TIGER192" },
-    { PGPHASHALGO_HAVAL_5_160,	"HAVAL-5-160" },
-    { -1,			"Unknown hash algorithm" },
-};
-
-static struct pgpValStr_s keyservPrefVals[] = {
-    { 0x80,			"No-modify" },
-    { -1,			"Unknown key server preference" },
-};
-
-static struct pgpValStr_s subtypeVals[] = {
-    { PGPSUBTYPE_SIG_CREATE_TIME,"signature creation time" },
-    { PGPSUBTYPE_SIG_EXPIRE_TIME,"signature expiration time" },
-    { PGPSUBTYPE_EXPORTABLE_CERT,"exportable certification" },
-    { PGPSUBTYPE_TRUST_SIG,	"trust signature" },
-    { PGPSUBTYPE_REGEX,		"regular expression" },
-    { PGPSUBTYPE_REVOCABLE,	"revocable" },
-    { PGPSUBTYPE_KEY_EXPIRE_TIME,"key expiration time" },
-    { PGPSUBTYPE_BACKWARD_COMPAT,"placeholder for backward compatibility" },
-    { PGPSUBTYPE_PREFER_SYMKEY,	"preferred symmetric algorithms" },
-    { PGPSUBTYPE_REVOKE_KEY,	"revocation key" },
-    { PGPSUBTYPE_ISSUER_KEYID,	"issuer key ID" },
-    { PGPSUBTYPE_NOTATION,	"notation data" },
-    { PGPSUBTYPE_PREFER_HASH,	"preferred hash algorithms" },
-    { PGPSUBTYPE_PREFER_COMPRESS,"preferred compression algorithms" },
-    { PGPSUBTYPE_KEYSERVER_PREFERS,"key server preferences" },
-    { PGPSUBTYPE_PREFER_KEYSERVER,"preferred key server" },
-    { PGPSUBTYPE_PRIMARY_USERID,"primary user id" },
-    { PGPSUBTYPE_POLICY_URL,	"policy URL" },
-    { PGPSUBTYPE_KEY_FLAGS,	"key flags" },
-    { PGPSUBTYPE_SIGNER_USERID,	"signer's user id" },
-    { PGPSUBTYPE_REVOKE_REASON,	"reason for revocation" },
-    { PGPSUBTYPE_INTERNAL_100,	"internal subpkt type 100" },
-    { PGPSUBTYPE_INTERNAL_101,	"internal subpkt type 101" },
-    { PGPSUBTYPE_INTERNAL_102,	"internal subpkt type 102" },
-    { PGPSUBTYPE_INTERNAL_103,	"internal subpkt type 103" },
-    { PGPSUBTYPE_INTERNAL_104,	"internal subpkt type 104" },
-    { PGPSUBTYPE_INTERNAL_105,	"internal subpkt type 105" },
-    { PGPSUBTYPE_INTERNAL_106,	"internal subpkt type 106" },
-    { PGPSUBTYPE_INTERNAL_107,	"internal subpkt type 107" },
-    { PGPSUBTYPE_INTERNAL_108,	"internal subpkt type 108" },
-    { PGPSUBTYPE_INTERNAL_109,	"internal subpkt type 109" },
-    { PGPSUBTYPE_INTERNAL_110,	"internal subpkt type 110" },
-    { -1,			"Unknown signature subkey type" },
-};
-
-static struct pgpValStr_s keypktVals[] = {
-    { PGPKEYPKT_PUBLIC_SESSION_KEY,"Public-Key Encrypted Session Key" },
-    { PGPKEYPKT_SIGNATURE,	"Signature" },
-    { PGPKEYPKT_SYMMETRIC_SESSION_KEY,"Symmetric-Key Encrypted Session Key" },
-    { PGPKEYPKT_ONEPASS_SIGNATURE,	"One-Pass Signature" },
-    { PGPKEYPKT_SECRET_KEY,	"Secret Key" },
-    { PGPKEYPKT_PUBLIC_KEY,	"Public Key" },
-    { PGPKEYPKT_SECRET_SUBKEY,	"Secret Subkey" },
-    { PGPKEYPKT_COMPRESSED_DATA,"Compressed Data" },
-    { PGPKEYPKT_SYMMETRIC_DATA,	"Symmetrically Encrypted Data" },
-    { PGPKEYPKT_MARKER,	       "Marker" },
-    { PGPKEYPKT_LITERAL_DATA,	"Literal Data" },
-    { PGPKEYPKT_TRUST,		"Trust" },
-    { PGPKEYPKT_USER_ID,	"User ID" },
-    { PGPKEYPKT_PUBLIC_SUBKEY,	"Public Subkey" },
-    { PGPKEYPKT_PRIVATE_60,	"Private #60" },
-    { PGPKEYPKT_PRIVATE_61,	"Private #61" },
-    { PGPKEYPKT_PRIVATE_62,	"Private #62" },
-    { PGPKEYPKT_PRIVATE_63,	"Private #63" },
-    { -1,			"Unknown packet tag" },
-};
-
-static int pr_signature_v3(pgpKeyPkt keypkt, const byte *h, unsigned hlen)
-{
-    pgpSigPktV3 v = (pgpSigPktV3)h;
-    byte *p;
-    unsigned plen;
-    time_t t;
-    int i;
-
-    pr_valstr("", keypktVals, keypkt);
-    if (v->version != 3) {
-	fprintf(stderr, " version(%d) != 3\n", v->version);
-	return 1;
-    }
-    if (v->hashlen != 5) {
-	fprintf(stderr, " hashlen(%d) != 5\n", v->hashlen);
-	return 1;
-    }
-    pr_valstr(" ", pubkeyVals, v->pubkey_algo);
-    pr_valstr(" ", hashVals, v->hash_algo);
-
-    pr_valstr(" ", sigtypeVals, v->sigtype);
-
-    t = grab(v->time, sizeof(v->time));
-fprintf(stderr, " time %08x %-24.24s", (unsigned)t, ctime(&t));
-fprintf(stderr, " signer keyid %02x%02x%02x%02x%02x%02x%02x%02x",
-	v->signer[0], v->signer[1], v->signer[2], v->signer[3],
-	v->signer[4], v->signer[5], v->signer[6], v->signer[7]);
-    plen = grab(v->signhash16, sizeof(v->signhash16));
-fprintf(stderr, " signhash16 %04x", plen);
-fprintf(stderr, "\n");
-
-    p = &v->data[0];
-    for (i = 0; p < &h[hlen]; i++, p += mpi_len(p))
-	fprintf(stderr, "%7d %s\n", i, pr_mpi(p));
-
-    return 0;
-}
-
-static int pr_sigsubkeys(const byte *h, unsigned hlen)
-{
-    const byte *p = h;
-    unsigned plen;
-    int i;
-
-    while (hlen > 0) {
-	if (*p < 192) {
-	    plen = *p++;
-	    hlen -= 1;
-	} else if (*p < 255) {
-	    plen = ((p[0] - 192) << 8) + p[1] + 192;
-	    p += 2;
-	    hlen -= 2;
-	} else {
-	    p++;
-	    plen = grab(p, 4);
-	    p += 4;
-	    hlen -= 5;
-	}
-	pr_valstr("    ", subtypeVals, p[0]);
-	switch (*p) {
-	case PGPSUBTYPE_PREFER_SYMKEY:	/* preferred symmetric algorithms */
-	    for (i = 1; i < plen; i++)
-		pr_valstr(" ", symkeyVals, p[i]);
-	    fprintf(stderr, "\n");
-	    break;
-	case PGPSUBTYPE_PREFER_HASH:	/* preferred hash algorithms */
-	    for (i = 1; i < plen; i++)
-		pr_valstr(" ", hashVals, p[i]);
-	    fprintf(stderr, "\n");
-	    break;
-	case PGPSUBTYPE_PREFER_COMPRESS:/* preferred compression algorithms */
-	    for (i = 1; i < plen; i++)
-		pr_valstr(" ", compressionVals, p[i]);
-	    fprintf(stderr, "\n");
-	    break;
-	case PGPSUBTYPE_KEYSERVER_PREFERS:/* key server preferences */
-	    for (i = 1; i < plen; i++)
-		pr_valstr(" ", keyservPrefVals, p[i]);
-	    fprintf(stderr, "\n");
-	    break;
-	case PGPSUBTYPE_SIG_CREATE_TIME:
-	case PGPSUBTYPE_SIG_EXPIRE_TIME:
-	case PGPSUBTYPE_KEY_EXPIRE_TIME:
-	    fprintf(stderr, " %s", pr_hex(p+1, plen-1));
-	    if ((plen - 1) == 4) {
-		time_t t = grab(p+1, plen-1);
-		fprintf(stderr, " %-24.24s", ctime(&t));
-	    }
-	    fprintf(stderr, "\n");
-	    break;
-
-	case PGPSUBTYPE_ISSUER_KEYID:	/* issuer key ID */
-	case PGPSUBTYPE_EXPORTABLE_CERT:
-	case PGPSUBTYPE_TRUST_SIG:
-	case PGPSUBTYPE_REGEX:
-	case PGPSUBTYPE_REVOCABLE:
-	case PGPSUBTYPE_BACKWARD_COMPAT:
-	case PGPSUBTYPE_REVOKE_KEY:
-	case PGPSUBTYPE_NOTATION:
-	case PGPSUBTYPE_PREFER_KEYSERVER:
-	case PGPSUBTYPE_PRIMARY_USERID:
-	case PGPSUBTYPE_POLICY_URL:
-	case PGPSUBTYPE_KEY_FLAGS:
-	case PGPSUBTYPE_SIGNER_USERID:
-	case PGPSUBTYPE_REVOKE_REASON:
-	case PGPSUBTYPE_INTERNAL_100:
-	case PGPSUBTYPE_INTERNAL_101:
-	case PGPSUBTYPE_INTERNAL_102:
-	case PGPSUBTYPE_INTERNAL_103:
-	case PGPSUBTYPE_INTERNAL_104:
-	case PGPSUBTYPE_INTERNAL_105:
-	case PGPSUBTYPE_INTERNAL_106:
-	case PGPSUBTYPE_INTERNAL_107:
-	case PGPSUBTYPE_INTERNAL_108:
-	case PGPSUBTYPE_INTERNAL_109:
-	case PGPSUBTYPE_INTERNAL_110:
-	default:
-	    fprintf(stderr, " %s", pr_hex(p+1, plen-1));
-	    fprintf(stderr, "\n");
-	    break;
-	}
-	p += plen;
-	hlen -= plen;
-    }
-    return 0;
-}
-
-static int pr_signature_v4(pgpKeyPkt keypkt, const byte *h, unsigned hlen)
-{
-    pgpSigPktV4 v = (pgpSigPktV4)h;
-    byte * p;
-    unsigned plen;
-    int i;
-
-    pr_valstr("", keypktVals, keypkt);
-    if (v->version != 4) {
-	fprintf(stderr, " version(%d) != 4\n", v->version);
-	return 1;
-    }
-    pr_valstr(" ", pubkeyVals, v->pubkey_algo);
-    pr_valstr(" ", hashVals, v->hash_algo);
-
-    pr_valstr(" ", sigtypeVals, v->sigtype);
-fprintf(stderr, "\n");
-
-    p = &v->hashlen[0];
-    plen = grab(v->hashlen, sizeof(v->hashlen));
-    p += 2;
-fprintf(stderr, "   hash[%d] -- %s\n", plen, pr_hex(p, plen));
-    pr_sigsubkeys(p, plen);
-    p += plen;
-    plen = grab(p,2);
-    p += 2;
-fprintf(stderr, " unhash[%d] -- %s\n", plen, pr_hex(p, plen));
-    pr_sigsubkeys(p, plen);
-    p += plen;
-    plen = grab(p,2);
-    p += 2;
-fprintf(stderr, " signhash16 %04x\n", plen);
-
-    for (i = 0; p < &h[hlen]; i++, p += mpi_len(p))
-	fprintf(stderr, "%7d %s\n", i, pr_mpi(p));
-
-    return 0;
-}
-
-static int pr_signature(pgpKeyPkt keypkt, const byte *h, unsigned hlen)
-{
-    byte version = *h;
-    switch (version) {
-    case 3:
-	pr_signature_v3(keypkt, h, hlen);
-	break;
-    case 4:
-	pr_signature_v4(keypkt, h, hlen);
-	break;
-    }
-    return 0;
-}
-
-static int pr_key_v3(pgpKeyPkt keypkt, const byte *h, unsigned hlen)
-{
-    pgpKeyV3 v = (pgpKeyV3)h;
-    byte * p;
-    unsigned plen;
-    time_t t;
-    int i;
-
-    pr_valstr("", keypktVals, keypkt);
-    if (v->version != 3) {
-	fprintf(stderr, " version(%d) != 3\n", v->version);
-	return 1;
-    }
-    plen = grab(v->time, sizeof(v->time));
-fprintf(stderr, " time %08x %-24.24s", (unsigned)t, ctime(&t));
-    pr_valstr(" ", pubkeyVals, v->pubkey_algo);
-
-    plen = grab(v->valid, sizeof(v->valid));
-    if (plen != 0)
-	fprintf(stderr, " valid %d days", plen);
-
-fprintf(stderr, "\n");
-
-    p = &v->data[0];
-    for (i = 0; p < &h[hlen]; i++, p += mpi_len(p))
-	fprintf(stderr, "%7d %s\n", i, pr_mpi(p));
-
-    return 0;
-}
-
-static int pr_key_v4(pgpKeyPkt keypkt, const byte *h, unsigned hlen)
-{
-    pgpKeyV4 v = (pgpKeyV4)h;
-    byte * p;
-    time_t t;
-    int i;
-
-    pr_valstr("", keypktVals, keypkt);
-    if (v->version != 4) {
-	fprintf(stderr, " version(%d) != 4\n", v->version);
-	return 1;
-    }
-    t = grab(v->time, sizeof(v->time));
-fprintf(stderr, " time %08x %-24.24s", (unsigned)t, ctime(&t));
-    pr_valstr(" ", pubkeyVals, v->pubkey_algo);
-fprintf(stderr, "\n");
-
-    p = &v->data[0];
-    for (i = 0; p < &h[hlen]; i++, p += mpi_len(p))
-	fprintf(stderr, "%7d %s\n", i, pr_mpi(p));
-
-    return 0;
-}
-
-static int pr_key(pgpKeyPkt keypkt, const byte *h, unsigned hlen)
-{
-    byte version = *h;
-    switch (version) {
-    case 3:
-	pr_key_v3(keypkt, h, hlen);
-	break;
-    case 4:
-	pr_key_v4(keypkt, h, hlen);
-	break;
-    }
-    return 0;
-}
-
-static int pr_user_id(pgpKeyPkt keypkt, const byte *h, unsigned hlen)
-{
-    pr_valstr("", keypktVals, keypkt);
-fprintf(stderr, " \"%*s\"\n", hlen, h);
-    return 0;
-}
-
-static int pr_keypkt(const byte *p)
-{
-    unsigned int val = *p;
-    unsigned int mark = (val >> 7) & 0x1;
-    unsigned int new = (val >> 6) & 0x1;
-    pgpKeyPkt keypkt = (val >> 2) & 0xf;
-    unsigned int plen = (1 << (val & 0x3));
-    const byte *h;
-    unsigned int hlen = 0;
-    unsigned int i;
-
-    /* XXX can't deal with these. */
-    if (!mark || new || plen > 8)
-	return -1;
-
-    for (i = 1; i <= plen; i++)
-	hlen = (hlen << 8) | p[i];
-
-    h = p + plen + 1;
-    switch (keypkt) {
-    case PGPKEYPKT_SIGNATURE:
-	pr_signature(keypkt, h, hlen);
-	break;
-    case PGPKEYPKT_PUBLIC_KEY:
-    case PGPKEYPKT_PUBLIC_SUBKEY:
-    case PGPKEYPKT_SECRET_KEY:
-    case PGPKEYPKT_SECRET_SUBKEY:
-	pr_key(keypkt, h, hlen);
-	break;
-    case PGPKEYPKT_USER_ID:
-	pr_user_id(keypkt, h, hlen);
-	break;
-    case PGPKEYPKT_RESERVED:
-    case PGPKEYPKT_PUBLIC_SESSION_KEY:
-    case PGPKEYPKT_SYMMETRIC_SESSION_KEY:
-    case PGPKEYPKT_COMPRESSED_DATA:
-    case PGPKEYPKT_SYMMETRIC_DATA:
-    case PGPKEYPKT_MARKER:
-    case PGPKEYPKT_LITERAL_DATA:
-    case PGPKEYPKT_TRUST:
-    case PGPKEYPKT_PRIVATE_60:
-    case PGPKEYPKT_PRIVATE_61:
-    case PGPKEYPKT_PRIVATE_62:
-    case PGPKEYPKT_PRIVATE_63:
-    default:
-	pr_valstr("", keypktVals, keypkt);
-	fprintf(stderr, " plen %02x hlen %x\n", plen, hlen);
-	break;
-    }
-
-    return plen+hlen+1;
-}
-
-/* This is the unarmored RPM-GPG-KEY public key. */
-const char * gpgsig = "\
-mQGiBDfqVDgRBADBKr3Bl6PO8BQ0H8sJoD6p9U7Yyl7pjtZqioviPwXP+DCWd4u8\n\
-HQzcxAZ57m8ssA1LK1Fx93coJhDzM130+p5BG9mYSWShLabR3N1KXdXQYYcowTOM\n\
-GxdwYRGr1Spw8QydLhjVfU1VSl4xt6bupPbWJbyjkg5Z3P7BlUOUJmrx3wCgobNV\n\
-EDGaWYJcch5z5B1of/41G8kEAKii6q7Gu/vhXXnLS6m15oNnPVybyngiw/23dKjS\n\
-ZVG7rKANEK2mxg1VB+vc/uUc4k49UxJJfCZg1gu1sPFV3GSa+Y/7jsiLktQvCiLP\n\
-lncQt1dV+ENmHR5BdIDPWDzKBVbgWnSDnqQ6KrZ7T6AlZ74VMpjGxxkWU6vV2xsW\n\
-XCLPA/9P/vtImA8CZN3jxGgtK5GGtDNJ/cMhhuv5tnfwFg4b/VGo2Jr8mhLUqoIb\n\
-E6zeGAmZbUpdckDco8D5fiFmqTf5+++pCEpJLJkkzel/32N2w4qzPrcRMCiBURES\n\
-PjCLd4Y5rPoU8E4kOHc/4BuHN903tiCsCPloCrWsQZ7UdxfQ5LQiUmVkIEhhdCwg\n\
-SW5jIDxzZWN1cml0eUByZWRoYXQuY29tPohVBBMRAgAVBQI36lQ4AwsKAwMVAwID\n\
-FgIBAheAAAoJECGRgM3bQqYOsBQAnRVtg7B25Hm11PHcpa8FpeddKiq2AJ9aO8sB\n\
-XmLDmPOEFI75mpTrKYHF6rkCDQQ36lRyEAgAokgI2xJ+3bZsk8jRA8ORIX8DH05U\n\
-lMH27qFYzLbT6npXwXYIOtVn0K2/iMDj+oEB1Aa2au4OnddYaLWp06v3d+XyS0t+\n\
-5ab2ZfIQzdh7wCwxqRkzR+/H5TLYbMG+hvtTdylfqIX0WEfoOXMtWEGSVwyUsnM3\n\
-Jy3LOi48rQQSCKtCAUdV20FoIGWhwnb/gHU1BnmES6UdQujFBE6EANqPhp0coYoI\n\
-hHJ2oIO8ujQItvvNaU88j/s/izQv5e7MXOgVSjKe/WX3s2JtB/tW7utpy12wh1J+\n\
-JsFdbLV/t8CozUTpJgx5mVA3RKlxjTA+On+1IEUWioB+iVfT7Ov/0kcAzwADBQf9\n\
-E4SKCWRand8K0XloMYgmipxMhJNnWDMLkokvbMNTUoNpSfRoQJ9EheXDxwMpTPwK\n\
-ti/PYrrL2J11P2ed0x7zm8v3gLrY0cue1iSba+8glY+p31ZPOr5ogaJw7ZARgoS8\n\
-BwjyRymXQp+8Dete0TELKOL2/itDOPGHW07SsVWOR6cmX4VlRRcWB5KejaNvdrE5\n\
-4XFtOd04NMgWI63uqZc4zkRa+kwEZtmbz3tHSdRCCE+Y7YVP6IUf/w6YPQFQriWY\n\
-FiA6fD10eB+BlIUqIw80VgjsBKmCwvKkn4jg8kibXgj4/TzQSx77uYokw1EqQ2wk\n\
-OZoaEtcubsNMquuLCMWijYhGBBgRAgAGBQI36lRyAAoJECGRgM3bQqYOhyYAnj7h\n\
-VDY/FJAGqmtZpwVp9IlitW5tAJ4xQApr/jNFZCTksnI+4O1765F7tA==\n\
-";
-
-/* This is the unarmored RPM-PGP-KEY public key. */
-const char * pgpsig = "\
-mQCNAzEpXjUAAAEEAKG4/V9oUSiDc9wIge6Bmg6erDGCLzmFyioAho8kDIJSrcmi\n\
-F9qTdPq+fj726pgW1iSb0Y7syZn9Y2lgQm5HkPODfNi8eWyTFSxbr8ygosLRClTP\n\
-xqHVhtInGrfZNLoSpv1LdWOme0yOpOQJnghdOMzKXpgf5g84vaUg6PHLopv5AAUR\n\
-tCpSZWQgSGF0IFNvZnR3YXJlLCBJbmMuIDxyZWRoYXRAcmVkaGF0LmNvbT6JAJUD\n\
-BRAyA5tUoyDApfg4JKEBAUzSA/9QdcVsu955vVyZDk8uvOXWV0X3voT9B3aYMFvj\n\
-UNHUD6F1VFruwQHVKbGJEq1o5MOA6OXKR3vJZStXEMF47TWXJfQaflgl8ywZTH5W\n\
-+eMlKau6Nr0labUV3lmsAE4Vsgu8NCkzIrp2wNVbeW2ZAXtrKswV+refLquUhp7l\n\
-wMpH9IkAdQMFEDGttkRNdXhbO1TgGQEBAGoC/j6C22PqXIyqZc6fG6J6Jl/T5kFG\n\
-xH1pKIzua5WCDDugAgnuOJgywa4pegT4UqwEZiMTAlwT6dmG1CXgKB+5V7lnCjDc\n\
-JZLni0iztoe08ig6fJrjNGXljf7KYXzgwBftQokAlQMFEDMQzo2MRVM9rfPulQEB\n\
-pLoD/1/MWv3u0Paiu14XRvDrBaJ7BmG2/48bA5vKOzpvvoNRO95YS7ZEtqErXA7Y\n\
-DRO8+C8f6PAILMk7kCk4lNMscS/ZRzu5+J8cv4ejsFvxgJBBU3Zgp8AWdWOpvZ0I\n\
-wW//HoDUGhOxlEtymljIMFBkj4SysHWhCBUfA9Xy86kouTJQiQCVAwUQMxDOQ50a\n\
-feTWLUSJAQFnYQQAkt9nhMTeioREB1DvJt+vsFyOj//o3ThqK5ySEP3dgj62iaQp\n\
-JrBmAe5XZPw25C/TXAf+x27H8h2QbKgq49VtsElFexc6wO+uq85fAPDdyE+2XyNE\n\
-njGZkY/TP2F/jTB0sAwJO+xFCHmSYkcBjzxK/2LMD+O7rwp2UCUhhl9QhhqJAJUD\n\
-BRAx5na6pSDo8cuim/kBARmjA/4lDVnV2h9KiNabp9oE38wmGgu5m5XgUHW8L6du\n\
-iQDnwO5IgXN2vDpKGxbgtwv6iYYmGd8IRQ66uJvOsxSv3OR7J7LkCHuI2b/s0AZn\n\
-c79DZaJ2ChUCZlbNQBMeEdrFWif9NopY+d5+2tby1onu9XOFMMvomxL3NhctElYR\n\
-HC8Xw4kAlQMFEDHmdTtURTdEKY1MpQEBEtEEAMZbp1ZFrjiHkj2aLFC1S8dGRbSH\n\
-GUdnLP9qLPFgmWekp9E0o8ZztALGVdqPfPF3N/JJ+AL4IMrfojd7+eZKw36Mdvtg\n\
-dPI+Oz4sxHDbDynZ2qspD9Om5yYuxuz/Xq+9nO2IlsAnEYw3ag3cxat0kvxpOPRe\n\
-Yy+vFpgfDNizr3MgiQBVAwUQMXNMXCjtrosVMemRAQEDnwH7BsJrnnh91nI54LAK\n\
-Gcq3pr8ld0PAtWJmNRGQvUlpEMXUSnu59j2P1ogPNjL3PqKdVxk5Jqgcr8TPQMf3\n\
-V4fqXokAlQMFEDFy+8YiEmsRQ3LyzQEB+TwD/03QDslXLg5F3zj4zf0yI6ikT0be\n\
-5OhZv2pnkb80qgdHzFRxBOYmSoueRKdQJASd8F9ue4b3bmf/Y7ikiY0DblvxcXB2\n\
-sz1Pu8i2Zn9u8SKuxNIoVvM8/STRVkgPfvL5QjAWMHT9Wvg81XcI2yXJzrt/2f2g\n\
-mNpWIvVOOT85rVPIiQCVAwUQMVPRlBlzviMjNHElAQG1nwP/fpVX6nKRWJCSFeB7\n\
-leZ4lb+y1uMsMVv0n7agjJVw13SXaA267y7VWCBlnhsCemxEugqEIkI4lu/1mgtw\n\
-WPWSE0BOIVjj0AA8zp2T0H3ZCCMbiFAFJ1P2Gq2rKr8QrOb/08oH1lEzyz0j/jKh\n\
-qiXAxdlB1wojQB6yLbHvTIe3rZGJAHUDBRAxKetfzauiKSJ6LJEBAed/AvsEiGgj\n\
-TQzhsZcUuRNrQpV0cDGH9Mpril7P7K7yFIzju8biB+Cu6nEknSOHlMLl8usObVlk\n\
-d8Wf14soHC7SjItiGSKtI8JhauzBJPl6fDDeyHGsJKo9f9adKeBMCipCFOuJAJUD\n\
-BRAxKeqWRHFTaIK/x+0BAY6eA/4m5X4gs1UwOUIRnljo9a0cVs6ITL554J9vSCYH\n\
-Zzd87kFwdf5W1Vd82HIkRzcr6cp33E3IDkRzaQCMVw2me7HePP7+4Ry2q3EeZMbm\n\
-NE++VzkxjikzpRb2+F5nGB2UdsElkgbXinswebiuOwOrocLbz6JFdDsJPcT5gVfi\n\
-z15FuA==\n\
-";
-
 static int doit(const char *sig)
 {
     const char *s, *t;
@@ -592,7 +33,7 @@ fprintf(stderr, "*** sig is\n%s\n", sig);
     }
 
     for (d = dec; d < (dec + declen); d += len) {
-	len = pr_keypkt(d);
+	len = pgpPrtPkt(d);
 	if (len <= 0)
 	    exit(len);
     }
@@ -623,11 +64,11 @@ main (int argc, char *argv[])
     int rc;
 
 fprintf(stderr, "============================================== RPM-GPG-KEY\n");
-    if ((rc = doit(gpgsig)) != 0)
+    if ((rc = doit(redhatPubKeyDSA)) != 0)
 	return rc;
 
 fprintf(stderr, "============================================== RPM-PGP-KEY\n");
-    if ((rc = doit(pgpsig)) != 0)
+    if ((rc = doit(redhatPubKeyRSA)) != 0)
 	return rc;
 
     return rc;