Date: Thu, 5 Apr 2012 09:15:07 +0200 (CEST) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/166659: maintainer-update of mail/mutt-devel Message-ID: <201204050715.q357F7OJ067157@alaska.cert.siemens.de> Resent-Message-ID: <201204050730.q357U1Nn038806@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166659 >Category: ports >Synopsis: maintainer-update of mail/mutt-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Apr 05 07:30:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: >Organization: >Environment: >Description: Maintainer update of mail/mutt-devel: - Fix vulnerability CVE-2011-1429 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-1429>; - Add a patch to the mutt pager that handles non-breaking space characters (0xA0) in an UTF8 environment correctly. - Bump port version. Committer: New files (cvs add): files/patch-gnutls-CN-validation files/patch-nbsp >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile 2011-11-23 06:05:53.000000000 +0100 +++ ./Makefile 2012-04-05 07:46:24.000000000 +0200 @@ -122,7 +122,7 @@ PORTNAME= mutt-devel PORTVERSION= 1.5.21 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES+= mail ipv6 .if defined(WITH_MUTT_NNTP) CATEGORIES+= news diff -ru /usr/ports/mail/mutt-devel/files/patch-gnutls-CN-validation ./files/patch-gnutls-CN-validation --- /usr/ports/mail/mutt-devel/files/patch-gnutls-CN-validation 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-gnutls-CN-validation 2012-04-05 07:44:15.000000000 +0200 @@ -0,0 +1,29 @@ +--- 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-devel/files/patch-nbsp ./files/patch-nbsp --- /usr/ports/mail/mutt-devel/files/patch-nbsp 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-nbsp 2012-02-23 17:04:58.000000000 +0100 @@ -0,0 +1,22 @@ +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; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204050715.q357F7OJ067157>