aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--UPDATING13
-rw-r--r--mail/qmail-spamcontrol/Makefile6
-rw-r--r--mail/qmail/Makefile81
-rw-r--r--mail/qmail/distinfo18
-rw-r--r--mail/qmail/files/extra-patch-spamcontrol-qmail-remote.c13
-rw-r--r--mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c43
-rw-r--r--mail/qmail/files/extra-patch-spamcontrol-tls_remote.c11
-rw-r--r--mail/qmail/pkg-plist2
8 files changed, 76 insertions, 111 deletions
diff --git a/UPDATING b/UPDATING
index a9210d5f1ac3..f6e54bb2f37e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,19 @@ You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20140626:
+ AFFECTS: users of mail/qmail-spamcontrol
+ AUTHOR: bdrewery@FreeBSD.org
+
+ Spamcontrol has been updated to the 2.7 release.
+
+ It is advised to read the release notes as some features were removed and
+ others reworked.
+
+ http://www.fehcom.de/qmail/spamcontrol/RELEASE_27.spamcontrol
+
+ 2.7 manual: http://www.fehcom.de/qmail/spamcontrol/README_spamcontrol.html
+
+20140626:
AFFECTS: users of comms/smstools3
AUTHOR: madpilot@FreeBSD.org
diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile
index c977a19db55d..11430db6d3f5 100644
--- a/mail/qmail-spamcontrol/Makefile
+++ b/mail/qmail-spamcontrol/Makefile
@@ -2,7 +2,7 @@
PORTNAME= qmail
PORTVERSION= ${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
-PORTREVISION= 5
+PORTREVISION= 0
CATEGORIES= mail
MASTER_SITES+= http://www.fehcom.de/qmail/spamcontrol/:spamcontrol \
${MASTER_SITE_LOCAL:S/$/:spamcontrol/}
@@ -21,8 +21,8 @@ EXTRA_PATCHES+= ${MASTERDIR}/files/patch-install.c \
# Distfiles
QMAIL_DIST= ${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX}
-SPAMCONTROL_DIST= spamcontrol-${SPAMCONTROL_VERSION}_tgz.bin
-SPAMCONTROL_VERSION= 2624
+SPAMCONTROL_DIST= spamcontrol-${SPAMCONTROL_VERSION}.tgz
+SPAMCONTROL_VERSION= 2731
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
SLAVE_SPAMCONTROL= yes
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index cf4d6f65b2cf..1bb61576c9ae 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -59,8 +59,6 @@ IGNOREVERISIGN_DESC= Disallow dns wildchar matches on gtlds
LDAP_DEBUG_DESC= Possibility to log and debug imap/pop
LOCALTIME_PATCH_DESC= Emit dates in the local timezone
MAILDIRQUOTA_PATCH_DESC= Maildir++ support
-MOREIPME_DESC= Add control files (more|not)ipme
-NEWLINE_DESC= Smtpd accept bare line feeds
OUTGOINGIP_PATCH_DESC= Set the IP address to send messages
PAM111421_DESC= Smtpd allow email in case PAM failure
QEXTRA_DESC= Enable QUEUE_EXTRA copy feature
@@ -79,7 +77,6 @@ SPF_PATCH_DESC= Implement SPF checker
SRS_DESC= Sender Rewriting Scheme support
TARPIT_PATCH_DESC= Implement TARPIT functions
TLS_DESC= SMTP TLS support
-TLSREMOTE_DESC= TLS support
TLS_DEBUG_DESC= Enable additional debug information
XF_QUITASAP_DESC= Close SMTP session ASAP (SMTPEXTFORK)
@@ -244,10 +241,10 @@ LDAP_PARAMS= ALTQUEUE BIGBROTHER BIGTODO BIND_8_COMPAT CLEARTEXTPASSWD \
QLDAP_CLUSTER QMQP_COMPRESS QUOTATRASH SMTPEXECCHECK
.elif defined(SLAVE_SPAMCONTROL)
-OPTIONS_DEFINE+=TLSREMOTE MOREIPME BIGTODO NEWLINE PAM111421 SMTPEXTFORK \
+OPTIONS_DEFINE+=PAM111421 SMTPEXTFORK \
XF_QUITASAP
-OPTIONS_DEFAULT+= TLSREMOTE PAM111421
+OPTIONS_DEFAULT+= PAM111421
.endif
OPTIONS_DEFINE+=QEXTRA
@@ -287,11 +284,12 @@ PKGMESSAGE_SUFFIX= mysql
.if defined(SLAVE_SPAMCONTROL)
EXTRA_MAN8= qmail-badloadertypes.8 qmail-badmimetypes.8 qmail-mfrules.8 \
- qmail-recipients.8
+ qmail-recipients.8 qmail-smtpam.8
ALL_TARGET+= ${EXTRA_MAN8}
MMAN8+= ${EXTRA_MAN8}
USES+= perl5
USE_PERL5= patch build
+CFLAGS+= -include /usr/include/errno.h
.endif
.if defined(SLAVE_LDAP)
@@ -358,14 +356,15 @@ DOCFILES_WRKDIR_doc+= FILES.spamcontrol HISTORY.spamcontrol \
INSTALL.spamcontrol LICENSE.spamcontrol \
LOGGING.spamcontrol PROPOSAL.mav README.bigtodo \
README.bouncemaxbytes README.clamav README.djbdns \
- README.doublebouncetrim README.mav README.moreipme \
+ README.mav \
README.qmailqueue README.recipients \
README.wildmat README_spamcontrol.html \
RELEASE_22.spamcontrol RELEASE_23.spamcontrol \
RELEASE_24.spamcontrol RELEASE_25.spamcontrol \
- RELEASE_26.spamcontrol SMTPREPLY.spamcontrol \
+ RELEASE_26.spamcontrol RELEASE_27.spamcontrol \
+ SMTPREPLY.spamcontrol \
TODO.spamcontrol badloadertypes badmailfrom \
- badmimetypes badrcptto
+ badmimetypes badrcptto smtpreplies
SCRIPTS+= qmail-alias2recipients qmail-pwd2recipients \
qmail-users2recipients qmail-vpopmail2recipients
.endif
@@ -390,8 +389,8 @@ NO_PREFIX_RMDIR=yes
.include <bsd.port.options.mk>
-# XXX Not needed with spamcontrol-2730
-.if ( ${ARCH} == "amd64" || ${ARCH} == "ia64" ) && !defined(SLAVE_LDAP)
+.if ( ${ARCH} == "amd64" || ${ARCH} == "ia64" ) && !defined(SLAVE_LDAP) \
+ && !defined(SLAVE_SPAMCONTROL)
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-amd64
.endif
@@ -405,7 +404,7 @@ DOCSDIR= ${PREFIX}/doc
SUB_LIST+= MANPATH="@comment "
. if defined(SLAVE_LDAP)
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-utmpx-ldap
-. else
+. elif !defined(SLAVE_SPAMCONTROL)
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-utmpx
. endif
.else
@@ -474,7 +473,7 @@ PATCHFILES+= qmail-discard-double-bounces.patch:doublebounce
.if ${PORT_OPTIONS:MSPF_PATCH}
. if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL)
. if defined(SLAVE_SPAMCONTROL)
-SPF_SPAMCONTROL_PATCH= qmail-spf-rc5.patch-spamcontrol-26
+SPF_SPAMCONTROL_PATCH= qmail-spf-rc5.patch-spamcontrol-27
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:spf_spamcontrol/}
MASTER_SITE_SUBDIR+= garga/qmail/:spf_spamcontrol
DISTFILES+= ${SPF_SPAMCONTROL_PATCH}:spf_spamcontrol
@@ -582,8 +581,7 @@ PATCHFILES+= tarpit.patch:tarpit
.if ${PORT_OPTIONS:MSMTPEXTFORK} && \
( defined(SLAVE_SPAMCONTROL) || defined(SLAVE_LDAP) )
. if defined(SLAVE_SPAMCONTROL)
-SMTPEXTFORK_PATCH= smtpextfork-spamcontrol-2519.patch
-CFLAGS+= -Wno-return-type
+SMTPEXTFORK_PATCH= smtpextfork-spamcontrol-2731.patch
. else
SMTPEXTFORK_PATCH= smtpextfork-ldap-${LDAP_PATCH_DATE}_4.patch
. endif
@@ -630,16 +628,16 @@ PATCHFILES+= SMTPAUTHUSER.patch:smtpauthuser
.if defined(SLAVE_SPAMCONTROL)
MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:ucspi_ssl/} \
- http://www.superscript.com/ucspi-ssl/:ucspi_ssl \
- http://dev.qmailrocks.org/downloads/qmailrocks_3.0-beta/:ucspi_ssl \
- ${MASTER_SITE_GENTOO:S/$/:ucspi_ssl/}
-MASTER_SITE_SUBDIR+= garga/ucspi-ssl/:ucspi_ssl
-DISTFILES+= ucspi-ssl-0.70.tar.gz:ucspi_ssl
-
-MASTER_SITES+= http://www.fehcom.de/qmail/spamcontrol/:ucspi_ssl_patch
-DISTFILES+= ucspi-ssl-0.70_ucspitls-0.6.patch_:ucspi_ssl_patch
+ http://www.fehcom.de/ipnet/ucspi-ssl/:ucspi_ssl
+MASTER_SITE_SUBDIR+= bdrewery/ucspi-ssl/:ucspi_ssl
+UCSPI_SSL_VER= 0.94
+UCSPI_SSL_DIST= ucspi-ssl-${UCSPI_SSL_VER}.tgz
+DISTFILES+= ${UCSPI_SSL_DIST}:ucspi_ssl
-UCSPISRC= ${WRKDIR}/host/superscript.com/net/ucspi-ssl-0.70
+UCSPISRC= ${WRKDIR}/host/superscript.com/net/ucspi-ssl-${UCSPI_SSL_VER}
+# XXX not yet, needs more cleanup
+#UCSPISRC!= ${MAKE} -C ${PORTSDIR}/sysutils/ucspi-ssl-tls -V WRKSRC
+#PATCH_DEPENDS+= ${UCSPISRC}/compile/ucspissl.a:${PORTSDIR}/sysutils/ucspi-ssl-tls:build
.endif
# Some default values, these can be modified by make command line
@@ -659,30 +657,6 @@ RCDLINK= \#
# Fill SELECTED_OPTIONS with options to write conf-spamcontrol
.if defined(SLAVE_SPAMCONTROL)
-. if ${PORT_OPTIONS:MTLSREMOTE}
-SELECTED_OPTIONS+= tlsremote=yes
-. else
-SELECTED_OPTIONS+= tlsremote=no
-. endif
-
-. if ${PORT_OPTIONS:MMOREIPME}
-SELECTED_OPTIONS+= moreipme=yes
-. else
-SELECTED_OPTIONS+= moreipme=no
-. endif
-
-. if ${PORT_OPTIONS:MBIGTODO}
-SELECTED_OPTIONS+= bigtodo=yes
-. else
-SELECTED_OPTIONS+= bigtodo=no
-. endif
-
-. if ${PORT_OPTIONS:MNEWLINE}
-SELECTED_OPTIONS+= newline=yes
-. else
-SELECTED_OPTIONS+= newline=no
-. endif
-
. if ${PORT_OPTIONS:MPAM111421}
SELECTED_OPTIONS+= pam111421=yes
. else
@@ -718,7 +692,7 @@ pre-everything::
post-extract:
.if defined(SLAVE_SPAMCONTROL)
@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${SPAMCONTROL_DIST}
- @cd ${WRKDIR} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/ucspi-ssl-0.70.tar.gz
+ @cd ${WRKDIR} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${UCSPI_SSL_DIST}
.endif
# XXX - Move all the major patch applications to post-extract
@@ -748,13 +722,16 @@ post-patch:
-e "s,MYSQL_LIBS=.*,MYSQL_LIBS=\`${LOCALBASE}/bin/mysql_config --libs\`," \
${WRKSRC}/Makefile
.elif defined(SLAVE_SPAMCONTROL)
+. if ${OSVERSION} < 900007
+# Prevent applying utmpx patch
+ @${ECHO_CMD} > ${WRKSRC}/qbiff.c.patch
+. endif
@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail
@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \
> ${WRKSRC}/conf-spamcontrol
. for option in ${SELECTED_OPTIONS}
@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
. endfor
- @cd ${UCSPISRC}/src && ${PATCH} -p0 < ${DISTDIR}/${DIST_SUBDIR}/ucspi-ssl-0.70_ucspitls-0.6.patch_
@${ECHO_CMD} "${UCSPISRC}/compile" > ${WRKSRC}/conf-ucspissl
${ECHO_CMD} "${CC} ${CFLAGS}" > ${UCSPISRC}/src/conf-cc
${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${UCSPISRC}/src/conf-ld
@@ -766,8 +743,6 @@ post-patch:
@cd ${UCSPISRC} && ${SETENV} ${MAKE_ENV} package/compile
@cd ${WRKSRC} && ./install_spamcontrol.sh
@${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-spamcontrol-qmail-smtpd.c
- @${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-spamcontrol-qmail-remote.c
- @${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-spamcontrol-tls_remote.c
. if ${PORT_OPTIONS:MSPF_PATCH} && defined(SPF_SPAMCONTROL_PATCH)
@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_SPAMCONTROL_PATCH}
. if ${PORT_OPTIONS:MEXTTODO_PATCH} && defined(EXTTODO_PATCH)
@@ -776,7 +751,6 @@ post-patch:
. endif
. if ${PORT_OPTIONS:MSMTPEXTFORK}
@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SMTPEXTFORK_PATCH}
- @${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-smtpextfork-qmail-smtpd.c
. if ${PORT_OPTIONS:MXF_QUITASAP}
@${REINPLACE_CMD} 's!//#define XF_QUITASAP!#define XF_QUITASAP!g' \
${WRKSRC}/qmail-smtpd.c
@@ -797,6 +771,7 @@ post-patch:
${WRKSRC}/Makefile
. if ${PORT_OPTIONS:MSMTPEXTFORK}
@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SMTPEXTFORK_PATCH}
+# @${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-smtpextfork-qmail-smtpd.c
. if ${PORT_OPTIONS:MXF_QUITASAP}
@${REINPLACE_CMD} 's!//#define XF_QUITASAP!#define XF_QUITASAP!g' \
${WRKSRC}/qmail-smtpd.c
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 64cf69a08533..42ec7ca060d0 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -42,8 +42,8 @@ SHA256 (qmail/qmail-ldap-1.03-20060201.patch.gz) = 92ba895df1957109ad856cc1d1554
SIZE (qmail/qmail-ldap-1.03-20060201.patch.gz) = 270788
SHA256 (qmail/netqmail-mysql-1.1.15.patch) = 656d2366c1b4749f0ffdaf68b30f10d469c67d7c2c5710190e12b2c6ca85b18a
SIZE (qmail/netqmail-mysql-1.1.15.patch) = 61635
-SHA256 (qmail/spamcontrol-2624_tgz.bin) = ab9454c777218b0958ca005d4bf44ae922a2f6d20a52a71da6ebec74b2de2d01
-SIZE (qmail/spamcontrol-2624_tgz.bin) = 167802
+SHA256 (qmail/spamcontrol-2731.tgz) = 24a9c0af8f405ae6bcc4038fd1fc1ea12d5e5c54642e105fd9f0790593128b71
+SIZE (qmail/spamcontrol-2731.tgz) = 179422
SHA256 (qmail/netqmail-1.06-tls-20110119.patch) = 0c9ad8b5f045b6c9198a2d07a3937c197b19a29254469535a03d4ac339f29cc7
SIZE (qmail/netqmail-1.06-tls-20110119.patch) = 50088
SHA256 (qmail/qmail-smtpd-auth-0.31.tar.gz) = 1b439fa7e128de13fa80b86883f61a39d17b87b7e8916b6a0eab065bbe49b938
@@ -62,8 +62,8 @@ SHA256 (qmail/ext_todo-20030105_mysql.patch) = 3fc65b91faaaae147dbf6264f93816648
SIZE (qmail/ext_todo-20030105_mysql.patch) = 33797
SHA256 (qmail/ext_todo-20030105_tls.patch) = 0924d3d1287200cb4efc1c3ebfa139f715d3a9d75a6d8af17520c5262a192da2
SIZE (qmail/ext_todo-20030105_tls.patch) = 33795
-SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol-26) = cc3530c984a1866c8ee9a015cfa1074173e38623522461becd50e5c2ee7188e3
-SIZE (qmail/qmail-spf-rc5.patch-spamcontrol-26) = 64004
+SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol-27) = 71e1d204a2f388fa2d0d9902a4289a46988f45119f91eed2ba4733b9e81dd932
+SIZE (qmail/qmail-spf-rc5.patch-spamcontrol-27) = 64059
SHA256 (qmail/auth.patch.diff) = 1d0f8e0ce139cd00b86f056bc31c1422d30b88cb8b125023d534cc3664f827b8
SIZE (qmail/auth.patch.diff) = 4412
SHA256 (qmail/auth.patch.diff-tls-20110119) = 838a35ea92990775fa96567366249f70e7edbfdf127bebbc23b3df58eb086921
@@ -72,8 +72,8 @@ SHA256 (qmail/ext_todo-20030105+big-todo.103.patch) = 4e44ad403b21f5910b6af11295
SIZE (qmail/ext_todo-20030105+big-todo.103.patch) = 2523
SHA256 (qmail/smtpextfork-ldap-20060201_4.patch) = ff587d7169f404b4a0d0957f81a6849fd867defee5ac91a52ee958e58034b49f
SIZE (qmail/smtpextfork-ldap-20060201_4.patch) = 6632
-SHA256 (qmail/smtpextfork-spamcontrol-2519.patch) = f45ecbb0949e4def25dc80b0b6c45d5e27df3afdb2ead1e5f0ac48d487af6bf2
-SIZE (qmail/smtpextfork-spamcontrol-2519.patch) = 7611
+SHA256 (qmail/smtpextfork-spamcontrol-2731.patch) = 9614dbbaddc5f8ccc4a9cdfe2c42e8de80f56159dbe161a3c7180eee7d860aae
+SIZE (qmail/smtpextfork-spamcontrol-2731.patch) = 8916
SHA256 (qmail/README.smtpextfork) = baf23f1cc5676c67041cdaf7c8a0ce5b27365351a4ef52d235d6d021776bb72a
SIZE (qmail/README.smtpextfork) = 7690
SHA256 (qmail/qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch) = 7656aef1f30f3c6a684e319d2a309d162b2a559eb84b38d21a1e23e88c78995b
@@ -82,10 +82,8 @@ SHA256 (qmail/qmail-ldap-20060201-grtdelay.patch) = db880469e3d1356252bc8d10251b
SIZE (qmail/qmail-ldap-20060201-grtdelay.patch) = 6051
SHA256 (qmail/enhacelogging-ldap-20060201_4.patch) = 07973f05602a1689e7585a2572c2b523723930214623ef5b922aeeed0bcfc867
SIZE (qmail/enhacelogging-ldap-20060201_4.patch) = 1205
-SHA256 (qmail/ucspi-ssl-0.70.tar.gz) = 8834aaa83a6862457c853818ce829291285043a553d4466671c05663bc580cf5
-SIZE (qmail/ucspi-ssl-0.70.tar.gz) = 85111
-SHA256 (qmail/ucspi-ssl-0.70_ucspitls-0.6.patch_) = 35ae45bd17a9ecb9cd79c25a751af47af787189c8b833b26d464b47bed1472ac
-SIZE (qmail/ucspi-ssl-0.70_ucspitls-0.6.patch_) = 12351
+SHA256 (qmail/ucspi-ssl-0.94.tgz) = 343c0281269d88650823eb053fe80bf34b81f52c12b895f27534706b983a23b4
+SIZE (qmail/ucspi-ssl-0.94.tgz) = 112640
SHA256 (qmail/SMTPAUTHUSER.patch) = 25d55714df2fc61e2cb6ec7853476e2c15f14207fa2218b5d5b68200450beb9c
SIZE (qmail/SMTPAUTHUSER.patch) = 347
SHA256 (qmail/qmail-1.03-enhaceloggingSMTPAUTHUSER) = 4e92498aaa2a6d08bf6535524e5220520f97ca9cf28ff464519f5f6f14ec3779
diff --git a/mail/qmail/files/extra-patch-spamcontrol-qmail-remote.c b/mail/qmail/files/extra-patch-spamcontrol-qmail-remote.c
deleted file mode 100644
index 32da199d6125..000000000000
--- a/mail/qmail/files/extra-patch-spamcontrol-qmail-remote.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- qmail-remote.c.orig 2010-09-20 10:31:12.000000000 -0300
-+++ qmail-remote.c 2010-09-20 10:32:12.000000000 -0300
-@@ -507,6 +507,10 @@
- j = str_chr(smtptext.s+i+8,'L'); /* AUTH LOGIN */
- if (j > 0)
- if (case_starts(smtptext.s+i+8+j,"LOGIN")) { mailfrom_login(); flagauth = 1; return; }
-+ /* Deal with EHLO messages like "PLAIN LOGIN" in this order */
-+ j = str_chr(smtptext.s+i+14,'L'); /* AUTH LOGIN */
-+ if (j > 0)
-+ if (case_starts(smtptext.s+i+14+j,"LOGIN")) { mailfrom_login(); flagauth = 1; return; }
- j = str_chr(smtptext.s+i+8,'P'); /* AUTH PLAIN */
- if (j > 0)
- if (case_starts(smtptext.s+i+8+j,"PLAIN")) { mailfrom_plain(); flagauth = 2; return; }
diff --git a/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c b/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c
index cfa11a413d16..c2887371f0ff 100644
--- a/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c
+++ b/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c
@@ -1,9 +1,9 @@
---- qmail-smtpd.c.orig 2009-12-23 15:20:45.000000000 -0200
-+++ qmail-smtpd.c 2009-12-23 15:23:40.000000000 -0200
-@@ -136,6 +136,27 @@
- logs(s1,s2,s3,s4,s5,s6,s7);
- return;
- }
+--- qmail-smtpd.c.orig 2014-06-26 16:33:05.703716277 -0500
++++ qmail-smtpd.c 2014-06-26 16:40:11.516685934 -0500
+@@ -116,6 +116,28 @@ int seenhelo = 0;
+ char *badmailcond;
+ char *badhelocond;
+
+void err_rbl(s1,s2,s3,s4,s5,s6,s7) char *s1, *s2, *s3, *s4, *s5, *s6, *s7; {
+ char *rblmatch;
+ stralloc rblmessage = {0};
@@ -22,32 +22,33 @@
+ if (!stralloc_0(&new_s1)) die_nomem();
+
+ out(rblmessage.s);
-+ logs(new_s1.s,s2,s3,s4,s5,s6,s7);
++ smtp_logg(new_s1.s,s2,s3,s4,s5,s6,s7);
+ return;
+ }
- void err_brcptto(s1,s2,s3,s4,s5,s6,s7) char *s1, *s2, *s3, *s4, *s5, *s6, *s7; {
- out("550 sorry, your envelope recipient is in my badrcptto list (#5.7.1)\r\n");
- logs(s1,s2,s3,s4,s5,s6,s7);
-@@ -282,6 +303,8 @@
++
+ void dohelo(arg) char *arg;
+ {
+ if (!stralloc_copys(&helohost,arg)) die_nomem();
+@@ -183,6 +205,8 @@ int tarpitcount = 0;
+ int tarpitdelay = 0;
char *auth;
- char *reqauth;
+char *rbl2smtpd;
+char *rblmatch;
- int smtpauth = 0;
+ int smtpauth = 0; /* -1:Cert 0:none 1:login/plain 2:cram 3:login/plain/cram 11:must_login/plain 12:must_2 13:must_3 */
int seenauth = 0;
-@@ -404,6 +427,9 @@
- if (env_get("UCSPITLS")) starttls = 1;
- if (starttls) reqttls = env_get("REQUIRETLS");
+@@ -344,6 +368,9 @@ void setup()
+ if (!stralloc_cats(&mailto," ")) die_nomem();
+ }
+ rbl2smtpd = env_get("RBL2SMTPD");
+ rblmatch = env_get("RBLMATCH");
+
- delivermailto = env_get("DELIVERTO");
- if (delivermailto) {
- if (!stralloc_cats(&mailto,delivermailto)) die_nomem();
-@@ -909,6 +935,10 @@
+ rblsmtpd = env_get("RBLSMTPD");
+ if (rblsmtpd) {
+ if (!stralloc_cats(&rblinfo,rblsmtpd)) die_nomem();
+@@ -909,6 +936,10 @@ void smtp_rcpt(arg) char *arg; {
return;
}
@@ -57,4 +58,4 @@
+ }
if (tarpitcount && flagerrcpts >= tarpitcount) { /* Tarpitting et al. */
if (tarpitdelay == 999) flagnotorious++;
- err_rcpts("Reject::RCPT::Toomany_Rcptto:",protocol.s,remoteip,remotehost,helohost.s,mailfrom.s,addr.s);
+ err_rcpts("Reject::RCPT::Toomany_Rcptto",protocol.s,remoteip,remotehost,helohost.s,mailfrom.s,addr.s);
diff --git a/mail/qmail/files/extra-patch-spamcontrol-tls_remote.c b/mail/qmail/files/extra-patch-spamcontrol-tls_remote.c
deleted file mode 100644
index 2f3f7c0318d7..000000000000
--- a/mail/qmail/files/extra-patch-spamcontrol-tls_remote.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tls_remote.c.orig 2013-08-26 14:12:08.434131056 -0500
-+++ tls_remote.c 2013-08-26 14:13:09.158131515 -0500
-@@ -59,7 +59,7 @@
- int tls_checkcrl(SSL *ssl)
- {
-
-- return;
-+ return 0;
- }
-
- int tls_exit(SSL *ssl)
diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist
index 8de6b8c654e4..78597a6f6bb6 100644
--- a/mail/qmail/pkg-plist
+++ b/mail/qmail/pkg-plist
@@ -62,6 +62,7 @@ bin/qmail-rspawn
%%LDAP%%bin/qmail-secretary
bin/qmail-send
bin/qmail-showctl
+%%SPAMCONTROL%%bin/qmail-smtpam
bin/qmail-smtpd
bin/qmail-start
bin/qmail-tcpok
@@ -170,6 +171,7 @@ man/man8/qmail-start.8.gz
man/man8/qmail-tcpok.8.gz
man/man8/qmail-tcpto.8.gz
man/man8/splogger.8.gz
+%%SPAMCONTROL%%man/man8/qmail-smtpam.8.gz
%%SPAMCONTROL%%man/man8/qmail-badloadertypes.8.gz
%%SPAMCONTROL%%man/man8/qmail-badmimetypes.8.gz
%%SPAMCONTROL%%man/man8/qmail-mfrules.8.gz
generated by cgit (git 2.34.1) at 2024-12-02 12:08:14 +0800