- drill ts/fi through verify mode, add methods to keep fi abstract.

- use mmap when calculating file digests on verify, ~20% faster.

CVS patchset: 5352
CVS date: 2002/03/12 16:56:17

1 files changed, 69 insertions, 77 deletions

diff --git a/po/gl.po b/po/gl.po
index ed2c8357b..6f2225eec 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-03-09 14:38-0500\n"
+"POT-Creation-Date: 2002-03-12 11:41-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -810,7 +810,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:618 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1445
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -840,7 +840,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:699 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1726
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1582,46 +1582,46 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:184 lib/package.c:260
+#: lib/package.c:181 lib/package.c:257
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:205 lib/package.c:268
+#: lib/package.c:202 lib/package.c:265
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
+#: lib/package.c:243 lib/rpmchecksig.c:165 lib/rpmchecksig.c:553
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:252
+#: lib/package.c:249
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
+#: lib/package.c:274 lib/rpmchecksig.c:183 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
+#: lib/package.c:278 lib/rpmchecksig.c:187 lib/rpmchecksig.c:574
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:331 lib/rpmchecksig.c:476
+#: lib/package.c:328 lib/rpmchecksig.c:474
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
+#: lib/package.c:363 lib/package.c:390 lib/package.c:422 lib/rpmchecksig.c:645
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
+#: lib/package.c:434 lib/rpmchecksig.c:113 lib/rpmchecksig.c:503
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2151,36 +2151,36 @@ msgstr ""
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1351
+#: lib/psm.c:1352
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1493
+#: lib/psm.c:1494
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1502
+#: lib/psm.c:1503
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1544
+#: lib/psm.c:1545
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1545
+#: lib/psm.c:1546
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:1733
+#: lib/psm.c:1734
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1736
+#: lib/psm.c:1737
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2317,11 +2317,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:674
+#: lib/rpmal.c:673
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:771
+#: lib/rpmal.c:770
 msgid "(added provide)"
 msgstr ""
 
@@ -2339,57 +2339,57 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:169
+#: lib/rpmchecksig.c:170
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:173
+#: lib/rpmchecksig.c:174
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:253
+#: lib/rpmchecksig.c:254
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:259
+#: lib/rpmchecksig.c:260
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:490
+#: lib/rpmchecksig.c:488
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:563
+#: lib/rpmchecksig.c:559
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:810
+#: lib/rpmchecksig.c:804
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
+#: lib/rpmchecksig.c:808 lib/rpmchecksig.c:822
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
+#: lib/rpmchecksig.c:810 lib/rpmchecksig.c:824
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:824
+#: lib/rpmchecksig.c:818
 msgid "OK"
 msgstr ""
 
@@ -2599,175 +2599,167 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
-#: lib/signature.c:119
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:128
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:133
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:153
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:157
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:170
+#: lib/signature.c:167
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:226
+#: lib/signature.c:221
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
-#: lib/signature.c:711
+#: lib/signature.c:300 lib/signature.c:397 lib/signature.c:664
+#: lib/signature.c:697
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:323
+#: lib/signature.c:316
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:330
+#: lib/signature.c:323
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:335
+#: lib/signature.c:328
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:351 lib/signature.c:451
+#: lib/signature.c:342 lib/signature.c:440
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:356
+#: lib/signature.c:347
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:423
+#: lib/signature.c:414
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:430
+#: lib/signature.c:421
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:435
+#: lib/signature.c:426
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:456
+#: lib/signature.c:445
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:716 lib/signature.c:771
+#: lib/signature.c:702 lib/signature.c:753
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:750
+#: lib/signature.c:732
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:763
+#: lib/signature.c:745
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:807
+#: lib/signature.c:789
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:847
+#: lib/signature.c:825
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:873
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1102
+#: lib/signature.c:1059
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1221
+#: lib/signature.c:1168
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1222
+#: lib/signature.c:1169
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1311
+#: lib/signature.c:1244
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1338
+#: lib/signature.c:1271
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1342
+#: lib/signature.c:1275
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:180
+#: lib/transaction.c:173
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:990
+#: lib/transaction.c:985
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:1085
+#: lib/transaction.c:1080
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
-#: lib/verify.c:243
-msgid "package lacks both user name and id lists (this should never happen)\n"
-msgstr ""
-
-#: lib/verify.c:264
-msgid "package lacks both group name and id lists (this should never happen)\n"
-msgstr ""
-
-#: lib/verify.c:408
+#: lib/verify.c:324
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:505
+#: lib/verify.c:419
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:543
+#: lib/verify.c:459
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""