Typos.

CVS patchset: 2907
CVS date: 1999/03/21 19:11:29

diff --git a/lib/signature.c b/lib/signature.c
index ccddc8a..2b99b1c 100644 (file)
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -34,7 +34,7 @@ static int verifyPGPSignature(const char *datafile, void *sig,
                              int count, char *result, int sigTag);
 static int verifyGPGSignature(const char *datafile, void *sig,
                              int count, char *result);
-static int checkPassPhrase(const char *passPhrase, const int sigType);
+static int checkPassPhrase(const char *passPhrase, const int sigTag);
 
 int rpmLookupSignatureType(void)
 {
@@ -61,7 +61,7 @@ int rpmLookupSignatureType(void)
 /* rpmDetectPGPVersion() returns the absolute path to the "pgp"  */
 /* executable of the requested version, or NULL when none found. */
 
-const char * rpmDetectPGPVersion(int sigType)
+const char * rpmDetectPGPVersion(int sigTag)
 {
     /* Actually this should support having more then one pgp version. */ 
     /* At the moment only one version is possible since we only       */
@@ -92,7 +92,7 @@ const char * rpmDetectPGPVersion(int sigType)
        free(pgpvbin);
     }
 
-    switch (sigType)
+    switch (sigTag)
     {
        case RPMSIGTAG_PGP:
            if (pgp_version == 26)
@@ -268,7 +268,7 @@ static int makePGPSignature(const char *file, void **sig, int_32 *size,
 
        /* dosetenv("PGPPASS", passPhrase, 1); */
 
-       if ((path = rpmDetectPGPVersion(sigTag)) != NULL {
+       if ((path = rpmDetectPGPVersion(sigTag)) != NULL) {
            switch(sigTag) {
            case RPMSIGTAG_PGP:
                execlp(path, "pgp", "+batchmode=on", "+verbose=0", "+armor=off",
@@ -442,7 +442,7 @@ int rpmVerifySignature(const char *file, int_32 sigTag, void *sig, int count,
        }
        break;
       case RPMSIGTAG_PGP:
-      case RPMSIGTAG_PGP%:
+      case RPMSIGTAG_PGP5:
        return verifyPGPSignature(file, sig, count, result, sigTag);
        break;
       case RPMSIGTAG_GPG:
@@ -727,7 +727,7 @@ char *rpmGetPassPhrase(const char *prompt, const int sigTag)
     return pass;
 }
 
-static int checkPassPhrase(const char *passPhrase, const int sigType)
+static int checkPassPhrase(const char *passPhrase, const int sigTag)
 {
     int passPhrasePipe[2];
     int pid, status;
@@ -751,7 +751,7 @@ static int checkPassPhrase(const char *passPhrase, const int sigType)
        }
        dup2(passPhrasePipe[0], 3);
 
-       switch (sigType) {
+       switch (sigTag) {
        case RPMSIGTAG_GPG:
        {   const char *gpg_path = rpmExpand("%{_gpg_path}", NULL);
            const char *name = rpmExpand("%{_gpg_name}", NULL);
@@ -774,7 +774,7 @@ static int checkPassPhrase(const char *passPhrase, const int sigType)
            if (pgp_path && *pgp_path != '%')
                dosetenv("PGPPATH", pgp_path, 1);
 
-           if ((path = rpmDetectPGPVersion(sigTag)) != NULL {
+           if ((path = rpmDetectPGPVersion(sigTag)) != NULL) {
                switch(sigTag) {
                case RPMSIGTAG_PGP:
                    execlp(path, "pgp", "+batchmode=on", "+verbose=0",
@@ -782,7 +782,7 @@ static int checkPassPhrase(const char *passPhrase, const int sigType)
                    break;
                case RPMSIGTAG_PGP5:
                    execlp(path,"pgps", "+batchmode=on", "+verbose=0",
-                       name, "-f", file, NULL);
+                       name, "-f", NULL);
                    break;
                }
            }

diff --git a/po/rpm.pot b/po/rpm.pot
index feb0b04..c800c50 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-20 15:35-0500\n"
+"POT-Creation-Date: 1999-03-21 14:06-0500\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"
@@ -98,12 +98,12 @@ msgstr ""
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
-#: ../checksig.c:27 ../checksig.c:165
+#: ../checksig.c:27 ../checksig.c:166
 #, c-format
 msgid "%s: Open failed\n"
 msgstr ""
 
-#: ../checksig.c:31 ../checksig.c:170
+#: ../checksig.c:31 ../checksig.c:171
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -118,12 +118,12 @@ msgstr ""
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: ../checksig.c:43 ../checksig.c:180
+#: ../checksig.c:43 ../checksig.c:181
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: ../checksig.c:56 ../checksig.c:194
+#: ../checksig.c:56 ../checksig.c:195
 msgid "Couldn't read the header/archive"
 msgstr ""
 
@@ -144,34 +144,42 @@ msgstr ""
 msgid "Couldn't write package"
 msgstr ""
 
-#: ../checksig.c:175
+#: ../checksig.c:176
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: ../checksig.c:185
+#: ../checksig.c:186
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: ../checksig.c:201
+#: ../checksig.c:202
 #, c-format
 msgid "Unable to write %s"
 msgstr ""
 
-#: ../checksig.c:311
+#: ../checksig.c:328
 msgid "NOT OK"
 msgstr ""
 
-#: ../checksig.c:312 ../checksig.c:322
+#: ../checksig.c:329 ../checksig.c:343
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: ../checksig.c:314 ../checksig.c:324
+#: ../checksig.c:331 ../checksig.c:345
+msgid ") "
+msgstr ""
+
+#: ../checksig.c:332 ../checksig.c:346
+msgid " (UNTRUSTED KEYS:"
+msgstr ""
+
+#: ../checksig.c:334 ../checksig.c:348
 msgid ")"
 msgstr ""
 
-#: ../checksig.c:321
+#: ../checksig.c:342
 msgid "OK"
 msgstr ""
 
@@ -1354,63 +1362,83 @@ msgstr ""
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: ../rpm.c:1108
+#: ../rpm.c:1111
+msgid "pgp not found: "
+msgstr ""
+
+#: ../rpm.c:1114
+msgid "Use `signature: pgp5' instead of `signature: pgp' in spec file.\n"
+msgstr ""
+
+#: ../rpm.c:1121
+msgid "pgp version 5 not found: "
+msgstr ""
+
+#: ../rpm.c:1124
+msgid "Use `signature: pgp' instead of `signature: pgp5' in spec file.\n"
+msgstr ""
+
+#: ../rpm.c:1131
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: ../rpm.c:1111
+#: ../rpm.c:1134
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: ../rpm.c:1123
+#: ../rpm.c:1140
+msgid "Invalid signature spec in rc file.\n"
+msgstr ""
+
+#: ../rpm.c:1145
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: ../rpm.c:1138
+#: ../rpm.c:1160
 msgid "exec failed\n"
 msgstr ""
 
-#: ../rpm.c:1157
+#: ../rpm.c:1179
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: ../rpm.c:1168
+#: ../rpm.c:1190
 msgid "no packages given for signature check"
 msgstr ""
 
-#: ../rpm.c:1176
+#: ../rpm.c:1198
 msgid "no packages given for signing"
 msgstr ""
 
-#: ../rpm.c:1185
+#: ../rpm.c:1207
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: ../rpm.c:1242
+#: ../rpm.c:1264
 msgid "no spec files given for build"
 msgstr ""
 
-#: ../rpm.c:1244
+#: ../rpm.c:1266
 msgid "no tar files given for build"
 msgstr ""
 
-#: ../rpm.c:1257
+#: ../rpm.c:1279
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: ../rpm.c:1305
+#: ../rpm.c:1327
 msgid "no packages given for install"
 msgstr ""
 
-#: ../rpm.c:1327
+#: ../rpm.c:1349
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: ../rpm.c:1333
+#: ../rpm.c:1355
 msgid "no arguments given for query"
 msgstr ""
 
-#: ../rpm.c:1351
+#: ../rpm.c:1373
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -3015,126 +3043,128 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: ../lib/signature.c:77
+#: ../lib/signature.c:129
 msgid "No signature\n"
 msgstr ""
 
-#: ../lib/signature.c:80
+#: ../lib/signature.c:132
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: ../lib/signature.c:93
+#: ../lib/signature.c:145
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#: ../lib/signature.c:97
+#: ../lib/signature.c:149
 msgid "New Header signature\n"
 msgstr ""
 
 #. 8-byte pad
-#: ../lib/signature.c:105 ../lib/signature.c:143
+#: ../lib/signature.c:157 ../lib/signature.c:195
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: ../lib/signature.c:106 ../lib/signature.c:144
+#: ../lib/signature.c:158 ../lib/signature.c:196
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: ../lib/signature.c:221 ../lib/signature.c:668
+#: ../lib/signature.c:283 ../lib/signature.c:789
 msgid "Couldn't exec pgp"
 msgstr ""
 
-#: ../lib/signature.c:232
+#: ../lib/signature.c:294
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: ../lib/signature.c:239
+#: ../lib/signature.c:301
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: ../lib/signature.c:244
+#: ../lib/signature.c:306
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: ../lib/signature.c:255 ../lib/signature.c:331
+#: ../lib/signature.c:317 ../lib/signature.c:393
 msgid "unable to read the signature"
 msgstr ""
 
-#: ../lib/signature.c:260
+#: ../lib/signature.c:322
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: ../lib/signature.c:297 ../lib/signature.c:655
+#: ../lib/signature.c:359 ../lib/signature.c:764
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: ../lib/signature.c:308
+#: ../lib/signature.c:370
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: ../lib/signature.c:315
+#: ../lib/signature.c:377
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: ../lib/signature.c:320
+#: ../lib/signature.c:382
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: ../lib/signature.c:336
+#: ../lib/signature.c:398
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: ../lib/signature.c:351
+#: ../lib/signature.c:413
 #, c-format
 msgid "sigsize         : %d\n"
 msgstr ""
 
-#: ../lib/signature.c:352
+#: ../lib/signature.c:414
 #, c-format
 msgid "Header + Archive: %d\n"
 msgstr ""
 
-#: ../lib/signature.c:353
+#: ../lib/signature.c:415
 #, c-format
 msgid "expected size   : %d\n"
 msgstr ""
 
-#: ../lib/signature.c:357
+#: ../lib/signature.c:419
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: ../lib/signature.c:480 ../lib/signature.c:547
-msgid "exec failed!\n"
+#: ../lib/signature.c:537 ../lib/signature.c:584
+msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: ../lib/signature.c:482
-msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
+#: ../lib/signature.c:582 ../lib/signature.c:654
+msgid "exec failed!\n"
 msgstr ""
 
-#: ../lib/signature.c:549
+#: ../lib/signature.c:656
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
-#: ../lib/signature.c:586
+#: ../lib/signature.c:693
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: ../lib/signature.c:597
+#: ../lib/signature.c:705
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#. This case should have been screened out long ago.
-#: ../lib/signature.c:606 ../lib/signature.c:672
+#. Currently the calling function (rpm.c:main) is checking this and
+#. * doing a better job.  This section should never be accessed.
+#.
+#: ../lib/signature.c:713 ../lib/signature.c:793
 msgid "Invalid signature spec in rc file"
 msgstr ""
 

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 129a610..143abe3 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -109,6 +109,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 NM = @NM@
 PACKAGE = @PACKAGE@
+PGPBIN = @PGPBIN@
 POFILES = @POFILES@
 POSUB = @POSUB@
 RANLIB = @RANLIB@