Date: Sat, 18 Feb 2012 21:00:07 GMT From: Nicolas de Bari Embriz <nbari@dalmp.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/165277: update port mail/qmail Message-ID: <201202182100.q1IL07VN068053@red.freebsd.org> Resent-Message-ID: <201202182100.q1IL0Hn0049599@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 165277 >Category: ports >Synopsis: update port mail/qmail >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Feb 18 21:00:17 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Nicolas de Bari Embriz >Release: 8 >Organization: >Environment: FreeBSD eu.route.mx 8.1-RELEASE-p2 FreeBSD 8.1-RELEASE-p2 #0: Fri Dec 10 08:27:37 EST 2010 >Description: patch to qmail-ldap so it can allow EZMLM to user multiple servers on DIR/qmqpservers/0 qmail processes messages on a first-come-first-served basis. This means that when it receives a post to 100,000 subscribers, it will try all the recipients before processing the next message. Often, it is desirable to offload this work to an external host so that the main list host remains responsive to e.g. ‘subscribe’ and archive access commands, as well as to other mail is it is not a dedicated mail host. ezmlm-idx allows the main distribution work to be offloaded to an external server via the QMQP protocol.Configure qmail-qmqpc(1) on the list host, and qmail-qmqpd(1) on the mail host (see qmail docs for details), then create the file DIR/qmqpservers/0. The list housed in DIR will now use the QMQP server for posts. The local qmail is used for other messages in versions prior to 7.1. with this patch, you can specify the QMQP server IP addresses, one per line, in DIR/qmqpservers/0, just as you normally would in /var/qmail/control/qmqpservers. If the first server cannot be contacted, the installation will try the second, and so on. more details: http://www.ezmlm.org/faq/How-QMQP-support-works.html the 'small' patch only modifies qmail-qmqpc.c after as been patched with qmail-ldap patch. http://qmail-ldap-smtpauthuser.googlecode.com/svn/trunk/qmail-qmqpc-servers_on_cmd_line.c >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN qmail.old/Makefile qmail/Makefile --- qmail.old/Makefile 2011-08-21 05:56:39.204328449 -0400 +++ qmail/Makefile 2012-02-18 14:43:36.963407957 -0500 @@ -2,7 +2,7 @@ # Date created: 25 May 1998 # Whom: Mario S F Ferreira <lioux@linf.unb.br> et al. # -# $FreeBSD: ports/mail/qmail/Makefile,v 1.154 2011/07/26 22:13:55 garga Exp $ +# $FreeBSD: ports/mail/qmail/Makefile,v 1.156 2011/11/16 21:18:26 garga Exp $ # PORTNAME= qmail @@ -178,7 +178,10 @@ XF_QUITASAP "Close SMTP session ASAP (SMTPEXTFORK)" off \ SENDERCHECK4 "LOOSE checks exclusively for RELAY clients" off \ ENHACELOGS "Enhace qmail-smtpd logs (spamcontrol-like)" off \ - GRTDELAY "Add jms1's Greet Delay feature" off + GRTDELAY "Add jms1's Greet Delay feature" off \ + SMTPAUTHUSER "create env SMTPAUTHUSER containing authuser" off\ + SRS "Sender Rewriting Scheme support" off\ + EZMLM_QMQPC "Allow multiple servers on DIR/qmqpservers/0" off LDAP_PARAMS= ALTQUEUE BIGBROTHER BIGTODO BIND_8_COMPAT\ CLEARTEXTPASSWD DASH_EXT DATA_COMPRESS\ @@ -305,16 +308,16 @@ CONFIGUREPROGRAMS= install dnsfq hostname dnsip ipmeprint dnsptr CONFIGURESCRIPTS= config config-fast -.include "${.CURDIR}/../../Mk/bsd.mail.mk" +WANT_QMAIL= yes -.if (${PREFIX} != ${LOCALBASE}) +.include <bsd.port.pre.mk> + +.if ${PREFIX} != ${LOCALBASE} DOCSDIR= ${PREFIX}/doc .endif NO_MTREE= yes -.include <bsd.port.pre.mk> - .if ${OSVERSION} >= 900007 . if defined(SLAVE_LDAP) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-utmpx-ldap @@ -349,6 +352,13 @@ PLIST_SUB+= EXTERNAL_TODO="@comment " . endif +. if defined(WITH_SRS) +BUILD_DEPENDS= srs:${PORTSDIR}/mail/libsrs2 +MASTER_SITES+= http://qmail-ldap-smtpauthuser.googlecode.com/svn/trunk/:srs_ldap +SRS_LDAP_PATCH = qmail-ldap-1.03-20060201-SRS.patch +DISTFILES+= ${SRS_LDAP_PATCH}:srs_ldap +. endif + .endif .if defined(WITH_SMTP_AUTH_PATCH) && !defined(BARRIER_SMTP_AUTH_PATCH) @@ -515,6 +525,24 @@ PATCHFILES+= enhacelogging-ldap-${LDAP_PATCH_DATE}_4.patch:ldapenhacelog .endif +.if defined(SLAVE_LDAP) && defined(WITH_SMTPAUTHUSER) +PATCH_SITES+= http://qmail-ldap-smtpauthuser.googlecode.com/svn/trunk/:smtpauthuser \ + ${MASTER_SITE_LOCAL:S/$/:smtpauthuser/} +PATCH_SITE_SUBDIR+= garga/qmail/:smtpauthuser +. if defined(WITH_ENHACELOGS) +PATCHFILES+= qmail-1.03-enhaceloggingSMTPAUTHUSER:smtpauthuser +. else +PATCHFILES+= SMTPAUTHUSER.patch:smtpauthuser +. endif +.endif + +.if defined(SLAVE_LDAP) && defined(WITH_EZMLM_QMQPC) +PATCH_SITES+= http://qmail-ldap-smtpauthuser.googlecode.com/svn/trunk/:ezmlm_qmqpc \ + ${MASTER_SITE_LOCAL:S/$/:ezmlm_qmqpc/} +PATCH_SITE_SUBDIR+= garga/qmail/:ezmlm_qmqpc +PATCHFILES+= qmail-qmqpc-servers_on_cmd_line.c:ezmlm_qmqpc +.endif + .if defined(SLAVE_SPAMCONTROL) MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:ucspi_ssl/} \ http://www.superscript.com/ucspi-ssl/:ucspi_ssl \ @@ -708,6 +736,9 @@ @${REINPLACE_CMD} "s|^#LDAPFLAGS=.*$$|LDAPFLAGS=${LDAPFLAGS}|" \ ${WRKSRC}/Makefile . endif +. if defined(WITH_SRS) + @${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SRS_LDAP_PATCH} +. endif .endif .if defined(EXT_BIG_TODO_PATCH) @${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXT_BIG_TODO_PATCH} @@ -733,6 +764,7 @@ do-configure: @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc + @${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld @${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-qmail .if defined(WITH_BIG_CONCURRENCY_PATCH) \ && !defined(BARRIER_BIG_CONCURRENCY_PATCH) \ diff -urN qmail.old/distinfo qmail/distinfo --- qmail.old/distinfo 2011-08-21 05:56:39.204328449 -0400 +++ qmail/distinfo 2012-02-18 14:58:07.402706659 -0500 @@ -1,80 +1,24 @@ SHA256 (qmail/qmail-1.03.tar.gz) = 21ed6c562cbb55092a66197c35c8222b84115d1acab0854fdb1ad1f301626f88 SIZE (qmail/qmail-1.03.tar.gz) = 220668 -SHA256 (qmail/qmail-103.patch) = 4cad53c7a6628a600c74c36bfee327db5052ca24c222d4013e4dfcd7f427653d -SIZE (qmail/qmail-103.patch) = 2104 -SHA256 (qmail/qmailqueue-patch) = 52e82aaa34e9f1308b063cc986a701f67e161662e9f789bb12af03a381530f94 -SIZE (qmail/qmailqueue-patch) = 2510 -SHA256 (qmail/big-todo.103.patch) = afa0a249e3271badd442f0bdae39997d9fe536157d8a0d62b6706f3dfcd11a72 -SIZE (qmail/big-todo.103.patch) = 5546 -SHA256 (qmail/big-concurrency.patch) = 0322991955878e86af495f7317c3a4bd2e60640f9a6dd70ad501fff27242ac2f -SIZE (qmail/big-concurrency.patch) = 9331 -SHA256 (qmail/sendmail-flagf.patch) = 9b3951c22b98c0e5a6ebfa793f052d91dfe01d68a0ad8dc83b8e0bd60c01802e -SIZE (qmail/sendmail-flagf.patch) = 863 -SHA256 (qmail/patch-qmail-1.03-rfc2821.diff) = c34b331e27882f0596529df14f0e9f24c4dff9f941d04e5df17cc158dddac426 -SIZE (qmail/patch-qmail-1.03-rfc2821.diff) = 2564 -SHA256 (qmail/qmail-date-localtime.patch) = 852aee7577edf8814c2429f82740da2a7e0b0b23516e10c4f3f7e845a47be2d5 -SIZE (qmail/qmail-date-localtime.patch) = 2603 -SHA256 (qmail/qmail-1.03-qmtpc.patch) = f704b6c0ca3515a4bb488d14f7c94910aba4daa87420db6cd5b7ea19f17f7449 -SIZE (qmail/qmail-1.03-qmtpc.patch) = 6197 -SHA256 (qmail/outgoingip.patch) = c117f5c41033f062cdc782a16403fc19725e98d92e73ab193dfd24f48c0ca5ac -SIZE (qmail/outgoingip.patch) = 6839 -SHA256 (qmail/outgoingip.patch-spamcontrol-25) = 17ef58193aad3ec834641a8e6c0b064965fa0f71ca432f52fe57ef1e48333ea3 -SIZE (qmail/outgoingip.patch-spamcontrol-25) = 6751 -SHA256 (qmail/qmail-1.03-qmtpc_outgoingip_20090630.patch) = a5b521d3f35aa0842ea3fe69f6e51fa3be5e9c0acfad8671de36fa62a5cb9539 -SIZE (qmail/qmail-1.03-qmtpc_outgoingip_20090630.patch) = 10364 -SHA256 (qmail/qmail-maildir++.patch) = 79e3f1f8f95b58b6d17e5469f125d873fe212d0a5a6d19b538ad57176fbafb52 -SIZE (qmail/qmail-maildir++.patch) = 38088 -SHA256 (qmail/qmail-block-executables.patch) = 97512624eb02db51e10ab6d0dd834a8797a238d0e006bd1c6c94a183d291b456 -SIZE (qmail/qmail-block-executables.patch) = 5070 -SHA256 (qmail/qmail-discard-double-bounces.patch) = 14489eefd9908f60af13fadd574d0e9bb936e5d1b706690ce52efef68529a8d8 -SIZE (qmail/qmail-discard-double-bounces.patch) = 1305 -SHA256 (qmail/qmail-spf-rc5.patch) = 8ad251d779125e11422ae9bcbf619b0ba002c0893dd8c8fe55a34a8b5fc42640 -SIZE (qmail/qmail-spf-rc5.patch) = 63582 -SHA256 (qmail/qmail-spf-rc5.patch-tls) = c884665ff0bc5a5272efe3e09aed71e648a79d0279bc708d5a9df25c5758804f -SIZE (qmail/qmail-spf-rc5.patch-tls) = 63617 -SHA256 (qmail/qmail-spf-rc5.patch-auth-tls) = 16fe99894938c30ed1928a61dabf0a598ef7e08a766a76cf084fe658d6d50092 -SIZE (qmail/qmail-spf-rc5.patch-auth-tls) = 63752 -SHA256 (qmail/qmail-ldap-1.03-20060201.patch.gz) = 92ba895df1957109ad856cc1d1554ece4d25d59017e77127dd52d76afd05525a -SIZE (qmail/qmail-ldap-1.03-20060201.patch.gz) = 270788 -SHA256 (qmail/qmail-mysql-1.1.15.patch) = 3d2b6a08fb149d6c9fe6c8250e87edd6c4d4b2b0417f03adf5cf4202bbadc53f -SIZE (qmail/qmail-mysql-1.1.15.patch) = 67602 -SHA256 (qmail/spamcontrol-2624_tgz.bin) = ab9454c777218b0958ca005d4bf44ae922a2f6d20a52a71da6ebec74b2de2d01 -SIZE (qmail/spamcontrol-2624_tgz.bin) = 167802 -SHA256 (qmail/qmail-1.03-tls-20021228-renato.patch) = ab0de8f744241dcb7f5ee207fc7eab4f067bf42812deb85f9eb0050ac49e6e23 -SIZE (qmail/qmail-1.03-tls-20021228-renato.patch) = 42095 -SHA256 (qmail/qmail-smtpd-auth-0.31.tar.gz) = 1b439fa7e128de13fa80b86883f61a39d17b87b7e8916b6a0eab065bbe49b938 -SIZE (qmail/qmail-smtpd-auth-0.31.tar.gz) = 8798 -SHA256 (qmail/qmail-smtpd-auth-close3.patch) = d933e871261d6740cebe5c21cad81146525cfe06a464e277979f61c1242b5ad4 -SIZE (qmail/qmail-smtpd-auth-close3.patch) = 520 -SHA256 (qmail/tarpit.patch) = de94abbb71ef5d25e168725e435edd96ce3b14b7347440e0805dcb919b9d9604 -SIZE (qmail/tarpit.patch) = 3089 -SHA256 (qmail/ext_todo-20030105.patch) = d46d0225360c0477f93e2990637ebf912b2a86e494f424ef2952ee11ab533ac7 -SIZE (qmail/ext_todo-20030105.patch) = 33763 -SHA256 (qmail/ext_todo-20030105_spf.patch) = 544629c0003d01d27a5a45508e84332f247ed54ece57ff22c0c7c3a56ba086d6 -SIZE (qmail/ext_todo-20030105_spf.patch) = 33781 -SHA256 (qmail/ext_todo-20030105_mysql.patch) = 3fc65b91faaaae147dbf6264f9381664819ef2f236532764309d174f29919ff1 -SIZE (qmail/ext_todo-20030105_mysql.patch) = 33797 -SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol-26) = cc3530c984a1866c8ee9a015cfa1074173e38623522461becd50e5c2ee7188e3 -SIZE (qmail/qmail-spf-rc5.patch-spamcontrol-26) = 64004 -SHA256 (qmail/auth.patch.diff) = 1d0f8e0ce139cd00b86f056bc31c1422d30b88cb8b125023d534cc3664f827b8 -SIZE (qmail/auth.patch.diff) = 4412 -SHA256 (qmail/auth.patch.diff-tls) = 467c5f68d5d332d2400f937c76311e5358b613923d64e68ae98d51d178c7de5e -SIZE (qmail/auth.patch.diff-tls) = 2993 -SHA256 (qmail/ext_todo-20030105+big-todo.103.patch) = 4e44ad403b21f5910b6af11295b82296bc8c0f18bc40dcfecfb95c11e5a296f7 -SIZE (qmail/ext_todo-20030105+big-todo.103.patch) = 2523 +SHA256 (qmail/qmail-ldap-1.03-20060201-SRS.patch) = 2c54abef2af35e7e7a54b94e06cd002877db3ea96fa06f1b53e6d741a62a2154 +SIZE (qmail/qmail-ldap-1.03-20060201-SRS.patch) = 25883 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/README.smtpextfork) = baf23f1cc5676c67041cdaf7c8a0ce5b27365351a4ef52d235d6d021776bb72a SIZE (qmail/README.smtpextfork) = 7690 +SHA256 (qmail/qmail-ldap-1.03-20060201.patch.gz) = 92ba895df1957109ad856cc1d1554ece4d25d59017e77127dd52d76afd05525a +SIZE (qmail/qmail-ldap-1.03-20060201.patch.gz) = 270788 +SHA256 (qmail/qmail-date-localtime.patch) = 852aee7577edf8814c2429f82740da2a7e0b0b23516e10c4f3f7e845a47be2d5 +SIZE (qmail/qmail-date-localtime.patch) = 2603 SHA256 (qmail/qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch) = 7656aef1f30f3c6a684e319d2a309d162b2a559eb84b38d21a1e23e88c78995b SIZE (qmail/qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch) = 2182 SHA256 (qmail/qmail-ldap-20060201-grtdelay.patch) = db880469e3d1356252bc8d10251b88cf5cf75a69f18971ffa6e2b85db5a796bc 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/qmail-1.03-enhaceloggingSMTPAUTHUSER) = 4e92498aaa2a6d08bf6535524e5220520f97ca9cf28ff464519f5f6f14ec3779 +SIZE (qmail/qmail-1.03-enhaceloggingSMTPAUTHUSER) = 552 +SHA256 (qmail/SMTPAUTHUSER.patch) = 25d55714df2fc61e2cb6ec7853476e2c15f14207fa2218b5d5b68200450beb9c +SIZE (qmail/SMTPAUTHUSER.patch) = 347 +SHA256 (qmail/qmail-qmqpc-servers_on_cmd_line.c) = 80edd1a9a52a8e3e41ec7abe445d125d233205d1f94f03d87b26ba19a09fdce3 +SIZE (qmail/qmail-qmqpc-servers_on_cmd_line.c) = 789 diff -urN qmail.old/files/pkg-install.in qmail/files/pkg-install.in --- qmail.old/files/pkg-install.in 2011-08-21 05:56:39.203327165 -0400 +++ qmail/files/pkg-install.in 2011-09-30 11:20:48.000000000 -0400 @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: ports/mail/qmail/files/pkg-install.in,v 1.9 2011/07/18 20:55:29 garga Exp $ +# $FreeBSD: ports/mail/qmail/files/pkg-install.in,v 1.10 2011/09/30 15:20:48 adamw Exp $ # export PATH=/bin:/sbin:/usr/bin:/usr/sbin @@ -17,7 +17,7 @@ %%RCDLINK%%echo "" %%RCDLINK%%echo "A %%LOCALBASE%%/etc/rc.d/qmail.sh symlink was created. To enable qmail at boot" %%RCDLINK%%echo "time you need to copy a script to %%PREFIX%%/rc. There are some examples at" - %%RCDLINK%%echo "%%PREFIX/boot" + %%RCDLINK%%echo "%%PREFIX%%/boot" %%RCDLINK%%echo "" if ! touch ${PREFIX}/alias/.qmail-postmaster \ diff -urN qmail.old/files/qmail-smtpd.rcNG qmail/files/qmail-smtpd.rcNG --- qmail.old/files/qmail-smtpd.rcNG 2011-08-21 05:56:39.203327165 -0400 +++ qmail/files/qmail-smtpd.rcNG 2012-01-14 03:56:03.000000000 -0500 @@ -1,6 +1,6 @@ #!/bin/sh -# $FreeBSD: ports/mail/qmail/files/qmail-smtpd.rcNG,v 1.2 2011/05/15 02:49:08 dougb Exp $ +# $FreeBSD: ports/mail/qmail/files/qmail-smtpd.rcNG,v 1.3 2012/01/14 08:56:03 dougb Exp $ # # PROVIDE: qmailsmtpd # REQUIRE: LOGIN cleanvar @@ -16,7 +16,7 @@ . /etc/rc.subr name="qmailsmtpd" -rcvar=`set_rcvar` +rcvar=qmailsmtpd_enable load_rc_config $name : ${qmailsmtpd_tcpserver="/usr/local/bin/tcpserver"} >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202182100.q1IL07VN068053>