diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2006-09-25 16:22:33 +0000 |
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2006-09-25 16:22:33 +0000 |
| commit | 5e261aad5d2a629d3ace6495f7e7cbc8218c926e (patch) | |
| tree | f1c9e7c322f38b1eb3a57994a05e5d0ac5e7a3f7 /security | |
| parent | d396e64036f57e605a2dfa0be66b6f6e8319ba1d (diff) | |
| download | ports-5e261aad5d2a629d3ace6495f7e7cbc8218c926e.tar.gz ports-5e261aad5d2a629d3ace6495f7e7cbc8218c926e.zip | |
Notes
Diffstat (limited to 'security')
| -rw-r--r-- | security/amavisd-new/Makefile | 2 | ||||
| -rw-r--r-- | security/amavisd-new/files/amavis-p0fanalyzer.sh.in | 24 | ||||
| -rw-r--r-- | security/amavisd-new/files/pkg-message.in | 8 |
3 files changed, 20 insertions, 14 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 6bec20fdca81..894d7dd72cae 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -8,7 +8,7 @@ PORTNAME= amavisd-new PORTVERSION= 2.4.2 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ \ diff --git a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in b/security/amavisd-new/files/amavis-p0fanalyzer.sh.in index fd05f8831785..c5dc8bdeebec 100644 --- a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in +++ b/security/amavisd-new/files/amavis-p0fanalyzer.sh.in @@ -1,32 +1,36 @@ #!/bin/sh # $FreeBSD$ -# PROVIDE: p0fanalyzer +# PROVIDE: amavis_p0fanalyzer # REQUIRE: DAEMON # BEFORE: amavisd # KEYWORD: FreeBSD -p0fanalyzer_enable="${p0fanalyzer_enable-NO}" +amavis_p0fanalyzer_enable="${amavis_p0fanalyzer_enable-NO}" +amavis_p0fanalyzer_p0f_filter="${amavis_p0fanalyzer_p0f_filter-"tcp dst port 25"}" +amavis_p0fanalyzer_pidfile1="${amavis_p0fanalyzer_pidfile1-/var/run/p0fanalyzer1.pid}" +amavis_p0fanalyzer_pidfile2="${amavis_p0fanalyzer_pidfile2-/var/run/p0fanalyzer2.pid}" . /etc/rc.subr -name="p0fanalyzer" +name="amavis_p0fanalyzer" rcvar=`set_rcvar` start_cmd=p0fanalyzer_start stop_cmd=p0fanalyzer_stop p0fanalyzer_start() { - checkyesno p0fanalyzer_enable && echo "Starting p0f-analyzer." && \ - /usr/sbin/daemon -p /var/run/p0fanalyzer1.pid \ - %%PREFIX%%/bin/p0f -i bge0 -l 'tcp dst port 25' 2>&1 | \ - /usr/sbin/daemon -p /var/run/p0fanalyzer2.pid \ - %%PREFIX%%/sbin/p0f-analyzer.pl 2345 + echo "Starting p0f-analyzer." && \ + /usr/sbin/daemon -p ${amavis_p0fanalyzer_pidfile1} \ + %%PREFIX%%/bin/p0f -l "${amavis_p0fanalyzer_p0f_filter}" \ + "${amavis_p0fanalyzer_flags}" 2>&1 | \ + /usr/sbin/daemon -p ${amavis_p0fanalyzer_pidfile2} \ + %%PREFIX%%/sbin/p0f-analyzer.pl 2345 } p0fanalyzer_stop() { - /bin/kill `cat /var/run/p0fanalyzer2.pid` - /bin/kill `cat /var/run/p0fanalyzer1.pid` + /bin/kill `cat ${amavis_p0fanalyzer_pidfile2}` && rm ${amavis_p0fanalyzer_pidfile2} + /bin/kill `cat ${amavis_p0fanalyzer_pidfile1}` && rm ${amavis_p0fanalyzer_pidfile1} } load_rc_config $name diff --git a/security/amavisd-new/files/pkg-message.in b/security/amavisd-new/files/pkg-message.in index db1db5290888..efcf16568533 100644 --- a/security/amavisd-new/files/pkg-message.in +++ b/security/amavisd-new/files/pkg-message.in @@ -22,9 +22,11 @@ you need the following additional lines in /etc/rc.conf (with modifications according to your needs): - amavisd_p0fanalyzer_enable="YES" - amavisd_p0fanalyzer_p0f_interface='bge0' - amavisd_p0fanalyzer_p0f_filter='tcp dst port 25' + amavis_p0fanalyzer_enable="YES" + amavis_p0fanalyzer_p0f_filter="tcp dst port 25" + + You can pass another command line options to p0fanalyzer by setting + amavis_p0fanalyzer_flags. Configuration templates are available in %%PREFIX%%/etc as amavisd.conf-dist, amavisd.conf-sample and amavisd.conf-default. |