Attachment #116645 for bug #158613

Lines 7-13 Link Here

(-)Makefile (-70 / +34 lines)
7	# Based on amavisd ports makefile.	7	# Based on amavisd ports makefile.
8		8
9	PORTNAME= amavisd-new	9	PORTNAME= amavisd-new
10	PORTVERSION= 2.6.6	10	PORTVERSION= 2.7.0
11	PORTEPOCH= 1	11	PORTEPOCH= 1
12	CATEGORIES= security	12	CATEGORIES= security
13	MASTER_SITES= http://www.ijs.si/software/amavisd/ \	13	MASTER_SITES= http://www.ijs.si/software/amavisd/ \
Lines 28-39 Link Here
28	p5-Mail-DKIM>=0.33:${PORTSDIR}/mail/p5-Mail-DKIM	28	p5-Mail-DKIM>=0.33:${PORTSDIR}/mail/p5-Mail-DKIM
29		29
30	USE_PERL5_RUN= 5.8.2+	30	USE_PERL5_RUN= 5.8.2+
31	GNU_CONFIGURE= yes
32	CONFIGURE_ARGS= --with-user=${AMAVISUSER} --with-runtime-dir=${AMAVISDIR}
33	CONFIGURE_WRKSRC= ${WRKSRC}/helper-progs
34	BUILD_WRKSRC= ${WRKSRC}/helper-progs
35		31
36	DOCS= AAAREADME.first AMAVIS-MIB.txt INSTALL LDAP.schema LICENSE \	32	NO_BUILD= yes
		33
		34	DOCS= AAAREADME.first AMAVIS-MIB.txt INSTALL LDAP.schema LICENSE \
37	RELEASE_NOTES README_FILES/README.* README_FILES/screen.css \	35	RELEASE_NOTES README_FILES/README.* README_FILES/screen.css \
38	README_FILES/amavisd-new-docs.html	36	README_FILES/amavisd-new-docs.html
39		37
Lines 43-77 Link Here
43	AMAVISQUARANTINE?= /var/virusmails	41	AMAVISQUARANTINE?= /var/virusmails
44	DAEMON?= /usr/sbin/daemon -p	42	DAEMON?= /usr/sbin/daemon -p
45		43
46	OPTIONS= IPV6 "Support IPv6" on \	44	OPTIONS= IPV6 "Support IPv6" on \
47	BDB "Use BerkeleyDB for nanny/cache/snmp" on \	45	BDB "Use BerkeleyDB for nanny/cache/snmp" on \
48	SNMP "Install amavisd snmp subagent" off \	46	SNMP "Install amavisd snmp subagent" off \
49	SQLITE "Use SQLite for lookups" off \	47	SQLITE "Use SQLite for lookups" off \
50	MYSQL "Use MySQL for lookups/logging/quarantine" off \	48	MYSQL "Use MySQL for lookups/logging/quarantine" off \
51	PGSQL "Use PgSQL for lookups/logging/quarantine" off \	49	PGSQL "Use PgSQL for lookups/logging/quarantine" off \
52	LDAP "Use LDAP for lookups" off \	50	LDAP "Use LDAP for lookups" off \
53	SASL "Use SASL authentication" off \	51	SASL "Use SASL authentication" off \
54	MILTER "Sendmail milter support" on \	52	SPAMASSASSIN "Use mail/p5-Mail-SpamAssassin" on \
55	SPAMASSASSIN "Use mail/p5-Mail-SpamAssassin" on \	53	P0F "Passive operating system fingerprinting" off \
56	P0F "Passive operating system fingerprinting" off \
57	ALTERMIME "Use AlterMime for defanging/disclaimers" off \	54	ALTERMIME "Use AlterMime for defanging/disclaimers" off \
58	FILE "Use newer file(1) utility from ports" on \	55	FILE "Use newer file(1) utility from ports" on \
59	RAR "RAR support with archivers/rar" off \	56	RAR "RAR support with archivers/rar" off \
60	UNRAR "RAR support with archivers/unrar" on \	57	UNRAR "RAR support with archivers/unrar" on \
61	ARJ "ARJ support with archivers/arj" on \	58	ARJ "ARJ support with archivers/arj" on \
62	UNARJ "ARJ support with archivers/unarj" off \	59	UNARJ "ARJ support with archivers/unarj" off \
63	LHA "LHA support with archivers/lha" on \	60	LHA "LHA support with archivers/lha" on \
64	ARC "ARC support with archivers/arc" on \	61	ARC "ARC support with archivers/arc" on \
65	NOMARCH "ARC support with archivers/nomarch" off \	62	NOMARCH "ARC support with archivers/nomarch" off \
66	CAB "CAB support with archivers/cabextract" on \	63	CAB "CAB support with archivers/cabextract" on \
67	RPM "RPM support with archivers/rpm2cpio" on \	64	RPM "RPM support with archivers/rpm2cpio" on \
68	ZOO "ZOO support with archivers/zoo" on \	65	ZOO "ZOO support with archivers/zoo" on \
69	UNZOO "ZOO support with archivers/unzoo" off \	66	UNZOO "ZOO support with archivers/unzoo" off \
70	LZOP "LZOP support with archivers/lzop" on \	67	LZOP "LZOP support with archivers/lzop" on \
71	FREEZE "FREEZE support with archivers/freeze" on \	68	FREEZE "FREEZE support with archivers/freeze" on \
72	P7ZIP "P7ZIP support with archivers/p7zip" on \	69	P7ZIP "P7ZIP support with archivers/p7zip" on \
73	MSWORD "Ms Word support with textproc/ripole" on \	70	MSWORD "Ms Word support with textproc/ripole" on \
74	TNEF "Add external tnef decoder converters/tnef" off	71	TNEF "Add external tnef decoder converters/tnef" off
75		72
76	SUB_FILES= pkg-install pkg-deinstall pkg-message	73	SUB_FILES= pkg-install pkg-deinstall pkg-message
77		74
Lines 82-90 Link Here
82	DAEMON="${DAEMON}" \	79	DAEMON="${DAEMON}" \
83	PERL=${PERL}	80	PERL=${PERL}
84		81
85	PLIST_SUB+= AMAVIS_NOAMAVIS=${AMAVIS_NOAMAVIS} \	82	PLIST_SUB+= AMAVIS_NOP0F=${AMAVIS_NOP0F}
86	AMAVIS_NOMILTER=${AMAVIS_NOMILTER} \
87	AMAVIS_NOP0F=${AMAVIS_NOP0F}
88		83
89	.include <bsd.port.options.mk>	84	.include <bsd.port.options.mk>
90		85
Lines 99-114 Link Here
99	RUN_DEPENDS+= ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP	94	RUN_DEPENDS+= ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP
100	.endif	95	.endif
101		96
102	.if !defined(WITH_MILTER) \|\| (!exists(/usr/lib/libmilter.a) && !exists(${PREFIX}/lib/libmilter.a))
103	AMAVIS_NOAMAVIS="@comment "
104	.endif
105
106	.if defined(WITH_MILTER) && !defined(AMAVIS_NOAMAVIS)
107	USE_RC_SUBR+= amavis-milter.sh
108	.else
109	AMAVIS_NOMILTER="@comment "
110	.endif
111
112	.if defined(WITH_BDB)	97	.if defined(WITH_BDB)
113	RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB	98	RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB
114	.endif	99	.endif
Lines 236-292 Link Here
236	pre-fetch:	221	pre-fetch:
237	@${ECHO} ""	222	@${ECHO} ""
238	@${ECHO} " ** UPGRADE WARNING: SQL SCHEMA CHANGED **"	223	@${ECHO} " ** UPGRADE WARNING: SQL SCHEMA CHANGED **"
239	@${ECHO} " If you are upgrading from version prior to 2.6.0"	224	@${ECHO} " If you are upgrading from version prior to 2.6.6"
240	@${ECHO} " Hit ^c now and read /usr/ports/UPDATING section or"	225	@${ECHO} " Hit ^c now and read /usr/ports/UPDATING section or"
241	@${ECHO} " /usr/local/share/doc/amavisd-new/RELEASE_NOTES"	226	@${ECHO} " /usr/local/share/doc/amavisd-new/RELEASE_NOTES"
242	@read -p "Hit ^c now to stop, any key to continue: " -t 5 a \|\| true	227	@read -p "Hit ^c now to stop, any key to continue: " -t 5 a \|\| true
243	@${ECHO} ""	228	@${ECHO} ""
244		229
245	post-patch:	230	post-patch:
246	.for f in amavisd.conf amavisd.conf-sample amavisd amavisd-agent amavisd-nanny amavisd-release
247	@${REINPLACE_CMD} "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/${f}
248	.endfor
249	.for i in amavisd.conf amavisd.conf-sample
250	@${REINPLACE_CMD} -e "s\|$daemon_user = \'vscan\';\|$daemon_user = \'${AMAVISUSER}\';\|" \	231	@${REINPLACE_CMD} -e "s\|$daemon_user = \'vscan\';\|$daemon_user = \'${AMAVISUSER}\';\|" \
251	-e "s\|$daemon_group = \'vscan\';\|$daemon_group = \'${AMAVISGROUP}\';\|" \	232	-e "s\|$daemon_group = \'vscan\';\|$daemon_group = \'${AMAVISGROUP}\';\|" \
252	-e "s\|/var/amavis\|${AMAVISDIR}\|" \	233	-e "s\|/var/amavis\|${AMAVISDIR}\|" \
253	-e "s\|/var/lib/amavis\|${AMAVISDIR}\|" \	234	-e "s\|/var/lib/amavis\|${AMAVISDIR}\|" \
254	-e 's\|$$log_level = 2;\|$$log_level = 0;\|' \
255	-e "s\|/var/virusmails\|${AMAVISQUARANTINE}\|" \	235	-e "s\|/var/virusmails\|${AMAVISQUARANTINE}\|" \
256	-e 's\|$$localhost_name = .localhost.;\|$$localhost_name = $$myhostname;\|' \	236	-e 's\|$$localhost_name = .localhost.;\|$$localhost_name = $$myhostname;\|' \
257	-e 's\|/var/run/clamav/clamd\|/var/run/clamav/clamd.sock\|g' \	237	-e 's\|/var/run/clamav/clamd\|/var/run/clamav/clamd.sock\|g' \
258	${WRKSRC}/${i}	238	${WRKSRC}/amavisd.conf
259	.endfor
260	@${REINPLACE_CMD} "s\|/var/amavis/db\|${AMAVISDIR}/db\|" ${WRKSRC}/amavisd-agent	239	@${REINPLACE_CMD} "s\|/var/amavis/db\|${AMAVISDIR}/db\|" ${WRKSRC}/amavisd-agent
261	@${REINPLACE_CMD} "s\|/var/amavis/db\|${AMAVISDIR}/db\|" ${WRKSRC}/amavisd-nanny	240	@${REINPLACE_CMD} "s\|/var/amavis/db\|${AMAVISDIR}/db\|" ${WRKSRC}/amavisd-nanny
262	@${REINPLACE_CMD} -e "s\|/var/amavis/db\|${AMAVISDIR}/db\|" \	241	@${REINPLACE_CMD} -e "s\|/var/amavis/db\|${AMAVISDIR}/db\|" \
263	-e "s\|/usr/bin/perl\|${PERL}\|" ${WRKSRC}/amavisd-snmp-subagent	242	-e "s\|/usr/bin/perl\|${PERL}\|" ${WRKSRC}/amavisd-snmp-subagent
264	@${REINPLACE_CMD} "s\|/var/amavis/amavisd.sock\|${AMAVISDIR}/amavisd.sock\|" \	243	@${REINPLACE_CMD} "s\|/var/amavis/amavisd.sock\|${AMAVISDIR}/amavisd.sock\|" \
265	${WRKSRC}/amavisd-release	244	${WRKSRC}/amavisd-release
266	@${REINPLACE_CMD} "s\|#define HAVE_MKTEMP\|#undef HAVE_MKTEMP\|" \
267	${WRKSRC}/helper-progs/config.h.in
268	@${REINPLACE_CMD} -e "s\|/etc/amavisd.conf\|${PREFIX}/etc/amavisd.conf\|" \	245	@${REINPLACE_CMD} -e "s\|/etc/amavisd.conf\|${PREFIX}/etc/amavisd.conf\|" \
269	-e "s\|/usr/bin/perl\|${PERL}\|" \	246	-e "s\|/usr/bin/perl\|${PERL}\|" \
270	-e "s\|/var/amavis\|${AMAVISDIR}\|g" \	247	-e "s\|/var/amavis\|${AMAVISDIR}\|g" \
271	-e 's\|$$localhost_name = .localhost.;\|$$localhost_name = $$myhostname;\|' \	248	-e 's\|$$localhost_name = .localhost.;\|$$localhost_name = $$myhostname;\|' \
272	${WRKSRC}/amavisd	249	${WRKSRC}/amavisd
273		250
274	.if defined(AMAVIS_NOAMAVIS)
275	do-configure:
276	do-build:
277	@${ECHO} libmilter not available, not building amavis-milter and amavis
278	.endif
279
280	pre-install:	251	pre-install:
281	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL	252	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
282		253
283	do-install:	254	do-install:
284	.if !defined(AMAVIS_NOAMAVIS)
285	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis ${PREFIX}/sbin
286	.endif
287	.if !defined(AMAVIS_NOMILTER)
288	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${PREFIX}/sbin
289	.endif
290	.if defined(WITH_P0F)	255	.if defined(WITH_P0F)
291	${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl ${PREFIX}/sbin	256	${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl ${PREFIX}/sbin
292	.endif	257	.endif
Lines 294-300 Link Here
294	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/sbin	259	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/sbin
295	.endfor	260	.endfor
296	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist	261	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist
297	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-sample ${PREFIX}/etc/amavisd.conf-sample
298	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default ${PREFIX}/etc/amavisd.conf-default	262	${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default ${PREFIX}/etc/amavisd.conf-default
299	${INSTALL_SCRIPT} ${WRKSRC}/amavisd-custom.conf ${PREFIX}/etc/amavisd-custom.conf-dist	263	${INSTALL_SCRIPT} ${WRKSRC}/amavisd-custom.conf ${PREFIX}/etc/amavisd-custom.conf-dist
300	.if !exists(${PREFIX}/etc/amavisd.conf)	264	.if !exists(${PREFIX}/etc/amavisd.conf)

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (amavisd-new-2.6.6.tar.gz) = 4d3ce005f63dce8ce474e07bec001dac545871e2bf5641c1ffebff6b979e33d5	1	SHA256 (amavisd-new-2.7.0.tar.gz) = 534b3d91c31e0e87a73602c84dfeb4b30b4ea64dee99fcceabd59b1bc0082b0b
2	SIZE (amavisd-new-2.6.6.tar.gz) = 952177	2	SIZE (amavisd-new-2.7.0.tar.gz) = 941811

Lines 71-79 Link Here

(-)pkg-plist (-3 lines)
71	@unexec if cmp -s %D/etc/amavisd.conf %D/etc/amavisd.conf-dist; then rm -f %D/etc/amavisd.conf; fi	71	@unexec if cmp -s %D/etc/amavisd.conf %D/etc/amavisd.conf-dist; then rm -f %D/etc/amavisd.conf; fi
72	etc/amavisd.conf-dist	72	etc/amavisd.conf-dist
73	@exec [ ! -f %B/amavisd.conf ] && cp %B/%f %B/amavisd.conf	73	@exec [ ! -f %B/amavisd.conf ] && cp %B/%f %B/amavisd.conf
74	etc/amavisd.conf-sample
75	%%AMAVIS_NOAMAVIS%%sbin/amavis
76	%%AMAVIS_NOMILTER%%sbin/amavis-milter
77	%%AMAVIS_NOP0F%%sbin/p0f-analyzer.pl	74	%%AMAVIS_NOP0F%%sbin/p0f-analyzer.pl
78	sbin/amavisd	75	sbin/amavisd
79	sbin/amavisd-agent	76	sbin/amavisd-agent




--- helper-progs/configure.orig	Thu Mar  4 18:45:55 2004
+++ helper-progs/configure	Fri Mar 12 08:53:15 2004
@@ -2041,9 +2041,3 @@
 
 
 
-if test "$SENDMAILPROG" != "no" ; then
-        sendmailversion=`$SENDMAILPROG -bv -d0.1 | $AWK '/Version/ {print $2}'`
-        echo ""
-        echo "Info: sendmail version $sendmailversion detected"
-        echo ""
-fi

Return to bug 158613

Removed Link Here

(-)files/patch-configure (-12 lines)
1	--- helper-progs/configure.orig Thu Mar 4 18:45:55 2004
2	+++ helper-progs/configure Fri Mar 12 08:53:15 2004
3	@@ -2041,9 +2041,3 @@
4
5
6
7	-if test "$SENDMAILPROG" != "no" ; then
8	- sendmailversion=`$SENDMAILPROG -bv -d0.1 \| $AWK '/Version/ {print $2}'`
9	- echo ""
10	- echo "Info: sendmail version $sendmailversion detected"
11	- echo ""
12	-fi