fix: use pgp5 rather than pgp-2.6.3 if both are in %_pgpbin (#4564).

CVS patchset: 3237
CVS date: 1999/08/18 17:04:54

diff --git a/CHANGES b/CHANGES
index 4ba629a..4c40b12 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,7 @@
        - fix: last char in rpmrc w/o terminating newline lost (#4361).
        - prepare for handling \r in macro exapnsions.
        - fix: n>1 occurrences of %config(noreplace) should not FA_CREATE (#4355).
+       - fix: use pgp5 rather than pgp-2.6.3 if both are in %_pgpbin (#4564).
 
 3.0.1 -> 3.0.2
        - eliminate armv4 entries from rpmrc (Andrew E. Mileski).

diff --git a/lib/signature.c b/lib/signature.c
index ccf1972..2e01af0 100644 (file)
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -85,11 +85,10 @@ const char * rpmDetectPGPVersion(int sigTag)
        }
        sprintf(pgpvbin, "%sv", pgpbin);
 
-       /* XXX Prefer pgp-2.6.3 over pgp5 */
-       if (stat(pgpbin, &statbuf) == 0)
-         pgp_version = 26;
-       else if (stat(pgpvbin, &statbuf) == 0)
+       if (stat(pgpvbin, &statbuf) == 0)
          pgp_version = 50;
+       else if (stat(pgpbin, &statbuf) == 0)
+         pgp_version = 26;
        else
          pgp_version = -1;
 

diff --git a/po/rpm.pot b/po/rpm.pot
index e727307..f4fcf34 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-08-17 18:52-0400\n"
+"POT-Creation-Date: 1999-08-18 12:12-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"
@@ -3089,126 +3089,126 @@ msgstr ""
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
-#: ../lib/signature.c:125
+#: ../lib/signature.c:124
 #, c-format
 msgid "sigsize         : %d\n"
 msgstr ""
 
-#: ../lib/signature.c:126
+#: ../lib/signature.c:125
 #, c-format
 msgid "Header + Archive: %d\n"
 msgstr ""
 
-#: ../lib/signature.c:127
+#: ../lib/signature.c:126
 #, c-format
 msgid "expected size   : %d\n"
 msgstr ""
 
-#: ../lib/signature.c:131
+#: ../lib/signature.c:130
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: ../lib/signature.c:154
+#: ../lib/signature.c:153
 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:169
 msgid "Old (internal-only) signature!  How did you get that!?"
 msgstr ""
 
-#: ../lib/signature.c:174
+#: ../lib/signature.c:173
 msgid "New Header signature\n"
 msgstr ""
 
 #. 8-byte pad
-#: ../lib/signature.c:182 ../lib/signature.c:220
+#: ../lib/signature.c:181 ../lib/signature.c:219
 #, c-format
 msgid "Signature size: %d\n"
 msgstr ""
 
-#: ../lib/signature.c:183 ../lib/signature.c:221
+#: ../lib/signature.c:182 ../lib/signature.c:220
 #, c-format
 msgid "Signature pad : %d\n"
 msgstr ""
 
-#: ../lib/signature.c:277 ../lib/signature.c:713
+#: ../lib/signature.c:276 ../lib/signature.c:712
 msgid "Couldn't exec pgp"
 msgstr ""
 
-#: ../lib/signature.c:288
+#: ../lib/signature.c:287
 msgid "pgp failed"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: ../lib/signature.c:295
+#: ../lib/signature.c:294
 msgid "pgp failed to write signature"
 msgstr ""
 
-#: ../lib/signature.c:300
+#: ../lib/signature.c:299
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: ../lib/signature.c:311 ../lib/signature.c:387
+#: ../lib/signature.c:310 ../lib/signature.c:386
 msgid "unable to read the signature"
 msgstr ""
 
-#: ../lib/signature.c:316
+#: ../lib/signature.c:315
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: ../lib/signature.c:353 ../lib/signature.c:688
+#: ../lib/signature.c:352 ../lib/signature.c:687
 msgid "Couldn't exec gpg"
 msgstr ""
 
-#: ../lib/signature.c:364
+#: ../lib/signature.c:363
 msgid "gpg failed"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: ../lib/signature.c:371
+#: ../lib/signature.c:370
 msgid "gpg failed to write signature"
 msgstr ""
 
-#: ../lib/signature.c:376
+#: ../lib/signature.c:375
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: ../lib/signature.c:392
+#: ../lib/signature.c:391
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: ../lib/signature.c:511 ../lib/signature.c:558
+#: ../lib/signature.c:510 ../lib/signature.c:557
 msgid "Could not run pgp.  Use --nopgp to skip PGP checks."
 msgstr ""
 
-#: ../lib/signature.c:556 ../lib/signature.c:628
+#: ../lib/signature.c:555 ../lib/signature.c:627
 msgid "exec failed!\n"
 msgstr ""
 
-#: ../lib/signature.c:630
+#: ../lib/signature.c:629
 msgid "Could not run gpg.  Use --nogpg to skip GPG checks."
 msgstr ""
 
 #. This case should have been screened out long ago.
-#: ../lib/signature.c:717 ../lib/signature.c:770
+#: ../lib/signature.c:716 ../lib/signature.c:769
 msgid "Invalid %%_signature spec in macro file"
 msgstr ""
 
-#: ../lib/signature.c:750
+#: ../lib/signature.c:749
 msgid "You must set \"%%_gpg_name\" in your macro file"
 msgstr ""
 
-#: ../lib/signature.c:762
+#: ../lib/signature.c:761
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""