Attachment #31311 for bug #52228

View | Details | Raw Unified | Return to bug 52228
Collapse All | Expand All





PORTNAME=	exim
PORTVERSION=	${EXIM_VERSION}
PORTREVISION=	2
CATEGORIES=	mail
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

USE_PERL5=	yes
MAN8=		exim.8

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}"

# XFree86 to be installed if it is not present.
#WITH_EXIMON=	yes

# 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

PORTDOC_FILES=	Exim3.upgrade Exim4.upgrade OptionLists.txt README \
		dbm.discuss.txt filter.txt pcrepattern.txt pcretest.txt \
		spec.txt
.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


.endif

post-patch:
.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

Lines 1-3 Link Here

(-)mail/exim/distinfo (-3 / +4 lines)
1	MD5 (exim-4.14.tar.bz2) = 81d0e304289f84a57144b66030ab9329	1	MD5 (exim/exim-4.20.tar.bz2) = 90f9e876b60d00c0a5dd53ece7c85338
2	MD5 (exim-texinfo-4.10.tar.bz2) = 2a2a34a2457d249d568a58e985f263c0	2	MD5 (exim/exim-texinfo-4.20.tar.bz2) = debc6d3fdd88fd6d9c646ca0495fa92d
3	MD5 (exiscan-4.14-26.tar.bz2) = edaabf47ad42dc7b26949fe1390abfff	3	MD5 (exim/exiscan-acl-4.20-02.patch) = 4d656b5e681a565f7dc42ff6f37c9e7f
		4	MD5 (exim/exiscan-4.20-26.tar.bz2) = a3ad2a486b52cc32990888a00f8fabca

Line 0 Link Here

(-)mail/exim/files/POST-INSTALL-NOTES.exiscan-acl (+10 lines)
	1	This installation of Exim includes Exiscan content scanning support,
	2	from http://duncanthrax.net/exiscan-acl/, which is documented in
	3	${PREFIX}/share/doc/exim/exiscan-acl-spec.txt. The ports tree
	4	includes various content scanners that might be useful, e.g.
	5	mail/p5-Mail-SpamAssassin and security/vscan.
	6
	7	When Exiscan is actually enabled in the Exim configure file, great
	8	care should be taken to test upgrades, since Exiscan updates tend
	9	to not maintain backward compatibility.
	10

Lines 15-21 Link Here

(-)mail/exim/files/patch-scripts::exim_install (-2 / +2 lines)
15	@@ -343,7 +342,7 @@	15	@@ -343,7 +342,7 @@
16		16
17	echo sed -e '\\'	17	echo sed -e '\\'
18	echo " \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${SYSTEM_ALIASES_FILE}'\"" '\\'	18	echo " \"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'\"" '\\'
19	- echo " ../src/configure.default > \${CONFIGURE_FILE}"	19	- echo " ../src/configure.default > \${CONFIGURE_FILE}"
20	+ echo " ../src/configure.default > \${CONFIGURE_FILE}.default"	20	+ echo " ../src/configure.default > \${CONFIGURE_FILE}.default"
21		21
Lines 24-30 Link Here
24	@@ -352,7 +351,7 @@	24	@@ -352,7 +351,7 @@
25	if [ "$real" = "" ] ; then	25	if [ "$real" = "" ] ; then
26	sed -e \	26	sed -e \
27	"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${SYSTEM_ALIASES_FILE}'" \	27	"/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'${ACTUAL_SYSTEM_ALIASES_FILE}'" \
28	- ../src/configure.default > ${CONFIGURE_FILE}	28	- ../src/configure.default > ${CONFIGURE_FILE}
29	+ ../src/configure.default > ${CONFIGURE_FILE}.default	29	+ ../src/configure.default > ${CONFIGURE_FILE}.default
30	else	30	else

Lines 1-11 Link Here

(-)mail/exim/files/patch-src::auths::plaintext.c (-11 lines)
1	--- src/auths/plaintext.c.orig Tue Apr 1 14:53:33 2003
2	+++ src/auths/plaintext.c Tue Apr 1 14:53:40 2003
3	@@ -93,7 +93,7 @@
4	if (Ustrcmp(data, "=") == 0)
5	{
6	expand_nstring[++expand_nmax] = US"";
7	- expand_nstring[expand_nmax] = 0;
8	+ expand_nlength[expand_nmax] = 0;
9	}
10	else
11	{

Lines 1-11 Link Here

(-)mail/exim/files/patch-src::rda.c (-11 lines)
1	--- src/rda.c.orig Tue Mar 11 13:20:22 2003
2	+++ src/rda.c Tue Apr 22 13:53:10 2003
3	@@ -376,7 +376,7 @@
4	options, /* specials that are allowed */
5	generated, /* where to hang them */
6	error, /* for errors */
7	- qualify_domain_recipient, /* to qualify \name */
8	+ deliver_domain, /* to qualify \name */
9	include_directory, /* restrain to directory */
10	eblockp); /* for skipped syntax errors */
11	}

Lines 1-11 Link Here

(-)mail/exim/files/patch-src::rewrite.c (-11 lines)
1	--- src/rewrite.c.orig Tue Mar 11 13:20:22 2003
2	+++ src/rewrite.c Tue Apr 15 14:48:37 2003
3	@@ -261,7 +261,7 @@
4	while (*p2 == ' ') p2++;
5	pf2 = parse_fix_phrase(p2, Ustrlen(p2), buff2, sizeof(buff2));
6
7	- start = Ustrlen(buff1) + start + new - p1;
8	+ start = Ustrlen(pf1) + start + new - p1;
9	end = start + Ustrlen(newparsed);
10	new = string_sprintf("%s%.*s%s", pf1, p2 - p1, p1, pf2);
11	}




--- 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)

Lines 27-32 Link Here

(-)mail/exim/pkg-plist (+1 lines)
27	%%PORTDOCS%%share/doc/exim/pcrepattern.txt	27	%%PORTDOCS%%share/doc/exim/pcrepattern.txt
28	%%PORTDOCS%%share/doc/exim/pcretest.txt	28	%%PORTDOCS%%share/doc/exim/pcretest.txt
29	%%PORTDOCS%%share/doc/exim/spec.txt	29	%%PORTDOCS%%share/doc/exim/spec.txt
		30	%%PORTDOCS%%%%EXISCAN_ACL%%share/doc/exim/exiscan-acl-spec.txt
30	%%PORTDOCS%%%%EXISCAN%%share/doc/exim/exiscan-readme.txt	31	%%PORTDOCS%%%%EXISCAN%%share/doc/exim/exiscan-readme.txt
31	@unexec install-info --delete %D/info/exim.info %D/info/dir	32	@unexec install-info --delete %D/info/exim.info %D/info/dir
32	@unexec install-info --delete %D/info/exim_filter.info %D/info/dir	33	@unexec install-info --delete %D/info/exim_filter.info %D/info/dir

Return to bug 52228

Lines 7-24 Link Here

(-)mail/exim/Makefile (-17 / +61 lines)
7		7
8	PORTNAME= exim	8	PORTNAME= exim
9	PORTVERSION= ${EXIM_VERSION}	9	PORTVERSION= ${EXIM_VERSION}
10	PORTREVISION= 2
11	CATEGORIES= mail	10	CATEGORIES= mail
12	MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \	11	MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \
13	http://www.exim.org/ftp/exim4/ \	12	ftp://gd.tuwien.ac.at/infosys/mail/exim/%SUBDIR%/ \
14	ftp://ftp.is.co.za/networking/mail/transport/exim/exim4/	13	ftp://ftp.easynet.be/exim/%SUBDIR%/ \
15	.if !defined(WITHOUT_EXISCAN)	14	ftp://mirror.direct.ca/pub/exim/%SUBDIR%/ \
16	MASTER_SITES+= http://duncanthrax.net/exiscan/	15	ftp://mirror.kn.vutbr.cz/pub/ftp.exim.org/%SUBDIR%/ \
17	.endif	16	ftp://sunsite.auc.dk/pub/mail/exim/%SUBDIR%/ \
18	DISTFILES= exim-${EXIM_VERSION}.tar.bz2 \	17	ftp://ftp.doc.cs.univ-paris8.fr/mirrors/ftp.exim.org/%SUBDIR%/ \
19	exim-texinfo-${EXIM_DOCVERSION}.tar.bz2	18	ftp://ftp.fu-berlin.de/unix/mail/exim/%SUBDIR%/ \
20	.if !defined(WITHOUT_EXISCAN)	19	ftp://ftp.tin.org/pub/mail/exim/%SUBDIR%/ \
21	DISTFILES+= exiscan-${EXISCAN_VERSION}.tar.bz2	20	ftp://ftp.freenet.de/pub/ftp.csx.cam.ac.uk/pub/software/email/exim/%SUBDIR%/ \
		21	ftp://ftp.esat.net/pub/networking/mail/mta/exim/%SUBDIR%/ \
		22	ftp://nagoya.linux.or.jp/mirror/exim/%SUBDIR%/ \
		23	http://exim.psshee.com/ftp/%SUBDIR%/ \
		24	ftp://ftp.nl.uu.net/pub/unix/mail/exim/%SUBDIR%/ \
		25	ftp://ftp.demon.nl/pub/mirrors/exim/%SUBDIR%/ \
		26	ftp://ftp.easynet.nl/mirror/exim/%SUBDIR%/ \
		27	ftp://sunsite.uio.no/pub/mail/exim/%SUBDIR%/ \
		28	http://sunsite.icm.edu.pl/pub/unix/mail/exim/%SUBDIR%/ \
		29	ftp://ftp.smux.net/pub/exim/%SUBDIR%/ \
		30	ftp://ftp.is.co.za/networking/mail/mta/exim/%SUBDIR%/ \
		31	ftp://sunsite.cnlab-switch.ch/mirror/exim/%SUBDIR%/ \
		32	ftp://ftp.exim.org/pub/exim/%SUBDIR%/ \
		33	http://www.us.exim.org/ftp/%SUBDIR%/ \
		34	http://exim.stanford.edu/ftp/pub/exim/%SUBDIR%/ \
		35	ftp://ftp.fsckit.net/pub/exim/%SUBDIR%/ \
		36	http://duncanthrax.net/%SUBDIR%/:exiscan,exiscan_acl
		37	MASTER_SITE_SUBDIR= exim4 exiscan/:exiscan exiscan-acl/:exiscan_acl
		38	DISTFILES= exim-${EXIM_VERSION}${EXTRACT_SUFX} \
		39	exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX}
		40	.if defined(WITH_EXISCAN_ACL)
		41	DISTFILES+= exiscan-acl-${EXISCAN_ACL_VERSION}.patch:exiscan_acl
		42	.elif !defined(WITHOUT_EXISCAN)
		43	DISTFILES+= exiscan-${EXISCAN_VERSION}${EXTRACT_SUFX}:exiscan
		44	.endif
		45	DIST_SUBDIR= exim
		46
		47	EXTRACT_ONLY= exim-${EXIM_VERSION}${EXTRACT_SUFX} \
		48	exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX}
		49	.if !defined(WITH_EXISCAN_ACL) && !defined(WITHOUT_EXISCAN)
		50	EXTRACT_ONLY+= exiscan-${EXISCAN_VERSION}${EXTRACT_SUFX}
22	.endif	51	.endif
23		52
24	MAINTAINER= sheldonh@FreeBSD.org	53	MAINTAINER= sheldonh@FreeBSD.org
Lines 28-35 Link Here
28	USE_PERL5= yes	57	USE_PERL5= yes
29	MAN8= exim.8	58	MAN8= exim.8
30		59
31	EXIM_VERSION= 4.14	60	EXIM_VERSION= 4.20
32	EXIM_DOCVERSION= 4.10	61	EXIM_DOCVERSION= 4.20
		62	EXISCAN_ACL_VERSION= ${EXIM_VERSION}-02
33	EXISCAN_VERSION= ${EXIM_VERSION}-26	63	EXISCAN_VERSION= ${EXIM_VERSION}-26
34		64
35	PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}"	65	PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}"
Lines 47-54 Link Here
47	# XFree86 to be installed if it is not present.	77	# XFree86 to be installed if it is not present.
48	#WITH_EXIMON= yes	78	#WITH_EXIMON= yes
49		79
50	# If WITHOUT_EXISCAN is defined, exim will be built without exiscan	80	# If WITH_EXISCAN_ACL is defined, exim will be build with the newer
51	# email content scanner support.	81	# exiscan acl support. Otherwise if WITHOUT_EXISCAN is defined,
		82	# exim will be built without exiscan email content scanner support.
		83	#WITH_EXISCAN_ACL= yes
52	#WITHOUT_EXISCAN= yes	84	#WITHOUT_EXISCAN= yes
53		85
54	# Define WITH_TCP_WRAPPERS, WITH_MYSQL, and WITH_PGSQL to link against	86	# Define WITH_TCP_WRAPPERS, WITH_MYSQL, and WITH_PGSQL to link against
Lines 121-130 Link Here
121	PORTDOC_FILES= Exim3.upgrade Exim4.upgrade OptionLists.txt README \	153	PORTDOC_FILES= Exim3.upgrade Exim4.upgrade OptionLists.txt README \
122	dbm.discuss.txt filter.txt pcrepattern.txt pcretest.txt \	154	dbm.discuss.txt filter.txt pcrepattern.txt pcretest.txt \
123	spec.txt	155	spec.txt
124	.if !defined(WITHOUT_EXISCAN)	156	.if defined(WITH_EXISCAN_ACL)
		157	PORTDOC_FILES+= exiscan-acl-spec.txt
		158	PLIST_SUB+= EXISCAN_ACL=""
		159	PLIST_SUB+= EXISCAN="@comment "
		160	.elif !defined(WITHOUT_EXISCAN)
125	PORTDOC_FILES+= exiscan-readme.txt	161	PORTDOC_FILES+= exiscan-readme.txt
		162	PLIST_SUB+= EXISCAN_ACL="@comment "
126	PLIST_SUB+= EXISCAN=""	163	PLIST_SUB+= EXISCAN=""
127	.else	164	.else
		165	PLIST_SUB+= EXISCAN_ACL="@comment "
128	PLIST_SUB+= EXISCAN="@comment "	166	PLIST_SUB+= EXISCAN="@comment "
129	.endif	167	.endif
130		168
Lines 288-294 Link Here
288	.endif	326	.endif
289		327
290	post-patch:	328	post-patch:
291	.if !defined(WITHOUT_EXISCAN)	329	.if defined(WITH_EXISCAN_ACL)
		330	cd ${WRKSRC} && ${PATCH} -p1 \
		331	< ${DISTDIR}/${DIST_SUBDIR}/exiscan-acl-${EXISCAN_ACL_VERSION}.patch \
		332	> ${WRKDIR}/patch-exiscan-acl.log 2>&1
		333	@${CAT} ${FILESDIR}/POST-INSTALL-NOTES.exiscan-acl \
		334	${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES
		335	.elif !defined(WITHOUT_EXISCAN)
292	cd ${WRKSRC} && ${PATCH} -p1 \	336	cd ${WRKSRC} && ${PATCH} -p1 \
293	< ../exiscan-${EXISCAN_VERSION}/exiscan-${EXISCAN_VERSION}.patch \	337	< ../exiscan-${EXISCAN_VERSION}/exiscan-${EXISCAN_VERSION}.patch \
294	> ${WRKDIR}/patch-exiscan.log 2>&1	338	> ${WRKDIR}/patch-exiscan.log 2>&1

Lines 1-13 Link Here

(-)mail/exim/files/patch-src::transports::appendfile.c (-13 lines)
1	--- src/transports/appendfile.c.orig Tue Mar 11 13:20:23 2003
2	+++ src/transports/appendfile.c Tue Apr 15 14:46:18 2003
3	@@ -702,7 +702,9 @@
4	if (pcre_exec(regex, NULL, CS name, Ustrlen(name), 0, 0, ovector,6) >= 2)
5	{
6	int size;
7	- Ustrncpy(buffer, name + ovector[2], ovector[3] - ovector[2]);
8	+ int n = ovector[3] - ovector[2];
9	+ Ustrncpy(buffer, name + ovector[2], n);
10	+ buffer[n] = 0;
11	size = Uatoi(buffer);
12	sum += size;
13	DEBUG(D_transport)