diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-06-18 13:42:32 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-06-18 13:42:32 +0000 |
| commit | 99b05cc884344122fa1c7804bbfc0848ed0d2ae9 (patch) | |
| tree | 8277fc7285ade99087d365ab351e5dd262aadaf6 /mail-client/mutt | |
| parent | Patchlevel bump, removing old, cleanup. (diff) | |
| download | gentoo-2-99b05cc884344122fa1c7804bbfc0848ed0d2ae9.tar.gz gentoo-2-99b05cc884344122fa1c7804bbfc0848ed0d2ae9.tar.bz2 gentoo-2-99b05cc884344122fa1c7804bbfc0848ed0d2ae9.zip | |
Update patch to include parts that were non-local to the ssl-files. Unfortunately the fix is non-straight-forward, and includes a lot of other changesets, causing this to happen. Should fix bug #274603.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'mail-client/mutt')
| -rw-r--r-- | mail-client/mutt/ChangeLog | 8 | ||||
| -rw-r--r-- | mail-client/mutt/files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch | 36 |
2 files changed, 43 insertions, 1 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog index 74fdb62609a1..2f3216ecfff1 100644 --- a/mail-client/mutt/ChangeLog +++ b/mail-client/mutt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for mail-client/mutt # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.130 2009/06/18 09:20:37 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.131 2009/06/18 13:42:32 grobian Exp $ + + 18 Jun 2009; Fabian Groffen <grobian@gentoo.org> + files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch: + Update patch to include parts that were non-local to the ssl-files. + Unfortunately the fix is non-straight-forward, and includes a lot of other + changesets, causing this to happen. Should fix bug #274603. *mutt-1.5.19-r1 (18 Jun 2009) diff --git a/mail-client/mutt/files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch b/mail-client/mutt/files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch index 7022c19a206c..cdeea565d19b 100644 --- a/mail-client/mutt/files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch +++ b/mail-client/mutt/files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch @@ -3,6 +3,42 @@ http://bugs.gentoo.org/show_bug.cgi?id=274488 whitespace-only hunks removed +Index: init.h +=================================================================== +--- init.h (revision 5639:e3af935cdb1a) ++++ init.h (revision 5665:b6b37a6a7f72) +@@ -2145,4 +2145,20 @@ + ** advertising the capability. When \fIunset\fP, mutt will not attempt to + ** use \fCSTARTTLS\fP regardless of the server's capabilities. ++ */ ++ { "ssl_verify_dates", DT_BOOL, R_NONE, OPTSSLVERIFYDATES, M_YES }, ++ /* ++ ** .pp ++ ** If \fIset\fP (the default), mutt will not automatically accept a server ++ ** certificate that is either not yet valid or already expired. You should ++ ** only unset this for particular known hosts, using the ++ ** \fC$<account-hook>\fP function. ++ */ ++ { "ssl_verify_host", DT_BOOL, R_NONE, OPTSSLVERIFYHOST, M_YES }, ++ /* ++ ** .pp ++ ** If \fIset\fP (the default), mutt will not automatically accept a server ++ ** certificate whose host name does not match the host used in your folder ++ ** URL. You should only unset this for particular known hosts, using ++ ** the \fC$<account-hook>\fP function. + */ + { "certificate_file", DT_PATH, R_NONE, UL &SslCertFile, UL "~/.mutt_certificates" }, +Index: mutt.h +=================================================================== +--- mutt.h (revision 5535:2050b44407bf) ++++ mutt.h (revision 5665:b6b37a6a7f72) +@@ -371,4 +371,6 @@ + OPTTLSV1, + OPTSSLFORCETLS, ++ OPTSSLVERIFYDATES, ++ OPTSSLVERIFYHOST, + #endif /* defined(USE_SSL) */ + OPTIMPLICITAUTOVIEW, Index: mutt_ssl.c =================================================================== --- mutt_ssl.c (revision 5622:3af7e8af1983) |