From owner-freebsd-ports Wed Aug 28 6:50:20 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47EF237B400 for ; Wed, 28 Aug 2002 06:50:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 479D743E6E for ; Wed, 28 Aug 2002 06:50:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7SDo2JU078083 for ; Wed, 28 Aug 2002 06:50:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7SDo2LN078082; Wed, 28 Aug 2002 06:50:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C999337B4D2 for ; Wed, 28 Aug 2002 06:45:47 -0700 (PDT) Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B15943E65 for ; Wed, 28 Aug 2002 06:45:46 -0700 (PDT) (envelope-from ust@cert.siemens.de) Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.11.6/8.11.6) with ESMTP id g7SDjin19500 for ; Wed, 28 Aug 2002 15:45:44 +0200 (MEST) Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17]) by mail1.siemens.de (8.11.6/8.11.6) with ESMTP id g7SDjhF16104 for ; Wed, 28 Aug 2002 15:45:44 +0200 (MEST) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [139.23.202.134]) by mars.cert.siemens.de (8.12.6/8.12.6/Siemens CERT [ $Revision: 1.25 ]) with ESMTP id g7SDjhiu036142 for ; Wed, 28 Aug 2002 15:45:43 +0200 (CEST) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [127.0.0.1]) by alaska.cert.siemens.de (8.12.6/8.12.6/alaska [ $Revision: 1.14 ]) with ESMTP id g7SDjhec003166 for ; Wed, 28 Aug 2002 15:45:43 +0200 (CEST) (envelope-from ust@alaska.cert.siemens.de) Received: (from ust@localhost) by alaska.cert.siemens.de (8.12.6/8.12.6/alaska [ $Revision: 1.3 ]) id g7SDjhwJ003165; Wed, 28 Aug 2002 15:45:43 +0200 (CEST) (envelope-from ust) Message-Id: <200208281345.g7SDjhwJ003165@alaska.cert.siemens.de> Date: Wed, 28 Aug 2002 15:45:43 +0200 (CEST) From: Udo Schweigert Reply-To: Udo Schweigert To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/42123: maintainer-update of mail/mutt-devel Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 42123 >Category: ports >Synopsis: maintainer-update of mail/mutt-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Aug 28 06:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD alaska.cert.siemens.de 4.6-STABLE FreeBSD 4.6-STABLE #13: Wed Aug 28 13:12:55 CEST 2002 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386 >Description: Maintainer update of mail/mutt-devel: - Drop WITH_MUTT_PGP_OUTLOOK_PATCH which is now part of mutt (via the pgp_create_traditional option) Pointed out by Dale Woolridge Comitter: Removed file (cvs rm) files/extra-patch-pgp-outlook >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Wed Aug 14 00:05:04 2002 +++ ./Makefile Wed Aug 28 13:44:03 2002 @@ -47,9 +47,6 @@ # If you want to enable extended quoting functions define: # WITH_MUTT_QUOTE_PATCH # -# If you want to enable the pgp_outlook_compat function for use with pgp define: -# WITH_MUTT_PGP_OUTLOOK_PATCH -# # If you want to disable a outlook_compat function for use with smime define: # WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT # @@ -167,13 +164,6 @@ .if defined(WITH_MUTT_CYRUS_SASL) LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl .endif -.if exists(${LOCALBASE}/bin/pgp) -WITH_MUTT_PGP_OUTLOOK_PATCH= yes -.endif -.if defined(WITH_MUTT_PGP_OUTLOOK_PATCH) -pre-configure:: - ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-pgp-outlook -.endif .if defined(WITHOUT_MUTT_SMIME_OUTLOOK_COMPAT) pre-configure:: ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-no-outlook @@ -242,9 +232,6 @@ .endif .if defined(WITH_MUTT_QUOTE_PATCH) SCRIPTS_ENV+= MUTT_QUOTE_PATCH="yes" -.endif -.if defined(WITH_MUTT_PGP_OUTLOOK_PATCH) -SCRIPTS_ENV+= MUTT_PGP_OUTLOOK_PATCH="yes" .endif .if defined(WITH_MUTT_EDIT_THREADS) SCRIPTS_ENV+= MUTT_EDIT_THREADS="yes" diff -ru /usr/ports/mail/mutt-devel/files/extra-patch-pgp-outlook ./files/extra-patch-pgp-outlook --- /usr/ports/mail/mutt-devel/files/extra-patch-pgp-outlook Sun Jun 16 15:05:26 2002 +++ ./files/extra-patch-pgp-outlook Thu Jan 1 01:00:00 1970 @@ -1,77 +0,0 @@ ---- init.h.orig Mon Feb 12 08:54:57 2001 -+++ init.h Sat Feb 24 18:03:32 2001 -@@ -1227,6 +1227,13 @@ - ** \fBdeprecated\fP. - */ - -+ { "pgp_outlook_compat", DT_QUAD, R_NONE, OPT_PGPOUTLOOK, M_NO }, -+ /* -+ ** .pp -+ ** If pgp_create_traditional is defined above, this option causes mutt -+ ** to generate messages readable by users of MS Outlook using PGP. -+ */ -+ - /* XXX Default values! */ - - { "pgp_decode_command", DT_STR, R_NONE, UL &PgpDecodeCommand, 0}, ---- mutt.h.orig Tue Feb 26 22:40:16 2002 -+++ mutt.h Tue Feb 26 22:44:05 2002 -@@ -263,2 +263,3 @@ - OPT_PGPTRADITIONAL, /* create old-style PGP messages */ -+ OPT_PGPOUTLOOK, /* Create even older broken outlook compatible messages */ - #endif ---- pgp.c.orig Thu Apr 4 08:49:50 2002 -+++ pgp.c Sun May 5 13:57:57 2002 -@@ -1399,11 +1399,20 @@ - - b->encoding = ENC7BIT; - -- b->type = TYPETEXT; -- b->subtype = safe_strdup ("plain"); -- -- mutt_set_parameter ("x-action", flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed", -- &b->parameter); -+ /* Outlook seems to work by scanning the message itself for PGP information, */ -+ /* not the headers. If the headers are anything but text/plain, it will */ -+ /* not recognize the message. */ -+ if (flags & PGPOUTLOOK) { -+ b->type = TYPETEXT; -+ b->subtype = safe_strdup ("plain"); -+ } else { -+ b->type = TYPEAPPLICATION; -+ b->subtype = safe_strdup ("pgp"); -+ -+ mutt_set_parameter ("format", "text", &b->parameter); -+ mutt_set_parameter ("x-action", flags & ENCRYPT ? "pgp-encrypted" : "pgp-signed", -+ &b->parameter); -+ } - mutt_set_parameter ("charset", send_charset, &b->parameter); - - b->filename = safe_strdup (pgpoutfile); ---- pgplib.h.orig Sun Feb 3 10:34:23 2002 -+++ pgplib.h Sun May 5 14:01:30 2002 -@@ -25,6 +25,7 @@ - #define PGPSIGN (APPLICATION_PGP | SIGN) - #define PGPGOODSIGN (APPLICATION_PGP | GOODSIGN) - #define PGPKEY (APPLICATION_PGP | (1 << 3)) -+#define PGPOUTLOOK (APPLICATION_PGP | (1 << 4)) - - #define KEYFLAG_CANSIGN (1 << 0) - #define KEYFLAG_CANENCRYPT (1 << 1) ---- crypt.c.orig Tue Mar 26 23:23:11 2002 -+++ crypt.c Sun May 5 13:53:52 2002 -@@ -184,8 +184,13 @@ - { - if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create an inline PGP message?"))) == -1) - return -1; -- else if (i == M_YES) -+ else if (i == M_YES) { - traditional = 1; -+ if ((i = query_quadoption (OPT_PGPOUTLOOK, _("Create an Outlook compatible message?"))) == -1) -+ return -1; -+ else if (i == M_YES) -+ flags |= PGPOUTLOOK; -+ } - } - if (traditional) - { diff -ru /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist --- /usr/ports/mail/mutt-devel/scripts/generate-plist Wed Aug 14 00:05:04 2002 +++ ./scripts/generate-plist Wed Aug 28 13:47:20 2002 @@ -139,9 +139,6 @@ if [ "$MUTT_IFDEF_PATCH" = "yes" ]; then html=$(($html + 1)) fi - if [ "$MUTT_PGP_OUTLOOK_PATCH" = "yes" ]; then - html=$(($html + 1)) - fi echo "share/doc/mutt/html/manual.html" >> $tmp_first echo "share/doc/mutt/html/manual_toc.html" >> $tmp_first i=1 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message