Date: Tue, 26 Aug 2003 20:28:06 +0200 (CEST) From: Blaz Zupan <blaz.zupan@amis.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/56013: MAINTAINER UPDATE: security/amavisd-new Message-ID: <20030826182806.8BACC5553E@titanic.medinet.si> Resent-Message-ID: <200308261830.h7QIUCFf035697@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 56013 >Category: ports >Synopsis: MAINTAINER UPDATE: security/amavisd-new >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Aug 26 11:30:12 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Blaz Zupan >Release: FreeBSD 4.8-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD titanic.medinet.si 4.8-RELEASE-p3 FreeBSD 4.8-RELEASE-p3 #0: Sat Aug 23 13:23:42 CEST 2003 root@bigbrother.amis.net:/db/obj/usr/src/sys/TITANIC i386 >Description: - update amavisd-new to 20030616.p5. - fix dependency on devel/p5-IO, which should only be used when perl older than 5.6.1 is installed. - enable cpio for extraction of tar archives, which uses much less memory than Archive::Tar (suggested by amavisd-new author) >How-To-Repeat: >Fix: diff -urN amavisd-new.old/Makefile amavisd-new/Makefile --- amavisd-new.old/Makefile Fri Aug 1 17:05:07 2003 +++ amavisd-new/Makefile Mon Aug 25 20:47:14 2003 @@ -7,7 +7,7 @@ # Based on amavisd ports makefile. PORTNAME= amavisd-new -PORTVERSION= 20030616.p2 +PORTVERSION= 20030616.p5 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-p/} @@ -15,8 +15,7 @@ MAINTAINER= blaz@si.FreeBSD.org COMMENT= Performance-enhanced daemonized version of amavis-perl -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IO/Socket/UNIX.pm:${PORTSDIR}/devel/p5-IO \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ ${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Unix-Syslog \ ${SITE_PERL}/MIME/Words.pm:${PORTSDIR}/mail/p5-MIME-Tools \ ${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \ @@ -104,4 +103,10 @@ @${CAT} ${PKGMESSAGE} .endif -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${PERL_LEVEL} < 500601 +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/IO/Socket/UNIX.pm:${PORTSDIR}/devel/p5-IO +.endif + +.include <bsd.port.post.mk> diff -urN amavisd-new.old/distinfo amavisd-new/distinfo --- amavisd-new.old/distinfo Fri Aug 1 17:05:07 2003 +++ amavisd-new/distinfo Mon Aug 25 20:47:27 2003 @@ -1 +1 @@ -MD5 (amavisd-new-20030616-p2.tar.gz) = 713a3ffc090481f72e5bb450b4a1f9ab +MD5 (amavisd-new-20030616-p5.tar.gz) = 13c76432e957ccd302856f64526483a2 diff -urN amavisd-new.old/files/patch-amavisd amavisd-new/files/patch-amavisd --- amavisd-new.old/files/patch-amavisd Mon Apr 7 03:18:06 2003 +++ amavisd-new/files/patch-amavisd Mon Aug 25 20:47:45 2003 @@ -1,11 +1,20 @@ ---- amavisd.orig Fri Jan 10 22:03:39 2003 -+++ amavisd Thu Mar 6 21:18:38 2003 -@@ -5070,7 +5070,7 @@ - my($amavisd_path) = find_program_path($0, [split(/:/, $path, -1)]); - $amavisd_path = $1 if $amavisd_path =~ m{^([A-Za-z0-9/._=+-]+)$}; # untaint +--- amavisd.orig Mon Aug 25 18:07:56 2003 ++++ amavisd Mon Aug 25 20:47:40 2003 +@@ -3903,7 +3903,7 @@ + /^\.lzo$/ && defined $lzop + && return do_uncompress($part,$tempdir,"$lzop -d -c"); + /^\.cpio$/ && defined $cpio && return do_cpio($part,$tempdir); +-# /^\.tar$/ && defined $cpio && return do_cpio($part,$tempdir); ++ /^\.tar$/ && defined $cpio && return do_cpio($part,$tempdir); + /^\.tar$/ && return do_tar($part,$tempdir); # fallback + /^\.zip$/ && return do_unzip($part,0,$tempdir); + /^\.rar$/ && return do_unrar($part,0,$tempdir); +@@ -6260,7 +6260,7 @@ + my($amavisd_path) = find_program_path($0, [split(/:/, $path, -1)], 0); + $amavisd_path = $1 if $amavisd_path=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)}; # untaint -my($config_file) = '/etc/amavisd.conf'; # default location of config file +my($config_file) = '%%PREFIX%%/etc/amavisd.conf'; # default location of config file if (@ARGV >= 2 && $ARGV[0] eq '-c') { # override by command line option -c shift @ARGV; $config_file = shift @ARGV; - $config_file = $1 if $config_file =~ m{^([A-Za-z0-9/._=+-]+)$}; # untaint + $config_file = $1 if $config_file=~m{^([A-Za-z0-9/._=+-]+)$(?!\n)};# untaint diff -urN amavisd-new.old/pkg-plist amavisd-new/pkg-plist --- amavisd-new.old/pkg-plist Fri Aug 1 17:05:07 2003 +++ amavisd-new/pkg-plist Mon Aug 25 20:46:59 2003 @@ -12,6 +12,7 @@ %%PORTDOCS%%share/doc/amavisd-new/README.milter %%PORTDOCS%%share/doc/amavisd-new/README.old.scanners %%PORTDOCS%%share/doc/amavisd-new/README.performance +%%PORTDOCS%%share/doc/amavisd-new/README.policy-on-notifications %%PORTDOCS%%share/doc/amavisd-new/README.postfix %%PORTDOCS%%share/doc/amavisd-new/README.sendmail %%PORTDOCS%%share/doc/amavisd-new/README.sendmail-dual >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030826182806.8BACC5553E>