diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-04-07 01:18:06 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-04-07 01:18:06 +0000 |
| commit | 84ad0cd6c3223e4f9e2e88ca9c102585a7809d1c (patch) | |
| tree | 9cd0565ae2f04a3015a27a97b85294c0933b5900 /security/amavisd-new/files | |
| parent | MAINTAINER UPDATE: net/nagios (diff) | |
MAINTAINER UPDATE: security/amavisd-new
Fixes for amavisd-new port:
- add missing dependency on devel/p5-IO
- install amavisdconf utility
- bump portrevision
PR: ports/48984
Submitted by: Blaz Zupan <blaz@si.FreeBSD.org>
Notes
Notes:
svn path=/head/; revision=78479
Diffstat (limited to 'security/amavisd-new/files')
| -rw-r--r-- | security/amavisd-new/files/amavisd.sh.tmpl | 3 | ||||
| -rw-r--r-- | security/amavisd-new/files/patch-amavisd | 11 | ||||
| -rw-r--r-- | security/amavisd-new/files/patch-amavisdconf | 20 |
3 files changed, 32 insertions, 2 deletions
diff --git a/security/amavisd-new/files/amavisd.sh.tmpl b/security/amavisd-new/files/amavisd.sh.tmpl index b69db78402ca..51becce9b859 100644 --- a/security/amavisd-new/files/amavisd.sh.tmpl +++ b/security/amavisd-new/files/amavisd.sh.tmpl @@ -7,7 +7,6 @@ fi DIR=%%AMAVISDIR%% PIDFILE=$DIR/amavisd.pid -CONFIGFILE=${PREFIX}/etc/amavisd.conf SOCKFILES=$DIR/amavis*.sock MILTERFLAG=$DIR/use.milter @@ -21,7 +20,7 @@ start) export LANG="C" export LC_ALL="C" export LC_TIME="C" - su %%AMAVISUSER%% -c "${PREFIX}/sbin/amavisd -c ${CONFIGFILE} > /dev/null 2>&1" && echo -n ' amavisd' + su %%AMAVISUSER%% -c "${PREFIX}/sbin/amavisd > /dev/null 2>&1" && echo -n ' amavisd' fi ;; stop) diff --git a/security/amavisd-new/files/patch-amavisd b/security/amavisd-new/files/patch-amavisd new file mode 100644 index 000000000000..7cd539f058c8 --- /dev/null +++ b/security/amavisd-new/files/patch-amavisd @@ -0,0 +1,11 @@ +--- 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 + +-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 diff --git a/security/amavisd-new/files/patch-amavisdconf b/security/amavisd-new/files/patch-amavisdconf new file mode 100644 index 000000000000..2f1bd8907560 --- /dev/null +++ b/security/amavisd-new/files/patch-amavisdconf @@ -0,0 +1,20 @@ +--- amavisdconf.orig Fri Dec 27 14:56:01 2002 ++++ amavisdconf Thu Mar 6 21:18:16 2003 +@@ -9,7 +9,7 @@ + # (none) show the value as will be used by amavisd; + # -d show default value as in the absence of the config file; + # -n only show variable if its value is different from the default. +-# -c conf-file ... use the specified file instead of /etc/amavisd.conf ++# -c conf-file ... use the specified file instead of %%PREFIX%%/etc/amavisd.conf + # + # If a variable is specified, show only that variable, otherwise show + # all configurable variables. (Note: the leading $, @ or % must be included +@@ -179,7 +179,7 @@ + } + + my($what,$onevar); +- my($config_file) = '/etc/amavisd.conf'; ++ my($config_file) = '%%PREFIX%%/etc/amavisd.conf'; + while (@ARGV) { + if (@ARGV >= 1 && $ARGV[0] =~ /^-([nd])$/) { + $what = $1; shift @ARGV; |