diff options
| author | gabor <gabor@FreeBSD.org> | 2012-10-14 02:04:57 +0800 |
|---|---|---|
| committer | gabor <gabor@FreeBSD.org> | 2012-10-14 02:04:57 +0800 |
| commit | 6daf14ca918beb26dccbca0f50cb1fe415cc12fc (patch) | |
| tree | 0136af19928c7102a1fbc9e1e93d0e26e7187544 /security/amavisd-new | |
| parent | 7564974931a0d7ad399b3f6e3633acb417291981 (diff) | |
| download | freebsd-ports-gnome-6daf14ca918beb26dccbca0f50cb1fe415cc12fc.tar.gz freebsd-ports-gnome-6daf14ca918beb26dccbca0f50cb1fe415cc12fc.tar.zst freebsd-ports-gnome-6daf14ca918beb26dccbca0f50cb1fe415cc12fc.zip | |
- Let amavisd_ram respect tmpfs [1]
- Fix amavis-p0fanalyzer startup script [2]
- Bump PORTREVISION
PR: ports/169660 [1],
ports/172182 [2]
Submitted by: Helmut Schneider <jumper99@gmx.de> [1],
Rouslan Iskhakov <rouslan@rshell.net> [2]
Feature safe: yes
Diffstat (limited to 'security/amavisd-new')
| -rw-r--r-- | security/amavisd-new/Makefile | 7 | ||||
| -rw-r--r-- | security/amavisd-new/files/amavis-p0fanalyzer.in | 4 | ||||
| -rw-r--r-- | security/amavisd-new/files/amavisd.in | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 9d811ba4cf3f..e830a28153e2 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,13 +1,8 @@ -# New ports collection makefile for: amavisd-new -# Date created: 05 Jun 2002 -# Whom: Christopher K Davis (ckd-freebsd@ckdhr.com) -# # $FreeBSD$ -# -# Based on amavisd ports makefile. PORTNAME= amavisd-new PORTVERSION= 2.8.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ \ diff --git a/security/amavisd-new/files/amavis-p0fanalyzer.in b/security/amavisd-new/files/amavis-p0fanalyzer.in index d7009711bcfc..19e19cee95f6 100644 --- a/security/amavisd-new/files/amavis-p0fanalyzer.in +++ b/security/amavisd-new/files/amavis-p0fanalyzer.in @@ -9,7 +9,6 @@ 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}" -amavis_p0f_daemon_flags="${amavis_p0f_daemon_flags--l}" amavis_p0fanalyzer_flags="${amavis_p0fanalyzer_flags-2345}" . /etc/rc.subr @@ -23,8 +22,7 @@ stop_cmd=p0fanalyzer_stop p0fanalyzer_start() { echo "Starting p0f-analyzer." && \ %%DAEMON%% ${amavis_p0fanalyzer_pidfile1} \ - %%PREFIX%%/bin/p0f ${amavis_p0f_daemon_flags} \ - "${amavis_p0fanalyzer_p0f_filter}" 2>&1 | \ + %%PREFIX%%/bin/p0f "${amavis_p0fanalyzer_p0f_filter}" 2>&1 | \ %%DAEMON%% ${amavis_p0fanalyzer_pidfile2} \ %%PREFIX%%/sbin/p0f-analyzer.pl ${amavis_p0fanalyzer_flags} } diff --git a/security/amavisd-new/files/amavisd.in b/security/amavisd-new/files/amavisd.in index 1b8e77ffee75..67a97f76ef57 100644 --- a/security/amavisd-new/files/amavisd.in +++ b/security/amavisd-new/files/amavisd.in @@ -36,8 +36,8 @@ if [ ${amavisd_ram} ];then echo "WARNING: using ramdisk is reported to be unstable and" echo "thus it is highly recommended to be turned off." echo "========================================================" - df %%AMAVISDIR%%/tmp | grep '^/dev/md' > /dev/null - if [ $? -eq 1 ];then + df /var/amavis/tmp | grep -E '^(/dev/md|tmpfs)' > /dev/null + if [ $? -eq 1 ]; then mdmfs -s ${amavisd_ram} -p 750 -w %%AMAVISUSER%%:%%AMAVISGROUP%% md %%AMAVISDIR%%/tmp || true fi fi |