47 files changed, 1146 insertions, 1161 deletions
diff --git a/CHANGES b/CHANGES
index a856411a3..8012f2749 100644
--- a/CHANGES
+++ b/CHANGES
@@ -276,6 +276,14 @@
 	- fix: segfault with --checksig, plug memory leak (#72455).
 	- rpm-4.1 release candidate.
 	- requirement on libelf >= 0.8.2 to work around incompatible soname (#72792).
+	- fix: common sanity check on headers, prevent segfault (#72590).
+	- limit number of NOKEY/UNTRUSTED keys that will be warned once.
+	- libadd -lelf to rpmdb (#73024).
+	- portability: non-linux is easier, more to do (#72893).
+	- fix: SIGCHLD reaper race (#73134).
+	- fix: don't exit with open cursor, there be a stale lock.
+	- fix: check for signal induced exit more often (#73193).
+	- reinterpret the _unsafe_rollbacks macro as earliest rollback.
 
 4.0.3 -> 4.0.4:
 	- solaris: translate i86pc to i386 (#57182).
diff --git a/Makefile.am b/Makefile.am
index b70d9542d..0a20d37b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,9 +6,10 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \
 	RPM-GPG-KEY RPM-PGP-KEY \
 	autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
 	config.site db db3/configure gendiff installplatform platform* \
-	xmlspec/Makefile xmlspec/*.cpp xmlspec/*.h xmlspec/*.xml \
-	xmlspec/doc/*.html \
-	Perl-RPM po/*.in po/*.po po/rpm.pot \
+	xmlspec/Makefile xmlspec/*.c xmlspec/*.h \
+	xmlspec/examples/*.sh xmlspec/examples/*.lst \
+	xmlspec/examples/*.xmlspec \
+	po/*.in po/*.po po/rpm.pot \
 	rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
 
 SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_LIBELF_SUBDIR@ @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
@@ -24,7 +25,7 @@ INCLUDES = \
 	@WITH_ZLIB_INCLUDE@ \
 	@INCPATH@
 
-myLDFLAGS = # @LDFLAGS_STATIC@
+myLDFLAGS = @LDFLAGS_STATIC@
 
 # XXX libtool can/should generate dependent libs.
 # XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?)
diff --git a/beecrypt/entropy.c b/beecrypt/entropy.c
index fc7b2ab97..077e85c3a 100644
--- a/beecrypt/entropy.c
+++ b/beecrypt/entropy.c
@@ -904,8 +904,9 @@ static const char *dev_tty_name = "/dev/tty";
 static int dev_tty_fd = -1;
 
 /** \ingroup ES_tty_m
+ * @todo hpux needs real locking mechanism.
  */
-# ifdef _REENTRANT
+# if defined(_REENTRANT) && !defined(hpux)
 #  if HAVE_SYNCH_H
 /*@unchecked@*/
 static mutex_t dev_tty_lock = DEFAULTMUTEX;
@@ -1556,7 +1557,8 @@ int entropy_dev_tty(uint32* data, int size)
 {
 	register int rc;
 
-	#ifdef _REENTRANT
+/** @todo hpux needs real locking mechanism. */
+	#if defined(_REENTRANT) && !defined(hpux)
 	# if HAVE_SYNCH_H
 	if (mutex_lock(&dev_tty_lock))
 		return -1;
@@ -1581,7 +1583,8 @@ int entropy_dev_tty(uint32* data, int size)
 	(void) close(dev_tty_fd);
 
 dev_tty_end:
-	#ifdef _REENTRANT
+/** @todo hpux needs real locking mechanism. */
+	#if defined(_REENTRANT) && !defined(hpux)
 	# if HAVE_SYNCH_H
 	mutex_unlock(&dev_tty_lock);
 	# elif HAVE_PTHREAD_H
diff --git a/lib/package.c b/lib/package.c
index cf6f3fc38..e28bf2b13 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -33,9 +33,13 @@
 static int _print_pkts = 0;
 
 /*@unchecked@*/
-static int nkeyids = 0;
+static unsigned int nkeyids_max = 256;
+/*@unchecked@*/
+static unsigned int nkeyids = 0;
+/*@unchecked@*/
+static unsigned int nextkeyid  = 0;
 /*@unchecked@*/ /*@only@*/ /*@null@*/
-static int * keyids;
+static unsigned int * keyids;
 
 /*@unchecked@*/
 static unsigned char header_magic[8] = {
@@ -235,28 +239,23 @@ static int rpmtsStashKeyid(rpmts ts)
 /*@=boundsread@*/
     }
 
-    keyids = xrealloc(keyids, (nkeyids + 1) * sizeof(*keyids));
+    if (nkeyids < nkeyids_max) {
+	nkeyids++;
+	keyids = xrealloc(keyids, nkeyids * sizeof(*keyids));
+    }
 /*@-boundswrite@*/
-    keyids[nkeyids] = keyid;
+    keyids[nextkeyid] = keyid;
 /*@=boundswrite@*/
-    nkeyids++;
+    nextkeyid++;
+    nextkeyid %= nkeyids_max;
 
     return 0;
 }
 
-/**
- * Perform simple sanity and range checks on header tag(s).
- * @param il		no. of tags in header
- * @param dl		no. of bytes in header data.
- * @param pe		1st element in tag array, big-endian
- * @param info		failing (or last) tag element, host-endian
- * @param negate	negative offset expected?
- * @return		-1 on success, otherwise failing tag element index
- */
-static int headerVerifyInfo(int il, int dl, entryInfo pe, entryInfo info,
-		int negate)
-	/*@modifies info @*/
+int headerVerifyInfo(int il, int dl, const void * pev, void * iv, int negate)
 {
+    entryInfo pe = (entryInfo) pev;
+    entryInfo info = iv;
     int i;
 
 /*@-boundsread@*/
@@ -558,8 +557,6 @@ verifyinfo_exit:
 	break;
     }
 
-/** @todo Implement disable/enable/warn/error/anal policy. */
-
 /*@-boundswrite@*/
     buf[0] = '\0';
 /*@=boundswrite@*/
@@ -574,8 +571,60 @@ verifyinfo_exit:
     return rc;
 }
 
-int rpmReadPackageFile(rpmts ts, FD_t fd,
-		const char * fn, Header * hdrp)
+rpmRC rpmReadHeader(rpmts ts, FD_t fd, Header *hdrp, const char ** msg)
+{
+    int_32 block[4];
+    int_32 il;
+    int_32 dl;
+    int_32 * ei = NULL;
+    size_t uc;
+    int_32 nb;
+    Header h = NULL;
+    rpmRC rc = RPMRC_FAIL;		/* assume failure */
+
+    if (hdrp)
+	*hdrp = NULL;
+
+    if (timedRead(fd, (char *)block, sizeof(block)) != sizeof(block))
+	goto exit;
+    if (memcmp(block, header_magic, sizeof(header_magic)))
+	goto exit;
+    il = ntohl(block[2]);
+    if (hdrchkTags(il))
+	goto exit;
+    dl = ntohl(block[3]);
+    if (hdrchkData(dl))
+	goto exit;
+
+    nb = (il * sizeof(struct entryInfo_s)) + dl;
+    uc = sizeof(il) + sizeof(dl) + nb;
+    ei = xmalloc(uc);
+    ei[0] = block[2];
+    ei[1] = block[3];
+    if (timedRead(fd, (char *)&ei[2], nb) != nb)
+	goto exit;
+
+    /* Sanity check header tags */
+    rc = headerCheck(ts, ei, uc, msg);
+    if (rc != RPMRC_OK)
+	goto exit;
+
+    /* OK, blob looks sane, load the header. */
+    h = headerLoad(ei);
+    if (h == NULL)
+        goto exit;
+    h->flags |= HEADERFLAG_ALLOCATED;
+    ei = NULL;	/* XXX will be freed with header */
+    
+exit:
+    if (rc == RPMRC_OK && hdrp)
+	*hdrp = headerLink(h);
+    ei = _free(ei);
+    h = headerFree(h);
+    return rc;
+}
+
+int rpmReadPackageFile(rpmts ts, FD_t fd, const char * fn, Header * hdrp)
 {
     pgpDig dig;
     byte buf[8*BUFSIZ];
@@ -587,6 +636,7 @@ int rpmReadPackageFile(rpmts ts, FD_t fd,
     const void * sig;
     int_32 siglen;
     Header h = NULL;
+    const char * msg;
     int hmagic;
     rpmVSFlags vsflags;
     rpmRC rc = RPMRC_FAIL;	/* assume failure */
@@ -649,10 +699,12 @@ int rpmReadPackageFile(rpmts ts, FD_t fd,
     /* Figger the most effective available signature. */
     sigtag = 0;
     vsflags = rpmtsVSFlags(ts);
+#ifdef	DYING
     if (_chk(RPMVSF_NODSAHEADER) && headerIsEntry(sigh, RPMSIGTAG_DSA))
 	sigtag = RPMSIGTAG_DSA;
     if (_chk(RPMVSF_NORSAHEADER) && headerIsEntry(sigh, RPMSIGTAG_RSA))
 	sigtag = RPMSIGTAG_RSA;
+#endif
     if (_chk(RPMVSF_NODSA|RPMVSF_NEEDPAYLOAD) &&
 	headerIsEntry(sigh, RPMSIGTAG_GPG))
     {
@@ -665,8 +717,10 @@ int rpmReadPackageFile(rpmts ts, FD_t fd,
 	sigtag = RPMSIGTAG_PGP;
 	fdInitDigest(fd, PGPHASHALGO_MD5, 0);
     }
+#ifdef	DYING
     if (_chk(RPMVSF_NOSHA1HEADER) && headerIsEntry(sigh, RPMSIGTAG_SHA1))
 	sigtag = RPMSIGTAG_SHA1;
+#endif
     if (_chk(RPMVSF_NOMD5|RPMVSF_NEEDPAYLOAD) &&
 	headerIsEntry(sigh, RPMSIGTAG_MD5))
     {
@@ -675,13 +729,15 @@ int rpmReadPackageFile(rpmts ts, FD_t fd,
     }
 
     /* Read the metadata, computing digest(s) on the fly. */
-    hmagic = ((l->major >= 3) ? HEADER_MAGIC_YES : HEADER_MAGIC_NO);
-    h = headerRead(fd, hmagic);
-    if (h == NULL) {
-	rpmError(RPMERR_FREAD, _("%s: headerRead failed\n"), fn);
-	rc = RPMRC_FAIL;
+    h = NULL;
+    msg = NULL;
+    rc = rpmReadHeader(ts, fd, &h, &msg);
+    if (rc != RPMRC_OK || h == NULL) {
+	rpmError(RPMERR_FREAD, _("%s: headerRead failed: %s\n"), fn, msg);
+	msg = _free(msg);
 	goto exit;
     }
+    msg = _free(msg);
 
     /* Any signatures to check? */
     if (sigtag == 0) {
@@ -774,6 +830,7 @@ int rpmReadPackageFile(rpmts ts, FD_t fd,
 	/*@fallthrough@*/
     case RPMSIGTAG_MD5:
 	/* Legacy signatures need the compressed payload in the digest too. */
+	hmagic = ((l->major >= 3) ? HEADER_MAGIC_YES : HEADER_MAGIC_NO);
 	dig->nbytes += headerSizeof(h, hmagic);
 	while ((count = Fread(buf, sizeof(buf[0]), sizeof(buf), fd)) > 0)
 	    dig->nbytes += count;
diff --git a/lib/psm.c b/lib/psm.c
index 439969596..026722a9a 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -33,8 +33,9 @@
 #include "rpmdb.h"		/* XXX for db_chrootDone */
 #include "debug.h"
 
+#define	_PSM_DEBUG	0
 /*@unchecked@*/
-int _psm_debug = 0;
+int _psm_debug = _PSM_DEBUG;
 
 /*@access Header @*/		/* compared with NULL */
 /*@access rpmdbMatchIterator @*//* compared with NULL */
@@ -700,10 +701,14 @@ static void handler(int signum)
 		rpmpsm psm = psmtbl.psms[i];
 		if (psm->child != reaped)
 		    /*@innercontinue@*/ continue;
+
+#if _PSM_DEBUG
 /*@-modfilesys@*/
 if (_psm_debug)
 fprintf(stderr, "      Reap: %p[%d:%d:%d] = %p child %d\n", psmtbl.psms, i, psmtbl.npsms, psmtbl.nalloced, psm, psm->child);
 /*@=modfilesys@*/
+#endif
+
 		psm->reaped = reaped;
 		psm->status = status;
 		/*@innerbreak@*/ break;
@@ -889,6 +894,23 @@ fprintf(stderr, "      Fork: %p[%d:%d:%d] = %p child %d\n", psmtbl.psms, 0, psmt
 }
 
 /**
+ * Return reaped pid safely (i.e. with signals blocked).
+ * @param psm		package state machine data
+ * @return		
+ */
+static inline pid_t psmGetReaped(rpmpsm psm)
+{
+    sigset_t newMask, oldMask;
+    pid_t reaped;
+
+    (void) sigfillset(&newMask);		/* block all signals */
+    (void) sigprocmask(SIG_BLOCK, &newMask, &oldMask);
+    reaped = psm->reaped;
+    (void) sigprocmask(SIG_SETMASK, &oldMask, NULL);
+    return reaped;
+}
+
+/**
  * Wait for child process to be reaped.
  * @param psm		package state machine data
  * @return		
@@ -899,8 +921,8 @@ static pid_t psmWait(rpmpsm psm)
 {
     if (psm->reaper) {
 	/*@-infloops@*/
-	while (psm->reaped == 0)
-	    (void) sleep(2);
+	while (psmGetReaped(psm) == 0)
+	    (void) pause();
 	/*@=infloops@*/
 /*@-modfilesys@*/
 if (_psm_debug)
@@ -946,8 +968,7 @@ static const char * ldconfig_path = "/sbin/ldconfig";
  * @param arg2		ditto, but for the target package
  * @return		0 on success
  */
-static rpmRC runScript(rpmpsm psm, Header h,
-		const char * sln,
+static rpmRC runScript(rpmpsm psm, Header h, const char * sln,
 		int progArgc, const char ** progArgv, 
 		const char * script, int arg1, int arg2)
 	/*@globals ldconfig_done, rpmGlobalMacroContext,
diff --git a/lib/query.c b/lib/query.c
index 9725fa3e5..6f96a5908 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -538,6 +538,8 @@ int rpmQueryVerify(QVA_t qva, rpmts ts, const char * arg)
     const char * s;
     int i;
 
+    (void) rpmdbCheckSignals();
+
     if (qva->qva_showPackage == NULL)
 	return 1;
 
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 284295a2b..e4615df33 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -606,7 +606,6 @@ static int readFile(FD_t fd, const char * fn, pgpDig dig)
 
     /* Read the header from the package. */
     {	Header h = headerRead(fd, HEADER_MAGIC_YES);
-
 	if (h == NULL) {
 	    rpmError(RPMERR_FREAD, _("%s: headerRead failed\n"), fn);
 	    goto exit;
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index f3d086f26..1220dfa5b 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -300,6 +300,9 @@ int rpmInstall(rpmts ts,
     ts->goal = TSM_INSTALL;
     rpmcliPackagesTotal = 0;
 
+    if (rpmExpandNumeric("%{?_repackage_all_erasures}"))
+	ia->transFlags |= RPMTRANS_FLAG_REPACKAGE;
+
     (void) rpmtsSetFlags(ts, ia->transFlags);
     probFilter = ia->probFilter;
     relocations = ia->relocations;
@@ -743,6 +746,9 @@ int rpmErase(rpmts ts,
 	vsflags |= RPMVSF_NOHDRCHK;
     ovsflags = rpmtsSetVSFlags(ts, vsflags);
 
+    if (rpmExpandNumeric("%{?_repackage_all_erasures}"))
+	ia->transFlags |= RPMTRANS_FLAG_REPACKAGE;
+
     (void) rpmtsSetFlags(ts, ia->transFlags);
 
 #ifdef	NOTYET	/* XXX no callbacks on erase yet */
@@ -1129,6 +1135,10 @@ int rpmRollback(rpmts ts, struct rpmInstallArguments_s * ia, const char ** argv)
 	if (thistid == 0 || thistid < ia->rbtid)
 	    break;
 
+	/* If we've reached the (configured) rollback goal, then we're done. */
+	if (_unsafe_rollbacks && thistid <= _unsafe_rollbacks)
+	    break;
+
 	rpmtsEmpty(ts);
 	(void) rpmtsSetFlags(ts, transFlags);
 
diff --git a/lib/rpmlead.c b/lib/rpmlead.c
index 348517856..a679334c3 100644
--- a/lib/rpmlead.c
+++ b/lib/rpmlead.c
@@ -12,6 +12,7 @@
 
 #include <rpmlib.h>
 
+#include "signature.h"
 #include "rpmlead.h"
 #include "debug.h"
 
@@ -59,13 +60,12 @@ rpmRC readLead(FD_t fd, struct rpmlead *lead)
 
     if (memcmp(lead->magic, lead_magic, sizeof(lead_magic)))
 	return RPMRC_FAIL;
-
     lead->type = ntohs(lead->type);
     lead->archnum = ntohs(lead->archnum);
     lead->osnum = ntohs(lead->osnum);
-
-    if (lead->major >= 2)
-	lead->signature_type = ntohs(lead->signature_type);
+    lead->signature_type = ntohs(lead->signature_type);
+    if (lead->signature_type != RPMSIGTYPE_HEADERSIG)
+	return RPMRC_FAIL;
 
     return RPMRC_OK;
 }
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 431e82ca6..72e2e4218 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -138,24 +138,6 @@ void headerMergeLegacySigs(Header h, const Header sig)
 Header headerRegenSigHeader(const Header h, int noArchiveSize)
 	/*@modifies h @*/;
 
-/** 
- * Check header consistency, performing headerGetEntry() the hard way.
- *  
- * Sanity checks on the header are performed while looking for a
- * header-only digest or signature to verify the blob. If found,
- * the digest or signature is verified.
- *
- * @param ts		transaction set
- * @param uh		unloaded header blob
- * @param uc		no. of bytes in blob (or 0 to disable)
- * @retval *msg		signature verification msg
- * @return		RPMRC_OK/RPMRC_NOTFOUND/RPMRC_FAIL
- */
-rpmRC headerCheck(rpmts ts, const void * uh, size_t uc, const char ** msg)
-	/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
-	/*@modifies ts, *msg, rpmGlobalMacroContext,
-		fileSystem, internalState @*/;
-
 /** \ingroup header
  * Retrieve file names from header.
  * The representation of file names in package headers changed in rpm-4.0.
@@ -850,8 +832,50 @@ typedef /*@abstract@*/ struct fsm_s * FSM_t;
 typedef /*@abstract@*/ /*@refcounted@*/ struct rpmpsm_s * rpmpsm;
 
 /**
- * Return package header from file handle, verifying digests/signatures as
- * available.
+ * Perform simple sanity and range checks on header tag(s).
+ * @param il		no. of tags in header
+ * @param dl		no. of bytes in header data.
+ * @param pev		1st element in tag array, big-endian
+ * @param iv		failing (or last) tag element, host-endian
+ * @param negate	negative offset expected?
+ * @return		-1 on success, otherwise failing tag element index
+ */
+int headerVerifyInfo(int il, int dl, const void * pev, void * iv, int negate)
+	/*@modifies *iv @*/;
+
+/** 
+ * Check header consistency, performing headerGetEntry() the hard way.
+ *  
+ * Sanity checks on the header are performed while looking for a
+ * header-only digest or signature to verify the blob. If found,
+ * the digest or signature is verified.
+ *
+ * @param ts		transaction set
+ * @param uh		unloaded header blob
+ * @param uc		no. of bytes in blob (or 0 to disable)
+ * @retval *msg		verification error message
+ * @return		RPMRC_OK on success
+ */
+rpmRC headerCheck(rpmts ts, const void * uh, size_t uc, const char ** msg)
+	/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+	/*@modifies ts, *msg, rpmGlobalMacroContext,
+		fileSystem, internalState @*/;
+
+/** 
+ * Return checked and loaded header.
+ * @param ts		transaction set
+ * @param fd		file handle
+ * @retval hdrp		address of header (or NULL)
+ * @retval *msg		verification error message
+ * @return		RPMRC_OK on success
+ */
+rpmRC rpmReadHeader(rpmts ts, FD_t fd, Header *hdrp, const char ** msg)
+        /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+        /*@modifies ts, *msg, rpmGlobalMacroContext,
+                fileSystem, internalState @*/;
+
+/**
+ * Return package header from file handle, verifying digests/signatures.
  * @param ts		transaction set
  * @param fd		file handle
  * @param fn		file name
diff --git a/lib/signature.c b/lib/signature.c
index 8d411e456..788363117 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -15,6 +15,7 @@
 #include "legacy.h"	/* XXX for mdbinfile() */
 #include "rpmlead.h"
 #include "signature.h"
+#include "header_internal.h"
 #include "debug.h"
 
 /*@access Header@*/		/* XXX compared with NULL */
@@ -108,7 +109,7 @@ const char * rpmDetectPGPVersion(pgpVersion * pgpVer)
 }
 
 /**
- * Check package size.
+ * Print package size.
  * @todo rpmio: use fdSize rather than fstat(2) to get file size.
  * @param fd			package file handle
  * @param siglen		signature header size
@@ -116,115 +117,103 @@ const char * rpmDetectPGPVersion(pgpVersion * pgpVer)
  * @param datalen		length of header+payload
  * @return 			rpmRC return code
  */
-static inline rpmRC checkSize(FD_t fd, int siglen, int pad, int datalen)
+static inline rpmRC printSize(FD_t fd, int siglen, int pad, int datalen)
 	/*@globals fileSystem @*/
 	/*@modifies fileSystem @*/
 {
     struct stat st;
-    int delta;
-    rpmRC rc;
 
-    if (fstat(Fileno(fd), &st))
+    if (fstat(Fileno(fd), &st) < 0)
 	return RPMRC_FAIL;
 
-    if (!S_ISREG(st.st_mode)) {
-	rpmMessage(RPMMESS_DEBUG,
-	    _("file is not regular -- skipping size check\n"));
-	return RPMRC_OK;
-    }
-
     /*@-sizeoftype@*/
-    delta = (sizeof(struct rpmlead) + siglen + pad + datalen) - st.st_size;
-    switch (delta) {
-    case -32: /* XXX rpm-4.0 packages */
-    case 32:  /* XXX Legacy headers have a HEADER_IMAGE tag added. */
-    case 0:
-	rc = RPMRC_OK;
-	break;
-    default:
-	rc = RPMRC_OK;	/* XXX repackaging destroys size checks */
-	break;
-    }
-
-    rpmMessage((rc == RPMRC_OK ? RPMMESS_DEBUG : RPMMESS_DEBUG),
+    rpmMessage(RPMMESS_DEBUG,
 	_("Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"),
 		(int)sizeof(struct rpmlead)+siglen+pad+datalen,
 		(int)sizeof(struct rpmlead), siglen, pad, datalen);
     /*@=sizeoftype@*/
-    rpmMessage((rc == RPMRC_OK ? RPMMESS_DEBUG : RPMMESS_DEBUG),
+    rpmMessage(RPMMESS_DEBUG,
 	_("  Actual size: %12d\n"), (int)st.st_size);
 
-    return rc;
+    return RPMRC_OK;
 }
 
-rpmRC rpmReadSignature(FD_t fd, Header * headerp, sigType sig_type)
+/*@unchecked@*/
+static unsigned char header_magic[8] = {
+    0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
+};
+
+rpmRC rpmReadSignature(FD_t fd, Header * sighp, sigType sig_type)
 {
-    byte buf[2048];
-    int sigSize, pad;
-    int_32 type, count;
-    int_32 *archSize;
-    Header h = NULL;
+    int_32 block[4];
+    int_32 il;
+    int_32 dl;
+    int_32 * ei = NULL;
+    entryInfo pe;
+    int_32 nb;
+    indexEntry entry = memset(alloca(sizeof(*entry)), 0, sizeof(*entry));
+    entryInfo info = memset(alloca(sizeof(*info)), 0, sizeof(*info));
+    Header sigh = NULL;
     rpmRC rc = RPMRC_FAIL;		/* assume failure */
+    int xx;
+    int i;
 
-/*@-boundswrite@*/
-    if (headerp)
-	*headerp = NULL;
-/*@=boundswrite@*/
+    if (sighp)
+	*sighp = NULL;
 
-    buf[0] = 0;
-    switch (sig_type) {
-    case RPMSIGTYPE_NONE:
-	rpmMessage(RPMMESS_DEBUG, _("No signature\n"));
-	rc = RPMRC_OK;
-	break;
-    case RPMSIGTYPE_PGP262_1024:
-	rpmMessage(RPMMESS_DEBUG, _("Old PGP signature\n"));
-	/* These are always 256 bytes */
-	if (timedRead(fd, buf, 256) != 256)
-	    break;
-	h = headerNew();
-	(void) headerAddEntry(h, RPMSIGTAG_PGP, RPM_BIN_TYPE, buf, 152);
-	rc = RPMRC_OK;
-	break;
-    case RPMSIGTYPE_MD5:
-    case RPMSIGTYPE_MD5_PGP:
-	rpmError(RPMERR_BADSIGTYPE,
-	      _("Old (internal-only) signature!  How did you get that!?\n"));
-	break;
-    case RPMSIGTYPE_HEADERSIG:
-    case RPMSIGTYPE_DISABLE:
-	/* This is a new style signature */
-	h = headerRead(fd, HEADER_MAGIC_YES);
-	if (h == NULL)
-	    break;
+    if (sig_type != RPMSIGTYPE_HEADERSIG)
+	goto exit;
 
-	rc = RPMRC_OK;
-	sigSize = headerSizeof(h, HEADER_MAGIC_YES);
+    if (timedRead(fd, (char *)block, sizeof(block)) != sizeof(block))
+	goto exit;
+    if (memcmp(block, header_magic, sizeof(header_magic)))
+	goto exit;
+    il = ntohl(block[2]);
+    if (il < 0 || il > 32)
+	goto exit;
+    dl = ntohl(block[3]);
+    if (dl < 0 || dl > 8192)
+	goto exit;
 
-	pad = (8 - (sigSize % 8)) % 8; /* 8-byte pad */
-	if (sig_type == RPMSIGTYPE_HEADERSIG) {
-	    if (! headerGetEntry(h, RPMSIGTAG_SIZE, &type,
-				(void **)&archSize, &count))
-		break;
-/*@-boundsread@*/
-	    rc = checkSize(fd, sigSize, pad, *archSize);
-/*@=boundsread@*/
-	}
-	if (pad && timedRead(fd, buf, pad) != pad)
-	    rc = RPMRC_FAIL;
-	break;
-    default:
-	break;
+    nb = (il * sizeof(struct entryInfo_s)) + dl;
+    ei = xmalloc(sizeof(il) + sizeof(dl) + nb);
+    ei[0] = htonl(il);
+    ei[1] = htonl(dl);
+    pe = (entryInfo) &ei[2];
+    if (timedRead(fd, (char *)pe, nb) != nb)
+	goto exit;
+    
+    /* Sanity check signature tags */
+    memset(info, 0, sizeof(*info));
+    for (i = 0; i < il; i++) {
+	xx = headerVerifyInfo(1, dl, pe+i, &entry->info, 0);
+	if (xx != -1)
+	    goto exit;
     }
 
-/*@-boundswrite@*/
-    /* XXX return the signature header no matter what. */
-    if (headerp)
-	*headerp = headerLink(h);
-/*@=boundswrite@*/
+    /* OK, blob looks sane, load the header. */
+    sigh = headerLoad(ei);
+    if (sigh == NULL)
+	goto exit;
+    sigh->flags |= HEADERFLAG_ALLOCATED;
 
-    h = headerFree(h);
+    {	int sigSize = headerSizeof(sigh, HEADER_MAGIC_YES);
+	int pad = (8 - (sigSize % 8)) % 8; /* 8-byte pad */
+	int_32 * archSize = NULL;
+
+	/* Position at beginning of header. */
+	if (pad && timedRead(fd, (char *)block, pad) != pad)
+	    goto exit;
+
+	/* Print package component sizes. */
+	if (headerGetEntry(sigh, RPMSIGTAG_SIZE, NULL,(void **)&archSize, NULL))
+	    rc = printSize(fd, sigSize, pad, *archSize);
+    }
 
+exit:
+    if (rc == RPMRC_OK && sighp && sigh)
+	*sighp = headerLink(sigh);
+    sigh = headerFree(sigh);
     return rc;
 }
 
@@ -511,11 +500,6 @@ static int makeGPGSignature(const char * file, /*@out@*/ byte ** pkt,
     return 0;
 }
 
-/*@unchecked@*/
-static unsigned char header_magic[8] = {
-	0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
-};
-
 /**
  * Generate header only signature(s) from a header+payload file.
  * @param sig		signature header
diff --git a/lib/signature.h b/lib/signature.h
index 6a99d6cb9..8163e557e 100644
--- a/lib/signature.h
+++ b/lib/signature.h
@@ -12,15 +12,7 @@
  * Signature types stored in rpm lead.
  */
 typedef	enum sigType_e {
-    RPMSIGTYPE_NONE	= 0,	/*!< unused, legacy. */
-    RPMSIGTYPE_PGP262_1024 = 1,	/*!< unused, legacy. */
-/*@-enummemuse@*/
-    RPMSIGTYPE_BAD	= 2,	/*!< Unknown signature type. */
-/*@=enummemuse@*/
-    RPMSIGTYPE_MD5	= 3,	/*!< unused, legacy. */
-    RPMSIGTYPE_MD5_PGP	= 4,	/*!< unused, legacy. */
-    RPMSIGTYPE_HEADERSIG= 5,	/*!< Header style signature */
-    RPMSIGTYPE_DISABLE	= 6	/*!< Disable verification (debugging only) */
+    RPMSIGTYPE_HEADERSIG= 5	/*!< Header style signature */
 } sigType;
 
 /** \ingroup signature
@@ -49,14 +41,14 @@ Header rpmNewSignature(void)
  * Read (and verify header+payload size) signature header.
  * If an old-style signature is found, we emulate a new style one.
  * @param fd		file handle
- * @retval headerp	address of (signature) header (or NULL)
+ * @retval sighp	address of (signature) header (or NULL)
  * @param sig_type	type of signature header to read (from lead)
  * @return		rpmRC return code
  */
-rpmRC rpmReadSignature(FD_t fd, /*@null@*/ /*@out@*/ Header *headerp,
+rpmRC rpmReadSignature(FD_t fd, /*@null@*/ /*@out@*/ Header *sighp,
 		sigType sig_type)
 	/*@globals fileSystem @*/
-	/*@modifies fd, *headerp, fileSystem @*/;
+	/*@modifies fd, *sighp, fileSystem @*/;
 
 /** \ingroup signature
  * Write signature header.
diff --git a/lib/transaction.c b/lib/transaction.c
index eadd2e391..e7b0d31ee 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1151,6 +1151,8 @@ rpmMessage(RPMMESS_DEBUG, _("computing %d file fingerprints\n"), totalFileCount)
     while ((p = rpmtsiNext(pi, 0)) != NULL) {
 	int fc;
 
+	(void) rpmdbCheckSignals();
+
 	if ((fi = rpmtsiFi(pi)) == NULL)
 	    continue;	/* XXX can't happen */
 	fc = rpmfiFC(fi);
@@ -1184,6 +1186,8 @@ rpmMessage(RPMMESS_DEBUG, _("computing file dispositions\n"));
 	int knownBad;
 	int fc;
 
+	(void) rpmdbCheckSignals();
+
 	if ((fi = rpmtsiFi(pi)) == NULL)
 	    continue;	/* XXX can't happen */
 	fc = rpmfiFC(fi);
@@ -1344,6 +1348,9 @@ rpmMessage(RPMMESS_DEBUG, _("computing file dispositions\n"));
 	progress = 0;
 	pi = rpmtsiInit(ts);
 	while ((p = rpmtsiNext(pi, 0)) != NULL) {
+
+	    (void) rpmdbCheckSignals();
+
 	    if ((fi = rpmtsiFi(pi)) == NULL)
 		continue;	/* XXX can't happen */
 	    switch (rpmteType(p)) {
@@ -1391,6 +1398,8 @@ rpmMessage(RPMMESS_DEBUG, _("computing file dispositions\n"));
 	alKey pkgKey;
 	int gotfd;
 
+	(void) rpmdbCheckSignals();
+
 	gotfd = 0;
 	if ((fi = rpmtsiFi(pi)) == NULL)
 	    continue;	/* XXX can't happen */
diff --git a/macros.in b/macros.in
index 565c40a9f..230fcaf58 100644
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.122 2002/08/26 18:56:12 jbj Exp $
+# $Id: macros.in,v 1.123 2002/08/31 22:39:34 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -567,6 +567,9 @@ package or when debugging this package. \
 #	A path (i.e. URL) prefix that is pre-pended to %{_repackage_dir}.
 %_repackage_root	%{nil}
 
+#	If non-zero, all erasures will be automagically repackaged.
+%_repackage_all_erasures	0
+
 #	Verify digest/signature flags for various rpm modes:
 #	     1	--nohdrchk	if set, don't check rpmdb headers
 #
diff --git a/po/cs.po b/po/cs.po
index e9685b21a..89e2ed86a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2644,7 +2644,7 @@ msgstr "��dek: %s\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "%s: Fread selhalo: %s\n"
@@ -2876,150 +2876,132 @@ msgstr "RPM verze %s\n"
 msgid "getting list of mounted filesystems\n"
 msgstr "z�sk�v�m seznam p�ipojen�ch syst�m� soubor�\n"
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr ""
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:177
-#, fuzzy
-msgid "No signature\n"
-msgstr "generovat PGP/GPG podpis"
-
-#: lib/signature.c:181
-#, fuzzy
-msgid "Old PGP signature\n"
-msgstr "vynechat p��padn� PGP podpisy"
-
-#: lib/signature.c:192
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr ""
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nemohu spustit %s: %s\n"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "%s selhalo\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "generovat PGP/GPG podpis"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "Nemohu p�e��st hlavi�ku z %s: %s\n"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "%s selhalo\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "generovat PGP/GPG podpis"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "�patn� %%_signature spec v souboru maker.\n"
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Velikost hlavi�ky je p�ili� velk�"
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "nekontrolovat SHA1 digest v hlavi�ce"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "vynechat p��padn� MD5 sou�ty"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "generovat PGP/GPG podpis"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3788,6 +3770,14 @@ msgid "DIRECTORY"
 msgstr ""
 
 #, fuzzy
+#~ msgid "No signature\n"
+#~ msgstr "generovat PGP/GPG podpis"
+
+#, fuzzy
+#~ msgid "Old PGP signature\n"
+#~ msgstr "vynechat p��padn� PGP podpisy"
+
+#, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "%s: spou�t�m %s skript(y) (pokud existuj�)\n"
 
diff --git a/po/da.po b/po/da.po
index 437c5aa78..f6b6d061e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2656,7 +2656,7 @@ msgstr "Installerer %s\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "l�sning mislykkedes: %s (%d)\n"
@@ -2893,143 +2893,127 @@ msgstr ""
 msgid "getting list of mounted filesystems\n"
 msgstr "henter liste over monterede filsystemer\n"
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr "filen er ikke regul�r -- overspringer st�rrelsestjek\n"
-
-#: lib/signature.c:150
+#: 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:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Faktisk st�rrelse: %12d\n"
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr "Ingen signatur\n"
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr "Gammel PGP-signatur\n"
-
-#: lib/signature.c:192
-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:249
+#: lib/signature.c:238
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signaturst�rrelse: %d\n"
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunne ikke udf�re %s: %s\n"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 msgid "pgp failed\n"
 msgstr "pgp fejlede\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 msgid "pgp failed to write signature\n"
 msgstr "pgp kunne ikke skrive signatur\n"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP-signaturst�rrelse: %d\n"
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 msgid "unable to read the signature\n"
 msgstr "kunne ikke l�se signaturen\n"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Fik %d byte af PGP-signatur\n"
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 msgid "gpg failed\n"
 msgstr "gpg fejlede\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 msgid "gpg failed to write signature\n"
 msgstr "gpg kunne ikke skrive signaturen\n"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG-signaturst�rrelse: %d\n"
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Fik %d byte GPG-signatur\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Ugyldig angivelse af '%%_signature'-spec i makrofil.\n"
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, 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:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Du skal angive \"%%_pgp_name\" i din makrofil\n"
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Hovedst�rrelse er for stor"
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "verific�r ikke filerne i pakke"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "overspring eventuelle MD5-signaturer"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signaturfyld : %d\n"
@@ -3796,6 +3780,18 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "file is not regular -- skipping size check\n"
+#~ msgstr "filen er ikke regul�r -- overspringer st�rrelsestjek\n"
+
+#~ msgid "No signature\n"
+#~ msgstr "Ingen signatur\n"
+
+#~ msgid "Old PGP signature\n"
+#~ msgstr "Gammel PGP-signatur\n"
+
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr "Gammel (internt brug) signatur! Hvordan fik du fingre i den!?\n"
+
 #, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "k�rer postinstallations-skript (hvis det findes)\n"
diff --git a/po/de.po b/po/de.po
index db508ac64..d61e8cba5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2829,7 +2829,7 @@ msgstr "Installiere %s\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "lesen fehlgeschlagen: %s (%d)"
@@ -3070,150 +3070,131 @@ msgstr "Hole %s heraus\n"
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr ""
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:177
-#, fuzzy
-msgid "No signature\n"
-msgstr "%s: Keine Signatur verf�gbar\n"
-
-#: lib/signature.c:181
-#, fuzzy
-msgid "Old PGP signature\n"
-msgstr "PGP-Signatur generieren"
-
-#: lib/signature.c:192
-#, 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:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Konnte pgp nicht durchf�hren"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp fehlgeschlagen"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nicht m�glich, die Signatur zu lesen"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "pgp fehlgeschlagen"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, 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:826
+#: lib/signature.c:810
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "Paket installieren"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "alle MD5-Signaturen �berspringen"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Keine Signatur verf�gbar\n"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3997,6 +3978,18 @@ msgid "DIRECTORY"
 msgstr ""
 
 #, fuzzy
+#~ msgid "No signature\n"
+#~ msgstr "%s: Keine Signatur verf�gbar\n"
+
+#, fuzzy
+#~ msgid "Old PGP signature\n"
+#~ msgstr "PGP-Signatur generieren"
+
+#, fuzzy
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr "Alte Signatur (nur intern)!  Wie bist du daran gekommen!?"
+
+#, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "Keine Stufen ausf�hren"
 
diff --git a/po/fi.po b/po/fi.po
index 8ba0d0c0b..e4550cec0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2699,7 +2699,7 @@ msgstr "Asennan: %s\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "luku ep�onnistui: %s (%d)"
@@ -2931,150 +2931,131 @@ msgstr "Haen: %s\n"
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr ""
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:177
-#, fuzzy
-msgid "No signature\n"
-msgstr "%s: Ei allekirjoitusta saatavilla\n"
-
-#: lib/signature.c:181
-#, fuzzy
-msgid "Old PGP signature\n"
-msgstr "generoi PGP-allekirjoitus"
-
-#: lib/signature.c:192
-#, 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:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "En voinut ajaa pgp:t�"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp ep�onnistui"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "en voinut lukea allekirjoitusta"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "pgp ep�onnistui"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, 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:826
+#: lib/signature.c:810
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Sinun pit�� asettaa \"pgp_name:\" rpmrc-tiedostossa"
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "asenna paketti"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ohita MD5-allekirjoitukset"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3849,6 +3830,18 @@ msgid "DIRECTORY"
 msgstr ""
 
 #, fuzzy
+#~ msgid "No signature\n"
+#~ msgstr "%s: Ei allekirjoitusta saatavilla\n"
+
+#, fuzzy
+#~ msgid "Old PGP signature\n"
+#~ msgstr "generoi PGP-allekirjoitus"
+
+#, fuzzy
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr "Vanha (sis�isen k�yt�n) allekirjoitus! Mist� sait sen!?"
+
+#, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "�l� suorita mit��n vaiheita"
 
diff --git a/po/fr.po b/po/fr.po
index 8587f5002..67514ea32 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2738,7 +2738,7 @@ msgstr ""
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -2970,146 +2970,129 @@ msgstr ""
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr ""
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr ""
-
-#: lib/signature.c:181
-#, fuzzy
-msgid "Old PGP signature\n"
-msgstr "      --sign            - genre une signature PGP"
-
-#: lib/signature.c:192
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr ""
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "La construction a chou.\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "La construction a chou.\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3873,6 +3856,10 @@ msgid "DIRECTORY"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Old PGP signature\n"
+#~ msgstr "      --sign            - genre une signature PGP"
+
+#, fuzzy
 #~ msgid "%s: base64 encode failed.\n"
 #~ msgstr "impossible d'ouvrir: %s\n"
 
diff --git a/po/gl.po b/po/gl.po
index 05a233897..672e37ee5 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2558,7 +2558,7 @@ msgstr ""
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr ""
@@ -2789,139 +2789,123 @@ msgstr ""
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr ""
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr ""
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr ""
-
-#: lib/signature.c:192
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr ""
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index e63b0919a..ee2fd6dac 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2587,7 +2587,7 @@ msgstr ""
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr ""
@@ -2818,140 +2818,124 @@ msgstr ""
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr ""
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr ""
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr ""
-
-#: lib/signature.c:192
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr ""
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Gat ekki keyrt %s: %s\n"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 msgid "pgp failed\n"
 msgstr "pgp br�st\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 msgid "pgp failed to write signature\n"
 msgstr "pgp gat ekki lesi� undirskriftina\n"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 msgid "unable to read the signature\n"
 msgstr "get ekki lesi� undirskriftina\n"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 msgid "gpg failed\n"
 msgstr "ggp br�st\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 msgid "gpg failed to write signature\n"
 msgstr "gpg get ekki lesi� undirskriftina\n"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "ekki yfirfara SHA1 undirritunina"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 8783a8d09..632f298b2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2738,7 +2738,7 @@ msgstr "%s �򥤥󥹥ȡ�����\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "�ɤ߹��ߤμ���: %s (%d)"
@@ -2979,150 +2979,132 @@ msgstr "��������: %s\n"
 msgid "getting list of mounted filesystems\n"
 msgstr "�ޥ���Ȥ��줿�ե����륷���ƥ�Υꥹ�Ȥ�������Ƥ��ޤ�\n"
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr ""
-"�ե�����ϰ��̤Υե�����ǤϤ���ޤ��� -- �����������å��򥹥��åפ��ޤ�\n"
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "��̾������: %d\n"
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr "��̾�Ϥ���ޤ���\n"
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr "�Ť� PGP ��̾\n"
-
-#: lib/signature.c:192
-#, fuzzy
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr "�Ť�(����������)��̾!  �ɤ���äƤ�����ˤ���ޤ�����!?"
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "��̾������: %d\n"
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s ��¹ԤǤ��ޤ���Ǥ���: %s"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp ����"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp ����̾��񤭹���Τ˼��Ԥ��ޤ���"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP ��̾������: %d\n"
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "��̾���ɤळ�Ȥ��Ǥ��ޤ���"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "PGP ��̾�� %d �Х��Ȥ����\n"
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg ����"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg ����̾��񤭹���Τ˼��Ԥ��ޤ���"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, fuzzy, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG ��̾������: %s\n"
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, fuzzy, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "GPG ��̾�� %d �Х��Ȥ����\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "�ޥ����ե��������̵���� %%_signature ��\n"
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "�ޥ����ե������ \"%%_pgp_name\" �����ꤷ�ʤ���Фʤ�ޤ���"
 
-#: lib/signature.c:826
+#: lib/signature.c:810
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "�ޥ����ե������ \"%%_pgp_name\" �����ꤷ�ʤ���Фʤ�ޤ���"
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "�إå����������礭�����ޤ�"
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "�ѥå�������Υե�����θ��ڤ򤷤ޤ���"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "MD5 ��̾�򥹥��åפ��ޤ�"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "��̾�Ϥ���ޤ���\n"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "��̾�ѥå�: %d\n"
@@ -3898,6 +3880,20 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "file is not regular -- skipping size check\n"
+#~ msgstr ""
+#~ "�ե�����ϰ��̤Υե�����ǤϤ���ޤ��� -- �����������å��򥹥��åפ��ޤ�\n"
+
+#~ msgid "No signature\n"
+#~ msgstr "��̾�Ϥ���ޤ���\n"
+
+#~ msgid "Old PGP signature\n"
+#~ msgstr "�Ť� PGP ��̾\n"
+
+#, fuzzy
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr "�Ť�(����������)��̾!  �ɤ���äƤ�����ˤ���ޤ�����!?"
+
 #, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "�ݥ��ȥ��󥹥ȡ��륹����ץ�(��ͭ���)��¹Ԥ��ޤ�\n"
diff --git a/po/ko.po b/po/ko.po
index 525271368..4e70f3c7f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2631,7 +2631,7 @@ msgstr "%s(��)�� ��ġ�մϴ�\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "�дµ� ������: %s (%d)\n"
@@ -2869,143 +2869,127 @@ msgstr "%s(��)�� �����մϴ�\n"
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr "������ �ùٸ���(regular) �ʽ��ϴ� -- �뷮 �˻縦 �����մϴ�\n"
-
-#: lib/signature.c:150
+#: 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:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr " ���� �뷮: %12d\n"
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr "������ �����ϴ�\n"
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr "���� PGP ����\n"
-
-#: lib/signature.c:192
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr "���� (����-��) ����!  ��� �����̽��ϱ�!?\n"
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "����: size(%d)+pad(%d)\n"
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s(��)�� ������ �� ����: %s\n"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 msgid "pgp failed\n"
 msgstr "pgp�� ������\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 msgid "pgp failed to write signature\n"
 msgstr "pgp ������ �ۼ��ϴµ� �����߽��ϴ�\n"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP ���� �뷮: %d\n"
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 msgid "unable to read the signature\n"
 msgstr "������ ���� �� �����ϴ�\n"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "%d ����Ʈ�� PGP ������ ������ϴ�\n"
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 msgid "gpg failed\n"
 msgstr "gpg�� ������\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 msgid "gpg failed to write signature\n"
 msgstr "gpg ������ �ۼ��ϴµ� �����߽��ϴ�\n"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG ���� �뷮: %d\n"
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "%d ����Ʈ�� GPG ������ ������ϴ�\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "��ũ�� ���� �ȿ� �������� %%_signature ����(spec)�� �ֽ��ϴ�\n"
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "��ũ�� ���� �ȿ� �ݵ�� \"%%_gpg_name\"�� �����ؾ� �մϴ�\n"
 
-#: lib/signature.c:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "��ũ�� ���� �ȿ� �ݵ�� \"%%_pgp_name\"�� �����ؾ� �մϴ�\n"
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "����� ũ�Ⱑ �ʹ� Ů�ϴ�"
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "SHA1 ���(digest) ����� �˻����� �ʽ��ϴ�"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "��� MD5 ������ �˻����� �ʽ��ϴ�"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "������ �����ϴ�\n"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "�ջ�� MD5 ���(digest): �������� ����\n"
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "����: size(%d)+pad(%d)\n"
@@ -3774,6 +3758,18 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "file is not regular -- skipping size check\n"
+#~ msgstr "������ �ùٸ���(regular) �ʽ��ϴ� -- �뷮 �˻縦 �����մϴ�\n"
+
+#~ msgid "No signature\n"
+#~ msgstr "������ �����ϴ�\n"
+
+#~ msgid "Old PGP signature\n"
+#~ msgstr "���� PGP ����\n"
+
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr "���� (����-��) ����!  ��� �����̽��ϱ�!?\n"
+
 #, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "%s: %s ��ũ��Ʈ�� �����մϴ� (���� ���)\n"
diff --git a/po/no.po b/po/no.po
index 01e304e4b..56ce74aab 100644
--- a/po/no.po
+++ b/po/no.po
@@ -2616,7 +2616,7 @@ msgstr "Installerer %s\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "lesing feilet: %s (%d)\n"
@@ -2848,142 +2848,126 @@ msgstr "Henter %s\n"
 msgid "getting list of mounted filesystems\n"
 msgstr "henter liste over monterte filsystemer\n"
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr ""
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr ""
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr ""
-
-#: lib/signature.c:192
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr ""
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunne ikke kj�re %s: %s\n"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "For stor header"
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "ikke verifiser header SHA1 digest"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "hopp over MD5-signaturer"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 892f962bc..60d801bf2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2699,7 +2699,7 @@ msgstr "Instalacja %s\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "odczyt nie powi�d� si�: %s (%d)"
@@ -2933,149 +2933,132 @@ msgstr "�r�d�a w: %s\n"
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr "plik nieregularny -- sprawdzanie rozmiaru pomini�te\n"
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Rozmiar sygnatury: %d\n"
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr "Brak sygnatury\n"
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr "Stara sygnatura PGP\n"
-
-#: lib/signature.c:192
-#, 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:249
+#: lib/signature.c:238
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Rozmiar sygnatury: %d\n"
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nie mo�na uruchomi� %s"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp nie powiod�o si�"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "zapisanie sygnatury przez pgp nie powiod�o si�"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "rozmiar sygnatury PGP: %d\n"
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nie mo�na odczyta� sygnatury"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Mam %d bajt�w sygnatury PGP\n"
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg nie powiod�o si�"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "zapisanie sygnatury przez gpg nie powiod�o si�"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "rozmiar sygnatury GPG: %d\n"
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Mam %d bajt�w sygnatury GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "B��dny %%_signature spec w pliku makra.\n"
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, 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:826
+#: lib/signature.c:810
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musisz ustawi� \"%%_pgp_name\" w pliku swego makra"
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Rozmiar nag��wka jest zbyt du�y"
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "nie sprawdzaj plik�w pakietu"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "pomi� wszelkie sygnatury MD5"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Brak sygnatury\n"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Blok sygnatury: %d\n"
@@ -3842,6 +3825,19 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "file is not regular -- skipping size check\n"
+#~ msgstr "plik nieregularny -- sprawdzanie rozmiaru pomini�te\n"
+
+#~ msgid "No signature\n"
+#~ msgstr "Brak sygnatury\n"
+
+#~ msgid "Old PGP signature\n"
+#~ msgstr "Stara sygnatura PGP\n"
+
+#, fuzzy
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr "Stara (tylko wewn�trzna) sygnatura! Sk�d Ty to wzi��e�!?"
+
 #, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "uruchamianie skryptu postinstall (je�li istnieje)\n"
diff --git a/po/pt.po b/po/pt.po
index af8a29d2e..776a80e4f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2643,7 +2643,7 @@ msgstr "A instalar o %s\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "a leitura falhou: %s (%d)\n"
@@ -2879,144 +2879,128 @@ msgstr "A obter o %s\n"
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-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:150
+#: 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:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Tamanho real: %12d\n"
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr "Sem assinatura\n"
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr "Assinatura PGP antiga\n"
-
-#: lib/signature.c:192
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr "Assinatura (s� interna) antiga! Como � que obteve isto!?\n"
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Assinatura: tamanho(%d)+pad(%d)\n"
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "N�o consegui executar %s: %s\n"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 msgid "pgp failed\n"
 msgstr "o pgp falhou\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 msgid "pgp failed to write signature\n"
 msgstr "o pgp n�o conseguiu gravar a assinatura\n"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "tamanho da assinatura do PGP: %d\n"
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 msgid "unable to read the signature\n"
 msgstr "incapaz de ler a assinatura\n"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Obtive %d bytes da assinatura PGP\n"
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 msgid "gpg failed\n"
 msgstr "o gpg falhou\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 msgid "gpg failed to write signature\n"
 msgstr "o gpg n�o conseguiu gravar a assinatura\n"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Tamanho da assinatura do GPG: %d\n"
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Obtive %d bytes da assinatura do GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "'Spec' %%_signature inv�lido no ficheiro de macros\n"
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, 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:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Precisa definir o \"%%_pgp_name\" no seu ficheiro de macros\n"
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Tamanho do cabe�alho demasiado grande"
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "n�o verificar o SHA1 do cabe�alho"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ignorar as assinaturas de MD5"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Sem assinatura\n"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "'Digest' MD5 estragado: N�O SUPORTADO\n"
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Assinatura: tamanho(%d)+pad(%d)\n"
@@ -3779,6 +3763,18 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "file is not regular -- skipping size check\n"
+#~ msgstr "o ficheiro n�o � normal -- a ignorar a verifica��o do tamanho\n"
+
+#~ msgid "No signature\n"
+#~ msgstr "Sem assinatura\n"
+
+#~ msgid "Old PGP signature\n"
+#~ msgstr "Assinatura PGP antiga\n"
+
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr "Assinatura (s� interna) antiga! Como � que obteve isto!?\n"
+
 #, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "%s: a correr os scripts(s) %s (se existirem)\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3313b2f1d..3bc5d2d53 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2879,7 +2879,7 @@ msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "No consegui abrir: %s\n"
@@ -3128,149 +3128,132 @@ msgstr "RPM verso %s\n"
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr ""
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr ""
-
-#: lib/signature.c:181
-#, fuzzy
-msgid "Old PGP signature\n"
-msgstr "gere assinatura PGP"
-
-#: lib/signature.c:192
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr ""
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 # , c-format
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "Construo falhou.\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "Construo falhou.\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "instale pacote"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "desconsidere quaisquer assinaturas MD5"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -4069,6 +4052,10 @@ msgid "DIRECTORY"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Old PGP signature\n"
+#~ msgstr "gere assinatura PGP"
+
+#, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "no execute nenhum estgio"
 
diff --git a/po/ro.po b/po/ro.po
index d474fde7c..18ef76898 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2558,7 +2558,7 @@ msgstr ""
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr ""
@@ -2789,139 +2789,123 @@ msgstr ""
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr ""
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr ""
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr ""
-
-#: lib/signature.c:192
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr ""
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index a2f3e1030..0fb5b0d10 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -2564,7 +2564,7 @@ msgstr ""
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr ""
@@ -2795,139 +2795,123 @@ msgstr ""
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr ""
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr ""
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr ""
-
-#: lib/signature.c:192
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr ""
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 58be74f93..24cbc3ac9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1549,58 +1549,58 @@ msgstr "���������� ������ � %%%s %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "������ �������� ���������� ����� %s\n"
 
-#: lib/package.c:331
+#: lib/package.c:322
 #, c-format
 msgid "blob size(%d): BAD, 8 + 16 * il(%d) + dl(%d)\n"
 msgstr ""
 
-#: lib/package.c:339 lib/package.c:392 lib/package.c:450
+#: lib/package.c:330 lib/package.c:383 lib/package.c:441
 #, c-format
 msgid "tag[%d]: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:371
+#: lib/package.c:362
 #, c-format
 msgid "region trailer: BAD, tag %d type %d offset %d count %d\n"
 msgstr ""
 
-#: lib/package.c:384
+#: lib/package.c:375
 #, c-format
 msgid "region size: BAD, ril(%d) > il(%d)\n"
 msgstr ""
 
-#: lib/package.c:481 lib/package.c:521 lib/package.c:715 lib/package.c:739
-#: lib/package.c:769 lib/rpmchecksig.c:797
+#: lib/package.c:472 lib/package.c:512 lib/package.c:706 lib/package.c:730
+#: lib/package.c:760 lib/rpmchecksig.c:797
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 "������ ������� ������ 3 ����� ���� ���������, ������������ ������� ������ %u"
 
-#: lib/package.c:617
+#: lib/package.c:608
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "������ ������ 1 �� �������������� ���� ������� RPM\n"
 
-#: lib/package.c:625
+#: lib/package.c:616
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "��� ������ RPM ������������ ������ ������ ������ <= 4\n"
 
-#: lib/package.c:635 lib/rpmchecksig.c:228 lib/rpmchecksig.c:715
+#: lib/package.c:626 lib/rpmchecksig.c:228 lib/rpmchecksig.c:715
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: ������ rpmReadSignature\n"
 
-#: lib/package.c:640 lib/rpmchecksig.c:233 lib/rpmchecksig.c:721
+#: lib/package.c:631 lib/rpmchecksig.c:233 lib/rpmchecksig.c:721
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: ������� ����������\n"
 
-#: lib/package.c:681 lib/rpmchecksig.c:611
+#: lib/package.c:672 lib/rpmchecksig.c:611
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: ������ headerRead\n"
 
-#: lib/package.c:781 lib/rpmchecksig.c:118 lib/rpmchecksig.c:640
+#: lib/package.c:772 lib/rpmchecksig.c:118 lib/rpmchecksig.c:640
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ������ Fread: %s\n"
@@ -2609,7 +2609,7 @@ msgstr "��������������� %s\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "����� ������� (+%d/-%d) �� %-24.24s (0x%08x):\n"
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "������ ������: %s (%d)\n"
@@ -2841,140 +2841,123 @@ msgstr "������������: %s\n"
 msgid "getting list of mounted filesystems\n"
 msgstr "�������� ������ �������������� �������� ������\n"
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr "��������� ���� -- ��������� �������� �������\n"
-
-#: lib/signature.c:150
+#: 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:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "����������� ������: %12d\n"
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr "������� ���\n"
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr "������ ������� PGP\n"
-
-#: lib/signature.c:192
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr ""
-"������ (������ ��� ����������� �������������) �������! ��� �� ��� �����!?\n"
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "�������: ������(%d)+����������(%d)\n"
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "���������� ��������� %s: %s\n"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 msgid "pgp failed\n"
 msgstr "������ pgp\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 msgid "pgp failed to write signature\n"
 msgstr "������ pgp ��� ������ �������\n"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "������ ������� PGP: %d\n"
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 msgid "unable to read the signature\n"
 msgstr "���������� �������� �������\n"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "�������� %d ���� ������� PGP\n"
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 msgid "gpg failed\n"
 msgstr "������ gpg\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 msgid "gpg failed to write signature\n"
 msgstr "������ gpg ��� ������ �������\n"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "������ ������� GPG: %d\n"
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "�������� %d ���� ������� GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "�������� ������������ %%_signature � ����������\n"
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "�� ������ ���������� \"%%_gpg_name\" � ����� ����������\n"
 
-#: lib/signature.c:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "�� ������ ���������� \"%%_pgp_name\" � ����� ����������\n"
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 msgid "Header+Payload size: "
 msgstr "������ ��������� � �����������:"
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr "�������� MD5:"
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 msgid "Header SHA1 digest: "
 msgstr "�������� SHA1 ���������:"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 msgid "V3 RSA/MD5 signature: "
 msgstr "������� RSA/MD5 V3: "
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr "��������� "
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 msgid "V3 DSA signature: "
 msgstr "������� DSA V3: "
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "�������� �������: ������������ ���������\n"
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "�����. ����� MD5 ����������: �� ��������������\n"
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "�������: ���������� (%d)\n"
@@ -3743,3 +3726,17 @@ msgstr "������������ ���� ������ � ��������"
 #: ../rpmpopt:410 ../rpmpopt:418
 msgid "DIRECTORY"
 msgstr "�������"
+
+#~ msgid "file is not regular -- skipping size check\n"
+#~ msgstr "��������� ���� -- ��������� �������� �������\n"
+
+#~ msgid "No signature\n"
+#~ msgstr "������� ���\n"
+
+#~ msgid "Old PGP signature\n"
+#~ msgstr "������ ������� PGP\n"
+
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr ""
+#~ "������ (������ ��� ����������� �������������) �������! ��� �� ��� "
+#~ "�����!?\n"
diff --git a/po/sk.po b/po/sk.po
index afb589511..bd3a3985e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2697,7 +2697,7 @@ msgstr "In�taluje sa %s\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "��tanie zlyhalo: %s (%d)"
@@ -2929,149 +2929,132 @@ msgstr "zdroje v: %s\n"
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr "nejde o be�n� s�bor - kontrola ve�kosti vynechan�\n"
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Ve�kos� podpisu:   %d\n"
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr "Podpis nie je k dispoz�cii\n"
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr "Star� PGP podpis\n"
-
-#: lib/signature.c:192
-#, 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:249
+#: lib/signature.c:238
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Ve�kos� podpisu:   %d\n"
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nie je mo�n� spusti� %s"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp zlyhalo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp sa nepodarilo zap�sa� podpis"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Ve�kos� PGP podpisu: %d\n"
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nie je mo�n� pre��ta� podpis"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Pre��tan� PGP podpis obsahuje %d bajtov\n"
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg zlyhalo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg sa nepodarilo zap�sa� podpis"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Ve�kos� GPG podpisu: %d\n"
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Pre��tan� GPG podpis obsahuje %d bajtov\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Chybn� �pecifik�cia %%_signature v makro-s�bore.\n"
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, 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:826
+#: lib/signature.c:810
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Mus�te nastavi� \"%%pgp_name\" vo va�om makro-s�bore"
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Prive�k� hlavi�ka"
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "zobrazi� s�bory v bal�ku"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "vynecha� ak�ko�vek MD5 podpisy"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Podpis nie je k dispoz�cii\n"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Doplnenie podpisu: %d\n"
@@ -3838,6 +3821,19 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "file is not regular -- skipping size check\n"
+#~ msgstr "nejde o be�n� s�bor - kontrola ve�kosti vynechan�\n"
+
+#~ msgid "No signature\n"
+#~ msgstr "Podpis nie je k dispoz�cii\n"
+
+#~ msgid "Old PGP signature\n"
+#~ msgstr "Star� PGP podpis\n"
+
+#, fuzzy
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr "Star� (iba intern�) podpis! Ako ste sa k tomu dostali?!"
+
 #, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "vykon�vaj� sa poin�tala�n� skripty (ak existuj�)\n"
diff --git a/po/sl.po b/po/sl.po
index 383863adf..b188d7eea 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 # -*- 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.316 2002/08/26 17:52:00 jbj Exp $
+# $Id: sl.po,v 1.317 2002/08/31 22:39:36 jbj Exp $
 #
 msgid ""
 msgstr ""
@@ -2699,7 +2699,7 @@ msgstr "Name��anje %s\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "branje je bilo neuspe�no: %s (%d)"
@@ -2932,149 +2932,132 @@ msgstr "izvori v: %s\n"
 msgid "getting list of mounted filesystems\n"
 msgstr "zbiranje seznama priklopljenih datote�nih sistemov.\n"
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n"
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Dol�. podpisa : %d\n"
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr "Podpis manjka\n"
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr "Stari podpis PGP\n"
-
-#: lib/signature.c:192
-#, 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:249
+#: lib/signature.c:238
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Dol�. podpisa : %d\n"
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Ni mo�no izvesti %s: %s"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp je bil neuspe�en"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp je bil neuspe�en pri zapisu podpisa"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Dol�. podpisa PGP: %d\n"
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "branje podpisa je bilo neuspe�no"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Prebrano %d bajtov podpisa PGP\n"
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg je bil neuspe�en"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg je boil neuspe�en pri zapisu podpisa"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Dol�. podpisa GnuPG: %d\n"
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Prebrano %d bajtov podpisa GnuPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:826
+#: lib/signature.c:810
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Glava je predolga"
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "presko�i vse podpise MD5"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Podpis manjka\n"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Dol�. polnila : %d\n"
@@ -3845,6 +3828,20 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "file is not regular -- skipping size check\n"
+#~ msgstr ""
+#~ "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n"
+
+#~ msgid "No signature\n"
+#~ msgstr "Podpis manjka\n"
+
+#~ msgid "Old PGP signature\n"
+#~ msgstr "Stari podpis PGP\n"
+
+#, fuzzy
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr "Podpis v (interni) stari obliki! Kje ste ga dobili?"
+
 #, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "poganjanje ponamestitvenih skript (�e obstajajo)\n"
diff --git a/po/sr.po b/po/sr.po
index 4043fa761..e82fa8729 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2690,7 +2690,7 @@ msgstr "Instaliram %s\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, fuzzy, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "neuspelo �itanje: %s (%d)"
@@ -2922,150 +2922,131 @@ msgstr "Pribavljam %s\n"
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr ""
-
-#: lib/signature.c:150
+#: lib/signature.c:131
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:177
-#, fuzzy
-msgid "No signature\n"
-msgstr "%s: Potpis nije na raspolaganju\n"
-
-#: lib/signature.c:181
-#, fuzzy
-msgid "Old PGP signature\n"
-msgstr "napravi PGP potpis"
-
-#: lib/signature.c:192
-#, fuzzy
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr "Stari (interni) potpis!  Odakle vam!?"
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Ne mogu da izvr�im PGP"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "PGP omanuo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "PGP nije uspeo da zapi�e potpis"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "ne mogu da pro�itam potpis"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "PGP omanuo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "PGP nije uspeo da zapi�e potpis"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, 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:826
+#: lib/signature.c:810
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Morate podesiti \"pgp_name:\" u va�oj rpmrc datoteci"
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "instaliraj paket"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "presko�i sve MD5 potpise"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3840,6 +3821,18 @@ msgid "DIRECTORY"
 msgstr ""
 
 #, fuzzy
+#~ msgid "No signature\n"
+#~ msgstr "%s: Potpis nije na raspolaganju\n"
+
+#, fuzzy
+#~ msgid "Old PGP signature\n"
+#~ msgstr "napravi PGP potpis"
+
+#, fuzzy
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr "Stari (interni) potpis!  Odakle vam!?"
+
+#, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "nemoj izvr�iti nijednu fazu"
 
diff --git a/po/sv.po b/po/sv.po
index e5bff312d..c07fa7d90 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2591,7 +2591,7 @@ msgstr "Installerar %s\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr "�terst�ller paket (+%d/-%d) till %-24.24s (0x%08x):\n"
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "l�sning misslyckades: %s (%d)\n"
@@ -2822,141 +2822,125 @@ msgstr "F�resl�r %s\n"
 msgid "getting list of mounted filesystems\n"
 msgstr "h�mtar lista �ver monterade filsystem\n"
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr "filen �r inte en vanlig fil -- hoppar �ver storlekskontroll\n"
-
-#: lib/signature.c:150
+#: 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:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Faktisk storlek: %12d\n"
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr "Ingen signatur\n"
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr "Gammal PGP-signatur\n"
-
-#: lib/signature.c:192
-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:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunde inte k�ra %s: %s\n"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 msgid "pgp failed\n"
 msgstr "pgp misslyckades\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 msgid "pgp failed to write signature\n"
 msgstr "pgp misslyckades att skriva en signatur\n"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP signaturstorlek: %d\n"
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 msgid "unable to read the signature\n"
 msgstr "kan inte l�sa signaturen\n"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Fick %d byte PGP-signatur\n"
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 msgid "gpg failed\n"
 msgstr "gpg misslyckades\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 msgid "gpg failed to write signature\n"
 msgstr "gpg kunde inte skriva signatur\n"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG-signaturstorlek: %d\n"
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Fick %d byte GPG-signatur\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Felaktig %%_signature-spec i makrofil\n"
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, 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:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Du m�ste s�tta \"%%_pgp_name\" i din makrofil\n"
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 msgid "Header+Payload size: "
 msgstr "Huvud+laststorlek: "
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr "MD5-summa: "
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 msgid "Header SHA1 digest: "
 msgstr "Huvudets SHA1-summa: "
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 msgid "V3 RSA/MD5 signature: "
 msgstr "V3 RSA/MD5-signatur: "
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr "Huvud "
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 msgid "V3 DSA signature: "
 msgstr "V3 DSA-signatur: "
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr "Verifiera signatur: FELAKTIGA PARAMETRAR\n"
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr "Trasig MD5-summa: ST�DS EJ\n"
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: OK�ND (%d)\n"
@@ -3717,6 +3701,18 @@ msgstr "anv�nd databas i KATALOG"
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
+#~ msgid "file is not regular -- skipping size check\n"
+#~ msgstr "filen �r inte en vanlig fil -- hoppar �ver storlekskontroll\n"
+
+#~ msgid "No signature\n"
+#~ msgstr "Ingen signatur\n"
+
+#~ msgid "Old PGP signature\n"
+#~ msgstr "Gammal PGP-signatur\n"
+
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr "Gammal (endast intern) signatur!  Hur fick du tag i den!?\n"
+
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "%s: k�r %s-skript\n"
 
diff --git a/po/tr.po b/po/tr.po
index 17568493f..1e713affe 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2660,7 +2660,7 @@ msgstr "%s kuruluyor\n"
 msgid "Rollback packages (+%d/-%d) to %-24.24s (0x%08x):\n"
 msgstr ""
 
-#: lib/rpmlead.c:54
+#: lib/rpmlead.c:55
 #, c-format
 msgid "read failed: %s (%d)\n"
 msgstr "okuma ba�ar�s�z: %s (%d)\n"
@@ -2892,143 +2892,127 @@ msgstr "%s al�n�yor\n"
 msgid "getting list of mounted filesystems\n"
 msgstr "ba�l� dosya sistemlerinin listesi al�n�yor\n"
 
-#: lib/signature.c:132
-msgid "file is not regular -- skipping size check\n"
-msgstr "dosya normal de�il -- uzunluk denetimi atlan�yor\n"
-
-#: lib/signature.c:150
+#: 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:155
+#: lib/signature.c:136
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Ger�ek boyut: %12d\n"
 
-#: lib/signature.c:177
-msgid "No signature\n"
-msgstr "�mza yok\n"
-
-#: lib/signature.c:181
-msgid "Old PGP signature\n"
-msgstr "Eski PGP imzas�\n"
-
-#: lib/signature.c:192
-msgid "Old (internal-only) signature!  How did you get that!?\n"
-msgstr "Eski imza !!! Bunu nas�l ald�n!?\n"
-
-#: lib/signature.c:249
+#: lib/signature.c:238
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "�mza: boyut(%d)+iz(%d)\n"
 
 #. @=boundsread@
-#: lib/signature.c:341 lib/signature.c:455 lib/signature.c:735
-#: lib/signature.c:774
+#: lib/signature.c:330 lib/signature.c:444 lib/signature.c:719
+#: lib/signature.c:758
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s icra edilemedi: %s\n"
 
-#: lib/signature.c:357
+#: lib/signature.c:346
 msgid "pgp failed\n"
 msgstr "pgp hata verdi\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:364
+#: lib/signature.c:353
 msgid "pgp failed to write signature\n"
 msgstr "pgp imzas�n�n yaz�lmas� ba�ar�s�z\n"
 
-#: lib/signature.c:370
+#: lib/signature.c:359
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP imza uzunlu�u: %d\n"
 
 #. @=boundswrite@
-#: lib/signature.c:388 lib/signature.c:503
+#: lib/signature.c:377 lib/signature.c:492
 msgid "unable to read the signature\n"
 msgstr "imza okunamad�\n"
 
-#: lib/signature.c:393
+#: lib/signature.c:382
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "GPG imzas�n�n %d bayt� al�nd�\n"
 
-#: lib/signature.c:472
+#: lib/signature.c:461
 msgid "gpg failed\n"
 msgstr "gpg hata verdi\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:479
+#: lib/signature.c:468
 msgid "gpg failed to write signature\n"
 msgstr "imzan�n yaz�lmas� s�ras�nda gpg hata verdi\n"
 
-#: lib/signature.c:485
+#: lib/signature.c:474
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG imza uzunlu�u: %d\n"
 
-#: lib/signature.c:508
+#: lib/signature.c:497
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "GPG imzas�n�n %d bayt� al�nd�\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:779 lib/signature.c:834
+#: lib/signature.c:763 lib/signature.c:818
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Makro dosyas�nda %%_signature spec ge�ersiz\n"
 
-#: lib/signature.c:811
+#: lib/signature.c:795
 #, 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:826
+#: lib/signature.c:810
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Makro dosyan�zda \"%%_pgp_name\" belirtmelisiniz\n"
 
-#: lib/signature.c:875
+#: lib/signature.c:859
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Ba�l�k �ok uzun"
 
-#: lib/signature.c:915
+#: lib/signature.c:899
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:971
+#: lib/signature.c:955
 #, fuzzy
 msgid "Header SHA1 digest: "
 msgstr "Ba�l�k SHA1 �z�mlemesi do�rulanmaz"
 
-#: lib/signature.c:1046
+#: lib/signature.c:1030
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "t�m MD5 imzalar�n� atlar"
 
-#: lib/signature.c:1163
+#: lib/signature.c:1147
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1164
+#: lib/signature.c:1148
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "�mza yok\n"
 
-#: lib/signature.c:1243
+#: lib/signature.c:1227
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1270
+#: lib/signature.c:1254
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1274
+#: lib/signature.c:1258
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "�mza: boyut(%d)+iz(%d)\n"
@@ -3790,6 +3774,18 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#~ msgid "file is not regular -- skipping size check\n"
+#~ msgstr "dosya normal de�il -- uzunluk denetimi atlan�yor\n"
+
+#~ msgid "No signature\n"
+#~ msgstr "�mza yok\n"
+
+#~ msgid "Old PGP signature\n"
+#~ msgstr "Eski PGP imzas�\n"
+
+#~ msgid "Old (internal-only) signature!  How did you get that!?\n"
+#~ msgstr "Eski imza !!! Bunu nas�l ald�n!?\n"
+
 #, fuzzy
 #~ msgid "%s: running %s scriptlet\n"
 #~ msgstr "%s: %s beti�i �al��t�r�l�yor (varsa)\n"
diff --git a/popt/poptint.h b/popt/poptint.h
index e612e925e..5d308efe9 100644
--- a/popt/poptint.h
+++ b/popt/poptint.h
@@ -103,7 +103,7 @@ struct poptContext_s {
 #define _(foo) foo
 #endif
 
-#if defined(HAVE_DGETTEXT) && !defined(__LCLINT__)
+#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
 #define D_(dom, str) dgettext(dom, str)
 #define POPT_(foo) D_("popt", foo)
 #else
diff --git a/python/Makefile.am b/python/Makefile.am
index 22a79ca4c..df555b11f 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -25,8 +25,7 @@ mylibs= \
 	$(top_builddir)/lib/.libs/librpm.so \
 	$(top_builddir)/rpmdb/.libs/librpmdb.so \
 	$(top_builddir)/rpmio/.libs/librpmio.so \
-	$(top_builddir)/popt/.libs/libpopt.so \
-	@WITH_LIBELF_ARCHIVE@
+	$(top_builddir)/popt/.libs/libpopt.so
 
 LDADD =
 
diff --git a/rpm.spec.in b/rpm.spec.in
index 4b8d4f93b..d27e356f6 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -527,3 +527,6 @@ fi
 - unify cachesize configuration, with (or without) a dbenv.
 - comments regarding unsupported (yet) db-4.1.17 functionality.
 - requirement on libelf >= 0.8.2 to work around incompatible soname (#72792).
+- fix: common sanity check on headers, prevent segfault (#72590).
+- limit number of NOKEY/UNTRUSTED keys that will be warned once.
+- libadd -lelf to rpmdb (#73024).
diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am
index 7fdc485a0..9201924fc 100644
--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@@ -28,7 +28,7 @@ mylibpaths = \
 	-L$(top_builddir)/rpmio \
 	-L$(top_builddir)/popt
 
-mylibs = -lrpm -lrpmio -lpopt @WITH_LIBELF_LIB@ @LIBS@ @INTLLIBS@ @LIBMISC@
+mylibs = -lrpm -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
 LIBS =
 
 DB3LOBJS = $(shell cat $(top_builddir)/$(WITH_DB_SUBDIR)/db3lobjs)
@@ -40,7 +40,7 @@ librpmdb_la_SOURCES = \
 	poptDB.c rpmhash.c rpmdb.c \
 	tagname.c tagtbl.c
 librpmdb_la_LDFLAGS = -release @VERSION@ @libdb3@
-librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
+librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) @WITH_LIBELF_LIB@
 librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) .created
 
 # XXX make sure that db.h symlink is generated
diff --git a/rpmdb/header.c b/rpmdb/header.c
index 663c6f4da..9ecaa416f 100644
--- a/rpmdb/header.c
+++ b/rpmdb/header.c
@@ -17,7 +17,7 @@
 #include "debug.h"
 
 /*@unchecked@*/
-int _hdr_debug = 1;
+int _hdr_debug = 0;
 
 /*@-redecl@*/	/* FIX: avoid rpmlib.h, need for debugging. */
 /*@observer@*/ const char *const tagName(int tag)	/*@*/;
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 37b818747..6ccc290ed 100644
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -687,15 +687,11 @@ static int enableSignals(void)
 }
 
 /*@unchecked@*/
-static rpmdb dbrock;
+static rpmdb rpmdbRock;
 
-/**
- * Check for signals.
- */
-/*@mayexit@*/
-static int checkSignals(void)
-	/*@globals dbrock, satbl, fileSystem @*/
-	/*@modifies dbrock, fileSystem @*/
+int rpmdbCheckSignals(void)
+	/*@globals rpmdbRock, satbl @*/
+	/*@modifies rpmdbRock @*/
 {
     struct sigtbl_s * tbl;
     sigset_t newMask, oldMask;
@@ -714,8 +710,8 @@ static int checkSignals(void)
 	rpmdb db;
 	rpmMessage(RPMMESS_WARNING, "Exiting on signal ...\n");
 /*@-newreftrans@*/
-	while ((db = dbrock) != NULL) {
-/*@i@*/	    dbrock = db->db_next;
+	while ((db = rpmdbRock) != NULL) {
+/*@i@*/	    rpmdbRock = db->db_next;
 	    db->db_next = NULL;
 	    (void) rpmdbClose(db);
 	}
@@ -773,10 +769,10 @@ static int blockSignals(/*@unused@*/ rpmdb db, /*@out@*/ sigset_t * oldMask)
  */
 /*@mayexit@*/
 static int unblockSignals(/*@unused@*/ rpmdb db, sigset_t * oldMask)
-	/*@globals dbrock, fileSystem @*/
-	/*@modifies dbrock, fileSystem @*/
+	/*@globals rpmdbRock, fileSystem @*/
+	/*@modifies rpmdbRock, fileSystem @*/
 {
-    (void) checkSignals();
+    (void) rpmdbCheckSignals();
     return sigprocmask(SIG_SETMASK, oldMask, NULL);
 }
 
@@ -842,8 +838,8 @@ int rpmdbCloseDBI(rpmdb db, int rpmtag)
 /* XXX query.c, rpminstall.c, verify.c */
 /*@-incondefs@*/
 int rpmdbClose(rpmdb db)
-	/*@globals dbrock @*/
-	/*@modifies dbrock @*/
+	/*@globals rpmdbRock @*/
+	/*@modifies rpmdbRock @*/
 {
     rpmdb * prev, next;
     int dbix;
@@ -876,7 +872,7 @@ int rpmdbClose(rpmdb db)
     db->_dbi = _free(db->_dbi);
 
 /*@-newreftrans@*/
-    prev = &dbrock;
+    prev = &rpmdbRock;
     while ((next = *prev) != NULL && next != db)
 	prev = &next->db_next;
     if (next) {
@@ -968,9 +964,9 @@ static int openDatabase(/*@null@*/ const char * prefix,
 		/*@null@*/ const char * dbpath,
 		int _dbapi, /*@null@*/ /*@out@*/ rpmdb *dbp,
 		int mode, int perms, int flags)
-	/*@globals dbrock, rpmGlobalMacroContext,
+	/*@globals rpmdbRock, rpmGlobalMacroContext,
 		fileSystem, internalState @*/
-	/*@modifies dbrock, *dbp, rpmGlobalMacroContext,
+	/*@modifies rpmdbRock, *dbp, rpmGlobalMacroContext,
 		fileSystem, internalState @*/
 	/*@requires maxSet(dbp) >= 0 @*/
 {
@@ -1055,8 +1051,8 @@ exit:
 	xx = rpmdbClose(db);
     else {
 /*@-assignexpose -newreftrans@*/
-/*@i@*/	db->db_next = dbrock;
-	dbrock = db;
+/*@i@*/	db->db_next = rpmdbRock;
+	rpmdbRock = db;
 /*@i@*/	*dbp = db;
 /*@=assignexpose =newreftrans@*/
     }
@@ -1700,7 +1696,7 @@ rpmdbMatchIterator rpmdbFreeIterator(rpmdbMatchIterator mi)
     mi->mi_db = rpmdbUnlink(mi->mi_db, "matchIterator");
     mi = _free(mi);
 
-    (void) checkSignals();
+    (void) rpmdbCheckSignals();
 
     return mi;
 }
@@ -2142,8 +2138,6 @@ Header rpmdbNextIterator(rpmdbMatchIterator mi)
     if (mi == NULL)
 	return NULL;
 
-    (void) checkSignals();
-
     dbi = dbiOpen(mi->mi_db, RPMDBI_PACKAGES, 0);
     if (dbi == NULL)
 	return NULL;
@@ -2441,7 +2435,7 @@ rpmdbMatchIterator rpmdbInitIterator(rpmdb db, rpmTag rpmtag,
     if (db == NULL)
 	return NULL;
 
-    (void) checkSignals();
+    (void) rpmdbCheckSignals();
 
     /* XXX HACK to remove rpmdbFindByLabel/findMatches from the API */
     if (rpmtag == RPMDBI_LABEL) {
diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
index 7314b1791..a9175df9b 100644
--- a/rpmdb/rpmdb.h
+++ b/rpmdb/rpmdb.h
@@ -1018,6 +1018,14 @@ Header rpmdbNextIterator(/*@null@*/ rpmdbMatchIterator mi)
 	/*@modifies mi, rpmGlobalMacroContext, fileSystem @*/;
 
 /** \ingroup rpmdb
+ * Check rpmdb signal handler for trapped signal exit.
+ */
+/*@mayexit@*/
+int rpmdbCheckSignals(void)
+	/*@globals fileSystem @*/
+	/*@modifies fileSystem @*/;
+
+/** \ingroup rpmdb
  * Destroy rpm database iterator.
  * @param mi		rpm database iterator
  * @return		NULL always
diff --git a/rpmio/fts.c b/rpmio/fts.c
index 8052281d9..57522aa37 100644
--- a/rpmio/fts.c
+++ b/rpmio/fts.c
@@ -45,6 +45,14 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #include <string.h>
 #include <unistd.h>
 #else
+#if defined(hpux)
+# define        _INCLUDE_POSIX_SOURCE
+#   define __errno_location() 	(&errno)
+#   define dirfd(dirp)		-1
+#   define stat64		stat
+#   define _STAT_VER		0
+#   define __fxstat64(_stat_ver, _fd, _sbp)	fstat((_fd), (_sbp))
+#endif
 #include "system.h"
 #include "fts.h"
 #include "rpmio.h"
diff --git a/rpmio/fts.h b/rpmio/fts.h
index e01768096..1f65a48ff 100644
--- a/rpmio/fts.h
+++ b/rpmio/fts.h
@@ -32,7 +32,27 @@
 #ifndef	_FTS_H
 #define	_FTS_H 1
 
+#if defined(__GLIBC__)
 #include <features.h>
+#else
+
+#   define __THROW
+#ifdef  __cplusplus
+# define __BEGIN_DECLS  extern "C" {
+# define __END_DECLS    }
+#else
+# define __BEGIN_DECLS
+# define __END_DECLS
+#endif
+
+#if defined(hpux)
+# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
+# define	_INCLUDE_POSIX_SOURCE
+# define	_LARGEFILE64_SOURCE
+#endif
+
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c
index 81544156e..80c10f987 100644
--- a/rpmio/rpmrpc.c
+++ b/rpmio/rpmrpc.c
@@ -1090,6 +1090,21 @@ struct __dirstream {
 #endif
 };
 
+#if !defined(DT_DIR)
+# define DT_UNKNOWN	0
+# define DT_FIFO	1
+# define DT_CHR		2
+# define DT_DIR		4
+# define DT_BLK		6
+# define DT_REG		8
+# define DT_LNK		10
+# define DT_SOCK	12
+# define DT_WHT		14
+typedef struct __dirstream *	FTPDIR;
+#else
+typedef DIR *			FTPDIR;
+#endif
+
 /*@unchecked@*/
 static int ftpmagicdir = 0x8440291;
 #define	ISFTPMAGIC(_dir) (!memcmp((_dir), &ftpmagicdir, sizeof(ftpmagicdir)))
@@ -1101,7 +1116,7 @@ static DIR * ftpOpendir(const char * path)
 	/*@globals fileSystem, internalState @*/
 	/*@modifies fileSystem, internalState @*/
 {
-    DIR * dir;
+    FTPDIR mydir;
     struct dirent * dp;
     size_t nb;
     const char * s, * sb, * se;
@@ -1149,21 +1164,21 @@ fprintf(stderr, "*** ftpOpendir(%s)\n", path);
 	}
     }
 
-    nb += sizeof(*dir) + sizeof(*dp) + ((ac + 1) * sizeof(*av)) + (ac + 1);
-    dir = xcalloc(1, nb);
+    nb += sizeof(*mydir) + sizeof(*dp) + ((ac + 1) * sizeof(*av)) + (ac + 1);
+    mydir = xcalloc(1, nb);
     /*@-abstract@*/
-    dp = (struct dirent *) (dir + 1);
+    dp = (struct dirent *) (mydir + 1);
     av = (const char **) (dp + 1);
     dt = (char *) (av + (ac + 1));
     t = (char *) (dt + ac + 1);
     /*@=abstract@*/
 
-    dir->fd = ftpmagicdir;
-    dir->data = (char *) dp;
-    dir->allocation = nb;
-    dir->size = ac;
-    dir->offset = -1;
-    dir->filepos = 0;
+    mydir->fd = ftpmagicdir;
+    mydir->data = (char *) dp;
+    mydir->allocation = nb;
+    mydir->size = ac;
+    mydir->offset = -1;
+    mydir->filepos = 0;
 
     ac = 0;
     /*@-dependenttrans -unrecog@*/
@@ -1227,7 +1242,7 @@ fprintf(stderr, "*** ftpOpendir(%s)\n", path);
     }
     av[ac] = NULL;
 
-    return dir;
+    return (DIR *) mydir;
 }
 /*@=boundswrite@*/
 
@@ -1236,6 +1251,7 @@ static struct dirent * ftpReaddir(DIR * dir)
 	/*@globals fileSystem @*/
 	/*@modifies fileSystem @*/
 {
+    FTPDIR mydir = (FTPDIR)dir;
     struct dirent * dp;
     const char ** av;
     unsigned char * dt;
@@ -1243,37 +1259,40 @@ static struct dirent * ftpReaddir(DIR * dir)
     int i;
 
     /*@+voidabstract@*/
-    if (dir == NULL || !ISFTPMAGIC(dir) || dir->data == NULL) {
+    if (mydir == NULL || !ISFTPMAGIC(mydir) || mydir->data == NULL) {
 	/* XXX TODO: EBADF errno. */
 	return NULL;
     }
     /*@=voidabstract@*/
 
-    dp = (struct dirent *) dir->data;
+    dp = (struct dirent *) mydir->data;
     av = (const char **) (dp + 1);
-    ac = dir->size;
+    ac = mydir->size;
     dt = (char *) (av + (ac + 1));
-    i = dir->offset + 1;
+    i = mydir->offset + 1;
 
 /*@-boundsread@*/
     if (i < 0 || i >= ac || av[i] == NULL)
 	return NULL;
 /*@=boundsread@*/
 
-    dir->offset = i;
+    mydir->offset = i;
 
     /* XXX glob(3) uses REAL_DIR_ENTRY(dp) test on d_ino */
     dp->d_ino = i + 1;		/* W2DO? */
-    dp->d_off = 0;		/* W2DO? */
     dp->d_reclen = 0;		/* W2DO? */
+
+#if !defined(hpux)
+    dp->d_off = 0;		/* W2DO? */
 /*@-boundsread@*/
     dp->d_type = dt[i];
 /*@=boundsread@*/
+#endif
 
     strncpy(dp->d_name, av[i], sizeof(dp->d_name));
 /*@+voidabstract@*/
 if (_ftp_debug)
-fprintf(stderr, "*** ftpReaddir(%p) %p \"%s\"\n", (void *)dir, dp, dp->d_name);
+fprintf(stderr, "*** ftpReaddir(%p) %p \"%s\"\n", (void *)mydir, dp, dp->d_name);
 /*@=voidabstract@*/
     
     return dp;
@@ -1284,16 +1303,18 @@ static int ftpClosedir(/*@only@*/ DIR * dir)
 	/*@globals fileSystem @*/
 	/*@modifies dir, fileSystem @*/
 {
+    FTPDIR mydir = (FTPDIR)dir;
+
     /*@+voidabstract@*/
 if (_ftp_debug)
-fprintf(stderr, "*** ftpClosedir(%p)\n", (void *)dir);
-    if (dir == NULL || !ISFTPMAGIC(dir)) {
+fprintf(stderr, "*** ftpClosedir(%p)\n", (void *)mydir);
+    if (mydir == NULL || !ISFTPMAGIC(mydir)) {
 	/* XXX TODO: EBADF errno. */
 	return -1;
     }
-    free((void *)dir);
+    free((void *)mydir);
     /*@=voidabstract@*/
-    dir = NULL;
+    mydir = NULL;
     return 0;
 }
 
diff --git a/tools/rpmsignature.c b/tools/rpmsignature.c
index f916f5ec4..23f194092 100644
--- a/tools/rpmsignature.c
+++ b/tools/rpmsignature.c
@@ -25,16 +25,11 @@ int main(int argc, char **argv)
 	exit(1);
     }
 
-    readLead(fdi, &lead);
-    rpmReadSignature(fdi, &sig, lead.signature_type);
-    switch (lead.signature_type) {
-    case RPMSIGTYPE_NONE:
-	fprintf(stderr, _("No signature available.\n"));
-	break;
-    default:
+    if (readLead(fdi, &lead) != RPMRC_OK)
+	exit(1);
+    if (rpmReadSignature(fdi, &sig, lead.signature_type) !=  RPMRC_OK) {
 	fdo = Fopen("-", "w.ufdio");
 	rpmWriteSignature(fdo, sig);
-	break;
     }
     
     return 0;
diff --git a/tools/utils.h b/tools/utils.h
index 221fc642d..0b2b3a3be 100644
--- a/tools/utils.h
+++ b/tools/utils.h
@@ -2,7 +2,6 @@
 #define UTILS_H
 
 #include <stdlib.h>
-#include <stdint.h>
 
 char *strconcat (const char *string1, ...);
 off_t align_up (off_t offset, size_t alignment);