Date: Wed, 11 Aug 2004 17:44:45 +0200 (CEST) From: Blaz Zupan <blaz@medinet.si> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70306: MAINTAINER UPDATE: amavisd-new port update Message-ID: <20040811154445.238125547B@titanic.medinet.si> Resent-Message-ID: <200408111550.i7BFoWIJ020331@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70306 >Category: ports >Synopsis: MAINTAINER UPDATE: amavisd-new port update >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Aug 11 15:50:31 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Blaz Zupan >Release: FreeBSD 4.10-RELEASE i386 >Organization: >Environment: System: FreeBSD titanic.medinet.si 4.10-RELEASE FreeBSD 4.10-RELEASE #1: Sun Jun 27 16:39:26 CEST 2004 root@bigbrother.amis.net:/usr/obj/usr/src/sys/TITANIC i386 >Description: Attached patch contains the following fixes: - Don't pretend we support anything older than perl 5.8.2. Support for 5.00503 was severly broken and amavisd-new author officially only supports 5.8.2 and up. As an added bonus, this simplifies the makefile very much. - Install a usable amavisd.conf if none exists - On installation, remove amavisd.conf if it is equal to default one - On installation, create /var/amavis/tmp, because the new amavisd.conf uses this directory to store temporary files - Remove address extension options from the example configuration file. Neither sendmail nor postfix support address extensions on FreeBSD by default. >How-To-Repeat: >Fix: diff -urN amavisd-new.orig/Makefile amavisd-new/Makefile --- amavisd-new.orig/Makefile Sun Jul 18 12:05:50 2004 +++ amavisd-new/Makefile Wed Aug 11 16:36:17 2004 @@ -8,6 +8,7 @@ PORTNAME= amavisd-new PORTVERSION= 20040701 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ \ http://mirrors.catpipe.net/amavisd-new/ \ @@ -94,19 +95,11 @@ .endif pre-build: -.if ${PERL_LEVEL} < 500802 -# add warning to greeting message when running perl older than 5.8.2 - ${SED} -e 's,%%PERLVERSION%%,${PERL_VERSION},g' < ${FILESDIR}/perlwarning.tmpl > ${WRKDIR}/MESSAGE -.endif -.if ${PERL_LEVEL} < 500600 -# remove taint checks when running under perl 5.00503 - ${SED} -e 's,^\#\!/usr/bin/perl -T,\#\!/usr/bin/perl,' < ${WRKSRC}/amavisd > ${WRKDIR}/amavisd -.endif for f in amavisd.sh amavis-milter.sh INSTALL DEINSTALL MESSAGE; do \ - ${SED} ${SED_SCRIPT} < ${FILESDIR}/$${f}.tmpl >> ${WRKDIR}/$${f}; \ + ${SED} ${SED_SCRIPT} < ${FILESDIR}/$${f}.tmpl > ${WRKDIR}/$${f}; \ done for f in amavisd.conf amavisd.conf-sample amavisd; do \ - ${SED} ${SED_SCRIPT} < ${WRKSRC}/$${f} >> ${WRKDIR}/$${f}; \ + ${SED} ${SED_SCRIPT} < ${WRKSRC}/$${f} > ${WRKDIR}/$${f}; \ done pre-install: @@ -120,6 +113,9 @@ .endif ${INSTALL_SCRIPT} ${WRKDIR}/amavisd ${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist +.if !exists(${PREFIX}/etc/amavisd.conf) + ${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf ${PREFIX}/etc +.endif ${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf-sample ${PREFIX}/etc/amavisd.conf-sample ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default ${PREFIX}/etc/amavisd.conf-default ${INSTALL_SCRIPT} ${WRKDIR}/amavisd.sh ${PREFIX}/etc/rc.d @@ -133,13 +129,8 @@ @${CAT} ${PKGMESSAGE} .endif -.if ${PERL_LEVEL} < 500800 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.if ${PERL_LEVEL} < 500600 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/IO/Socket/UNIX.pm:${PORTSDIR}/devel/p5-IO +.if ${PERL_LEVEL} < 500802 +IGNORE= "requires perl 5.8.2 or higher" .endif .include <bsd.port.post.mk> diff -urN amavisd-new.orig/files/INSTALL.tmpl amavisd-new/files/INSTALL.tmpl --- amavisd-new.orig/files/INSTALL.tmpl Sun Jul 18 12:05:50 2004 +++ amavisd-new/files/INSTALL.tmpl Wed Aug 11 16:18:48 2004 @@ -43,6 +43,8 @@ echo "Created \"${DIR}\" directory." /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}/db echo "Created \"${DIR}/db\" directory." + /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}/tmp + echo "Created \"${DIR}/tmp\" directory." /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${QUARANTINE} echo "Created \"${QUARANTINE}\" directory." fi diff -urN amavisd-new.orig/files/MESSAGE.tmpl amavisd-new/files/MESSAGE.tmpl --- amavisd-new.orig/files/MESSAGE.tmpl Sun Jul 18 12:05:50 2004 +++ amavisd-new/files/MESSAGE.tmpl Wed Aug 11 16:37:52 2004 @@ -20,7 +20,6 @@ Configuration templates are available in %%PREFIX%%/etc as amavisd.conf-dist, amavisd.conf-sample and amavisd.conf-default. - Copy any of them to amavisd.conf and edit the file to suit your - needs. Documentation is available in %%DOCSDIR%%. + Documentation is available in %%DOCSDIR%%. ******************************************************************* diff -urN amavisd-new.orig/files/patch-amavisd.conf amavisd-new/files/patch-amavisd.conf --- amavisd-new.orig/files/patch-amavisd.conf Sun Jul 18 12:05:50 2004 +++ amavisd-new/files/patch-amavisd.conf Wed Aug 11 16:23:37 2004 @@ -1,5 +1,5 @@ --- amavisd.conf.orig Thu Jul 1 22:04:36 2004 -+++ amavisd.conf Sun Jul 4 11:32:17 2004 ++++ amavisd.conf Wed Aug 11 16:23:13 2004 @@ -9,7 +9,7 @@ # MUST BE SET (no useful default): @@ -29,3 +29,18 @@ # $daemon_chroot_dir = $MYHOME; # (default is undef, meaning: do not chroot) $inet_socket_port = 10024; # accept SMTP on this local TCP port(s) (Postfix) +@@ -50,10 +50,10 @@ + $mailfrom_notify_admin = "virusalert\@$mydomain"; + $mailfrom_notify_recip = "virusalert\@$mydomain"; + $mailfrom_notify_spamadmin = "spam.police\@$mydomain"; +-@addr_extension_virus_maps = ('virus'); +-@addr_extension_spam_maps = ('spam'); +-@addr_extension_banned_maps = ('banned'); +-@addr_extension_bad_header_maps = ('badh'); ++#@addr_extension_virus_maps = ('virus'); ++#@addr_extension_spam_maps = ('spam'); ++#@addr_extension_banned_maps = ('banned'); ++#@addr_extension_bad_header_maps = ('badh'); + + $path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin'; + $file = 'file'; # file(1) utility; use 3.41 or later to avoid vulnerability diff -urN amavisd-new.orig/files/perlwarning.tmpl amavisd-new/files/perlwarning.tmpl --- amavisd-new.orig/files/perlwarning.tmpl Sun Jul 18 12:05:50 2004 +++ amavisd-new/files/perlwarning.tmpl Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ - -******************************************************************* - WARNING: You appear to be running perl version %%PERLVERSION%%. - - amavisd-new has been tested and is guaranteed to run only with - perl 5.8.2 and above. There are numerous problems with amavisd-new - when running under previous perl versions, including perl crashes, - taint bugs and others. You are strongly advised to upgrade your - perl by using the /usr/ports/lang/perl5.8 port. -******************************************************************* diff -urN amavisd-new.orig/pkg-plist amavisd-new/pkg-plist --- amavisd-new.orig/pkg-plist Sun Jul 18 12:05:50 2004 +++ amavisd-new/pkg-plist Wed Aug 11 16:31:31 2004 @@ -23,7 +23,9 @@ %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES %%PORTDOCS%%@dirrm %%DOCSDIR%% etc/amavisd.conf-default +@unexec if cmp -s %D/etc/amavisd.conf %D/etc/amavisd.conf-dist; then rm -f %D/etc/amavisd.conf; fi etc/amavisd.conf-dist +@exec [ ! -f %B/amavisd.conf ] && cp %B/%f %B/amavisd.conf etc/amavisd.conf-sample %%AMAVIS_NOMILTER%%etc/rc.d/amavis-milter.sh etc/rc.d/amavisd.sh >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040811154445.238125547B>