From d110dbd1c9590d8da4b5624ce0785d1032589a90 Mon Sep 17 00:00:00 2001 From: Antonio Radici Date: Wed, 27 May 2009 23:35:38 +0100 Subject: [PATCH] patches/misc/manpage-typos.patch, fixes some typos in the manpage (Closes: 428017) --- debian/changelog | 2 + debian/patches/misc/manpage-typos.patch | 44 +++++++++++++++++++ debian/patches/series | 1 + ...14960-certificate-insecure-algorithm.patch | 6 +++ 4 files changed, 53 insertions(+) create mode 100644 debian/patches/misc/manpage-typos.patch diff --git a/debian/changelog b/debian/changelog index 93504af..9e2e58b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ mutt (1.5.19-4) unstable; urgency=low * patches/upstream/514960-certificate-insecure-algorithm.patch + allow certs generated with insecure algorithms if they are in cache (Closes: 514960) + * patches/misc/manpage-typos.patch + + fixes some typos in the manpage (Closes: 428017) -- Antonio Radici Tue, 26 May 2009 23:42:51 +0100 diff --git a/debian/patches/misc/manpage-typos.patch b/debian/patches/misc/manpage-typos.patch new file mode 100644 index 0000000..add6c5d --- /dev/null +++ b/debian/patches/misc/manpage-typos.patch @@ -0,0 +1,44 @@ +--- a/init.h ++++ b/init.h +@@ -760,7 +760,7 @@ + ** If the GECOS field contains a string like ``lastname, firstname'' then you + ** should set it to ``\fC.*\fP''. + ** .pp +- ** This can be useful if you see the following behavior: you address a e-mail ++ ** This can be useful if you see the following behavior: you address an e-mail + ** to user ID ``stevef'' whose full name is ``Steve Franklin''. If mutt expands + ** ``stevef'' to ``"Franklin" stevef@foo.bar'' then you should set the $$gecos_mask to + ** a regular expression that will match the whole name so mutt will expand +@@ -1869,7 +1869,7 @@ + { "pgp_clearsign_command", DT_STR, R_NONE, UL &PgpClearSignCommand, 0 }, + /* + ** .pp +- ** This format is used to create a old-style ``clearsigned'' PGP ++ ** This format is used to create an old-style ``clearsigned'' PGP + ** message. Note that the use of this format is \fBstrongly\fP + ** \fBdeprecated\fP. + ** .pp +@@ -2218,20 +2218,20 @@ + { "ssl_use_sslv2", DT_BOOL, R_NONE, OPTSSLV2, 1 }, + /* + ** .pp +- ** This variables specifies whether to attempt to use SSLv2 in the ++ ** This variable specifies whether to attempt to use SSLv2 in the + ** SSL authentication process. + */ + # endif /* defined USE_SSL_OPENSSL */ + { "ssl_use_sslv3", DT_BOOL, R_NONE, OPTSSLV3, 1 }, + /* + ** .pp +- ** This variables specifies whether to attempt to use SSLv3 in the ++ ** This variable specifies whether to attempt to use SSLv3 in the + ** SSL authentication process. + */ + { "ssl_use_tlsv1", DT_BOOL, R_NONE, OPTTLSV1, 1 }, + /* + ** .pp +- ** This variables specifies whether to attempt to use TLSv1 in the ++ ** This variable specifies whether to attempt to use TLSv1 in the + ** SSL authentication process. + */ + # ifdef USE_SSL_GNUTLS diff --git a/debian/patches/series b/debian/patches/series index b944dba..0824d89 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,6 +35,7 @@ upstream/493719-segfault-imap-close.patch upstream/514960-certificate-insecure-algorithm.patch misc/hyphen-as-minus.patch +misc/manpage-typos.patch misc/smime_keys-manpage.patch mutt.org diff --git a/debian/patches/upstream/514960-certificate-insecure-algorithm.patch b/debian/patches/upstream/514960-certificate-insecure-algorithm.patch index f0292f2..0aa4096 100644 --- a/debian/patches/upstream/514960-certificate-insecure-algorithm.patch +++ b/debian/patches/upstream/514960-certificate-insecure-algorithm.patch @@ -1,3 +1,9 @@ +The new version of gnutls introduced this new option which mutt did not +know about, if the cert is signed with an insecure algorithm (md5) it will +set a particular bit; if the cert is in the cache of the user we will +unset all bits so this has to be unset as well +See http://bugs.mutt.org/3229 and http://bugs.debian.org/514960 + --- a/mutt_ssl_gnutls.c +++ b/mutt_ssl_gnutls.c @@ -614,6 +614,13 @@ -- 2.43.0