[46601] trunk/dports/mail/qmail-spamcontrol
simon at macports.org
simon at macports.org
Sun Feb 8 13:59:51 PST 2009
Revision: 46601
http://trac.macports.org/changeset/46601
Author: simon at macports.org
Date: 2009-02-08 13:59:50 -0800 (Sun, 08 Feb 2009)
Log Message:
-----------
mail/qmail-spamcontrol: Maintainer update to 2.5.19, closes #18219.
Modified Paths:
--------------
trunk/dports/mail/qmail-spamcontrol/Portfile
trunk/dports/mail/qmail-spamcontrol/files/README.txt
trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run.in
trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run.in
trunk/dports/mail/qmail-spamcontrol/files/qmailctl.in
Added Paths:
-----------
trunk/dports/mail/qmail-spamcontrol/files/patch-Makefile.diff
trunk/dports/mail/qmail-spamcontrol/files/patch-qmail-lspawn.c.diff
trunk/dports/mail/qmail-spamcontrol/files/patch-qmail-rspawn.c.diff
trunk/dports/mail/qmail-spamcontrol/files/patch-qmail.c.diff
Removed Paths:
-------------
trunk/dports/mail/qmail-spamcontrol/files/append-Makefile
Modified: trunk/dports/mail/qmail-spamcontrol/Portfile
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/Portfile 2009-02-08 21:49:31 UTC (rev 46600)
+++ trunk/dports/mail/qmail-spamcontrol/Portfile 2009-02-08 21:59:50 UTC (rev 46601)
@@ -3,8 +3,8 @@
PortSystem 1.0
name qmail-spamcontrol
-version 2.4.18
-revision 5
+version 2.5.19
+revision 0
categories mail
maintainers yahoo.com:compconsultant
platforms darwin
@@ -17,11 +17,11 @@
universal_variant no
-variant relaymailfrom {}
-variant noreqbrackets {}
-variant noverp {}
-variant moreipme {}
-variant bigtodo {}
+variant relaymailfrom description {Relay based on sender email, not a good idea} {}
+variant noreqbrackets description {Do not require brackets in SMTP addresses} {}
+variant noverp description {Do not alow VERP addresses for recipients} {}
+variant moreipme description {Patch to account for certain NAT or load balance situations} {}
+variant bigtodo description {May make very large installations more efficient} {}
homepage http://www.fehcom.de/qmail/spamcontrol.html
@@ -32,26 +32,36 @@
http://www.qmail.org/:qmail \
distfiles qmail-1.03.tar.gz:qmail \
- spamcontrol-2418_tgz.bin:spamcontrol \
+ spamcontrol-2519_tgz.bin:spamcontrol \
checksums qmail-1.03.tar.gz \
md5 622f65f982e380dbe86e6574f3abcb7c \
sha1 18fb960481291a0503e93a94df3f6094edb7f27a \
rmd160 b851f273f1d365d38efd949b1efcf35768ffa30f \
- spamcontrol-2418_tgz.bin \
- md5 a5502cd69e573a2753e532bce8fb6c3a \
- sha1 b2329b412a88ca2072cfb5e430efd1dd8a410b64 \
- rmd160 4306ff09148332f5ad4cb1a3ff3b5da74b888d79 \
+ spamcontrol-2519_tgz.bin \
+ md5 acca46cc48d8b5cfa9eb3de4d3fc90ad \
+ sha1 b259183cb9afd7a574ad598cb2399af5002226ec \
+ rmd160 8374835ade0656145ba15eded23c6f8ce0a1b936 \
worksrcdir qmail-1.03
patchfiles patch-dns.c.diff \
- patch-strerr_sys.c.diff
+ patch-strerr_sys.c.diff \
+ patch-qmail-lspawn.c.diff \
+ patch-qmail-rspawn.c.diff \
+ patch-qmail.c.diff \
+ patch-Makefile.diff
configure.cflags -O2 -include /usr/include/errno.h -c
build.target setup-patch
destroot.cmd ./install-destroot
+pre-fetch {
+ if {${os.platform} == "darwin" && ${os.major} == "6"} {
+ return -code error "${name} requires Mac OS X 10.3 or newer."
+ }
+}
+
post-extract {
# Merge Spamcontrol source with Qmail source
@@ -72,15 +82,14 @@
${worksrcpath}/conf-qmail
}
-post-patch {
+pre-patch {
# Apply Spamcontrol patches
foreach file [glob ${worksrcpath}/*.patch] {
- system "patch -p2 <${file}"
+ system "patch -d ${worksrcpath} -p2 <${file}"
}
+}
- # Append our commands for making a destroot installer
- # This is because Spamcontrol and us needs to patch Makefile
- system "cat ${filespath}/append-Makefile >>${worksrcpath}/Makefile"
+post-patch {
# Handle the variants, disable via source code define change
foreach file [glob ${worksrcpath}/*c] {
@@ -168,54 +177,21 @@
# Additional Spamcontrol files
xinstall -d ${destroot}${prefix}/var/qmail/scripts
- xinstall -W ${worksrcpath} \
- qmail-alias2recipients \
- qmail-users2recipients \
- qmail-pwd2recipients \
- qmail-vpopmail2recipients \
- ${destroot}${prefix}/var/qmail/scripts
- xinstall -m 644 -W ${worksrcpath} \
- conf-spamcontrol \
- ucspi-ssl-0.70_ucspitls-0.4.patch_ \
- clamav-0.90.1_output.patch_ \
- Makefile.djbdns \
- badmailfrom \
- badmimetypes \
- badloadertypes \
- badrcptto \
- tarpitcount \
- README_spamcontrol.html \
- README.wildmat \
- README.moreipme \
- README.bigtodo \
- README.qmailqueue \
- README.bouncemaxbytes \
- README.doublebouncetrim \
- README.recipients \
- README.djbdns \
- INSTALL.spamcontrol \
- HISTORY.spamcontrol \
- FILES.spamcontrol \
- LICENSE.spamcontrol \
- TODO.spamcontrol \
- RELEASE_22.spamcontrol \
- RELEASE_23.spamcontrol \
- RELEASE_24.spamcontrol \
- LOGGING.spamcontrol \
- SMTPREPLY.spamcontrol \
- README.mav \
- PROPOSAL.mav \
- README.clamav \
- ${destroot}${prefix}/var/qmail/doc
- xinstall -W ${worksrcpath} \
- install_spamcontrol.sh \
- ${destroot}${prefix}/var/qmail/doc
+ foreach file {qmail-alias2recipients qmail-users2recipients qmail-pwd2recipients qmail-vpopmail2recipients} {
+ xinstall -W ${worksrcpath} ${file} ${destroot}${prefix}/var/qmail/scripts
+ }
+ foreach file {conf-spamcontrol ucspi-ssl-0.70_ucspitls-0.4.patch_ clamav-0.90.1_output.patch_ Makefile.djbdns badmailfrom badmimetypes badloadertypes badrcptto INSTALL.spamcontrol HISTORY.spamcontrol FILES.spamcontrol LICENSE.spamcontrol TODO.spamcontrol LOGGING.spamcontrol SMTPREPLY.spamcontrol PROPOSAL.mav install_spamcontrol.sh} {
+ xinstall -m 644 -W ${worksrcpath} ${file} ${destroot}${prefix}/var/qmail/doc
+ }
+ foreach file [glob -directory ${worksrcpath} README* RELEASE*] {
+ xinstall -m 644 ${file} ${destroot}${prefix}/var/qmail/doc
+ }
# User must run this
xinstall -W ${worksrcpath} config-fast ${destroot}${prefix}/var/qmail/scripts/config-fast
# Per Qmail install doc
- xinstall ${destroot}${prefix}/var/qmail/boot/home ${destroot}${prefix}/var/qmail/rc
+ xinstall ${destroot}${prefix}/var/qmail/boot/home ${destroot}${prefix}/var/qmail/rc.sample
}
post-install {
@@ -228,6 +204,7 @@
The fehcom site has docs for all the stuff added to the base qmail software.
There are numerous configuration options to qmail. Please read all the docs!
******************************
+NEW INSTALLS ONLY
For now, you must run ${prefix}/var/qmail/scripts/config-fast your.domain.name
to set up some files for your mail server. your.domain.name should point
to this machine you are installing qmail on.
@@ -237,16 +214,10 @@
post-activate {
- # Remove the turd files
+ # Remove the turd files, it is not know if they cause a problem but
+ # people have recommended not having them there.
system "cd ${prefix}/var/qmail; find . -name .turd_${name} -delete"
- system "rm ${destroot}${prefix}/var/log/qmail/smtpd/.turd_${name}"
}
-platform darwin 6 {
- pre-fetch {
- error "${name} requires Mac OS X 10.3 or newer."
- }
-}
-
livecheck.check regex
-livecheck.regex {Version\s+([0-9.]+)<}
+livecheck.regex {SPAMCONTROL\sVersion\s([0-9.]+)}
Modified: trunk/dports/mail/qmail-spamcontrol/files/README.txt
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/README.txt 2009-02-08 21:49:31 UTC (rev 46600)
+++ trunk/dports/mail/qmail-spamcontrol/files/README.txt 2009-02-08 21:59:50 UTC (rev 46601)
@@ -1,5 +1,5 @@
-The files in this directory are samples of the files referenced on the web site
-http://www.lifewithqmail.org/ . They should be moved and renamed accordingly.
+The files in this directory are samples of the files referenced on the
+www.lifewithqmail.org web site. They should be moved and renamed accordingly.
They require the use of several ports - daemontools and ucspi-tcp.
If you are following the Life with Qmail directions, then you would rename and
move the files like this:
@@ -13,11 +13,10 @@
You will definitely want to at least review the Life with Qmail site carefully
if this is your first experience with Qmail. Also, this is the enhanced version
-of Qmail with the SPAMCONTROL patches from http://www.fehcom.de/ . You will
-want to read that site carefully to see what features you may want to take
-advantage of.
+of Qmail with the SPAMCONTROL patches from www.fehcom.de, you will want to read
+that site careifully to see what features you may want to take advantage of.
-The files here are samples only. Modify and use them as you see fit!
+The files here are samples only, modify and use them as you see fit!
The qmail-smtpd-run file has an example of using some Spamcontrol add-ons as
well a using some rbl spam lists. It also uses fixcrio which is part of
ucspi-tcp to fix up buggy email software.
Deleted: trunk/dports/mail/qmail-spamcontrol/files/append-Makefile
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/append-Makefile 2009-02-08 21:49:31 UTC (rev 46600)
+++ trunk/dports/mail/qmail-spamcontrol/files/append-Makefile 2009-02-08 21:59:50 UTC (rev 46601)
@@ -1,21 +0,0 @@
-
-setup-patch: it man install-destroot
-
-auto_destroot.c: \
-auto-str conf-destroot
- ./auto-str auto_qmail `head -1 conf-destroot` > auto_destroot.c
-
-auto_destroot.o: \
-compile auto_destroot.c
- ./compile auto_destroot.c
-
-install-destroot: \
-load install-destroot.o fifo.o hier.o auto_destroot.o auto_split.o auto_uids.o \
-strerr.a substdio.a open.a error.a str.a fs.a
- ./load install-destroot fifo.o hier.o auto_destroot.o auto_split.o \
-auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a
-
-install-destroot.o: \
-compile install-destroot.c substdio.h strerr.h error.h open.h readwrite.h \
-exit.h
- ./compile install-destroot.c
Added: trunk/dports/mail/qmail-spamcontrol/files/patch-Makefile.diff
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/mail/qmail-spamcontrol/files/patch-Makefile.diff 2009-02-08 21:59:50 UTC (rev 46601)
@@ -0,0 +1,27 @@
+--- Makefile.orig 2008-01-27 22:15:07.000000000 -0800
++++ Makefile 2008-01-27 22:15:44.000000000 -0800
+@@ -2290,3 +2290,24 @@
+ ucspitls.o: \
+ compile ucspitls.c ucspitls.h
+ ./compile ucspitls.c
++
++setup-patch: it man install-destroot
++
++auto_destroot.c: \
++auto-str conf-destroot
++ ./auto-str auto_qmail `head -1 conf-destroot` > auto_destroot.c
++
++auto_destroot.o: \
++compile auto_destroot.c
++ ./compile auto_destroot.c
++
++install-destroot: \
++load install-destroot.o fifo.o hier.o auto_destroot.o auto_split.o auto_uids.o \
++strerr.a substdio.a open.a error.a str.a fs.a
++ ./load install-destroot fifo.o hier.o auto_destroot.o auto_split.o \
++auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a
++
++install-destroot.o: \
++compile install-destroot.c substdio.h strerr.h error.h open.h readwrite.h \
++exit.h
++ ./compile install-destroot.c
Added: trunk/dports/mail/qmail-spamcontrol/files/patch-qmail-lspawn.c.diff
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/patch-qmail-lspawn.c.diff (rev 0)
+++ trunk/dports/mail/qmail-spamcontrol/files/patch-qmail-lspawn.c.diff 2009-02-08 21:59:50 UTC (rev 46601)
@@ -0,0 +1,11 @@
+--- qmail-lspawn.c.orig 2008-01-27 21:44:32.000000000 -0800
++++ qmail-lspawn.c 2008-01-27 21:44:47.000000000 -0800
+@@ -142,7 +142,7 @@
+ args[0] = "bin/qmail-getpw";
+ args[1] = local;
+ args[2] = 0;
+- switch(gpwpid = vfork())
++ switch(gpwpid = fork())
+ {
+ case -1:
+ _exit(QLX_SYS);
Added: trunk/dports/mail/qmail-spamcontrol/files/patch-qmail-rspawn.c.diff
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/patch-qmail-rspawn.c.diff (rev 0)
+++ trunk/dports/mail/qmail-spamcontrol/files/patch-qmail-rspawn.c.diff 2009-02-08 21:59:50 UTC (rev 46601)
@@ -0,0 +1,11 @@
+--- qmail-rspawn.c.orig 2008-01-27 21:47:10.000000000 -0800
++++ qmail-rspawn.c 2008-01-27 21:46:17.000000000 -0800
+@@ -90,7 +90,7 @@
+ args[3] = r;
+ args[4] = 0;
+
+- if (!(f = vfork()))
++ if (!(f = fork()))
+ {
+ if (fd_move(0,fdmess) == -1) _exit(111);
+ if (fd_move(1,fdout) == -1) _exit(111);
Added: trunk/dports/mail/qmail-spamcontrol/files/patch-qmail.c.diff
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/patch-qmail.c.diff (rev 0)
+++ trunk/dports/mail/qmail-spamcontrol/files/patch-qmail.c.diff 2009-02-08 21:59:50 UTC (rev 46601)
@@ -0,0 +1,11 @@
+--- qmail.c.orig 2008-01-27 21:47:50.000000000 -0800
++++ qmail.c 2008-01-27 21:47:59.000000000 -0800
+@@ -29,7 +29,7 @@
+ if (pipe(pim) == -1) return -1;
+ if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; }
+
+- switch(qq->pid = vfork()) {
++ switch(qq->pid = fork()) {
+ case -1:
+ close(pim[0]); close(pim[1]);
+ close(pie[0]); close(pie[1]);
Modified: trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run.in
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run.in 2009-02-08 21:49:31 UTC (rev 46600)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmail-send-log-run.in 2009-02-08 21:59:50 UTC (rev 46601)
@@ -1,2 +1,2 @@
#!/bin/sh
-exec @PREFIX@/sbin/setuidgid qmaill @PREFIX@/sbin/multilog t @PREFIX@/var/log/qmail
+exec @PREFIX@/sbin/setuidgid qmaill @PREFIX@/sbin/multilog t s5000000 @PREFIX@/var/log/qmail
Modified: trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run.in
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run.in 2009-02-08 21:49:31 UTC (rev 46600)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmail-smtpd-run.in 2009-02-08 21:59:50 UTC (rev 46601)
@@ -1,8 +1,5 @@
#!/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`
@@ -24,14 +21,6 @@
@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 \
+ -b -r safe.dnsbl.sorbs.net \
+ -b -r zen.spamhaus.org \
@PREFIX@/bin/fixcrio @PREFIX@/var/qmail/bin/qmail-smtpd 2>&1
Modified: trunk/dports/mail/qmail-spamcontrol/files/qmailctl.in
===================================================================
--- trunk/dports/mail/qmail-spamcontrol/files/qmailctl.in 2009-02-08 21:49:31 UTC (rev 46600)
+++ trunk/dports/mail/qmail-spamcontrol/files/qmailctl.in 2009-02-08 21:59:50 UTC (rev 46601)
@@ -1,6 +1,6 @@
#!/bin/sh
-PATH=@PREFIX@/var/qmail/bin:@PREFIX@/bin:@PREFIX@/sbin:/bin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin
+PATH=@PREFIX@/var/qmail/bin:@PREFIX@/bin:@PREFIX@/sbin:/bin:/sbin:/usr/bin:/usr/sbin
export PATH
QMAILDUID=`id -u qmaild`
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090208/cf95906f/attachment.html>
More information about the macports-changes
mailing list