Support stunnel 5.x

Author: tats

mew-ssl.el

@@ -108,9 +108,9 @@ no extra text.")
 	(insert (format "verify=%d\n" (mew-ssl-verify-level case)))
 	(insert "foreground=yes\n")
 	(insert "debug=debug\n")
-	(if (and mew-ssl-libwrap (>= mew-ssl-minor-ver 45))
+	(if (and mew-ssl-libwrap (or (>= mew-ssl-ver 5) (>= mew-ssl-minor-ver 45)))
 	    (insert "libwrap=no\n"))
-	(if (>= mew-ssl-minor-ver 22)
+	(if (or (>= mew-ssl-ver 5) (>= mew-ssl-minor-ver 22))
 	    (insert "syslog=no\n"))
 	(insert "CApath=" (expand-file-name (mew-ssl-cert-directory case)) "\n")
 	(if mew-prog-ssl-arg
@@ -173,7 +173,7 @@ A local port number can be obtained the process name after ':'. "
 	    (setq pnm (process-name pro))
 	    (mew-info-clean-up pnm)
 	    (mew-ssl-set-try pnm 0)
-	    (if (= mew-ssl-ver 4) (mew-ssl-set-file pnm (car opts)))
+	    (if (>= mew-ssl-ver 4) (mew-ssl-set-file pnm (car opts)))
 	    (mew-set-process-cs pro mew-cs-text-for-read mew-cs-text-for-write)
 	    (set-process-filter pro 'mew-ssl-filter1)
 	    (set-process-sentinel pro 'mew-ssl-sentinel)
@@ -270,10 +270,10 @@ A local port number can be obtained the process name after ':'. "
       (call-process mew-prog-ssl nil t nil "-version")
       (goto-char (point-min))
       (re-search-forward "^stunnel " nil t 1)
-      (if (looking-at "4\\.\\([0-9]+\\)")
+      (if (looking-at "\\([45]\\)\\.\\([0-9]+\\)")
 	  (progn
-	    (setq mew-ssl-ver 4)
-	    (setq mew-ssl-minor-ver (string-to-number (mew-match-string 1))))
+	    (setq mew-ssl-ver (string-to-number (mew-match-string 1)))
+	    (setq mew-ssl-minor-ver (string-to-number (mew-match-string 2))))
 	(setq mew-ssl-ver 3))
       (when (re-search-forward "LIBWRAP" nil t)
 	(setq mew-ssl-libwrap t)))))