summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-07-12 19:09:09 +0000
committerjbj <devnull@localhost>2002-07-12 19:09:09 +0000
commitd132234000940b4c7b0f1d91ec8f8c27f184914c (patch)
tree2edc863517514ff6646d6a83cea4ba083f9719e1
parent1bf723fca490b598fa289ddcd437bc61c87d4ef4 (diff)
downloadrpm-d132234000940b4c7b0f1d91ec8f8c27f184914c.tar.gz
rpm-d132234000940b4c7b0f1d91ec8f8c27f184914c.tar.bz2
rpm-d132234000940b4c7b0f1d91ec8f8c27f184914c.zip
- display signature details using rpm -qi
CVS patchset: 5547 CVS date: 2002/07/12 19:09:09
-rw-r--r--CHANGES1
-rw-r--r--lib/formats.c84
-rw-r--r--po/cs.po18
-rw-r--r--po/da.po18
-rw-r--r--po/de.po18
-rw-r--r--po/en_RN.po14
-rw-r--r--po/es.po14
-rw-r--r--po/eu_ES.po14
-rw-r--r--po/fi.po18
-rw-r--r--po/fr.po15
-rw-r--r--po/gl.po14
-rw-r--r--po/hu.po14
-rw-r--r--po/id.po14
-rw-r--r--po/is.po15
-rw-r--r--po/it.po14
-rw-r--r--po/ja.po18
-rw-r--r--po/ko.po18
-rw-r--r--po/no.po18
-rw-r--r--po/pl.po18
-rw-r--r--po/pt.po18
-rw-r--r--po/pt_BR.po18
-rw-r--r--po/ro.po14
-rw-r--r--po/rpm.pot14
-rw-r--r--po/ru.po18
-rw-r--r--po/sk.po18
-rw-r--r--po/sl.po20
-rw-r--r--po/sr.po18
-rw-r--r--po/sv.po15
-rw-r--r--po/tr.po18
-rw-r--r--po/uk.po14
-rw-r--r--po/wa.po14
-rw-r--r--po/zh.po14
-rw-r--r--po/zh_CN.GB2312.po14
-rw-r--r--rpm.spec.in5
-rw-r--r--rpmpopt.in2
35 files changed, 382 insertions, 209 deletions
diff --git a/CHANGES b/CHANGES
index cc20f5645..e28ae6409 100644
--- a/CHANGES
+++ b/CHANGES
@@ -164,6 +164,7 @@
- placeholders for manifest constants for SuSE patch packages.
- fix: repair 2ndary match criteria with rpmdb iterators.
- update for sv.po.
+ - display signature details using rpm -qi.
4.0.3 -> 4.0.4:
- solaris: translate i86pc to i386 (#57182).
diff --git a/lib/formats.c b/lib/formats.c
index f4be621a4..b11d48e4a 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -125,6 +125,7 @@ static /*@only@*/ char * fflagsFormat(int_32 type, const void * data,
/**
* Wrap a pubkey in ascii armor for display.
+ * @todo Permit selectable display formats (i.e. binary).
* @param type tag type
* @param data tag value
* @param formatPrefix
@@ -214,6 +215,7 @@ static /*@only@*/ char * armorFormat(int_32 type, const void * data,
/**
* Encode binary data in base64 for display.
+ * @todo Permit selectable display formats (i.e. binary).
* @param type tag type
* @param data tag value
* @param formatPrefix
@@ -259,8 +261,8 @@ static /*@only@*/ char * base64Format(int_32 type, const void * data,
return val;
}
-#ifdef NOTYET
/**
+ * Display signature fingerprint and time.
* @param type tag type
* @param data tag value
* @param formatPrefix
@@ -268,20 +270,90 @@ static /*@only@*/ char * base64Format(int_32 type, const void * data,
* @param element (unused)
* @return formatted string
*/
-static /*@only@*/ char * pgppktFormat(int_32 type, const void * data,
+static /*@only@*/ char * pgpsigFormat(int_32 type, const void * data,
char * formatPrefix, int padding, int element)
/*@modifies formatPrefix @*/
{
- char * val;
+ char * val, * t;
if (type != RPM_BIN_TYPE) {
val = xstrdup(_("(not a blob)"));
} else {
+ unsigned char * pkt = (byte *) data;
+ unsigned int pktlen = 0;
+ unsigned int v = *pkt;
+ pgpTag tag = 0;
+ unsigned int plen;
+ unsigned int hlen = 0;
+
+ if (v & 0x80) {
+ if (v & 0x40) {
+ tag = (v & 0x3f);
+ plen = pgpLen(pkt+1, &hlen);
+ } else {
+ tag = (v >> 2) & 0xf;
+ plen = (1 << (v & 0x3));
+ hlen = pgpGrab(pkt+1, plen);
+ }
+
+ pktlen = 1 + plen + hlen;
+ }
+
+ if (pktlen == 0 || tag != PGPTAG_SIGNATURE) {
+ val = xstrdup(_("(not a OpenPGP signature"));
+ } else {
+ struct pgpDig_s * dig = pgpNewDig();
+ struct pgpDigParams_s * sigp = &dig->signature;
+ size_t nb = 80;
+
+ (void) pgpPrtPkts(pkt, pktlen, dig, 0);
+
+ val = t = xmalloc(nb + 1);
+
+ switch (sigp->pubkey_algo) {
+ case PGPPUBKEYALGO_DSA:
+ t = stpcpy(t, "DSA");
+ break;
+ case PGPPUBKEYALGO_RSA:
+ t = stpcpy(t, "RSA");
+ break;
+ default:
+ sprintf(t, "%d", sigp->pubkey_algo);
+ t += strlen(t);
+ break;
+ }
+ *t++ = '/';
+ switch (sigp->hash_algo) {
+ case PGPHASHALGO_MD5:
+ t = stpcpy(t, "MD5");
+ break;
+ case PGPHASHALGO_SHA1:
+ t = stpcpy(t, "SHA1");
+ break;
+ default:
+ sprintf(t, "%d", sigp->hash_algo);
+ t += strlen(t);
+ break;
+ }
+
+ t = stpcpy(t, ", ");
+
+ /* this is important if sizeof(int_32) ! sizeof(time_t) */
+ { time_t dateint = pgpGrab(sigp->time, sizeof(sigp->time));
+ struct tm * tstruct = localtime(&dateint);
+ if (tstruct)
+ (void) strftime(t, (nb - (t - val)), "%c", tstruct);
+ }
+ t += strlen(t);
+ t = stpcpy(t, ", Key ID ");
+ t = stpcpy(t, pgpHexStr(sigp->signid, sizeof(sigp->signid)));
+
+ dig = pgpFreeDig(dig);
+ }
}
return val;
}
-#endif
/**
* Format dependency flags for display.
@@ -796,9 +868,7 @@ const struct headerSprintfExtension_s rpmHeaderFormats[] = {
{ HEADER_EXT_TAG, "RPMTAG_TRIGGERTYPE", { triggertypeTag } },
{ HEADER_EXT_FORMAT, "armor", { armorFormat } },
{ HEADER_EXT_FORMAT, "base64", { base64Format } },
-#ifdef NOTYET
- { HEADER_EXT_FORMAT, "pgppkt", { pgppktFormat } },
-#endif
+ { HEADER_EXT_FORMAT, "pgpsig", { pgpsigFormat } },
{ HEADER_EXT_FORMAT, "depflags", { depflagsFormat } },
{ HEADER_EXT_FORMAT, "fflags", { fflagsFormat } },
{ HEADER_EXT_FORMAT, "perms", { permsFormat } },
diff --git a/po/cs.po b/po/cs.po
index 09f834009..ef7b6635c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 2001-07-24 10:02+0100\n"
"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -1512,25 +1512,30 @@ msgstr "========== pokraèuje tsort ...\n"
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(není èíslo)"
-#: lib/formats.c:156
+#: lib/formats.c:157
#, fuzzy
msgid "(not base64)"
msgstr "(není èíslo)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
#, fuzzy
msgid "(not a blob)"
msgstr "(není èíslo)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "vynechat pøípadné PGP podpisy"
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -4068,9 +4073,6 @@ msgstr "%s: Fread selhalo: %s\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " --K <balíèek>+ "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "vynechat pøípadné PGP podpisy"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "vynechat pøípadné GPG podpisy"
diff --git a/po/da.po b/po/da.po
index 4fa3f3efa..45c5b16d2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 2001-04-05 23:03GMT\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -1511,25 +1511,30 @@ msgstr "========== fortsætter tsort ...\n"
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(ikke et tal)"
-#: lib/formats.c:156
+#: lib/formats.c:157
#, fuzzy
msgid "(not base64)"
msgstr "(ikke et tal)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
#, fuzzy
msgid "(not a blob)"
msgstr "(ikke et tal)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "overspring eventuelle PGP-signaturer"
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -4069,9 +4074,6 @@ msgstr "%s: læs manifest mislykkedes: %s\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " -K <pakke>+ "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "overspring eventuelle PGP-signaturer"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "overspring eventuelle GPG-signaturer"
diff --git a/po/de.po b/po/de.po
index 67c28052e..08a6e13f9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 1998-08-03 18:02+02:00\n"
"Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
"Language-Team: German <de@li.org>\n"
@@ -1643,25 +1643,30 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(keine Zahl)"
-#: lib/formats.c:156
+#: lib/formats.c:157
#, fuzzy
msgid "(not base64)"
msgstr "(keine Zahl)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
#, fuzzy
msgid "(not a blob)"
msgstr "(keine Zahl)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "alle PGP-Signaturen überspringen"
+
# , c-format
#: lib/fs.c:77
#, fuzzy, c-format
@@ -4235,9 +4240,6 @@ msgstr "%s: »readLead« fehlgeschlagen\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " -b<STUFE> <SPEC> "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "alle PGP-Signaturen überspringen"
-
#, fuzzy
#~ msgid "skip any GPG signatures"
#~ msgstr "alle PGP-Signaturen überspringen"
diff --git a/po/en_RN.po b/po/en_RN.po
index d1a35ed27..c80d4ee57 100644
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1479,23 +1479,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/es.po b/po/es.po
index d1a35ed27..c80d4ee57 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1479,23 +1479,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index d1a35ed27..c80d4ee57 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1479,23 +1479,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/fi.po b/po/fi.po
index 9f6183ed4..145bc030b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@@ -1533,25 +1533,30 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(ei ole luku)"
-#: lib/formats.c:156
+#: lib/formats.c:157
#, fuzzy
msgid "(not base64)"
msgstr "(ei ole luku)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
#, fuzzy
msgid "(not a blob)"
msgstr "(ei ole luku)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "ohita PGP-allekirjoitukset"
+
#: lib/fs.c:77
#, fuzzy, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -4089,9 +4094,6 @@ msgstr "%s: readLead epäonnistui\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " -b<vaihe> <määrittely> "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "ohita PGP-allekirjoitukset"
-
#, fuzzy
#~ msgid "skip any GPG signatures"
#~ msgstr "ohita PGP-allekirjoitukset"
diff --git a/po/fr.po b/po/fr.po
index 9432fa807..a52b86e95 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1563,23 +1563,28 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr " --sign - genre une signature PGP"
+
#: lib/fs.c:77
#, fuzzy, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/gl.po b/po/gl.po
index eecd72a7d..2ba25b08c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 2001-01-13 22:31+0100\n"
"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -1474,23 +1474,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/hu.po b/po/hu.po
index d1a35ed27..c80d4ee57 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1479,23 +1479,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/id.po b/po/id.po
index d1a35ed27..c80d4ee57 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1479,23 +1479,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/is.po b/po/is.po
index 0139df4e3..48b374ee9 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 2001-07-12 13:25+0000\n"
"Last-Translator: Richard Allen <ra@hp.is>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
@@ -1483,23 +1483,28 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "búa til undirskrift"
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/it.po b/po/it.po
index d1a35ed27..c80d4ee57 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1479,23 +1479,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/ja.po b/po/ja.po
index d98d1d87d..745f05eb8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 1999-12-01 22:49 +JST\n"
"Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
"Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -1558,25 +1558,30 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)"
-#: lib/formats.c:156
+#: lib/formats.c:157
#, fuzzy
msgid "(not base64)"
msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
#, fuzzy
msgid "(not a blob)"
msgstr "(¿ô»ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "PGP ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
+
#: lib/fs.c:77
#, fuzzy, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -3911,9 +3916,6 @@ msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
#~ msgid "add a signature to a package"
#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤òÄɲä·¤Þ¤¹"
-#~ msgid "skip any PGP signatures"
-#~ msgstr "PGP ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
-
#, fuzzy
#~ msgid "skip any GPG signatures"
#~ msgstr "GPG ½ð̾¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹"
diff --git a/po/ko.po b/po/ko.po
index 30170437c..204049201 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 2002-03-04 17:17+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"
@@ -1498,23 +1498,28 @@ msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n"
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(¼ýÀÚ°¡ ¾Æ´Õ´Ï´Ù)"
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr "(base64°¡ ¾Æ´Õ´Ï´Ù)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr "(ºÎÀûÇÕÇÑ Å¸ÀÔ)"
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr "(BLOB[Binary Large OBject]ÀÌ ¾Æ´Õ´Ï´Ù)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "¾î¶°ÇÑ PGP ¼­¸íµµ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -4057,9 +4062,6 @@ msgstr "%s: Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " -K <ÆÐÅ°Áö>+ "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "¾î¶°ÇÑ PGP ¼­¸íµµ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "¾î¶°ÇÑ GPG ¼­¸íµµ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
diff --git a/po/no.po b/po/no.po
index 8be10e61f..b1843e767 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 2001-06-27 12:24+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -1498,23 +1498,28 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "hopp over PGP-signaturer"
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -4016,9 +4021,6 @@ msgstr "%s: lesing av manifest feilet: %s\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " -K <pkg>+ "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "hopp over PGP-signaturer"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "hopp over GPG-signaturer"
diff --git a/po/pl.po b/po/pl.po
index 862492550..20a81185d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 1999-05-25 17:00+0100\n"
"Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -1540,25 +1540,30 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(nie jest liczb±)"
-#: lib/formats.c:156
+#: lib/formats.c:157
#, fuzzy
msgid "(not base64)"
msgstr "(nie jest liczb±)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
#, fuzzy
msgid "(not a blob)"
msgstr "(nie jest liczb±)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "pomiñ wszelkie sygnatury PGP"
+
#: lib/fs.c:77
#, fuzzy, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -4135,9 +4140,6 @@ msgstr "%s: readLead nie powiod³o siê\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " --resign <pakiet>+ "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "pomiñ wszelkie sygnatury PGP"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "pomiñ wszelkie sygnatury GPG"
diff --git a/po/pt.po b/po/pt.po
index be99b5028..124cceb22 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 2002-02-14 10:51+0000\n"
"Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
"Language-Team: pt <morais@kde.org\n"
@@ -1513,23 +1513,28 @@ msgstr "========== a prosseguir o tsort ...\n"
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(não é um número)"
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr "(não é um base64)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr "(tipo inválido)"
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr "(não é um blob)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "ignorar as assinaturas de PGP"
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -4057,9 +4062,6 @@ msgstr "%s: a leitura do manifesto falhou: %s\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " -K <pacote>+ "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "ignorar as assinaturas de PGP"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "ignorar as assinaturas de GPG"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 00630f10f..2f0c8fcd6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
#: build.c:40
#, fuzzy
@@ -1652,23 +1652,28 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "desconsidere quaisquer assinaturas PGP"
+
# , c-format
#: lib/fs.c:77
#, fuzzy, c-format
@@ -4306,9 +4311,6 @@ msgstr "No consegui abrir: %s\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " -b<estgio> <spec> "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "desconsidere quaisquer assinaturas PGP"
-
#, fuzzy
#~ msgid "skip any GPG signatures"
#~ msgstr "desconsidere quaisquer assinaturas PGP"
diff --git a/po/ro.po b/po/ro.po
index 1f906a2f0..51a002bfe 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 1999-04-10 12:00+EST\n"
"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
"Language-Team: Romanian <ro@li.org>\n"
@@ -1474,23 +1474,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index b9790685b..25e704692 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1480,23 +1480,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/ru.po b/po/ru.po
index 052d20531..c2c99bc77 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 2002-04-09 16:44-0400\n"
"Last-Translator: Eugene Kanter, <eugene@bcl.bz>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -1520,23 +1520,28 @@ msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n"
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(ÎÅ ÞÉÓÌÏ)"
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr "(ÎÅ base64)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr "(ÎÅÐÒÁ×ÉÌØÎÙÊ ÔÉÐ)"
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ PGP-ÐÏÄÐÉÓÉ"
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -4054,9 +4059,6 @@ msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ÓÐÉÓËÁ ÆÁÊÌÏ×: %s\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " -K <ÐÁËÅÔ>+ "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ PGP-ÐÏÄÐÉÓÉ"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "ÐÒÏÐÕÓÔÉÔØ ×ÓÅ GPG-ÐÏÄÐÉÓÉ"
diff --git a/po/sk.po b/po/sk.po
index 7c343ec18..4c3262a95 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 1999-04-08 21:37+02:00\n"
"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -1538,25 +1538,30 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(nie je èíslo)"
-#: lib/formats.c:156
+#: lib/formats.c:157
#, fuzzy
msgid "(not base64)"
msgstr "(nie je èíslo)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
#, fuzzy
msgid "(not a blob)"
msgstr "(nie je èíslo)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "vynecha» akékoµvek PGP podpisy"
+
#: lib/fs.c:77
#, fuzzy, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -4146,9 +4151,6 @@ msgstr "%s: readLead zlyhalo\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " --resign <balík>+ "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "vynecha» akékoµvek PGP podpisy"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "vynecha» akékoµvek GPG podpisy"
diff --git a/po/sl.po b/po/sl.po
index 90043aaa7..e88e198e5 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
# -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
# Copyright (C) 2000 Free Software Foundation, Inc.
# Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.276 2002/07/11 21:48:26 jbj Exp $
+# $Id: sl.po,v 1.277 2002/07/12 19:09:49 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 2000-10-08 19:05+0200\n"
"Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -1541,25 +1541,30 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(ni ¹tevilo)"
-#: lib/formats.c:156
+#: lib/formats.c:157
#, fuzzy
msgid "(not base64)"
msgstr "(ni ¹tevilo)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
#, fuzzy
msgid "(not a blob)"
msgstr "(ni ¹tevilo)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "preskoèi vse podpise PGP"
+
#: lib/fs.c:77
#, fuzzy, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -4144,9 +4149,6 @@ msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " -K <paket>+ "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "preskoèi vse podpise PGP"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "preskoèi vse podpise GPG"
diff --git a/po/sr.po b/po/sr.po
index e453d5d1e..6b01cb73e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
@@ -1526,25 +1526,30 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(nije broj)"
-#: lib/formats.c:156
+#: lib/formats.c:157
#, fuzzy
msgid "(not base64)"
msgstr "(nije broj)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
#, fuzzy
msgid "(not a blob)"
msgstr "(nije broj)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "preskoèi sve PGP potpise"
+
#: lib/fs.c:77
#, fuzzy, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -3989,9 +3994,6 @@ msgstr "%s: Neuspeo 'readLead'\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " -b<faza> <spec>\t "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "preskoèi sve PGP potpise"
-
#, fuzzy
#~ msgid "skip any GPG signatures"
#~ msgstr "preskoèi sve PGP potpise"
diff --git a/po/sv.po b/po/sv.po
index 47159793d..c405243a5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.1\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 2002-07-11 22:49+0200\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -1496,23 +1496,28 @@ msgstr "========== fortsätter med tsort ...\n"
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr "rpmtsOrder misslyckades, %d element återstår\n"
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(inte ett tal)"
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr "(inte base64)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr "(felaktig typ)"
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr "(inte en klick)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "Gammal PGP-signatur\n"
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 4dac0c7f9..2ba934b1b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: 2001-07-05 08:02+300\n"
"Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
@@ -1526,25 +1526,30 @@ msgstr "========== tsort sürüyor ...\n"
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr "(bir sayý deðil)"
-#: lib/formats.c:156
+#: lib/formats.c:157
#, fuzzy
msgid "(not base64)"
msgstr "(bir sayý deðil)"
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
#, fuzzy
msgid "(not a blob)"
msgstr "(bir sayý deðil)"
+#: lib/formats.c:303
+#, fuzzy
+msgid "(not a OpenPGP signature"
+msgstr "tüm PGP imzalarýný atlar"
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
@@ -4074,9 +4079,6 @@ msgstr "%s: bildirge okuma baþarýsýz: %s\n"
#~ msgid " -K <pkg>+ "
#~ msgstr " -K <pkt>+ "
-#~ msgid "skip any PGP signatures"
-#~ msgstr "tüm PGP imzalarýný atlar"
-
#~ msgid "skip any GPG signatures"
#~ msgstr "tüm GPG imzalarýný atlar"
diff --git a/po/uk.po b/po/uk.po
index d1a35ed27..c80d4ee57 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1479,23 +1479,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/wa.po b/po/wa.po
index d1a35ed27..c80d4ee57 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1479,23 +1479,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/zh.po b/po/zh.po
index d1a35ed27..c80d4ee57 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1479,23 +1479,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index d1a35ed27..c80d4ee57 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-11 17:49-0400\n"
+"POT-Creation-Date: 2002-07-12 14:51-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1479,23 +1479,27 @@ msgstr ""
msgid "rpmtsOrder failed, %d elements remain\n"
msgstr ""
-#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:305
+#: lib/formats.c:31 lib/formats.c:57 lib/formats.c:92 lib/formats.c:377
#: rpmdb/header.c:3136 rpmdb/header.c:3159 rpmdb/header.c:3183
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:156
+#: lib/formats.c:157
msgid "(not base64)"
msgstr ""
-#: lib/formats.c:166
+#: lib/formats.c:167
msgid "(invalid type)"
msgstr ""
-#: lib/formats.c:231 lib/formats.c:278
+#: lib/formats.c:233 lib/formats.c:280
msgid "(not a blob)"
msgstr ""
+#: lib/formats.c:303
+msgid "(not a OpenPGP signature"
+msgstr ""
+
#: lib/fs.c:77
#, c-format
msgid "mntctl() failed to return size: %s\n"
diff --git a/rpm.spec.in b/rpm.spec.in
index 66cd3cc1c..a9a33c2cc 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -17,7 +17,7 @@ Name: rpm
%define version @VERSION@
Version: %{version}
%{expand: %%define rpm_version %{version}}
-Release: 0.45
+Release: 0.46
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
Copyright: GPL
@@ -514,6 +514,9 @@ fi
%{__prefix}/include/popt.h
%changelog
+* Fri Jul 12 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.46
+- display signature details using rpm -qi.
+
* Thu Jul 11 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.45
- placeholders for manifest constants for SuSE patch packages.
- fix: repair 2ndary match criteria with rpmdb iterators.
diff --git a/rpmpopt.in b/rpmpopt.in
index 2037dc0e0..9c669d6db 100644
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -63,6 +63,7 @@ Release : %-27{RELEASE} Build Date: %{BUILDTIME:date}\n\
Install date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed) }| Build Host: %{BUILDHOST}\n\
Group : %-27{GROUP} Source RPM: %{SOURCERPM}\n\
Size : %-27{SIZE}%|LICENSE?{ License: %{LICENSE}}|\n\
+Signature : %|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|\n\
%|PACKAGER?{Packager : %{PACKAGER}\n}|\
%|URL?{URL : %{URL}\n}|\
Summary : %{SUMMARY}\n\
@@ -308,6 +309,7 @@ Release : %-27{RELEASE} Build Date: %{BUILDTIME:date}\n\
Install date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed) }| Build Host: %{BUILDHOST}\n\
Group : %-27{GROUP} Source RPM: %{SOURCERPM}\n\
Size : %-27{SIZE}%|LICENSE?{ License: %{LICENSE}}|\n\
+Signature : %|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|\n\
%|PACKAGER?{Packager : %{PACKAGER}\n}|\
%|URL?{URL : %{URL}\n}|\
Summary : %{SUMMARY}\n\