aboutsummaryrefslogtreecommitdiffstats
path: root/mail/qmail
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2006-07-01 03:13:21 +0800
committerRenato Botelho <garga@FreeBSD.org>2006-07-01 03:13:21 +0800
commit195dc22fa1adfd255b0748a0e32121a4732f31a8 (patch)
tree3554484882746dcfed2c0aae50f7fd1cb3c671da /mail/qmail
parent125d5e5c1260c652033b775e52cae3e78c66821b (diff)
downloadfreebsd-ports-gnome-195dc22fa1adfd255b0748a0e32121a4732f31a8.tar.gz
freebsd-ports-gnome-195dc22fa1adfd255b0748a0e32121a4732f31a8.tar.zst
freebsd-ports-gnome-195dc22fa1adfd255b0748a0e32121a4732f31a8.zip
- Update to spamcontrol 2.4.15:
2.4.15 FIXED missing IP information in Received header. ADDED ucspi-ssl-0.70_ucspitls-0.4.patch_. CHNGD order of qmail-smtpd reject conditions.
Diffstat (limited to 'mail/qmail')
-rw-r--r--mail/qmail/distinfo6
-rw-r--r--mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 29ca01677a89..4b57308c24ee 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -55,9 +55,9 @@ SIZE (qmail/qmail-ldap-1.03-20060201.patch.gz) = 270788
MD5 (qmail/qmail-mysql-1.1.15.patch) = c0298550475f928e82881e574e905313
SHA256 (qmail/qmail-mysql-1.1.15.patch) = 3d2b6a08fb149d6c9fe6c8250e87edd6c4d4b2b0417f03adf5cf4202bbadc53f
SIZE (qmail/qmail-mysql-1.1.15.patch) = 67602
-MD5 (qmail/spamcontrol-2414_tgz.bin) = c7569fd045ce8181423e287d64feb3cd
-SHA256 (qmail/spamcontrol-2414_tgz.bin) = 0be01c1dd45001dba13e23fbba3277b1de14db061345006269689646488f39dc
-SIZE (qmail/spamcontrol-2414_tgz.bin) = 121789
+MD5 (qmail/spamcontrol-2415_tgz.bin) = 73dee86cde7759a2a670cf14c34015d1
+SHA256 (qmail/spamcontrol-2415_tgz.bin) = 74fd08316eebc593f0da43802c58a768c9e03a066dac07bb8b7750eba8e7df9f
+SIZE (qmail/spamcontrol-2415_tgz.bin) = 121776
MD5 (qmail/qmail-1.03-tls-20021228-renato.patch) = be15cd5eaff7aa3cd88aee962febadc6
SHA256 (qmail/qmail-1.03-tls-20021228-renato.patch) = ab0de8f744241dcb7f5ee207fc7eab4f067bf42812deb85f9eb0050ac49e6e23
SIZE (qmail/qmail-1.03-tls-20021228-renato.patch) = 42095
diff --git a/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c b/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c
index 48676daf1d26..dad0362724a5 100644
--- a/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c
+++ b/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c
@@ -1,5 +1,5 @@
---- qmail-smtpd.c.orig Sun Jun 4 18:50:11 2006
-+++ qmail-smtpd.c Sun Jun 4 18:54:15 2006
+--- qmail-smtpd.c.orig Fri Jun 30 15:41:00 2006
++++ qmail-smtpd.c Fri Jun 30 15:44:49 2006
@@ -129,6 +129,18 @@
logs(s1,s2,s3,s4,s5,s6,s7);
return;
@@ -38,7 +38,7 @@
#ifdef RELAYMAILFROM
if (!relayclient) {
relaymailfromok = control_readfile(&relaymailfrom,"control/relaymailfrom",0);
-@@ -910,6 +927,10 @@
+@@ -876,6 +893,10 @@
flagerrcpts++;
return;
}
@@ -46,6 +46,6 @@
+ err_rbl("Reject::RBL::RBL_Listed:",protocol.s,remoteip,remotehost,helohost.s,mailfrom.s,addr.s);
+ return;
+ }
- if (tarpitcount && flagerrcpts >= tarpitcount) {
+ if (tarpitcount && flagerrcpts >= tarpitcount) { /* Tarpitting et al. */
err_rcpts("Reject::RCPT::Toomany_Rcptto:",protocol.s,remoteip,remotehost,helohost.s,mailfrom.s,addr.s);
return;