Date: Mon, 25 Apr 2005 10:45:49 +0200 (CEST) From: Blaz Zupan <blaz@si.FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/80318: MAINTAINER UPDATE: security/amavisd-new Message-ID: <20050425084549.2F9F455475@titanic.medinet.si> Resent-Message-ID: <200504250850.j3P8oIhS046083@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 80318 >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: Mon Apr 25 08:50:18 GMT 2005 >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: Update security/amavisd-new to 2.3.0. >How-To-Repeat: >Fix: diff -urN amavisd-new.old/Makefile amavisd-new/Makefile --- amavisd-new.old/Makefile Tue Apr 12 07:42:39 2005 +++ amavisd-new/Makefile Mon Apr 25 09:52:13 2005 @@ -7,8 +7,7 @@ # Based on amavisd ports makefile. PORTNAME= amavisd-new -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.3.0 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ \ diff -urN amavisd-new.old/distinfo amavisd-new/distinfo --- amavisd-new.old/distinfo Sun Dec 26 14:04:16 2004 +++ amavisd-new/distinfo Mon Apr 25 09:52:54 2005 @@ -1,2 +1,2 @@ -MD5 (amavisd-new-2.2.1.tar.gz) = 567b6df37a2f049fe23c176e6fd1472f -SIZE (amavisd-new-2.2.1.tar.gz) = 741461 +MD5 (amavisd-new-2.3.0.tar.gz) = 9dfeed1587a6ff1f0327c1d46bb8f631 +SIZE (amavisd-new-2.3.0.tar.gz) = 777817 diff -urN amavisd-new.old/files/patch-amavisd amavisd-new/files/patch-amavisd --- amavisd-new.old/files/patch-amavisd Sun Dec 26 14:06:51 2004 +++ amavisd-new/files/patch-amavisd Mon Apr 25 09:55:53 2005 @@ -1,11 +1,11 @@ ---- amavisd.orig Thu Dec 23 02:38:39 2004 -+++ amavisd Sun Dec 26 14:06:38 2004 -@@ -7805,7 +7805,7 @@ - umask(0027); +--- amavisd.orig Mon Apr 25 01:23:32 2005 ++++ amavisd Mon Apr 25 09:53:59 2005 +@@ -8495,7 +8495,7 @@ + Amavis::Conf::build_default_maps(); # default location of the config file if none specified -push(@config_files, '/etc/amavisd.conf') if !@config_files; +push(@config_files, '%%PREFIX%%/etc/amavisd.conf') if !@config_files; + # Read/execute the config file, which may override default settings + Amavis::Conf::read_config(@config_files); - # Read config file, which may override default settings - Amavis::Conf::build_default_maps(); diff -urN amavisd-new.old/files/patch-amavisd.conf amavisd-new/files/patch-amavisd.conf --- amavisd-new.old/files/patch-amavisd.conf Fri Nov 5 21:35:47 2004 +++ amavisd-new/files/patch-amavisd.conf Mon Apr 25 09:58:21 2005 @@ -1,22 +1,22 @@ ---- amavisd.conf.orig Tue Nov 2 22:22:48 2004 -+++ amavisd.conf Wed Nov 3 07:21:51 2004 -@@ -12,15 +12,15 @@ +--- amavisd.conf.orig Mon Apr 25 01:23:26 2005 ++++ amavisd.conf Mon Apr 25 09:58:07 2005 +@@ -14,15 +14,15 @@ # @bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code $max_servers = 2; # number of pre-forked children (2..15 is common) -$daemon_user = 'vscan'; # (no default; customary: vscan or amavis) -$daemon_group = 'vscan'; # (no default; customary: vscan or amavis) +$daemon_user = '%%AMAVISUSER%%'; # (no default; customary: vscan or amavis) -+$daemon_group = '%%AMAVISGROUP%%'; # (no default; customary: vscan or amavis) ++$daemon_group = '%%AMAVISGROUP%%'; # (no default; customary: vscan or amavis) $mydomain = 'example.com'; # a convenient default for other settings -$MYHOME = '/var/amavis'; # a convenient default for other settings -+$MYHOME = '%%AMAVISDIR%%'; # a convenient default for other settings ++$MYHOME = '%%AMAVISDIR%%'; # a convenient default for other settings $TEMPBASE = "$MYHOME/tmp"; # working directory, needs to be created manually $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR -$QUARANTINEDIR = '/var/virusmails'; +$QUARANTINEDIR = '%%AMAVISQUARANTINE%%'; + # $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine # $daemon_chroot_dir = $MYHOME; # chroot directory or undef - diff -urN amavisd-new.old/pkg-plist amavisd-new/pkg-plist --- amavisd-new.old/pkg-plist Fri Nov 5 21:35:47 2004 +++ amavisd-new/pkg-plist Mon Apr 25 09:59:46 2005 @@ -21,6 +21,7 @@ %%PORTDOCS%%%%DOCSDIR%%/README.protocol %%PORTDOCS%%%%DOCSDIR%%/README.sendmail %%PORTDOCS%%%%DOCSDIR%%/README.sendmail-dual +%%PORTDOCS%%%%DOCSDIR%%/README.sql %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES %%PORTDOCS%%%%DOCSDIR%%/amavisd-new-docs.html %%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050425084549.2F9F455475>