diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2003-09-07 10:38:36 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2003-09-07 10:38:36 +0000 |
| commit | ea0835111f62da31a30c5d4ee83a6cd374362b8b (patch) | |
| tree | a063ac48a515cad9ca416ae47690e49258a51ab0 /mail/milter-sender | |
| parent | 6f0d9eefe82570809c13c0a8c17c65b803ba6b3d (diff) | |
| download | ports-ea0835111f62da31a30c5d4ee83a6cd374362b8b.tar.gz ports-ea0835111f62da31a30c5d4ee83a6cd374362b8b.zip | |
Remove socket before starting daemon
Don't install binary with smmsp:smmsp, it is not suid
Notes
Notes:
svn path=/head/; revision=88675
Diffstat (limited to 'mail/milter-sender')
| -rw-r--r-- | mail/milter-sender/files/patch-ac | 13 | ||||
| -rw-r--r-- | mail/milter-sender/files/patch-ad | 21 |
2 files changed, 24 insertions, 10 deletions
diff --git a/mail/milter-sender/files/patch-ac b/mail/milter-sender/files/patch-ac index f16b9696cc6f..c84e4d3e1548 100644 --- a/mail/milter-sender/files/patch-ac +++ b/mail/milter-sender/files/patch-ac @@ -1,5 +1,5 @@ ---- milter-sender/milter-sender.sh.bak Tue Sep 2 21:12:30 2003 -+++ milter-sender/milter-sender.sh Sun Sep 7 12:09:08 2003 +--- milter-sender/milter-sender.sh.orig Tue Sep 2 21:12:30 2003 ++++ milter-sender/milter-sender.sh Sun Sep 7 14:28:41 2003 @@ -10,15 +10,14 @@ # BEFORE: mail # KEYWORD: FreeBSD NetBSD @@ -24,7 +24,7 @@ ########################################################################## # Nothing to be configured below this point. -@@ -64,11 +63,10 @@ +@@ -64,31 +63,29 @@ start() { NAME=`basename "$PROGRAM"` @@ -36,8 +36,11 @@ + echo " milter-sender:FAILED" return fi - -@@ -78,17 +76,16 @@ +- ++ rm -f ${PREFIX}/lib/milter-sender/socket + # Start the program in the background from a sub-shell + # so that process will appear in the ps output immediately. + sh -c "$PROGRAM $OPTIONS &" pid=`getpid "$PROGRAM"` if [ X"$pid" = X ]; then diff --git a/mail/milter-sender/files/patch-ad b/mail/milter-sender/files/patch-ad index f66541a17bf0..a69138a289f8 100644 --- a/mail/milter-sender/files/patch-ad +++ b/mail/milter-sender/files/patch-ad @@ -1,15 +1,26 @@ ---- milter-sender/install.sh.bak Mon Aug 25 14:36:47 2003 -+++ milter-sender/install.sh Sun Sep 7 12:12:40 2003 -@@ -26,10 +26,10 @@ +--- milter-sender/install.sh.orig Mon Aug 25 14:36:47 2003 ++++ milter-sender/install.sh Sun Sep 7 14:35:00 2003 +@@ -18,19 +18,17 @@ + chgrp ${GROUP} ${STATEDIR} + + cp -f ${MILTER} ${BINDIR} +-chown ${USER} ${BINDIR}/${MILTER} +-chgrp ${GROUP} ${BINDIR}/${MILTER} ++#chown ${USER} ${BINDIR}/${MILTER} ++#chgrp ${GROUP} ${BINDIR}/${MILTER} + + chgrp ${GROUP} ${MAILDIR} ${MAILDIR}/access.* ${MAILDIR}/aliases.* + case `uname -s` in *BSD*) - RC="/usr/local/etc/rc.d/${MILTER}.sh" +- if [ ! -f $RC ]; then + RC="/usr/local/etc/rc.d/${MILTER}.sh-dist" - if [ ! -f $RC ]; then cp ${MILTER}.sh $RC - chmod 540 $RC +- fi + chmod 640 $RC - fi ;; Linux*) + if [ -d '/etc/rc.d/init.d' ]; then |