From c594d0ff1644621b1a5ea3c7c9c1a73bc76fb95e Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 25 Oct 2001 23:10:44 +0000 Subject: [PATCH] Synch with Oort Gnus. --- contrib/ChangeLog | 5 +++++ contrib/canlock.el | 20 ++++++++++++-------- texi/ChangeLog | 5 +++++ texi/gnus-ja.texi | 20 ++++++++++++++------ texi/gnus.texi | 20 ++++++++++++++------ 5 files changed, 50 insertions(+), 20 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 179d05f..52685c9 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2001-10-25 Simon Josefsson + + * canlock.el (canlock-password, canlock-password-for-verify) + (canlock-force-insert-header): Defcustom. + 2001-10-17 Simon Josefsson * canlock.el (sha1-binary): Autoload `sha1-binary'. diff --git a/contrib/canlock.el b/contrib/canlock.el index 29339af..ad617bc 100644 --- a/contrib/canlock.el +++ b/contrib/canlock.el @@ -102,17 +102,21 @@ :type 'hook :group 'canlock) -;;; Internal variables. - -(defvar canlock-password nil - "*Password to use when signing a Cancel-Lock or a Cancel-Key header.") +(defcustom canlock-password nil + "*Password to use when signing a Cancel-Lock or a Cancel-Key header." + :type 'string + :group 'canlock) -(defvar canlock-password-for-verify canlock-password - "*Password to use when verifying a Cancel-Lock or a Cancel-Key header.") +(defcustom canlock-password-for-verify canlock-password + "*Password to use when verifying a Cancel-Lock or a Cancel-Key header." + :type 'string + :group 'canlock) -(defvar canlock-force-insert-header nil +(defcustom canlock-force-insert-header nil "*If non-nil, insert a Cancel-Lock or a Cancel-Key header even though the -buffer does not contain a news message.") +buffer does not contain a news message." + :type 'boolean + :group 'canlock) ;;; Functions. diff --git a/texi/ChangeLog b/texi/ChangeLog index 27c421a..7d00cd5 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,8 @@ +2001-10-25 Simon Josefsson + + * gnus.texi (Mail Source Specifiers): More info on SSL, kerberos etc. + (IMAP): Ditto. Suggested by Martin Blais . + 2001-10-23 Per Abrahamsen * gnus.texi (Posting Server): Use `native' instead of `nil' for diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 76a4ce3..ae8ac9e 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -11517,6 +11517,9 @@ IMAP $B%5!<%P!<$+$i%a!<%k$r\$7$/$O(B @xref{IMAP} $B$r;2>H$7$F2<$5$$!#(B +Kerberos, GSSAPI, SSL/TLS $B$*$h$S(B STARTTLS $B$N$?$a$N30It%W%m%0%i%`$H%i%$%V(B +$B%i%j$,I,MW$G$"$k$3$H$KN10U$7$F2<$5$$!#(B@xref{IMAP} + $B%-!<%o!<%I(B: @table @code @@ -11524,7 +11527,7 @@ gnus $B$G$O(B POP $B%5!<%P!<$HF1MM$K07$&$3$H$,$G$-!"M?$($i$l$?(B IMAP $B%a! IMAP $B%5!<%P!<$NL>A0!#=i4|CM$O4D6-JQ?t(B @code{MAILHOST} $B$+$iF@$^$9!#(B @item :port -IMAP $B%5!<%P!<$N%]!<%HHV9f!#IaDL$O=i4|CM$O(B @samp{143} $B$G!"(BSSL $B@\B3$K(B +IMAP $B%5!<%P!<$N%]!<%HHV9f!#IaDL$O=i4|CM$O(B @samp{143} $B$G!"(BSSL/TLS $B@\B3$K(B $B$O(B @samp{993} $B$G$9!#(B @item :user @@ -13625,6 +13628,9 @@ gnus-secondary-select-methods $B$K(B nnimap $B$rEPO?$7$F2<$5$$!#$3$l$K$h$C(B (nnimap-stream ssl)))) @end lisp +(SSL/TLS $B$r;H$&$K$O30It%i%$%V%i%j(B @samp{ssl.el} $B$,I,MW$G$9!#0J2<$r;2>H$7(B +$B$F2<$5$$!#(B) + $B0J2<$NJQ?t$O2>A[(B @code{nnimap} $B%5!<%P!<$r:n@.$9$k$?$a$K;H$&$3$H$,$G$-$^(B $B$9!#(B @@ -13670,9 +13676,9 @@ gnus-secondary-select-methods $B$K(B nnimap $B$rEPO?$7$F2<$5$$!#$3$l$K$h$C(B @item nnimap-stream @vindex nnimap-stream $B%5!<%P!<$K@\B3$9$k$H$-$K;H$o$l$k%9%H%j!<%`$N7?$G$9!#=i4|@_Dj$G(B -$B$O(B nnimap $B$O(B SSL $B$r=|$/0J2<$N$9$Y$F$r<+F0E*$K8!CN$7$F$=$l$r;H$$$^$9!#(B -(SSL $B$O(B STARTTLS $B$GCV$-49$($i$l$F$$$^$9!#$3$l$O<+F08!=P$G$-$^$9$,!"$^$@(B -$B9-HO0O$KG[Hw$5$l$F$$$^$;$s!#(B) +$B$O(B nnimap $B$O(B SSL/TLS $B$r=|$/0J2<$N$9$Y$F$r<+F0E*$K8!CN$7$F$=$l$r;H$$$^$9!#(B +(SSL/TLS $B$r;H$&(B IMAP $B$O(B STARTTLS $B$GCV$-49$($i$l$F$$$^$9!#$3$l$O<+F08!=P(B +$B$G$-$^$9$,!"$^$@9-HO0O$KG[Hw$5$l$F$$$^$;$s!#(B) $B0J2<$O%5!<%P!<;XDj$NNc$G$9!#(B @@ -13696,7 +13702,8 @@ gnus-secondary-select-methods $B$K(B nnimap $B$rEPO?$7$F2<$5$$!#$3$l$K$h$C(B $B%j(B @samp{starttls.el} $B$H(B @samp{starttls} $B%W%m%0%i%`$,I,MW$G$9!#(B @item @dfn{ssl:} SSL $B$r;H$$$^$9!#(BOpenSSL (@samp{openssl} $B%W%m%0%i(B -$B%`(B) $B$+(B SSLeay (@samp{s_client}) $B$,I,MW$G$9!#(B +$B%`(B) $B$+(B SSLeay (@samp{s_client}) $B$H30It%i%$%V%i%j(B @samp{ssl.el} $B$,I,MW$G(B +$B$9!#(B @item @dfn{shell:} $B%7%'%kL?Na$r;H$C$F(B @sc{imap} $B@\B3$r3+;O$7$^$9!#(B @item @@ -13721,7 +13728,8 @@ SSL $B@\B3$N$?$a$N(B OpenSSL $B%W%m%0%i%`$O(B @uref{http://www.openssl.org/} nnimap $B$O$=$l$b%5%]!<%H$7$^$9!#$7$+$7!"(BSSLeay $B$N:G?7HG$G$"$k(B 0.9.x $B$K$O(B $B=EBg$J%P%0$,$"$k$?$a;H$($^$;$s!#0JA0$NHG!"FC$K(B SSLeay 0.8.x $B$O;H$($k$3$H(B $B$,$o$+$C$F$$$^$9!#JQ?t(B @code{imap-ssl-program} $B$O(B OpenSSL/SSLeay $B$KEO$9(B -$B%Q%?%a!<%?$r4^$_$^$9!#(B +$B%Q%?%a!<%?$r4^$_$^$9!#2C$($F(B @samp{ssl.el} ($BNc$($P(B W3 $B$K4^$^$l$F$$$k$b(B +$B$N(B) $B$,I,MW$G$9!#(B @vindex imap-shell-program @vindex imap-shell-host diff --git a/texi/gnus.texi b/texi/gnus.texi index 8ef8267..f012401 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -12098,6 +12098,9 @@ some reason or other, Gnus let you treat it similar to a POP server and fetches articles from a given @sc{imap} mailbox. @xref{IMAP}, for more information. +Note that for the Kerberos, GSSAPI, SSL/TLS and STARTTLS support you +may need external programs and libraries, @xref{IMAP}. + Keywords: @table @code @@ -12107,7 +12110,7 @@ The name of the @sc{imap} server. The default is taken from the @item :port The port number of the @sc{imap} server. The default is @samp{143}, or -@samp{993} for SSL connections. +@samp{993} for SSL/TLS connections. @item :user The user name to give to the @sc{imap} server. The default is the login @@ -14031,6 +14034,9 @@ might look something like this: (nnimap-stream ssl)))) @end lisp +(Note that for SSL/TLS to work, you need the external library +@samp{ssl.el}, see below.) + The following variables can be used to create a virtual @code{nnimap} server: @@ -14078,8 +14084,8 @@ Example server specification: @vindex nnimap-stream The type of stream used to connect to your server. By default, nnimap will detect and automatically use all of the below, with the exception -of SSL. (SSL is being replaced by STARTTLS, which can be automatically -detected, but it's not widely deployed yet). +of SSL/TLS. (IMAP over SSL/TLS is being replaced by STARTTLS, which +can be automatically detected, but it's not widely deployed yet.) Example server specification: @@ -14101,8 +14107,9 @@ Please note that the value of @code{nnimap-stream} is a symbol! SSL). Requires the external library @samp{starttls.el} and program @samp{starttls}. @item -@dfn{ssl:} Connect through SSL. Requires OpenSSL (the -program @samp{openssl}) or SSLeay (@samp{s_client}). +@dfn{ssl:} Connect through SSL. Requires OpenSSL (the program +@samp{openssl}) or SSLeay (@samp{s_client}) as well as the external +library @samp{ssl.el}. @item @dfn{shell:} Use a shell command to start @sc{imap} connection. @item @@ -14127,7 +14134,8 @@ and nnimap support it too - altough the most recent versions of SSLeay, 0.9.x, are known to have serious bugs making it useless. Earlier versions, especially 0.8.x, of SSLeay are known to work. The variable @code{imap-ssl-program} contain parameters to pass -to OpenSSL/SSLeay. +to OpenSSL/SSLeay. You also need @samp{ssl.el} (from the W3 +distribution, for instance). @vindex imap-shell-program @vindex imap-shell-host -- 1.7.10.4