diff options
| author | Yen-Ming Lee <leeym@FreeBSD.org> | 2005-04-25 14:51:44 +0000 |
|---|---|---|
| committer | Yen-Ming Lee <leeym@FreeBSD.org> | 2005-04-25 14:51:44 +0000 |
| commit | 3b918216915776309fc3eecebf2fc34af1d145a0 (patch) | |
| tree | 11000f4855c183c4f94d6591c3860e51a39862d2 /security/amavisd-new | |
| parent | 17edb4d7637564bde35559113f5130cc8082d4f1 (diff) | |
| download | ports-3b918216915776309fc3eecebf2fc34af1d145a0.tar.gz ports-3b918216915776309fc3eecebf2fc34af1d145a0.zip | |
- Update security/amavisd-new to 2.3.0.
PR: 80318
Submitted by: Blaz Zupan <blaz@si.FreeBSD.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=134144
Diffstat (limited to 'security/amavisd-new')
| -rw-r--r-- | security/amavisd-new/Makefile | 5 | ||||
| -rw-r--r-- | security/amavisd-new/distinfo | 4 | ||||
| -rw-r--r-- | security/amavisd-new/files/patch-amavisd | 12 | ||||
| -rw-r--r-- | security/amavisd-new/files/patch-amavisd.conf | 12 | ||||
| -rw-r--r-- | security/amavisd-new/pkg-plist | 1 |
5 files changed, 17 insertions, 17 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index b2fe370ba2ba..0f84157e787c 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -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/ \ @@ -132,7 +131,7 @@ post-install: .endif .if ${PERL_LEVEL} < 500802 -IGNORE= "requires perl 5.8.2 or higher" +IGNORE= requires perl 5.8.2 or higher .endif .include <bsd.port.post.mk> diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo index 550577c0d39b..1467e63e8a14 100644 --- a/security/amavisd-new/distinfo +++ b/security/amavisd-new/distinfo @@ -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 --git a/security/amavisd-new/files/patch-amavisd b/security/amavisd-new/files/patch-amavisd index 3de10192c0b0..5b4203b51670 100644 --- a/security/amavisd-new/files/patch-amavisd +++ b/security/amavisd-new/files/patch-amavisd @@ -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 --git a/security/amavisd-new/files/patch-amavisd.conf b/security/amavisd-new/files/patch-amavisd.conf index 727e9bc86a7e..3c0b7fa9a7b6 100644 --- a/security/amavisd-new/files/patch-amavisd.conf +++ b/security/amavisd-new/files/patch-amavisd.conf @@ -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 --git a/security/amavisd-new/pkg-plist b/security/amavisd-new/pkg-plist index 1884740a6a3c..0de0824a9273 100644 --- a/security/amavisd-new/pkg-plist +++ b/security/amavisd-new/pkg-plist @@ -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%% |