View | Details | Raw Unified | Return to bug 80318
Collapse All | Expand All

(-)amavisd-new/Makefile (-2 / +1 lines)
Lines 7-14 Link Here
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.2.1
10
PORTVERSION=	2.3.0
11
PORTREVISION=	1
12
PORTEPOCH=	1
11
PORTEPOCH=	1
13
CATEGORIES=	security
12
CATEGORIES=	security
14
MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
13
MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
(-)amavisd-new/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (amavisd-new-2.2.1.tar.gz) = 567b6df37a2f049fe23c176e6fd1472f
1
MD5 (amavisd-new-2.3.0.tar.gz) = 9dfeed1587a6ff1f0327c1d46bb8f631
2
SIZE (amavisd-new-2.2.1.tar.gz) = 741461
2
SIZE (amavisd-new-2.3.0.tar.gz) = 777817
(-)amavisd-new/files/patch-amavisd (-6 / +6 lines)
Lines 1-11 Link Here
1
--- amavisd.orig	Thu Dec 23 02:38:39 2004
1
--- amavisd.orig	Mon Apr 25 01:23:32 2005
2
+++ amavisd	Sun Dec 26 14:06:38 2004
2
+++ amavisd	Mon Apr 25 09:53:59 2005
3
@@ -7805,7 +7805,7 @@
3
@@ -8495,7 +8495,7 @@
4
 umask(0027);
4
 Amavis::Conf::build_default_maps();
5
 
5
 
6
 # default location of the config file if none specified
6
 # default location of the config file if none specified
7
-push(@config_files, '/etc/amavisd.conf')  if !@config_files;
7
-push(@config_files, '/etc/amavisd.conf')  if !@config_files;
8
+push(@config_files, '%%PREFIX%%/etc/amavisd.conf')  if !@config_files;
8
+push(@config_files, '%%PREFIX%%/etc/amavisd.conf')  if !@config_files;
9
 # Read/execute the config file, which may override default settings
10
 Amavis::Conf::read_config(@config_files);
9
 
11
 
10
 # Read config file, which may override default settings
11
 Amavis::Conf::build_default_maps();
(-)amavisd-new/files/patch-amavisd.conf (-6 / +6 lines)
Lines 1-22 Link Here
1
--- amavisd.conf.orig	Tue Nov  2 22:22:48 2004
1
--- amavisd.conf.orig	Mon Apr 25 01:23:26 2005
2
+++ amavisd.conf	Wed Nov  3 07:21:51 2004
2
+++ amavisd.conf	Mon Apr 25 09:58:07 2005
3
@@ -12,15 +12,15 @@
3
@@ -14,15 +14,15 @@
4
 # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
4
 # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
5
 
5
 
6
 $max_servers = 2;            # number of pre-forked children (2..15 is common)
6
 $max_servers = 2;            # number of pre-forked children (2..15 is common)
7
-$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis)
7
-$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis)
8
-$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis)
8
-$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis)
9
+$daemon_user  = '%%AMAVISUSER%%';     # (no default;  customary: vscan or amavis)
9
+$daemon_user  = '%%AMAVISUSER%%';     # (no default;  customary: vscan or amavis)
10
+$daemon_group = '%%AMAVISGROUP%%';    # (no default;  customary: vscan or amavis)
10
+$daemon_group = '%%AMAVISGROUP%%';     # (no default;  customary: vscan or amavis)
11
 
11
 
12
 $mydomain = 'example.com';   # a convenient default for other settings
12
 $mydomain = 'example.com';   # a convenient default for other settings
13
 
13
 
14
-$MYHOME   = '/var/amavis';   # a convenient default for other settings
14
-$MYHOME   = '/var/amavis';   # a convenient default for other settings
15
+$MYHOME   = '%%AMAVISDIR%%'; # a convenient default for other settings
15
+$MYHOME   = '%%AMAVISDIR%%';   # a convenient default for other settings
16
 $TEMPBASE = "$MYHOME/tmp";   # working directory, needs to be created manually
16
 $TEMPBASE = "$MYHOME/tmp";   # working directory, needs to be created manually
17
 $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR
17
 $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR
18
-$QUARANTINEDIR = '/var/virusmails';
18
-$QUARANTINEDIR = '/var/virusmails';
19
+$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
19
+$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
20
 # $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
20
 
21
 
21
 # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef
22
 # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef
22
 
(-)amavisd-new/pkg-plist (+1 lines)
Lines 21-26 Link Here
21
%%PORTDOCS%%%%DOCSDIR%%/README.protocol
21
%%PORTDOCS%%%%DOCSDIR%%/README.protocol
22
%%PORTDOCS%%%%DOCSDIR%%/README.sendmail
22
%%PORTDOCS%%%%DOCSDIR%%/README.sendmail
23
%%PORTDOCS%%%%DOCSDIR%%/README.sendmail-dual
23
%%PORTDOCS%%%%DOCSDIR%%/README.sendmail-dual
24
%%PORTDOCS%%%%DOCSDIR%%/README.sql
24
%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
25
%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
25
%%PORTDOCS%%%%DOCSDIR%%/amavisd-new-docs.html
26
%%PORTDOCS%%%%DOCSDIR%%/amavisd-new-docs.html
26
%%PORTDOCS%%@dirrm %%DOCSDIR%%
27
%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 80318