Date: Sat, 13 Oct 2012 18:04:57 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305843 - in head/security/amavisd-new: . files Message-ID: <201210131804.q9DI4vrq076263@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Sat Oct 13 18:04:57 2012 New Revision: 305843 URL: http://svn.freebsd.org/changeset/ports/305843 Log: - 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 Modified: head/security/amavisd-new/Makefile head/security/amavisd-new/files/amavis-p0fanalyzer.in head/security/amavisd-new/files/amavisd.in Modified: head/security/amavisd-new/Makefile ============================================================================== --- head/security/amavisd-new/Makefile Sat Oct 13 17:48:41 2012 (r305842) +++ head/security/amavisd-new/Makefile Sat Oct 13 18:04:57 2012 (r305843) @@ -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/ \ Modified: head/security/amavisd-new/files/amavis-p0fanalyzer.in ============================================================================== --- head/security/amavisd-new/files/amavis-p0fanalyzer.in Sat Oct 13 17:48:41 2012 (r305842) +++ head/security/amavisd-new/files/amavis-p0fanalyzer.in Sat Oct 13 18:04:57 2012 (r305843) @@ -9,7 +9,6 @@ amavis_p0fanalyzer_enable="${amavis_p0fa 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} } Modified: head/security/amavisd-new/files/amavisd.in ============================================================================== --- head/security/amavisd-new/files/amavisd.in Sat Oct 13 17:48:41 2012 (r305842) +++ head/security/amavisd-new/files/amavisd.in Sat Oct 13 18:04:57 2012 (r305843) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210131804.q9DI4vrq076263>