- fix: --repackage repaired (#67217).

- fix: rpm2cpio disables signature checks (i.e. same behavior).

CVS patchset: 5574
CVS date: 2002/07/25 23:36:32

1 files changed, 56 insertions, 52 deletions

diff --git a/po/rpm.pot b/po/rpm.pot
index 331d94c1d..d7a9b5457 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-24 20:06-0400\n"
+"POT-Creation-Date: 2002-07-25 18:54-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"
@@ -66,15 +66,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:47
+#: rpm2cpio.c:54
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:53
+#: rpm2cpio.c:60
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:75
+#: rpm2cpio.c:82
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -817,7 +817,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629 lib/psm.c:1394
+#: build/pack.c:629 lib/psm.c:1398
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -847,7 +847,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:710 lib/psm.c:1684
+#: build/pack.c:710 lib/psm.c:1696
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1585,42 +1585,42 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:437 lib/package.c:477 lib/package.c:696 lib/package.c:720
-#: lib/package.c:750 lib/rpmchecksig.c:767
+#: lib/package.c:440 lib/package.c:480 lib/package.c:699 lib/package.c:723
+#: lib/package.c:753 lib/rpmchecksig.c:767
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:579 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/package.c:582 lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:594
+#: lib/package.c:597
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:602
+#: lib/package.c:605
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:611 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:614 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:615 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:618 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:662 lib/rpmchecksig.c:586
+#: lib/package.c:665 lib/rpmchecksig.c:586
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:762 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:765 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2090,31 +2090,35 @@ msgstr ""
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1445
+#: lib/psm.c:1411
+msgid "Unable to reload signature header\n"
+msgstr ""
+
+#: lib/psm.c:1457
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1454
+#: lib/psm.c:1466
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1496
+#: lib/psm.c:1508
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1497
+#: lib/psm.c:1509
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1692
+#: lib/psm.c:1704
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1695
+#: lib/psm.c:1707
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2748,124 +2752,124 @@ msgstr ""
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:248
+#: lib/signature.c:249
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 #. @=boundsread@
-#: lib/signature.c:339 lib/signature.c:452 lib/signature.c:731
-#: lib/signature.c:770
+#: lib/signature.c:340 lib/signature.c:453 lib/signature.c:732
+#: lib/signature.c:771
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:362
+#: lib/signature.c:363
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:368
+#: lib/signature.c:369
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
 #. @=boundswrite@
-#: lib/signature.c:386 lib/signature.c:500
+#: lib/signature.c:387 lib/signature.c:501
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:391
+#: lib/signature.c:392
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:469
+#: lib/signature.c:470
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:476
+#: lib/signature.c:477
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:482
+#: lib/signature.c:483
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:505
+#: lib/signature.c:506
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:775 lib/signature.c:830
+#: lib/signature.c:776 lib/signature.c:831
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:807
+#: lib/signature.c:808
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:822
+#: lib/signature.c:823
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:871
+#: lib/signature.c:872
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:912
+#: lib/signature.c:913
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:968
+#: lib/signature.c:969
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1043
+#: lib/signature.c:1044
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1160
+#: lib/signature.c:1161
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1161
+#: lib/signature.c:1162
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1240
+#: lib/signature.c:1241
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1267
+#: lib/signature.c:1268
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1271
+#: lib/signature.c:1272
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:105
+#: lib/transaction.c:106
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:909
+#: lib/transaction.c:910
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
@@ -2878,7 +2882,7 @@ msgstr ""
 #. * For packages being removed:
 #. * - count files.
 #.
-#: lib/transaction.c:1019
+#: lib/transaction.c:1020
 #, c-format
 msgid "sanity checking %d elments\n"
 msgstr ""
@@ -2891,7 +2895,7 @@ msgstr ""
 #. * calling fpLookupList only once. I'm not sure that the speedup is
 #. * worth the trouble though.
 #.
-#: lib/transaction.c:1100
+#: lib/transaction.c:1101
 #, c-format
 msgid "computing %d file fingerprints\n"
 msgstr ""
@@ -2899,21 +2903,21 @@ msgstr ""
 #. ===============================================
 #. * Compute file disposition for each package in transaction set.
 #.
-#: lib/transaction.c:1177
+#: lib/transaction.c:1178
 msgid "computing file dispositions\n"
 msgstr ""
 
 #. ===============================================
 #. * Save removed files before erasing.
 #.
-#: lib/transaction.c:1343
+#: lib/transaction.c:1344
 msgid "repackage about-to-be-erased packages\n"
 msgstr ""
 
 #. ===============================================
 #. * Install and remove packages.
 #.
-#: lib/transaction.c:1369
+#: lib/transaction.c:1374
 #, c-format
 msgid "install/erase %d elements\n"
 msgstr ""