Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-client/mutt/files: mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch
Date: Thu, 18 Jun 2009 13:42:35
Message-Id: E1MHHsu-0006pm-7a@stork.gentoo.org
1 grobian 09/06/18 13:42:32
2
3 Modified:
4 mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch
5 Log:
6 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.
7 (Portage version: 2.1.6.13/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 mail-client/mutt/files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch?r1=1.1&r2=1.2
15
16 Index: mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/mail-client/mutt/files/mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch 18 Jun 2009 09:20:37 -0000 1.1
23 +++ mutt-1.5.19-mutt_ssl-3af7e8af1983-dc9ec900c657.patch 18 Jun 2009 13:42:32 -0000 1.2
24 @@ -3,6 +3,42 @@
25
26 whitespace-only hunks removed
27
28 +Index: init.h
29 +===================================================================
30 +--- init.h (revision 5639:e3af935cdb1a)
31 ++++ init.h (revision 5665:b6b37a6a7f72)
32 +@@ -2145,4 +2145,20 @@
33 + ** advertising the capability. When \fIunset\fP, mutt will not attempt to
34 + ** use \fCSTARTTLS\fP regardless of the server's capabilities.
35 ++ */
36 ++ { "ssl_verify_dates", DT_BOOL, R_NONE, OPTSSLVERIFYDATES, M_YES },
37 ++ /*
38 ++ ** .pp
39 ++ ** If \fIset\fP (the default), mutt will not automatically accept a server
40 ++ ** certificate that is either not yet valid or already expired. You should
41 ++ ** only unset this for particular known hosts, using the
42 ++ ** \fC$<account-hook>\fP function.
43 ++ */
44 ++ { "ssl_verify_host", DT_BOOL, R_NONE, OPTSSLVERIFYHOST, M_YES },
45 ++ /*
46 ++ ** .pp
47 ++ ** If \fIset\fP (the default), mutt will not automatically accept a server
48 ++ ** certificate whose host name does not match the host used in your folder
49 ++ ** URL. You should only unset this for particular known hosts, using
50 ++ ** the \fC$<account-hook>\fP function.
51 + */
52 + { "certificate_file", DT_PATH, R_NONE, UL &SslCertFile, UL "~/.mutt_certificates" },
53 +Index: mutt.h
54 +===================================================================
55 +--- mutt.h (revision 5535:2050b44407bf)
56 ++++ mutt.h (revision 5665:b6b37a6a7f72)
57 +@@ -371,4 +371,6 @@
58 + OPTTLSV1,
59 + OPTSSLFORCETLS,
60 ++ OPTSSLVERIFYDATES,
61 ++ OPTSSLVERIFYHOST,
62 + #endif /* defined(USE_SSL) */
63 + OPTIMPLICITAUTOVIEW,
64 Index: mutt_ssl.c
65 ===================================================================
66 --- mutt_ssl.c (revision 5622:3af7e8af1983)