diff options
| author | delphij <delphij@FreeBSD.org> | 2007-03-20 23:16:44 +0800 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2007-03-20 23:16:44 +0800 |
| commit | 927aee7fb58afd55ca17cc890c76690833659bf9 (patch) | |
| tree | ffa54cc740d03bec26425eaa2b96ee7a84b7c262 /mail/spamd | |
| parent | 1adb61b4785e2159ef67554574f4ba022c53e0ba (diff) | |
| download | freebsd-ports-gnome-927aee7fb58afd55ca17cc890c76690833659bf9.tar.gz freebsd-ports-gnome-927aee7fb58afd55ca17cc890c76690833659bf9.tar.zst freebsd-ports-gnome-927aee7fb58afd55ca17cc890c76690833659bf9.zip | |
- Resolve conflict between sa-spamd and pf-spamd
- Add pfspamd_setup_flags to give finer grained control
- Give maintainership to submitter
Submitted by: Alex Samorukov <samm os2 kiev ua>
PR: ports/108663
Diffstat (limited to 'mail/spamd')
| -rw-r--r-- | mail/spamd/Makefile | 4 | ||||
| -rw-r--r-- | mail/spamd/files/pfspamd.sh.in | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile index 144336674d9c..74c14dcaf930 100644 --- a/mail/spamd/Makefile +++ b/mail/spamd/Makefile @@ -7,13 +7,13 @@ PORTNAME= spamd PORTVERSION= 3.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= delphij DISTNAME= ${PORTNAME}_${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= samm@os2.kiev.ua COMMENT= Traps spammers with a very slow smtp-login and return 4xx error USE_BZIP2= yes diff --git a/mail/spamd/files/pfspamd.sh.in b/mail/spamd/files/pfspamd.sh.in index 5f82af096862..e2e2e52ad0a7 100644 --- a/mail/spamd/files/pfspamd.sh.in +++ b/mail/spamd/files/pfspamd.sh.in @@ -14,6 +14,8 @@ # Set it to "YES" to enable spamd # pfspamd_flags (str): Set to "" by default. # Extra flags passed to start command. +# pfspamd_setup_flags (str): Set to "" by default. +# Extra flags passed to spamd-setup command. . %%RC_SUBR%% @@ -26,13 +28,21 @@ restart_postcmd="pfspamd_postcmd" [ -z "$pfspamd_enable" ] && pfspamd_enable="NO" [ -z "$pfspamd_flags" ] && pfspamd_flags="" +[ -z "$pfspamd_setup_flags" ] && pfspamd_setup_flags="" load_rc_config $name +# we override check_process to avoid conflict with the spamd from sa-spamd +check_process() +{ + ps ax -o pid,command | grep "libexec/spamd" | grep -v grep | awk '{print $1}' +} + + pfspamd_postcmd() { if [ -x %%PREFIX%%/sbin/spamd-setup ]; then - %%PREFIX%%/sbin/spamd-setup + %%PREFIX%%/sbin/spamd-setup $pfspamd_setup_flags fi } |