diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2004-05-24 22:45:37 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2004-05-24 22:45:37 +0000 |
| commit | fbd0fe5998ba81ce1d5201f08664606dfe7c2f04 (patch) | |
| tree | 2a84e8d957e3a36adc283a9daf515be3c5785be7 /mail/spamass-milter | |
| parent | 757997a92ca64ab7b622383a49c9153f7aee4d52 (diff) | |
Notes
Diffstat (limited to 'mail/spamass-milter')
| -rw-r--r-- | mail/spamass-milter/Makefile | 6 | ||||
| -rw-r--r-- | mail/spamass-milter/files/patch-spamass-milter.cpp | 15 | ||||
| -rw-r--r-- | mail/spamass-milter/files/spamass-milter.sh.dist | 18 |
3 files changed, 19 insertions, 20 deletions
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile index ea83ab989836..7eab76faddda 100644 --- a/mail/spamass-milter/Makefile +++ b/mail/spamass-milter/Makefile @@ -7,7 +7,7 @@ PORTNAME= spamass-milter PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= spamass-milt @@ -54,11 +54,9 @@ MILTERLIB= ${MILTERBASE}/lib CPPFLAGS+= -I${MILTERINC} LDFLAGS+= -L${MILTERLIB} +GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -USE_AUTOCONF_VER= 253 -USE_AUTOMAKE_VER= 15 - MAN1= spamass-milter.1 post-patch: diff --git a/mail/spamass-milter/files/patch-spamass-milter.cpp b/mail/spamass-milter/files/patch-spamass-milter.cpp index 049ea89572b7..abb9a0e48b75 100644 --- a/mail/spamass-milter/files/patch-spamass-milter.cpp +++ b/mail/spamass-milter/files/patch-spamass-milter.cpp @@ -1,5 +1,5 @@ ---- spamass-milter.cpp.orig Thu Jun 26 19:10:44 2003 -+++ spamass-milter.cpp Wed Oct 29 13:43:29 2003 +--- spamass-milter.cpp.orig Thu Jun 26 17:10:44 2003 ++++ spamass-milter.cpp Tue May 25 00:29:58 2004 @@ -102,6 +102,10 @@ #include <csignal> #include <string> @@ -11,7 +11,15 @@ #ifdef __cplusplus extern "C" { -@@ -350,6 +354,9 @@ +@@ -273,6 +277,7 @@ + exit(errno); + break; + case 0: /* Child */ ++ setsid(); + break; + default: /* Parent */ + exit(0); +@@ -350,6 +355,9 @@ string::size_type eoh2(assassin->d().find("\n\r\n")); string::size_type eoh = ( eoh1 < eoh2 ? eoh1 : eoh2 ); string::size_type bob = assassin->d().find_first_not_of("\r\n", eoh); @@ -21,4 +29,3 @@ update_or_insert(assassin, ctx, assassin->spam_flag(), &SpamAssassin::set_spam_flag, "X-Spam-Flag"); update_or_insert(assassin, ctx, assassin->spam_status(), &SpamAssassin::set_spam_status, "X-Spam-Status"); - diff --git a/mail/spamass-milter/files/spamass-milter.sh.dist b/mail/spamass-milter/files/spamass-milter.sh.dist index b771dc6f2579..bcb03473e123 100644 --- a/mail/spamass-milter/files/spamass-milter.sh.dist +++ b/mail/spamass-milter/files/spamass-milter.sh.dist @@ -2,28 +2,22 @@ DAEMON=/usr/local/sbin/spamass-milter SOCKET=/var/run/spamass-milter.sock -PIDFILE=/var/run/spamass-milter.pid case "$1" in start) if [ -f "${DAEMON}" -a -x "${DAEMON}" ] then - "${DAEMON}" -p "${SOCKET}" -f & - echo $! > "${PIDFILE}" + "${DAEMON}" -p "${SOCKET}" -f sleep 1 kill -HUP `head -1 /var/run/sendmail.pid` echo -n ' spamass-milter' fi ;; stop) - if [ -f "${PIDFILE}" ] - then - read -r pid junk < "${PIDFILE}" - kill ${pid} - rm -f "${SOCKET}" "${PIDFILE}" - sleep 1 - kill -HUP `head -1 /var/run/sendmail.pid` - echo -n ' spamass-milter' - fi + killall $(basename ${DAEMON}) + rm -f "${SOCKET}" + sleep 1 + kill -HUP `head -1 /var/run/sendmail.pid` + echo -n ' spamass-milter' ;; esac |