[Mew-dist 03668] Re: can I use PGP 5.0i ?

[MURATA Nobuhiro]

村田＠牧丘、自分でフォローです。

以下のようなpatchで pgp5.0i だけに対応させてみました。
ただし、これを当てると pgp2.6.3i は使用できなくなります。

-------------- next part --------------
diff -uNr mew-1.93b12.orig/mew-pgp.el mew-1.93b12/mew-pgp.el
--- mew-1.93b12.orig/mew-pgp.el	Wed Jan 28 21:39:09 1998
+++ mew-1.93b12/mew-pgp.el	Thu Feb  5 22:02:56 1998
@@ -122,8 +122,8 @@
   (message "PGP verifying ... ")
   (save-excursion
     (mew-set-buffer-tmp)
-    (call-process mew-prog-pgp nil t nil 
-		  "+batchmode=on" "+language=en" file2 file1)
+    (call-process mew-prog-pgpv nil t nil 
+		   file2 file1)
     (message "PGP verifying ... done")
     (mew-pgp-verify-check)
     ))
@@ -155,9 +155,9 @@
       (setq file3 (concat (mew-make-temp-name) mew-pgp-ascii-suffix))
       (mew-set-buffer-tmp)
       (apply (function call-process) 
-	     mew-prog-pgp nil t nil
-	     "-ea" "+language=en" "+batchmode=on" "+armorlines=0"
-	     "-o" file3 file1 decrypters)
+	     mew-prog-pgpe nil nil nil
+	     "-a" 
+	     "-o" file3 file1 "-r" decrypters)
       (message "PGP encrypting ... done")
       (list file2 nil file3 nil (mew-pgp-encrypt-check)) ;; both ctes are 7bit
       )
@@ -181,8 +181,7 @@
     (setq file3 (mew-make-temp-name))
     (setq process (start-process "PGP decrypt"
 				 (current-buffer)
-				 mew-prog-pgp
-				 "+language=en" "+batchmode=off"
+				 mew-prog-pgpv
 				 "-o" file3 file2))
     (mew-set-process-cs process mew-cs-autoconv mew-cs-noconv)
     (set-process-filter process 'mew-pgp-process-filter1)
@@ -225,11 +224,10 @@
     ;; not perfectly unique but OK
     (setq process (start-process "PGP sign"
 				 (current-buffer)
-				 mew-prog-pgp
-				 "+language=en" "+batchmode=off"
+				 mew-prog-pgps
 				 "-u" inherit-signer
 				 "-o" file2
-				 "-sab" file1))
+				 "-ab" file1))
     (mew-set-process-cs process mew-cs-autoconv mew-cs-noconv)
     (set-process-filter process 'mew-pgp-process-filter1)
     (set-process-sentinel process 'mew-pgp-process-sentinel)
@@ -469,7 +467,7 @@
 	(setq user (mew-input-address2 "Who's key? (%s): " mew-mail-address))
 	(save-excursion
 	  (mew-set-buffer-tmp)
-	  (call-process mew-prog-pgp nil t nil "-fkxa" user)
+	  (call-process mew-prog-pgpk nil t nil "-xa" user)
 	  (goto-char (point-min))
 	  (if (not (re-search-forward mew-pgp-key-begin nil t))
 	      (setq error t)
@@ -511,8 +509,8 @@
 	(set-buffer (mew-buffer-message))
 	(let ((buffer-read-only nil))
 	  (message "Adding PGP keys ... ")
-	  (call-process mew-prog-pgp nil t nil 
-			"+batchmode=on" "-ka" mew-pgp-tmp-file)
+	  (call-process mew-prog-pgpk nil t nil 
+			"-a" mew-pgp-tmp-file)
 	  (message "Adding PGP keys ... done")
 	  (insert "\n\n"
 		  "**************** IMPORTANT NOTE ****************\n"
diff -uNr mew-1.93b12.orig/mew-vars.el mew-1.93b12/mew-vars.el
--- mew-1.93b12.orig/mew-vars.el	Thu Jan 29 22:44:53 1998
+++ mew-1.93b12/mew-vars.el	Thu Feb  5 18:32:24 1998
@@ -186,6 +186,10 @@
 (defvar mew-prog-gzip        "gzip")
 (defvar mew-prog-utime       "utime")
 (defvar mew-prog-pgp         "pgp")
+(defvar mew-prog-pgps        "pgps")
+(defvar mew-prog-pgpe        "pgpe")
+(defvar mew-prog-pgpk        "pgpk")
+(defvar mew-prog-pgpv        "pgpv")
 (defvar mew-prog-uncompface  "uncompface")
 (defvar mew-prog-shell       "/bin/sh")
 ;(defvar mew-prog-shell       "cmd.exe")