FreeBSD Bugzilla – Attachment 137535 Details for
Bug 183125
maintainer-update of mail/mutt
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 21.27 KB, created by
Udo.Schweigert
on 2013-10-20 13:40:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Udo.Schweigert
Created:
2013-10-20 13:40:00 UTC
Size:
21.27 KB
patch
obsolete
>diff -ru /usr/ports/mail/mutt/Makefile ./Makefile >--- /usr/ports/mail/mutt/Makefile 2013-09-21 06:12:08.000000000 +0200 >+++ ./Makefile 2013-10-20 14:04:15.000000000 +0200 >@@ -2,8 +2,8 @@ > # $FreeBSD: head/mail/mutt/Makefile 327742 2013-09-20 19:59:12Z bapt $ > > PORTNAME= mutt >-PORTVERSION= 1.5.21 >-PORTREVISION= 4 >+PORTVERSION= 1.5.22 >+PORTREVISION= 0 > CATEGORIES+= mail ipv6 > MASTER_SITES= ftp://ftp.mutt.org/mutt/devel/ \ > ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/devel/ \ >@@ -306,6 +306,7 @@ > > .if ${PORT_OPTIONS:MNNTP} > DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv >+DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv > CONFIGURE_ARGS+= --enable-nntp > XML_NEEDED= yes > CATEGORIES+= news >@@ -354,7 +355,7 @@ > .endif > > WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} >-MAN1= mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1 >+MAN1= mutt.1 mutt_dotlock.1 flea.1 muttbug.1 pgpewrap.1 pgpring.1 smime_keys.1 > MAN5= muttrc.5 > .if ${PORT_OPTIONS:MMAILBOX_MANPAGES} > MAN5+= mbox.5 mmdf.5 >diff -ru /usr/ports/mail/mutt/distinfo ./distinfo >--- /usr/ports/mail/mutt/distinfo 2012-07-22 11:15:04.057605000 +0200 >+++ ./distinfo 2013-10-20 13:22:50.572408000 +0200 >@@ -1,10 +1,12 @@ >-SHA256 (mutt/mutt-1.5.21.tar.gz) = 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0 >-SIZE (mutt/mutt-1.5.21.tar.gz) = 3716886 >-SHA256 (mutt/patch-1.5.21.rr.compressed.gz) = 5056b181222c4322667fd99a6314e80a4a8b4613357364d9deddef626136b4d9 >-SIZE (mutt/patch-1.5.21.rr.compressed.gz) = 10133 >-SHA256 (mutt/patch-1.5.21.vvv.nntp.gz) = 514cb4c3404bb68fef08781c17be41c6cd1251d05442db4105c6258f0b9d4928 >-SIZE (mutt/patch-1.5.21.vvv.nntp.gz) = 55611 >-SHA256 (mutt/patch-1.5.21.vvv.initials.gz) = ecce3643b04d1aced7085bca506896298bd56d991a5d1af057922c8358abf141 >-SIZE (mutt/patch-1.5.21.vvv.initials.gz) = 691 >-SHA256 (mutt/patch-1.5.21.vvv.quote.gz) = b0613d305932b31eaf005ee0740558d46561a6d7a333c97a00d34a1d0c1ef843 >-SIZE (mutt/patch-1.5.21.vvv.quote.gz) = 1280 >+SHA256 (mutt/mutt-1.5.22.tar.gz) = 8feae890ed0758a5108bafaef27bd8fc9c378675acf25a3c620f2c7b7540f3a7 >+SIZE (mutt/mutt-1.5.22.tar.gz) = 3782237 >+SHA256 (mutt/patch-1.5.22.rr.compressed.gz) = 88480159f4b30a5d257665aa091c651eb934502db08c3459975fe64a1cd700e1 >+SIZE (mutt/patch-1.5.22.rr.compressed.gz) = 10214 >+SHA256 (mutt/patch-1.5.22.vvv.nntp.gz) = 0de014565facf48f368cf74d8d25c31c2e68cd22810e84d1b64b55befbe48fe6 >+SIZE (mutt/patch-1.5.22.vvv.nntp.gz) = 61382 >+SHA256 (mutt/patch-1.5.22.vvv.nntp_ru.gz) = 899dc48b2873a6965f54c1d3a5da22f7ff94b2e4e0bdc2df6828266420dc8b07 >+SIZE (mutt/patch-1.5.22.vvv.nntp_ru.gz) = 5726 >+SHA256 (mutt/patch-1.5.22.vvv.initials.gz) = d5d25971f5d91b22554fa151b05ba5b76a88d8541158620eee5ae43047cd2b4b >+SIZE (mutt/patch-1.5.22.vvv.initials.gz) = 684 >+SHA256 (mutt/patch-1.5.22.vvv.quote.gz) = deb5c212adddf4723618a351d456989addd8840d647cb487a44545113ba5c14d >+SIZE (mutt/patch-1.5.22.vvv.quote.gz) = 1288 >diff -ru /usr/ports/mail/mutt/files/extra-patch-doc-xml ./files/extra-patch-doc-xml >--- /usr/ports/mail/mutt/files/extra-patch-doc-xml 2012-07-22 11:15:04.057605000 +0200 >+++ ./files/extra-patch-doc-xml 2013-10-18 13:22:50.439991000 +0200 >@@ -4,8 +4,8 @@ > > all: makedoc-all > >--makedoc-all: mutt.1 smime_keys.1 muttrc.man >-+makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-chunked manual.txt >+-makedoc-all: mutt.1 smime_keys.1 muttrc.man pgpewrap.1 pgpring.1 >++makedoc-all: mutt.1 smime_keys.1 muttrc.man pgpewrap.1 pgpring.1 manual.html stamp-doc-chunked manual.txt > > install-data-local: makedoc-all instdoc > $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 >diff -ru /usr/ports/mail/mutt/files/patch-02 ./files/patch-02 >--- /usr/ports/mail/mutt/files/patch-02 2012-07-22 11:15:04.057605000 +0200 >+++ ./files/patch-02 2013-10-18 13:22:50.439991000 +0200 >@@ -1,15 +1,15 @@ >---- doc/Makefile.am.orig 2010-09-17 16:04:58.000000000 +0200 >-+++ doc/Makefile.am 2010-09-17 16:09:09.000000000 +0200 >-@@ -47,7 +47,7 @@ >+--- doc/Makefile.am.orig 2013-10-18 06:48:24.000000000 +0200 >++++ doc/Makefile.am 2013-10-18 12:30:09.000000000 +0200 >+@@ -48,7 +48,7 @@ > > all: makedoc-all > >--makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt >-+makedoc-all: mutt.1 smime_keys.1 muttrc.man >+-makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt pgpewrap.1 pgpring.1 >++makedoc-all: mutt.1 smime_keys.1 muttrc.man pgpewrap.1 pgpring.1 > > install-data-local: makedoc-all instdoc > $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 >-@@ -70,9 +70,6 @@ >+@@ -73,9 +73,6 @@ > $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \ > done > -$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) >@@ -19,7 +19,7 @@ > $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist > -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \ > mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \ >-@@ -103,9 +100,7 @@ >+@@ -106,9 +103,7 @@ > > check: > manual.txt: manual.html >diff -ru /usr/ports/mail/mutt/files/patch-bdb ./files/patch-bdb >--- /usr/ports/mail/mutt/files/patch-bdb 2012-07-22 11:15:04.057605000 +0200 >+++ ./files/patch-bdb 1970-01-01 01:00:00.000000000 +0100 >@@ -1,11 +0,0 @@ >---- configure.ac.orig 2009-06-09 08:50:33.000000000 +0200 >-+++ configure.ac 2010-01-27 18:15:31.000000000 +0100 >-@@ -976,7 +976,7 @@ >- bdbpfx="$bdbpfx $d/$v" >- done >- done >-- BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" >-+ BDB_VERSIONS="db-4 db4 db-5 db5 db-5.2 db5.2 db52 db-5.1 db5.1 db51 db-5.0 db5.0 db50 db-4.8 db4.8 db48 db-4.7 db4.7 db47 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" >- AC_MSG_CHECKING([for BerkeleyDB > 4.0]) >- for d in $bdbpfx; do >- BDB_INCLUDE_DIR="" >diff -ru /usr/ports/mail/mutt/files/patch-color-eol ./files/patch-color-eol >--- /usr/ports/mail/mutt/files/patch-color-eol 2012-07-22 11:15:04.057605000 +0200 >+++ ./files/patch-color-eol 1970-01-01 01:00:00.000000000 +0100 >@@ -1,62 +0,0 @@ >---- mutt.h.orig Fri Jun 4 13:35:59 2004 >-+++ mutt.h Fri Jun 4 13:49:26 2004 >-@@ -350,6 +350,7 @@ >- OPTBEEPNEW, >- OPTBOUNCEDELIVERED, >- OPTCHECKNEW, >-+ OPTCOLORAFTEREOL, >- OPTCOLLAPSEUNREAD, >- OPTCONFIRMAPPEND, >- OPTCONFIRMCREATE, >---- init.h.orig Fri Jun 4 13:35:56 2004 >-+++ init.h Fri Jun 4 13:45:43 2004 >-@@ -315,6 +315,12 @@ >- ** \fIcheck_new\fP is \fIunset\fP, no check for new mail is performed >- ** while the mailbox is open. >- */ >-+ { "color_after_eol", DT_BOOL, R_NONE, OPTCOLORAFTEREOL, 1 }, >-+ /* >-+ ** .pp >-+ ** When \fIset\fP, Mutt will color a line after the last character extending >-+ ** to the end of the window. >-+ */ >- { "collapse_unread", DT_BOOL, R_NONE, OPTCOLLAPSEUNREAD, 1 }, >- /* >- ** .pp >---- pager.c.orig Sat Jun 5 09:13:33 2004 >-+++ pager.c Sat Jun 5 09:12:31 2004 >-@@ -1392,7 +1392,7 @@ >- * ncurses does an implicit clrtoeol() when you do addch('\n') so we have >- * to make sure to reset the color *after* that >- */ >-- if (flags & M_SHOWCOLOR) >-+ if (option (OPTCOLORAFTEREOL) && (flags & M_SHOWCOLOR)) >- { >- m = ((*lineInfo)[n].continuation) ? ((*lineInfo)[n].syntax)[0].first : n; >- if ((*lineInfo)[m].type == MT_COLOR_HEADER) >-@@ -1406,6 +1406,16 @@ >- #endif >- } >- >-+ /* >-+ * reset the color back to normal. This *must* come before the >-+ * addch('\n') for the color not to be filled to the right margin. >-+ */ >-+ if (!option (OPTCOLORAFTEREOL) && (flags & M_SHOWCOLOR)) >-+ { >-+ SETCOLOR(MT_COLOR_NORMAL); >-+ BKGDSET(MT_COLOR_NORMAL); >-+ } >-+ >- /* ncurses always wraps lines when you get to the right side of the >- * screen, but S-Lang seems to only wrap if the next character is *not* >- * a newline (grr!). >-@@ -1420,7 +1430,7 @@ >- * addch('\n'), otherwise the color for this line will not be >- * filled to the right margin. >- */ >-- if (flags & M_SHOWCOLOR) >-+ if (option (OPTCOLORAFTEREOL) && (flags & M_SHOWCOLOR)) >- { >- SETCOLOR(MT_COLOR_NORMAL); >- BKGDSET(MT_COLOR_NORMAL); >diff -ru /usr/ports/mail/mutt/files/patch-configure.ac ./files/patch-configure.ac >--- /usr/ports/mail/mutt/files/patch-configure.ac 2012-07-22 11:15:04.057605000 +0200 >+++ ./files/patch-configure.ac 1970-01-01 01:00:00.000000000 +0100 >@@ -1,9 +0,0 @@ >---- configure.ac.orig 2010-08-24 09:34:21.000000000 -0700 >-+++ configure.ac 2012-05-03 18:14:34.000000000 -0700 >-@@ -29,6 +29,2 @@ >- AC_ISC_POSIX >--AM_C_PROTOTYPES >--if test "x$U" != "x"; then >-- AC_MSG_ERROR(Compiler not ANSI compliant) >--fi >- AC_PROG_CPP >diff -ru /usr/ports/mail/mutt/files/patch-crypt-gpgme.c ./files/patch-crypt-gpgme.c >--- /usr/ports/mail/mutt/files/patch-crypt-gpgme.c 2012-07-22 11:15:04.057605000 +0200 >+++ ./files/patch-crypt-gpgme.c 1970-01-01 01:00:00.000000000 +0100 >@@ -1,10 +0,0 @@ >---- ./crypt-gpgme.c.orig 2009-07-01 21:28:51.000000000 -0400 >-+++ ./crypt-gpgme.c 2009-07-01 21:31:52.000000000 -0400 >-@@ -342,6 +342,7 @@ >- gpgme_error_t err; >- gpgme_ctx_t ctx; >- >-+ gpgme_check_version (NULL); >- if (!GpgmeLocaleSet) >- { >- gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL)); >diff -ru /usr/ports/mail/mutt/files/patch-gnutls-CN-validation ./files/patch-gnutls-CN-validation >--- /usr/ports/mail/mutt/files/patch-gnutls-CN-validation 2012-07-22 11:15:04.057605000 +0200 >+++ ./files/patch-gnutls-CN-validation 1970-01-01 01:00:00.000000000 +0100 >@@ -1,29 +0,0 @@ >---- mutt_ssl_gnutls.c.orig >-+++ mutt_ssl_gnutls.c >-@@ -999,6 +999,7 @@ >- unsigned int cert_list_size = 0; >- gnutls_certificate_status certstat; >- int certerr, i, preauthrc, savedcert, rc = 0; >-+ int rcpeer; >- >- if (gnutls_auth_get_type (state) != GNUTLS_CRD_CERTIFICATE) >- { >-@@ -1024,6 +1025,9 @@ >- for (i = 0; i < cert_list_size; i++) { >- rc = tls_check_preauth(&cert_list[i], certstat, conn->account.host, i, >- &certerr, &savedcert); >-+ if (i == 0) >-+ rcpeer = rc; >-+ >- preauthrc += rc; >- >- if (savedcert) >-@@ -1049,7 +1053,7 @@ >- dprint (1, (debugfile, "error trusting certificate %d: %d\n", i, rc)); >- >- certstat = tls_verify_peers (state); >-- if (!certstat) >-+ if (!certstat && !rcpeer) >- return 1; >- } >- } >diff -ru /usr/ports/mail/mutt/files/patch-init.c ./files/patch-init.c >--- /usr/ports/mail/mutt/files/patch-init.c 2012-07-14 15:54:48.109008000 +0200 >+++ ./files/patch-init.c 1970-01-01 01:00:00.000000000 +0100 >@@ -1,39 +0,0 @@ >---- init.c.orig Wed Jul 24 10:41:29 2002 >-+++ init.c Sat May 3 08:46:29 2003 >-@@ -1707,7 +1707,11 @@ >- void mutt_init (int skip_sys_rc, LIST *commands) >- { >- struct passwd *pw; >-+#if __FreeBSD_version < 500000 >-+ char nodename[STRING]; >-+#else >- struct utsname utsname; >-+#endif >- char *p, buffer[STRING], error[STRING]; >- int i, default_rc = 0, need_pause = 0; >- BUFFER err; >-@@ -1765,16 +1769,21 @@ >- #endif >- >- /* And about the host... */ >-+#if __FreeBSD_version < 500000 >-+ gethostname(nodename, sizeof (nodename)); >-+#else >- uname (&utsname); >-+ strfcpy (nodename, utsname.nodename, sizeof (nodename)); >-+#endif >- /* some systems report the FQDN instead of just the hostname */ >-- if ((p = strchr (utsname.nodename, '.'))) >-+ if ((p = strchr (nodename, '.'))) >- { >-- Hostname = mutt_substrdup (utsname.nodename, p); >-+ Hostname = mutt_substrdup (nodename, p); >- p++; >- strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */ >- } >- else >-- Hostname = safe_strdup (utsname.nodename); >-+ Hostname = safe_strdup (nodename); >- >- #ifndef DOMAIN >- #define DOMAIN buffer >diff -ru /usr/ports/mail/mutt/files/patch-nbsp ./files/patch-nbsp >--- /usr/ports/mail/mutt/files/patch-nbsp 2012-07-22 11:15:04.057605000 +0200 >+++ ./files/patch-nbsp 1970-01-01 01:00:00.000000000 +0100 >@@ -1,22 +0,0 @@ >-diff --git a/pager.c b/pager.c >---- pager.c >-+++ pager.c >-@@ -1187,10 +1187,17 @@ >- last_special = special; >- } >- >-- if (IsWPrint (wc)) >-+ if (IsWPrint (wc) || (Charset_is_utf8 && wc == 0x00A0)) >- { >- if (wc == ' ') >- space = ch; >-+ else if (Charset_is_utf8 && wc == 0x00A0) >-+ { >-+ /* Convert non-breaking space to normal space. The local variable >-+ * `space' is not set here so that the caller of this function won't >-+ * attempt to wrap at this character. */ >-+ wc = ' '; >-+ } >- t = wcwidth (wc); >- if (col + t > wrap_cols) >- break; >diff -ru /usr/ports/mail/mutt/files/patch-pgp ./files/patch-pgp >--- /usr/ports/mail/mutt/files/patch-pgp 2012-07-22 11:15:04.057605000 +0200 >+++ ./files/patch-pgp 1970-01-01 01:00:00.000000000 +0100 >@@ -1,134 +0,0 @@ >---- crypt-gpgme.c~ 2010-09-10 07:41:33.584316201 +1000 >-+++ crypt-gpgme.c 2010-09-10 08:22:32.948976728 +1000 >-@@ -2003,12 +2003,14 @@ >- { >- if (!mutt_strncmp ("-----BEGIN PGP ", buf, 15)) >- { >-- if (!mutt_strcmp ("MESSAGE-----\n", buf + 15)) >-+ if (!mutt_strcmp ("MESSAGE-----\n", buf + 15) || >-+ !mutt_strcmp ("MESSAGE-----\r\n", buf + 15)) >- { >- enc = 1; >- break; >- } >-- else if (!mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15)) >-+ else if (!mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15) || >-+ !mutt_strcmp ("SIGNED MESSAGE-----\r\n", buf + 15)) >- { >- sgn = 1; >- break; >-@@ -2128,7 +2130,8 @@ >- continue; >- } >- >-- if (!mutt_strcmp (buf, "-----BEGIN PGP SIGNATURE-----\n")) >-+ if (!mutt_strcmp (buf, "-----BEGIN PGP SIGNATURE-----\n") || >-+ !mutt_strcmp (buf, "-----BEGIN PGP SIGNATURE-----\r\n")) >- break; >- >- if (armor_header) >-@@ -2196,14 +2199,17 @@ >- clearsign = 0; >- start_pos = last_pos; >- >-- if (!mutt_strcmp ("MESSAGE-----\n", buf + 15)) >-+ if (!mutt_strcmp ("MESSAGE-----\n", buf + 15) || >-+ !mutt_strcmp ("MESSAGE-----\r\n", buf + 15)) >- needpass = 1; >-- else if (!mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15)) >-+ else if (!mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15) || >-+ !mutt_strcmp ("SIGNED MESSAGE-----\r\n", buf + 15)) >- { >- clearsign = 1; >- needpass = 0; >- } >-- else if (!mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15)) >-+ else if (!mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15) || >-+ !mutt_strcmp ("PUBLIC KEY BLOCK-----\r\n", buf + 15)) >- { >- needpass = 0; >- pgp_keyblock = 1; >---- pgp.c~ 2009-05-31 03:20:08.000000000 +1000 >-+++ pgp.c 2010-09-10 08:27:40.317064142 +1000 >-@@ -219,7 +219,8 @@ >- continue; >- } >- >-- if (mutt_strcmp (buf, "-----BEGIN PGP SIGNATURE-----\n") == 0) >-+ if (mutt_strcmp (buf, "-----BEGIN PGP SIGNATURE-----\n") == 0 || >-+ mutt_strcmp (buf, "-----BEGIN PGP SIGNATURE-----\r\n") == 0) >- break; >- >- if (armor_header) >-@@ -287,14 +288,17 @@ >- clearsign = 0; >- start_pos = last_pos; >- >-- if (mutt_strcmp ("MESSAGE-----\n", buf + 15) == 0) >-+ if (mutt_strcmp ("MESSAGE-----\n", buf + 15) == 0 || >-+ mutt_strcmp ("MESSAGE-----\r\n", buf + 15) == 0) >- needpass = 1; >-- else if (mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0) >-+ else if (mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0 || >-+ mutt_strcmp ("SIGNED MESSAGE-----\r\n", buf + 15) == 0) >- { >- clearsign = 1; >- needpass = 0; >- } >-- else if (!mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15)) >-+ else if (!mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15) || >-+ !mutt_strcmp ("PUBLIC KEY BLOCK-----\r\n", buf + 15)) >- { >- needpass = 0; >- pgp_keyblock = 1; >-@@ -327,10 +331,14 @@ >- >- fputs (buf, tmpfp); >- >-- if ((needpass && mutt_strcmp ("-----END PGP MESSAGE-----\n", buf) == 0) || >-- (!needpass >-- && (mutt_strcmp ("-----END PGP SIGNATURE-----\n", buf) == 0 >-- || mutt_strcmp ("-----END PGP PUBLIC KEY BLOCK-----\n",buf) == 0))) >-+ if ((needpass && >-+ (mutt_strcmp ("-----END PGP MESSAGE-----\n", buf) == 0 || >-+ mutt_strcmp ("-----END PGP MESSAGE-----\r\n", buf) == 0)) || >-+ (!needpass && >-+ (mutt_strcmp ("-----END PGP SIGNATURE-----\n", buf) == 0 || >-+ mutt_strcmp ("-----END PGP SIGNATURE-----\r\n", buf) == 0 || >-+ mutt_strcmp ("-----END PGP PUBLIC KEY BLOCK-----\n",buf) == 0 || >-+ mutt_strcmp ("-----END PGP PUBLIC KEY BLOCK-----\r\n",buf) == 0))) >- break; >- /* remember optional Charset: armor header as defined by RfC4880 */ >- if (mutt_strncmp ("Charset: ", buf, 9) == 0) >-@@ -554,11 +562,14 @@ >- { >- if (mutt_strncmp ("-----BEGIN PGP ", buf, 15) == 0) >- { >-- if (mutt_strcmp ("MESSAGE-----\n", buf + 15) == 0) >-+ if (mutt_strcmp ("MESSAGE-----\n", buf + 15) == 0 || >-+ mutt_strcmp ("MESSAGE-----\r\n", buf + 15) == 0) >- enc = 1; >-- else if (mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0) >-+ else if (mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0 || >-+ mutt_strcmp ("SIGNED MESSAGE-----\r\n", buf + 15) == 0) >- sgn = 1; >-- else if (mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) >-+ else if (mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15) == 0 || >-+ mutt_strcmp ("PUBLIC KEY BLOCK-----\r\n", buf + 15) == 0) >- key = 1; >- } >- } >-@@ -1067,9 +1078,11 @@ >- */ >- while (fgets (buffer, sizeof (buffer) - 1, pgpout) != NULL) >- { >-- if (mutt_strcmp ("-----BEGIN PGP MESSAGE-----\n", buffer) == 0) >-+ if (mutt_strcmp ("-----BEGIN PGP MESSAGE-----\n", buffer) == 0 || >-+ mutt_strcmp ("-----BEGIN PGP MESSAGE-----\r\n", buffer) == 0) >- fputs ("-----BEGIN PGP SIGNATURE-----\n", fp); >-- else if (mutt_strcmp("-----END PGP MESSAGE-----\n", buffer) == 0) >-+ else if (mutt_strcmp("-----END PGP MESSAGE-----\n", buffer) == 0 || >-+ mutt_strcmp("-----END PGP MESSAGE-----\r\n", buffer) == 0) >- fputs ("-----END PGP SIGNATURE-----\n", fp); >- else >- fputs (buffer, fp); >diff -ru /usr/ports/mail/mutt/files/patch-tls-version ./files/patch-tls-version >--- /usr/ports/mail/mutt/files/patch-tls-version 2013-08-31 06:07:07.000000000 +0200 >+++ ./files/patch-tls-version 1970-01-01 01:00:00.000000000 +0100 >@@ -1,112 +0,0 @@ >---- init.h.orig 2010-09-15 08:39:31.000000000 -0700 >-+++ init.h 2012-03-28 10:58:42.870572835 -0700 >-@@ -2972,6 +2972,18 @@ struct option_t MuttVars[] = { >- ** SSL authentication process. >- */ >- #ifdef USE_SSL_OPENSSL >-+ { "ssl_use_tlsv1_1", DT_BOOL, R_NONE, OPTTLSV1_1, 1 }, >-+ /* >-+ ** .pp >-+ ** This variable specifies whether to attempt to use TLSv1.1 in the >-+ ** SSL authentication process. >-+ */ >-+ { "ssl_use_tlsv1_2", DT_BOOL, R_NONE, OPTTLSV1_2, 1 }, >-+ /* >-+ ** .pp >-+ ** This variable specifies whether to attempt to use TLSv1.2 in the >-+ ** SSL authentication process. >-+ */ >- { "ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, 1 }, >- /* >- ** .pp >---- mutt.h 2010-09-13 10:19:55.000000000 -0700 >-+++ mutt.h 2012-03-28 10:59:24.437237530 -0700 >-@@ -376,6 +376,8 @@ enum >- # endif /* USE_SSL_GNUTLS */ >- OPTSSLV3, >- OPTTLSV1, >-+ OPTTLSV1_1, >-+ OPTTLSV1_2, >- OPTSSLFORCETLS, >- OPTSSLVERIFYDATES, >- OPTSSLVERIFYHOST, >---- mutt_ssl.c.orig 2010-08-25 18:31:40.000000000 +0200 >-+++ mutt_ssl.c 2013-08-20 13:51:14.000000000 +0200 >-@@ -100,12 +100,33 @@ >- goto bail; >- >- ssldata = (sslsockdata*) safe_calloc (1, sizeof (sslsockdata)); >-- /* the ssl_use_xxx protocol options don't apply. We must use TLS in TLS. */ >-- if (! (ssldata->ctx = SSL_CTX_new (TLSv1_client_method ()))) >-+ /* the ssl_use_xxx protocol options don't apply. We must use TLS in TLS. >-+ * TLSv1.2 support was added in OpenSSL 1.0.1. RHEL6 shipped with 1.0.0 so >-+ * our configure script checks for TLSv1.2 availability. >-+ */ >-+ if (! (ssldata->ctx = SSL_CTX_new ( >-+#ifdef HAVE_TLSV1_2_CLIENT_METHOD >-+ TLSv1_2_client_method () >-+#else >-+ TLSv1_client_method () >-+#endif >-+ ))) >- { >- dprint (1, (debugfile, "mutt_ssl_starttls: Error allocating SSL_CTX\n")); >- goto bail_ssldata; >- } >-+#ifdef SSL_OP_NO_TLSv1_1 >-+ if (!option(OPTTLSV1_1)) >-+ { >-+ SSL_CTX_set_options(ssldata->ctx, SSL_OP_NO_TLSv1_1); >-+ } >-+#endif >-+#ifdef SSL_OP_NO_TLSv1_2 >-+ if (!option(OPTTLSV1_2)) >-+ { >-+ SSL_CTX_set_options(ssldata->ctx, SSL_OP_NO_TLSv1_2); >-+ } >-+#endif >- >- ssl_get_client_cert(ssldata, conn); >- >-@@ -303,6 +324,21 @@ >- { >- SSL_CTX_set_options(data->ctx, SSL_OP_NO_TLSv1); >- } >-+ /* TLSv1.1/1.2 support was added in OpenSSL 1.0.1, but some OS distros such >-+ * as Fedora 17 are on OpenSSL 1.0.0. >-+ */ >-+#ifdef SSL_OP_NO_TLSv1_1 >-+ if (!option(OPTTLSV1_1)) >-+ { >-+ SSL_CTX_set_options(data->ctx, SSL_OP_NO_TLSv1_1); >-+ } >-+#endif >-+#ifdef SSL_OP_NO_TLSv1_2 >-+ if (!option(OPTTLSV1_2)) >-+ { >-+ SSL_CTX_set_options(data->ctx, SSL_OP_NO_TLSv1_2); >-+ } >-+#endif >- if (!option(OPTSSLV2)) >- { >- SSL_CTX_set_options(data->ctx, SSL_OP_NO_SSLv2); >-@@ -375,8 +411,8 @@ >- if (!ssl_check_certificate (conn, ssldata)) >- return -1; >- >-- mutt_message (_("SSL connection using %s (%s)"), >-- SSL_get_cipher_version (ssldata->ssl), SSL_get_cipher_name (ssldata->ssl)); >-+ mutt_message (_("%s connection using %s (%s)"), >-+ SSL_get_version(ssldata->ssl), SSL_get_cipher_version (ssldata->ssl), SSL_get_cipher_name (ssldata->ssl)); >- mutt_sleep (0); >- >- return 0; >-@@ -911,7 +947,7 @@ >- >- static int interactive_check_cert (X509 *cert, int idx, int len) >- { >-- char *part[] = >-+ static const char * const part[] = >- {"/CN=", "/Email=", "/O=", "/OU=", "/L=", "/ST=", "/C="}; >- char helpstr[LONG_STRING]; >- char buf[STRING];
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=137535">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 183125
: 137535