From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 14 06:30:07 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6081337B404 for ; Wed, 14 May 2003 06:30:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A46943F85 for ; Wed, 14 May 2003 06:30:05 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h4EDU4Up046566 for ; Wed, 14 May 2003 06:30:04 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h4EDU4xn046564; Wed, 14 May 2003 06:30:04 -0700 (PDT) Resent-Date: Wed, 14 May 2003 06:30:04 -0700 (PDT) Resent-Message-Id: <200305141330.h4EDU4xn046564@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Oliver Eikemeier Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CBA8937B401; Wed, 14 May 2003 06:23:29 -0700 (PDT) Received: from mx1.fillmore-labs.com (nuuk.fillmore-labs.com [62.138.193.82]) by mx1.FreeBSD.org (Postfix) with ESMTP id D378F43F3F; Wed, 14 May 2003 06:23:27 -0700 (PDT) (envelope-from root@fillmore-labs.com) Received: from root by mx1.fillmore-labs.com with local (Exim 4.14) id 19FwE9-000C2W-Dx; Wed, 14 May 2003 15:23:25 +0200 Message-Id: Date: Wed, 14 May 2003 15:23:25 +0200 From: Oliver Eikemeier To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Sheldon Hearn cc: Oliver Eikemeier Subject: ports/52228: [PATCH] update of port mail/exim to version 4.20 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Oliver Eikemeier List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2003 13:30:07 -0000 >Number: 52228 >Category: ports >Synopsis: [PATCH] update of port mail/exim to version 4.20 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed May 14 06:30:02 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Oliver Eikemeier >Release: FreeBSD 4.8-STABLE i386 >Organization: Fillmore Labs - http://www.fillmore-labs.com >Environment: System: FreeBSD nuuk.fillmore-labs.com 4.8-STABLE FreeBSD 4.8-STABLE #0: Sun Apr 6 14:21:01 CEST 2003 root@nuuk.fillmore-labs.com:/usr/obj/usr/src/sys/FILLMORE-LABS i386 >Description: - update of exim and exim-texinfo to version 4.20 - removed 4.14 patches that are fixed in 4.20 - support for exiscan-acl - update of port mail/exim distribution sites (PR 51300 didn't made it to CVS) - put distribution files in a subdirectory >How-To-Repeat: >Fix: cat exim-4.20.patch | patch -p0 -d /usr/ports find /usr/ports/mail/exim \( -empty -o -name '*.orig' \) -delete --- exim-4.20.patch begins here --- diff -Nur mail/exim/Makefile.orig mail/exim/Makefile --- mail/exim/Makefile.orig Mon May 12 11:44:01 2003 +++ mail/exim/Makefile Wed May 14 14:57:56 2003 @@ -7,18 +7,47 @@ PORTNAME= exim PORTVERSION= ${EXIM_VERSION} -PORTREVISION= 2 CATEGORIES= mail -MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \ - http://www.exim.org/ftp/exim4/ \ - ftp://ftp.is.co.za/networking/mail/transport/exim/exim4/ -.if !defined(WITHOUT_EXISCAN) -MASTER_SITES+= http://duncanthrax.net/exiscan/ -.endif -DISTFILES= exim-${EXIM_VERSION}.tar.bz2 \ - exim-texinfo-${EXIM_DOCVERSION}.tar.bz2 -.if !defined(WITHOUT_EXISCAN) -DISTFILES+= exiscan-${EXISCAN_VERSION}.tar.bz2 +MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \ + ftp://gd.tuwien.ac.at/infosys/mail/exim/%SUBDIR%/ \ + ftp://ftp.easynet.be/exim/%SUBDIR%/ \ + ftp://mirror.direct.ca/pub/exim/%SUBDIR%/ \ + ftp://mirror.kn.vutbr.cz/pub/ftp.exim.org/%SUBDIR%/ \ + ftp://sunsite.auc.dk/pub/mail/exim/%SUBDIR%/ \ + ftp://ftp.doc.cs.univ-paris8.fr/mirrors/ftp.exim.org/%SUBDIR%/ \ + ftp://ftp.fu-berlin.de/unix/mail/exim/%SUBDIR%/ \ + ftp://ftp.tin.org/pub/mail/exim/%SUBDIR%/ \ + ftp://ftp.freenet.de/pub/ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \ + ftp://ftp.esat.net/pub/networking/mail/mta/exim/%SUBDIR%/ \ + ftp://nagoya.linux.or.jp/mirror/exim/%SUBDIR%/ \ + http://exim.psshee.com/ftp/%SUBDIR%/ \ + ftp://ftp.nl.uu.net/pub/unix/mail/exim/%SUBDIR%/ \ + ftp://ftp.demon.nl/pub/mirrors/exim/%SUBDIR%/ \ + ftp://ftp.easynet.nl/mirror/exim/%SUBDIR%/ \ + ftp://sunsite.uio.no/pub/mail/exim/%SUBDIR%/ \ + http://sunsite.icm.edu.pl/pub/unix/mail/exim/%SUBDIR%/ \ + ftp://ftp.smux.net/pub/exim/%SUBDIR%/ \ + ftp://ftp.is.co.za/networking/mail/mta/exim/%SUBDIR%/ \ + ftp://sunsite.cnlab-switch.ch/mirror/exim/%SUBDIR%/ \ + ftp://ftp.exim.org/pub/exim/%SUBDIR%/ \ + http://www.us.exim.org/ftp/%SUBDIR%/ \ + http://exim.stanford.edu/ftp/pub/exim/%SUBDIR%/ \ + ftp://ftp.fsckit.net/pub/exim/%SUBDIR%/ \ + http://duncanthrax.net/%SUBDIR%/:exiscan,exiscan_acl +MASTER_SITE_SUBDIR= exim4 exiscan/:exiscan exiscan-acl/:exiscan_acl +DISTFILES= exim-${EXIM_VERSION}${EXTRACT_SUFX} \ + exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX} +.if defined(WITH_EXISCAN_ACL) +DISTFILES+= exiscan-acl-${EXISCAN_ACL_VERSION}.patch:exiscan_acl +.elif !defined(WITHOUT_EXISCAN) +DISTFILES+= exiscan-${EXISCAN_VERSION}${EXTRACT_SUFX}:exiscan +.endif +DIST_SUBDIR= exim + +EXTRACT_ONLY= exim-${EXIM_VERSION}${EXTRACT_SUFX} \ + exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX} +.if !defined(WITH_EXISCAN_ACL) && !defined(WITHOUT_EXISCAN) +EXTRACT_ONLY+= exiscan-${EXISCAN_VERSION}${EXTRACT_SUFX} .endif MAINTAINER= sheldonh@FreeBSD.org @@ -28,8 +57,9 @@ USE_PERL5= yes MAN8= exim.8 -EXIM_VERSION= 4.14 -EXIM_DOCVERSION= 4.10 +EXIM_VERSION= 4.20 +EXIM_DOCVERSION= 4.20 +EXISCAN_ACL_VERSION= ${EXIM_VERSION}-02 EXISCAN_VERSION= ${EXIM_VERSION}-26 PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}" @@ -47,8 +77,10 @@ # XFree86 to be installed if it is not present. #WITH_EXIMON= yes -# If WITHOUT_EXISCAN is defined, exim will be built without exiscan -# email content scanner support. +# If WITH_EXISCAN_ACL is defined, exim will be build with the newer +# exiscan acl support. Otherwise if WITHOUT_EXISCAN is defined, +# exim will be built without exiscan email content scanner support. +#WITH_EXISCAN_ACL= yes #WITHOUT_EXISCAN= yes # Define WITH_TCP_WRAPPERS, WITH_MYSQL, and WITH_PGSQL to link against @@ -121,10 +153,16 @@ PORTDOC_FILES= Exim3.upgrade Exim4.upgrade OptionLists.txt README \ dbm.discuss.txt filter.txt pcrepattern.txt pcretest.txt \ spec.txt -.if !defined(WITHOUT_EXISCAN) +.if defined(WITH_EXISCAN_ACL) +PORTDOC_FILES+= exiscan-acl-spec.txt +PLIST_SUB+= EXISCAN_ACL="" +PLIST_SUB+= EXISCAN="@comment " +.elif !defined(WITHOUT_EXISCAN) PORTDOC_FILES+= exiscan-readme.txt +PLIST_SUB+= EXISCAN_ACL="@comment " PLIST_SUB+= EXISCAN="" .else +PLIST_SUB+= EXISCAN_ACL="@comment " PLIST_SUB+= EXISCAN="@comment " .endif @@ -288,7 +326,13 @@ .endif post-patch: -.if !defined(WITHOUT_EXISCAN) +.if defined(WITH_EXISCAN_ACL) + cd ${WRKSRC} && ${PATCH} -p1 \ + < ${DISTDIR}/${DIST_SUBDIR}/exiscan-acl-${EXISCAN_ACL_VERSION}.patch \ + > ${WRKDIR}/patch-exiscan-acl.log 2>&1 + @${CAT} ${FILESDIR}/POST-INSTALL-NOTES.exiscan-acl \ + ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES +.elif !defined(WITHOUT_EXISCAN) cd ${WRKSRC} && ${PATCH} -p1 \ < ../exiscan-${EXISCAN_VERSION}/exiscan-${EXISCAN_VERSION}.patch \ > ${WRKDIR}/patch-exiscan.log 2>&1 diff -Nur mail/exim/distinfo.orig mail/exim/distinfo --- mail/exim/distinfo.orig Mon Mar 31 11:27:07 2003 +++ mail/exim/distinfo Wed May 14 14:46:21 2003 @@ -1,3 +1,4 @@ -MD5 (exim-4.14.tar.bz2) = 81d0e304289f84a57144b66030ab9329 -MD5 (exim-texinfo-4.10.tar.bz2) = 2a2a34a2457d249d568a58e985f263c0 -MD5 (exiscan-4.14-26.tar.bz2) = edaabf47ad42dc7b26949fe1390abfff +MD5 (exim/exim-4.20.tar.bz2) = 90f9e876b60d00c0a5dd53ece7c85338 +MD5 (exim/exim-texinfo-4.20.tar.bz2) = debc6d3fdd88fd6d9c646ca0495fa92d +MD5 (exim/exiscan-acl-4.20-02.patch) = 4d656b5e681a565f7dc42ff6f37c9e7f +MD5 (exim/exiscan-4.20-26.tar.bz2) = a3ad2a486b52cc32990888a00f8fabca diff -Nur mail/exim/files/POST-INSTALL-NOTES.exiscan-acl.orig mail/exim/files/POST-INSTALL-NOTES.exiscan-acl --- mail/exim/files/POST-INSTALL-NOTES.exiscan-acl.orig Thu Jan 1 01:00:00 1970 +++ mail/exim/files/POST-INSTALL-NOTES.exiscan-acl Wed May 14 14:04:02 2003 @@ -0,0 +1,10 @@ +This installation of Exim includes Exiscan content scanning support, +from http://duncanthrax.net/exiscan-acl/, which is documented in +${PREFIX}/share/doc/exim/exiscan-acl-spec.txt. The ports tree +includes various content scanners that might be useful, e.g. +mail/p5-Mail-SpamAssassin and security/vscan. + +When Exiscan is actually enabled in the Exim configure file, great +care should be taken to test upgrades, since Exiscan updates tend +to not maintain backward compatibility. + diff -Nur mail/exim/files/patch-scripts::exim_install.orig mail/exim/files/patch-scripts::exim_install --- mail/exim/files/patch-scripts::exim_install.orig Wed Jan 8 14:33:30 2003 +++ mail/exim/files/patch-scripts::exim_install Wed May 14 14:08:18 2003 @@ -15,7 +15,7 @@ @@ -343,7 +342,7 @@ echo sed -e '\\' - echo " \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${SYSTEM_ALIASES_FILE}'\"" '\\' + echo " \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'\"" '\\' - echo " ../src/configure.default > \${CONFIGURE_FILE}" + echo " ../src/configure.default > \${CONFIGURE_FILE}.default" @@ -24,7 +24,7 @@ @@ -352,7 +351,7 @@ if [ "$real" = "" ] ; then sed -e \ - "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${SYSTEM_ALIASES_FILE}'" \ + "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'" \ - ../src/configure.default > ${CONFIGURE_FILE} + ../src/configure.default > ${CONFIGURE_FILE}.default else diff -Nur mail/exim/files/patch-src::auths::plaintext.c.orig mail/exim/files/patch-src::auths::plaintext.c --- mail/exim/files/patch-src::auths::plaintext.c.orig Mon May 12 11:44:02 2003 +++ mail/exim/files/patch-src::auths::plaintext.c Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- src/auths/plaintext.c.orig Tue Apr 1 14:53:33 2003 -+++ src/auths/plaintext.c Tue Apr 1 14:53:40 2003 -@@ -93,7 +93,7 @@ - if (Ustrcmp(data, "=") == 0) - { - expand_nstring[++expand_nmax] = US""; -- expand_nstring[expand_nmax] = 0; -+ expand_nlength[expand_nmax] = 0; - } - else - { diff -Nur mail/exim/files/patch-src::rda.c.orig mail/exim/files/patch-src::rda.c --- mail/exim/files/patch-src::rda.c.orig Mon May 12 11:44:02 2003 +++ mail/exim/files/patch-src::rda.c Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- src/rda.c.orig Tue Mar 11 13:20:22 2003 -+++ src/rda.c Tue Apr 22 13:53:10 2003 -@@ -376,7 +376,7 @@ - options, /* specials that are allowed */ - generated, /* where to hang them */ - error, /* for errors */ -- qualify_domain_recipient, /* to qualify \name */ -+ deliver_domain, /* to qualify \name */ - include_directory, /* restrain to directory */ - eblockp); /* for skipped syntax errors */ - } diff -Nur mail/exim/files/patch-src::rewrite.c.orig mail/exim/files/patch-src::rewrite.c --- mail/exim/files/patch-src::rewrite.c.orig Mon May 12 11:44:02 2003 +++ mail/exim/files/patch-src::rewrite.c Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- src/rewrite.c.orig Tue Mar 11 13:20:22 2003 -+++ src/rewrite.c Tue Apr 15 14:48:37 2003 -@@ -261,7 +261,7 @@ - while (*p2 == ' ') p2++; - pf2 = parse_fix_phrase(p2, Ustrlen(p2), buff2, sizeof(buff2)); - -- start = Ustrlen(buff1) + start + new - p1; -+ start = Ustrlen(pf1) + start + new - p1; - end = start + Ustrlen(newparsed); - new = string_sprintf("%s%.*s%s", pf1, p2 - p1, p1, pf2); - } diff -Nur mail/exim/files/patch-src::transports::appendfile.c.orig mail/exim/files/patch-src::transports::appendfile.c --- mail/exim/files/patch-src::transports::appendfile.c.orig Mon May 12 11:44:02 2003 +++ mail/exim/files/patch-src::transports::appendfile.c Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- src/transports/appendfile.c.orig Tue Mar 11 13:20:23 2003 -+++ src/transports/appendfile.c Tue Apr 15 14:46:18 2003 -@@ -702,7 +702,9 @@ - if (pcre_exec(regex, NULL, CS name, Ustrlen(name), 0, 0, ovector,6) >= 2) - { - int size; -- Ustrncpy(buffer, name + ovector[2], ovector[3] - ovector[2]); -+ int n = ovector[3] - ovector[2]; -+ Ustrncpy(buffer, name + ovector[2], n); -+ buffer[n] = 0; - size = Uatoi(buffer); - sum += size; - DEBUG(D_transport) diff -Nur mail/exim/pkg-plist.orig mail/exim/pkg-plist --- mail/exim/pkg-plist.orig Mon Mar 31 11:27:07 2003 +++ mail/exim/pkg-plist Wed May 14 13:47:57 2003 @@ -27,6 +27,7 @@ %%PORTDOCS%%share/doc/exim/pcrepattern.txt %%PORTDOCS%%share/doc/exim/pcretest.txt %%PORTDOCS%%share/doc/exim/spec.txt +%%PORTDOCS%%%%EXISCAN_ACL%%share/doc/exim/exiscan-acl-spec.txt %%PORTDOCS%%%%EXISCAN%%share/doc/exim/exiscan-readme.txt @unexec install-info --delete %D/info/exim.info %D/info/dir @unexec install-info --delete %D/info/exim_filter.info %D/info/dir --- exim-4.20.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: