Date: Tue, 10 May 2005 14:54:17 -0300 (BRST) From: Renato Botelho <freebsd@galle.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/80864: [MAINTAINER] mail/qmail: Add QMTPC and LOCALTIME patches Message-ID: <200505101754.j4AHsHcC035539@data.galle.com.br> Resent-Message-ID: <200505101800.j4AI0SnI087868@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 80864 >Category: ports >Synopsis: [MAINTAINER] mail/qmail: Add QMTPC and LOCALTIME patches >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue May 10 18:00:27 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 5.4-RELEASE i386 >Organization: Galle Folheados - http://www.galle.com.br >Environment: System: FreeBSD data.galle.com.br 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Tue May 10 09:20:42 BRST 2005 >Description: - Add QMTPC patch, it closes PR ports/54002 - Add LOCALTIME patch, that emit dates in local timezone - Add BROKEN message if QMTPC and OUTGOINGIP patches are selected simultaneously - Rename BARRIER vars to a short name - Change DISTDIR to download all qmail related files on qmail subdir - Bump PORTREVISION Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- qmail-1.03_5.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/qmail/Makefile,v retrieving revision 1.59 diff -u -r1.59 Makefile --- Makefile 10 May 2005 14:31:28 -0000 1.59 +++ Makefile 10 May 2005 17:48:50 -0000 @@ -7,7 +7,7 @@ PORTNAME= qmail PORTVERSION?= ${QMAIL_VERSION} -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= mail MASTER_SITES+= ${MASTER_SITE_QMAIL} DISTNAME= ${PORTNAME}-${QMAIL_VERSION} @@ -15,27 +15,31 @@ MAINTAINER?= freebsd@galle.com.br COMMENT?= A secure, reliable, efficient, simple, and fast MTA +DISTDIR= ${PORTSDIR}/distfiles/qmail + .if defined(SLAVE_LDAP) || defined(SLAVE_SPAMCONTROL) -MAIN_QMAIL_PORT_DNS_PATCH_BARRIER=yes -MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER=yes +BARRIER_DNS_PATCH=yes +BARRIER_BIG_CONCURRENCY_PATCH=yes +BARRIER_QMTPC_PATCH=yes .endif .if defined(SLAVE_LDAP) || defined(SLAVE_SMTP_AUTH_TLS) || \ defined(SLAVE_SPAMCONTROL) || defined(SLAVE_TLS) -MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=yes -MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER=yes +BARRIER_OUTGOINGIP_PATCH=yes +BARRIER_RFC2821_PATCH=yes .endif .if defined(SLAVE_MYSQL) || defined(SLAVE_SPAMCONTROL) -MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER=yes +BARRIER_QMAILQUEUE_PATCH=yes .endif .if defined(SLAVE_SPAMCONTROL) -MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER=yes -MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER=yes +BARRIER_SENDMAIL_F_PATCH=yes +BARRIER_BIG_TODO_PATCH=yes +BARRIER_LOCALTIME_PATCH=yes .endif -.if !defined(MAIN_QMAIL_PORT_DNS_PATCH_BARRIER) +.if !defined(BARRIER_DNS_PATCH) # Patch necessary to cope with non-RFC >512 dns entries # Since AOL has been using those, the problem has skyrocketed from minor to # groundzero. qmail being RFC compliant need to be "fixed" to work with those @@ -44,14 +48,14 @@ PATCH_DIST_STRIP+= -p1 .endif -.if !defined(MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER) +.if !defined(BARRIER_SENDMAIL_F_PATCH) # David Phillips noticed that sendmail's -f option sets a default # From: header, and so should qmail's emulation. PATCH_SITES+= http://david.acz.org/software/:sendmail_flagf PATCHFILES+= sendmail-flagf.patch:sendmail_flagf .endif -.if !defined(MAIN_QMAIL_PORT_RFC2821_PATCH_BARRIER) +.if !defined(BARRIER_RFC2821_PATCH) # This patch changes qmail-remote to skip over MX servers that greet with # codes 400 to 499 and to bounce mail when any MX server that qmail tries # greets with a code 500 to 599. @@ -94,18 +98,24 @@ .endif .endif -.if !defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER) +.if !defined(BARRIER_QMAILQUEUE_PATCH) OPTIONS+= QMAILQUEUE_PATCH "run a QMAILQUEUE program" off .endif -.if !defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER) +.if !defined(BARRIER_BIG_TODO_PATCH) OPTIONS+= BIG_TODO_PATCH "enable big_todo qmail patch" off .endif -.if !defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER) +.if !defined(BARRIER_BIG_CONCURRENCY_PATCH) OPTIONS+= BIG_CONCURRENCY_PATCH "use a concurrency greater than 240" off .endif -.if !defined(MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER) +.if !defined(BARRIER_OUTGOINGIP_PATCH) OPTIONS+= OUTGOINGIP_PATCH "set the IP address to send messages" off .endif +.if !defined(BARRIER_LOCALTIME_PATCH) +OPTIONS+= LOCALTIME_PATCH "emit dates in the local timezone" off +.endif +.if !defined(BARRIER_QMTPC_PATCH) +OPTIONS+= QMTPC_PATCH "send email using qmtp protocol" off +.endif .if defined(SLAVE_TLS) || defined(SLAVE_SMTP_AUTH_TLS) OPTIONS+= TLS_DEBUG "enable additional debug information" off .elif defined(SLAVE_LDAP) @@ -252,29 +262,43 @@ .include <bsd.port.pre.mk> -.if !defined(MAIN_QMAIL_PORT_DNS_PATCH_BARRIER) \ - ||(defined(WITH_QMAILQUEUE_PATCH) && !defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER)) \ - ||(defined(WITH_BIG_TODO_PATCH) && !defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER)) \ - ||(defined(WITH_BIG_CONCURRENCY_PATCH)&& !defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER)) \ - ||(defined(WITH_OUTGOINGIP_PATCH) && !defined(MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER)) +.if (defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)) &&\ + (defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH)) +BROKEN= "OUTGOINGIP and QMTPC conflicts! Please, make your choice" +.endif + +.if !defined(BARRIER_DNS_PATCH) \ + ||(defined(WITH_QMAILQUEUE_PATCH) && !defined(BARRIER_QMAILQUEUE_PATCH)) \ + ||(defined(WITH_BIG_TODO_PATCH) && !defined(BARRIER_BIG_TODO_PATCH)) \ + ||(defined(WITH_BIG_CONCURRENCY_PATCH)&& !defined(BARRIER_BIG_CONCURRENCY_PATCH)) \ + ||(defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)) \ + ||(defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH)) PATCH_SITES+= ${MASTER_SITE_QMAIL} .endif -.if defined(WITH_QMAILQUEUE_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER) +.if defined(WITH_QMAILQUEUE_PATCH) && !defined(BARRIER_QMAILQUEUE_PATCH) PATCHFILES+= qmailqueue-patch .endif -.if defined(WITH_BIG_TODO_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_TODO_PATCH_BARRIER) +.if defined(WITH_BIG_TODO_PATCH) && !defined(BARRIER_BIG_TODO_PATCH) PATCHFILES+= big-todo.103.patch .endif -.if defined(WITH_BIG_CONCURRENCY_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER) +.if defined(WITH_BIG_CONCURRENCY_PATCH) && !defined(BARRIER_BIG_CONCURRENCY_PATCH) PATCHFILES+= big-concurrency.patch .endif -.if defined(WITH_OUTGOINGIP_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER) +.if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH) PATCHFILES+= outgoingip.patch .endif +.if defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH) +PATCHFILES+= qmail-1.03-qmtpc.patch +.endif + +.if defined(WITH_LOCALTIME_PATCH) && !defined(BARRIER_LOCALTIME_PATCH) +PATCH_SITES+= http://www.alib.jp/files/:localtime +PATCHFILES+= qmail-date-localtime.patch:localtime +.endif # Some default values, these can be modified by make command line -.if defined(WITH_BIG_CONCURRENCY_PATCH)&&!defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER) +.if defined(WITH_BIG_CONCURRENCY_PATCH) && !defined(BARRIER_BIG_CONCURRENCY_PATCH) WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT?= 509 .endif @@ -342,7 +366,7 @@ .endif pre-everything:: -.if !defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER) +.if !defined(BARRIER_BIG_CONCURRENCY_PATCH) @${ECHO_MSG} "" @${ECHO_MSG} "You may use the following build options:" @${ECHO_MSG} "" @@ -433,7 +457,7 @@ @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc @${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-qmail .if defined(WITH_BIG_CONCURRENCY_PATCH) \ - && !defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER) \ + && !defined(BARRIER_BIG_CONCURRENCY_PATCH) \ && defined(WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT) @if [ ${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT} -gt 0 ]; then \ ${ECHO_CMD} "${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT}" \ Index: distinfo =================================================================== RCS file: /home/ncvs/ports/mail/qmail/distinfo,v retrieving revision 1.25 diff -u -r1.25 distinfo --- distinfo 10 May 2005 14:31:28 -0000 1.25 +++ distinfo 10 May 2005 17:48:50 -0000 @@ -24,3 +24,7 @@ SIZE (patch-qmail-1.03-rfc2821.diff) = 2564 MD5 (spamcontrol-2313_tgz.bin) = a8ad350699dfd6110c3e8a8784f55ad4 SIZE (spamcontrol-2313_tgz.bin) = 116888 +MD5 (qmail-date-localtime.patch) = d566e8bd99b33efee0194e855b8d6995 +SIZE (qmail-date-localtime.patch) = 2603 +MD5 (qmail-1.03-qmtpc.patch) = 122664c38338e5ec35fcac43f33d6927 +SIZE (qmail-1.03-qmtpc.patch) = 6197 --- qmail-1.03_5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505101754.j4AHsHcC035539>