[33388] trunk/dports/mail/qmail-spamcontrol
ryandesign at macports.org
ryandesign at macports.org
Fri Jan 25 21:39:57 PST 2008
Revision: 33388
http://trac.macosforge.org/projects/macports/changeset/33388
Author: ryandesign at macports.org
Date: 2008-01-25 21:39:52 -0800 (Fri, 25 Jan 2008)
Log Message:
-----------
qmail-spamcontrol: don't hardcode /opt/local as the prefix; see #13972
Modified Paths:
--------------
trunk/dports/mail/qmail-spamcontrol/Portfile
Added Paths:
-----------
trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run.in
trunk/dports/mail/qmail-spamcontrol/files/qmail-send-run.in
trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-log-run.in
trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run.in
trunk/dports/mail/qmail-spamcontrol/files/qmailctl.in
trunk/dports/mail/qmail-spamcontrol/files/run.in
Removed Paths:
-------------
trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run
trunk/dports/mail/qmail-spamcontrol/files/qmail-send-run
trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-log-run
trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run
trunk/dports/mail/qmail-spamcontrol/files/qmailctl
trunk/dports/mail/qmail-spamcontrol/files/run
Modified: trunk/dports/mail/qmail-spamcontrol/Portfile
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/Portfile 2008-01-26 05:20:33 UTC (rev 33387)
+++ trunk/dports/mail/qmail-spamcontrol/Portfile 2008-01-26 05:39:52 UTC (rev 33388)
@@ -6,6 +6,7 @@
name qmail-spamcontrol
version 2.4.18
+revision 1
categories mail
maintainers yahoo.com:compconsultant
platforms darwin
@@ -232,13 +233,20 @@
# Copy example files
file mkdir ${destroot}${prefix}/var/qmail/samples
- file copy ${filespath}/qmailctl ${destroot}${prefix}/var/qmail/samples/qmailctl
- file copy ${filespath}/run ${destroot}${prefix}/var/qmail/samples/run
file copy ${filespath}/README.txt ${destroot}${prefix}/var/qmail/samples/README.txt
- file copy ${filespath}/qmail-send-run ${destroot}${prefix}/var/qmail/samples/qmail-send-run
- file copy ${filespath}/qmail-send-log-run ${destroot}${prefix}/var/qmail/samples/qmail-send-log-run
- file copy ${filespath}/qmail-smtpd-run ${destroot}${prefix}/var/qmail/samples/qmail-smtpd-run
- file copy ${filespath}/qmail-smtpd-log-run ${destroot}${prefix}/var/qmail/samples/qmail-smtpd-log-run
+ file copy ${filespath}/qmailctl.in ${destroot}${prefix}/var/qmail/samples/qmailctl
+ file copy ${filespath}/run.in ${destroot}${prefix}/var/qmail/samples/run
+ file copy ${filespath}/qmail-send-run.in ${destroot}${prefix}/var/qmail/samples/qmail-send-run
+ file copy ${filespath}/qmail-send-log-run.in ${destroot}${prefix}/var/qmail/samples/qmail-send-log-run
+ file copy ${filespath}/qmail-smtpd-run.in ${destroot}${prefix}/var/qmail/samples/qmail-smtpd-run
+ file copy ${filespath}/qmail-smtpd-log-run.in ${destroot}${prefix}/var/qmail/samples/qmail-smtpd-log-run
+ reinplace "s%@PREFIX@%${prefix}%g" \
+ ${destroot}${prefix}/var/qmail/samples/qmailctl \
+ ${destroot}${prefix}/var/qmail/samples/run \
+ ${destroot}${prefix}/var/qmail/samples/qmail-send-run \
+ ${destroot}${prefix}/var/qmail/samples/qmail-send-log-run \
+ ${destroot}${prefix}/var/qmail/samples/qmail-smtpd-run \
+ ${destroot}${prefix}/var/qmail/samples/qmail-smtpd-log-run
# Additional Spamcontrol files
file mkdir ${destroot}${prefix}/var/qmail/scripts
Deleted: trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run 2008-01-26 05:20:33 UTC (rev 33387)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run 2008-01-26 05:39:52 UTC (rev 33388)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /opt/local/sbin/setuidgid qmaill /opt/local/sbin/multilog t /opt/local/var/log/qmail
Copied: trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run.in (from rev 33386, trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run)
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run.in (rev 0)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run.in 2008-01-26 05:39:52 UTC (rev 33388)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec @PREFIX@/sbin/setuidgid qmaill @PREFIX@/sbin/multilog t @PREFIX@/var/log/qmail
Deleted: trunk/dports/mail/qmail-spamcontrol/files/qmail-send-run
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmail-send-run 2008-01-26 05:20:33 UTC (rev 33387)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmail-send-run 2008-01-26 05:39:52 UTC (rev 33388)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /opt/local/var/qmail/rc
Copied: trunk/dports/mail/qmail-spamcontrol/files/qmail-send-run.in (from rev 33386, trunk/dports/mail/qmail-spamcontrol/files/qmail-send-run)
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmail-send-run.in (rev 0)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmail-send-run.in 2008-01-26 05:39:52 UTC (rev 33388)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec @PREFIX@/var/qmail/rc
Deleted: trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-log-run
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-log-run 2008-01-26 05:20:33 UTC (rev 33387)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-log-run 2008-01-26 05:39:52 UTC (rev 33388)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /opt/local/sbin/setuidgid qmaill /opt/local/sbin/multilog t /opt/local/var/log/qmail/smtpd
Copied: trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-log-run.in (from rev 33386, trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-log-run)
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-log-run.in (rev 0)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-log-run.in 2008-01-26 05:39:52 UTC (rev 33388)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @PREFIX@/sbin/setuidgid qmaill @PREFIX@/sbin/multilog t @PREFIX@/var/log/qmail/smtpd
Deleted: trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run 2008-01-26 05:20:33 UTC (rev 33387)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run 2008-01-26 05:39:52 UTC (rev 33388)
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-export TARPITCOUNT="3"
-export TARPITDELAY="10"
-export MFDNSCHECK=""
-QMAILDUID=`id -u qmaild`
-NOFILESGID=`id -g qmaild`
-MAXSMTPD=`cat /opt/local/var/qmail/control/concurrencyincoming`
-LOCAL=`head -1 /opt/local/var/qmail/control/me`
-
-if [ -z "$QMAILDUID" -o -z "$NOFILESGID" -o -z "$MAXSMTPD" -o -z "$LOCAL" ]; then
- echo QMAILDUID, NOFILESGID, MAXSMTPD, or LOCAL is unset in
- echo /opt/local/var/qmail/supervise/qmail-smtpd/run
- exit 1
-fi
-
-if [ ! -f /opt/local/var/qmail/control/rcpthosts ]; then
- echo "No /opt/local/var/qmail/control/rcpthosts"
- echo "Refusing to start SMTP listener because it'll create an open relay"
- exit 1
-fi
-
-exec /opt/local/sbin/softlimit -m 30000000 \
- /opt/local/bin/tcpserver -v -R -l "$LOCAL" -x /opt/local/etc/tcp.smtp.cdb -c "$MAXSMTPD" \
- -u "$QMAILDUID" -g "$NOFILESGID" 0 smtp \
- /opt/local/bin/rblsmtpd -t 300 \
- -b -r l1.spews.dnsbl.sorbs.net \
- -b -r misc.dnsbl.sorbs.net \
- -b -r http.dnsbl.sorbs.net \
- -b -r socks.dnsbl.sorbs.net \
- -b -r smtp.dnsbl.sorbs.net \
- -b -r web.dnsbl.sorbs.net \
- -b -r zombie.dnsbl.sorbs.net \
- -b -r dul.dnsbl.sorbs.net \
- -b -r rhsbl.sorbs.net \
- -b -r sbl-xbl.spamhaus.org \
- /opt/local/bin/fixcrio /opt/local/var/qmail/bin/qmail-smtpd 2>&1
Copied: trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run.in (from rev 33386, trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run)
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run.in (rev 0)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run.in 2008-01-26 05:39:52 UTC (rev 33388)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+export TARPITCOUNT="3"
+export TARPITDELAY="10"
+export MFDNSCHECK=""
+QMAILDUID=`id -u qmaild`
+NOFILESGID=`id -g qmaild`
+MAXSMTPD=`cat @PREFIX@/var/qmail/control/concurrencyincoming`
+LOCAL=`head -1 @PREFIX@/var/qmail/control/me`
+
+if [ -z "$QMAILDUID" -o -z "$NOFILESGID" -o -z "$MAXSMTPD" -o -z "$LOCAL" ]; then
+ echo QMAILDUID, NOFILESGID, MAXSMTPD, or LOCAL is unset in
+ echo @PREFIX@/var/qmail/supervise/qmail-smtpd/run
+ exit 1
+fi
+
+if [ ! -f @PREFIX@/var/qmail/control/rcpthosts ]; then
+ echo "No @PREFIX@/var/qmail/control/rcpthosts"
+ echo "Refusing to start SMTP listener because it'll create an open relay"
+ exit 1
+fi
+
+exec @PREFIX@/sbin/softlimit -m 30000000 \
+ @PREFIX@/bin/tcpserver -v -R -l "$LOCAL" -x @PREFIX@/etc/tcp.smtp.cdb -c "$MAXSMTPD" \
+ -u "$QMAILDUID" -g "$NOFILESGID" 0 smtp \
+ @PREFIX@/bin/rblsmtpd -t 300 \
+ -b -r l1.spews.dnsbl.sorbs.net \
+ -b -r misc.dnsbl.sorbs.net \
+ -b -r http.dnsbl.sorbs.net \
+ -b -r socks.dnsbl.sorbs.net \
+ -b -r smtp.dnsbl.sorbs.net \
+ -b -r web.dnsbl.sorbs.net \
+ -b -r zombie.dnsbl.sorbs.net \
+ -b -r dul.dnsbl.sorbs.net \
+ -b -r rhsbl.sorbs.net \
+ -b -r sbl-xbl.spamhaus.org \
+ @PREFIX@/bin/fixcrio @PREFIX@/var/qmail/bin/qmail-smtpd 2>&1
Deleted: trunk/dports/mail/qmail-spamcontrol/files/qmailctl
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmailctl 2008-01-26 05:20:33 UTC (rev 33387)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmailctl 2008-01-26 05:39:52 UTC (rev 33388)
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-PATH=/opt/local/var/qmail/bin:/opt/local/bin:/opt/local/sbin:/bin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin
-export PATH
-
-QMAILDUID=`id -u qmaild`
-NOFILESGID=`id -g qmaild`
-
-case "$1" in
- start)
- echo "Starting qmail"
- if svok /opt/local/var/service/qmail-send ; then
- svc -u /opt/local/var/service/qmail-send /opt/local/var/service/qmail-send/log
- else
- echo "qmail-send supervise not running"
- fi
- if svok /opt/local/var/service/qmail-smtpd ; then
- svc -u /opt/local/var/service/qmail-smtpd /opt/local/var/service/qmail-smtpd/log
- else
- echo "qmail-smtpd supervise not running"
- fi
- if [ -d /var/lock/subsys ]; then
- touch /var/lock/subsys/qmail
- fi
- ;;
- stop)
- echo "Stopping qmail..."
- echo " qmail-smtpd"
- svc -d /opt/local/var/service/qmail-smtpd /opt/local/var/service/qmail-smtpd/log
- echo " qmail-send"
- svc -d /opt/local/var/service/qmail-send /opt/local/var/service/qmail-send/log
- if [ -f /opt/local/var/lock/subsys/qmail ]; then
- rm /var/lock/subsys/qmail
- fi
- ;;
- stat)
- svstat /opt/local/var/service/qmail-send
- svstat /opt/local/var/service/qmail-send/log
- svstat /opt/local/var/service/qmail-smtpd
- svstat /opt/local/var/service/qmail-smtpd/log
- qmail-qstat
- ;;
- doqueue|alrm|flush)
- echo "Flushing timeout table and sending ALRM signal to qmail-send."
- /opt/local/var/qmail/bin/qmail-tcpok
- svc -a /opt/local/var/service/qmail-send
- ;;
- queue)
- qmail-qstat
- qmail-qread
- ;;
- reload|hup)
- echo "Sending HUP signal to qmail-send."
- svc -h /opt/local/var/service/qmail-send
- ;;
- pause)
- echo "Pausing qmail-send"
- svc -p /opt/local/var/service/qmail-send
- echo "Pausing qmail-smtpd"
- svc -p /opt/local/var/service/qmail-smtpd
- ;;
- cont)
- echo "Continuing qmail-send"
- svc -c /opt/local/var/service/qmail-send
- echo "Continuing qmail-smtpd"
- svc -c /opt/local/var/service/qmail-smtpd
- ;;
- restart)
- echo "Restarting qmail:"
- echo "* Stopping qmail-smtpd."
- svc -d /opt/local/var/service/qmail-smtpd /opt/local/var/service/qmail-smtpd/log
- echo "* Sending qmail-send SIGTERM and restarting."
- svc -t /opt/local/var/service/qmail-send /opt/local/var/service/qmail-send/log
- echo "* Restarting qmail-smtpd."
- svc -u /opt/local/var/service/qmail-smtpd /opt/local/var/service/qmail-smtpd/log
- ;;
- cdb)
- tcprules /opt/local/etc/tcp.smtp.cdb /opt/local/etc/tcp.smtp.tmp < /opt/local/etc/tcp.smtp
- chmod 644 /opt/local/etc/tcp.smtp.cdb
- echo "Reloaded /opt/local/etc/tcp.smtp."
- ;;
- help)
- cat <<HELP
- stop -- stops mail service (smtp connections refused, nothing goes out)
- start -- starts mail service (smtp connection accepted, mail can go out)
- pause -- temporarily stops mail service (connections accepted, nothing leaves)
- cont -- continues paused mail service
- stat -- displays status of mail service
- cdb -- rebuild the tcpserver cdb file for smtp
-restart -- stops and restarts smtp, sends qmail-send a TERM & restarts it
-doqueue -- schedules queued messages for immediate delivery
- reload -- sends qmail-send HUP, rereading locals and virtualdomains
- queue -- shows status of queue
- alrm -- same as doqueue
- flush -- same as doqueue
- hup -- same as reload
-HELP
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|doqueue|flush|reload|stat|pause|cont|cdb|queue|help}"
- exit 1
- ;;
-esac
-
-exit 0
Copied: trunk/dports/mail/qmail-spamcontrol/files/qmailctl.in (from rev 33386, trunk/dports/mail/qmail-spamcontrol/files/qmailctl)
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmailctl.in (rev 0)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmailctl.in 2008-01-26 05:39:52 UTC (rev 33388)
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+PATH=@PREFIX@/var/qmail/bin:@PREFIX@/bin:@PREFIX@/sbin:/bin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin
+export PATH
+
+QMAILDUID=`id -u qmaild`
+NOFILESGID=`id -g qmaild`
+
+case "$1" in
+ start)
+ echo "Starting qmail"
+ if svok @PREFIX@/var/service/qmail-send ; then
+ svc -u @PREFIX@/var/service/qmail-send @PREFIX@/var/service/qmail-send/log
+ else
+ echo "qmail-send supervise not running"
+ fi
+ if svok @PREFIX@/var/service/qmail-smtpd ; then
+ svc -u @PREFIX@/var/service/qmail-smtpd @PREFIX@/var/service/qmail-smtpd/log
+ else
+ echo "qmail-smtpd supervise not running"
+ fi
+ if [ -d /var/lock/subsys ]; then
+ touch /var/lock/subsys/qmail
+ fi
+ ;;
+ stop)
+ echo "Stopping qmail..."
+ echo " qmail-smtpd"
+ svc -d @PREFIX@/var/service/qmail-smtpd @PREFIX@/var/service/qmail-smtpd/log
+ echo " qmail-send"
+ svc -d @PREFIX@/var/service/qmail-send @PREFIX@/var/service/qmail-send/log
+ if [ -f @PREFIX@/var/lock/subsys/qmail ]; then
+ rm /var/lock/subsys/qmail
+ fi
+ ;;
+ stat)
+ svstat @PREFIX@/var/service/qmail-send
+ svstat @PREFIX@/var/service/qmail-send/log
+ svstat @PREFIX@/var/service/qmail-smtpd
+ svstat @PREFIX@/var/service/qmail-smtpd/log
+ qmail-qstat
+ ;;
+ doqueue|alrm|flush)
+ echo "Flushing timeout table and sending ALRM signal to qmail-send."
+ @PREFIX@/var/qmail/bin/qmail-tcpok
+ svc -a @PREFIX@/var/service/qmail-send
+ ;;
+ queue)
+ qmail-qstat
+ qmail-qread
+ ;;
+ reload|hup)
+ echo "Sending HUP signal to qmail-send."
+ svc -h @PREFIX@/var/service/qmail-send
+ ;;
+ pause)
+ echo "Pausing qmail-send"
+ svc -p @PREFIX@/var/service/qmail-send
+ echo "Pausing qmail-smtpd"
+ svc -p @PREFIX@/var/service/qmail-smtpd
+ ;;
+ cont)
+ echo "Continuing qmail-send"
+ svc -c @PREFIX@/var/service/qmail-send
+ echo "Continuing qmail-smtpd"
+ svc -c @PREFIX@/var/service/qmail-smtpd
+ ;;
+ restart)
+ echo "Restarting qmail:"
+ echo "* Stopping qmail-smtpd."
+ svc -d @PREFIX@/var/service/qmail-smtpd @PREFIX@/var/service/qmail-smtpd/log
+ echo "* Sending qmail-send SIGTERM and restarting."
+ svc -t @PREFIX@/var/service/qmail-send @PREFIX@/var/service/qmail-send/log
+ echo "* Restarting qmail-smtpd."
+ svc -u @PREFIX@/var/service/qmail-smtpd @PREFIX@/var/service/qmail-smtpd/log
+ ;;
+ cdb)
+ tcprules @PREFIX@/etc/tcp.smtp.cdb @PREFIX@/etc/tcp.smtp.tmp < @PREFIX@/etc/tcp.smtp
+ chmod 644 @PREFIX@/etc/tcp.smtp.cdb
+ echo "Reloaded @PREFIX@/etc/tcp.smtp."
+ ;;
+ help)
+ cat <<HELP
+ stop -- stops mail service (smtp connections refused, nothing goes out)
+ start -- starts mail service (smtp connection accepted, mail can go out)
+ pause -- temporarily stops mail service (connections accepted, nothing leaves)
+ cont -- continues paused mail service
+ stat -- displays status of mail service
+ cdb -- rebuild the tcpserver cdb file for smtp
+restart -- stops and restarts smtp, sends qmail-send a TERM & restarts it
+doqueue -- schedules queued messages for immediate delivery
+ reload -- sends qmail-send HUP, rereading locals and virtualdomains
+ queue -- shows status of queue
+ alrm -- same as doqueue
+ flush -- same as doqueue
+ hup -- same as reload
+HELP
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|doqueue|flush|reload|stat|pause|cont|cdb|queue|help}"
+ exit 1
+ ;;
+esac
+
+exit 0
Deleted: trunk/dports/mail/qmail-spamcontrol/files/run
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/run 2008-01-26 05:20:33 UTC (rev 33387)
+++ trunk/dports/mail/qmail-spamcontrol/files/run 2008-01-26 05:39:52 UTC (rev 33388)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /opt/local/var/qmail/rc
Copied: trunk/dports/mail/qmail-spamcontrol/files/run.in (from rev 33386, trunk/dports/mail/qmail-spamcontrol/files/run)
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/run.in (rev 0)
+++ trunk/dports/mail/qmail-spamcontrol/files/run.in 2008-01-26 05:39:52 UTC (rev 33388)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec @PREFIX@/var/qmail/rc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080125/a0c4c1c1/attachment.html
More information about the macports-changes
mailing list