diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | mail/Makefile | 1 | ||||
| -rw-r--r-- | mail/qmail-smtp_auth+tls/Makefile | 30 | ||||
| -rw-r--r-- | mail/qmail-smtp_auth+tls/pkg-descr | 22 | ||||
| -rw-r--r-- | mail/qmail/Makefile | 69 | ||||
| -rw-r--r-- | mail/qmail/distinfo | 3 | ||||
| -rw-r--r-- | mail/qmail/files/pkg-message-smtp_auth+tls.in | 23 | ||||
| -rw-r--r-- | mail/qmail/pkg-plist | 1 |
8 files changed, 9 insertions, 141 deletions
@@ -2000,3 +2000,4 @@ devel/php5-dio||2005-12-09|Unsupported in PHP 5.1 devel/php5-mcve||2005-12-09|Unsupported in PHP 5.1 net/php5-yp||2005-12-09|Unsupported in PHP 5.1 www/php5-mnogosearch||2005-12-09|Unsupported in PHP 5.1 +mail/qmail-smtp_auth+tls||2005-12-12|SMTP_AUTH patch added to qmail-tls port diff --git a/mail/Makefile b/mail/Makefile index f7c83c0fb990..04be5a6b38cf 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -422,7 +422,6 @@ SUBDIR += qmail-rblchk SUBDIR += qmail-remove SUBDIR += qmail-scanner - SUBDIR += qmail-smtp_auth+tls SUBDIR += qmail-spamcontrol SUBDIR += qmail-tls SUBDIR += qmail-vida diff --git a/mail/qmail-smtp_auth+tls/Makefile b/mail/qmail-smtp_auth+tls/Makefile deleted file mode 100644 index 6cc45a921348..000000000000 --- a/mail/qmail-smtp_auth+tls/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# New ports collection makefile for: qmail-smtp_auth+tls -# Date created: 03 Dec 2000 -# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> et. al. -# -# $FreeBSD$ -# - -PORTNAME= qmail -PORTVERSION= ${QMAIL_VERSION}.${SMTP_AUTH-TLS_PATCH_DATE} -PORTREVISION= 1 -CATEGORIES= mail -PKGNAMESUFFIX= -smtp_auth+tls - -COMMENT= A SECURE, reliable, and FAST MTA for UNIX systems WITH SMTP_AUTH+TLS - -# not type-safe -ONLY_FOR_ARCHS= i386 - -USE_OPENSSL= yes - -SLAVE_SMTP_AUTH_TLS= yes - -SMTP_AUTH-TLS_PATCH_DATE= 20020519 - -# Local overrides -MASTERDIR= ${.CURDIR}/../qmail -DESCR= ${.CURDIR}/pkg-descr -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - -.include "${MASTERDIR}/Makefile" diff --git a/mail/qmail-smtp_auth+tls/pkg-descr b/mail/qmail-smtp_auth+tls/pkg-descr deleted file mode 100644 index e2b55ce1a034..000000000000 --- a/mail/qmail-smtp_auth+tls/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -What is is: [excerpt taken from README.auth from the patch] - -This patch adds ESMTP AUTH authentication protocol support to -qmail-1.03. It's originally based on Mrs. Brisby's smtp-auth patch -with many enhancements from Krzysztof Dabrowski <brush@elysium.pl>. - -You can always get the newest version from: -http://members.elysium.pl/brush/qmail-smtpd-auth/ - -To use all of it's functionality you will also have to obtain and -install Krzysztof's cmd5checkpw utility available at: -http://members.elysium.pl/brush/cmd5checkpw/ - -If you need more information about SMTP-AUTH itself and the -client/server support and configuration, visit: -http://members.elysium.pl/brush/smtp-auth/ - -Neal Groothuis glued both ESMTP AUTH and TLS patches together and -then we have this port. - -Author: Neal Groothuis <ngroot@imsa.edu> -WWW: http://www.qmail.org/ diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 0359b9885846..7e0884b4e252 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -26,6 +26,7 @@ CONFLICTS= qmail-vida-[0-9]* BARRIER_MAILDIRQUOTA_PATCH= yes BARRIER_BLOCKEXEC_PATCH= yes BARRIER_QMAILQUEUE_PATCH= yes +BARRIER_SMTP_AUTH_PATCH= yes .endif .if defined(SLAVE_LDAP) || \ @@ -43,34 +44,16 @@ BARRIER_LOCALTIME_PATCH= yes defined(SLAVE_SPAMCONTROL) || \ defined(SLAVE_TLS) BARRIER_OUTGOINGIP_PATCH= yes -.endif - -.if defined(SLAVE_LDAP) || \ - defined(SLAVE_SMTP_AUTH_TLS) || \ - defined(SLAVE_SPAMCONTROL) || \ - defined(SLAVE_TLS) BARRIER_RFC2821_PATCH= yes .endif .if defined(SLAVE_LDAP) || \ defined(SLAVE_MYSQL) || \ - defined(SLAVE_SMTP_AUTH_TLS) || \ - defined(SLAVE_SPAMCONTROL) -BARRIER_SMTP_AUTH_PATCH= yes -.endif - -.if defined(SLAVE_LDAP) || \ - defined(SLAVE_MYSQL) || \ - defined(SLAVE_SMTP_AUTH_TLS) || \ defined(SLAVE_SPAMCONTROL) || \ defined(SLAVE_TLS) BARRIER_SPF_PATCH= yes .endif -.if !defined(SLAVE_SMTP_AUTH_TLS) -BARRIER_MAXRCPT_PATCH= yes -.endif - .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 @@ -109,8 +92,8 @@ PATCHFILES+= qmail-1.03-tls-${TLS_PATCH_DATE}.patch:tls PATCH_DIST_STRIP+= -p1 .endif -PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,smtp_auth_tls,tls,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip/} -PATCH_SITE_SUBDIR+= garga/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,smtp_auth_tls,tls,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip +PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip/} +PATCH_SITE_SUBDIR+= garga/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip NO_PACKAGE= "djb\'s packaging license does not allow non-standard \ qmail binary distributions" @@ -157,10 +140,7 @@ OPTIONS+= DISCBOUNCES_PATCH "discard double-bounces" off .if !defined(BARRIER_SPF_PATCH) OPTIONS+= SPF_PATCH "Implement SPF checker" off .endif -.if !defined(BARRIER_MAXRCPT_PATCH) -OPTIONS+= MAXRCPT_PATCH "Limit max RCPT's allowed per message" off -.endif -.if defined(SLAVE_TLS) || defined(SLAVE_SMTP_AUTH_TLS) +.if defined(SLAVE_TLS) OPTIONS+= TLS_DEBUG "enable additional debug information" off .elif defined(SLAVE_LDAP) OPTIONS+= TLS "SMTP TLS support" on \ @@ -224,7 +204,7 @@ ALL_TARGET+= ${EXTRA_MAN8} MAN8+= ${EXTRA_MAN8} .endif -.if defined(SLAVE_SPAMCONTROL) || defined(SLAVE_SMTP_AUTH_TLS) +.if defined(SLAVE_SPAMCONTROL) PLIST_SUB+= README_AUTH="" .else PLIST_SUB+= README_AUTH="@comment " @@ -237,13 +217,6 @@ PLIST_SUB+= LDAP="" NOT_LDAP="@comment " PLIST_SUB+= LDAP="@comment " NOT_LDAP="" .endif -.if defined(SLAVE_SMTP_AUTH_TLS) -PKGMESSAGE_SUFFIX= -smtp_auth+tls -PLIST_SUB+= SMTP_AUTH_TLS="" -.else -PLIST_SUB+= SMTP_AUTH_TLS="@comment " -.endif - .if defined(SLAVE_SPAMCONTROL) PLIST_SUB+= SPAMCONTROL="" .else @@ -286,9 +259,6 @@ DOCFILES+= ${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \ ${WRKSRC}/POPBEFORESMTP ${WRKSRC}/QLDAPTODO \ ${WRKSRC}/QLDAPPICTURE ${WRKSRC}/QLDAPGROUP \ ${WRKSRC}/EXTTODO ${WRKSRC}/qmail.schema -.elif defined(SLAVE_SMTP_AUTH_TLS) -DOCFILES+= ${WRKDIR}/SMTP_AUTH+TLS.readme \ - ${WRKSRC}/README.auth .elif defined(SLAVE_TLS) DOCFILES+= ${WRKDIR}/TLS.readme .elif defined(SLAVE_SPAMCONTROL) @@ -330,7 +300,7 @@ USE_REINPLACE= yes .include <bsd.port.pre.mk> -.if defined(SLAVE_SMTP_AUTH_TLS) || defined(SLAVE_TLS) +.if defined(SLAVE_TLS) CFLAGS+= -I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS .if defined(WITH_TLS_DEBUG) CFLAGS+= -DDEBUG @@ -365,24 +335,6 @@ MASTER_SITES+= http://members.elysium.pl/brush/qmail-smtpd-auth/dist/:smtp_auth DISTFILES+= qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz:smtp_auth .endif -.if defined(SLAVE_SMTP_AUTH_TLS) -PATCH_SITES+= http://www.galle.com.br/~garga/qmail/:smtp_auth_tls - -.if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH) -SMTP_AUTH_TLS_PATCH= qmail-1.03-starttls-smtp-auth_outgoingip.patch -.else -SMTP_AUTH_TLS_PATCH= qmail-1.03-starttls-smtp-auth.patch -.endif - -PATCHFILES+= ${SMTP_AUTH_TLS_PATCH}:smtp_auth_tls - -.if defined(WITH_MAXRCPT_PATCH) && !defined(BARRIER_MAXRCPT_PATCH) -PATCH_SITES+= http://www.unixlike.com.br/coisas/qmail/:maxrcpt -PATCHFILES+= qmail-1.03-maxrcpt.freebsd_qmail-smtp+tls_port.patch:maxrcpt -.endif - -.endif - .if defined(WITH_MAILDIRQUOTA_PATCH) && !defined(BARRIER_MAILDIRQUOTA_PATCH) PATCH_SITES+= http://www.alexdupre.com/qmail/:quota PATCHFILES+= qmail-maildir++.patch:quota @@ -535,11 +487,6 @@ post-patch: .if defined(SLAVE_MYSQL) @${REINPLACE_CMD} 's|/opt/mysql|${LOCALBASE}|' \ ${WRKSRC}/Makefile -.elif defined(SLAVE_SMTP_AUTH_TLS) - @${HEAD} -6 ${DISTDIR}/${DIST_SUBDIR}/${SMTP_AUTH_TLS_PATCH} \ - | ${TAIL} -5 \ - > ${WRKDIR}/SMTP_AUTH+TLS.readme - @${REINPLACE_CMD} "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile .elif defined(SLAVE_SPAMCONTROL) @${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail @${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \ @@ -651,7 +598,7 @@ do-install: @${ECHO_CMD} certificate: -.if defined(SLAVE_TLS) || defined(SLAVE_SMTP_AUTH_TLS) || defined(SLAVE_LDAP) +.if defined(SLAVE_TLS) || defined(SLAVE_LDAP) @if [ -f ${OPENSSLDIR}/openssl.cnf ]; then \ if [ ! -d ${WRKDIR} ]; then \ ${MKDIR} ${WRKDIR} ; \ @@ -667,7 +614,7 @@ certificate: .endif certificate-req: -.if defined(SLAVE_TLS) || defined(SLAVE_SMTP_AUTH_TLS) || defined(SLAVE_LDAP) +.if defined(SLAVE_TLS) || defined(SLAVE_LDAP) @if [ -f ${OPENSSLDIR}/openssl.cnf ]; then \ if [ ! -d ${WRKDIR} ]; then \ ${MKDIR} ${WRKDIR} ; \ diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo index 79e66b43e456..9df8afe4ea16 100644 --- a/mail/qmail/distinfo +++ b/mail/qmail/distinfo @@ -43,9 +43,6 @@ SIZE (qmail/qmail-discard-double-bounces.patch) = 1305 MD5 (qmail/qmail-spf-rc5.patch) = 434bd84b87e2027cfa643673c498bd6f SHA256 (qmail/qmail-spf-rc5.patch) = 8ad251d779125e11422ae9bcbf619b0ba002c0893dd8c8fe55a34a8b5fc42640 SIZE (qmail/qmail-spf-rc5.patch) = 63582 -MD5 (qmail/qmail-1.03-maxrcpt.freebsd_qmail-smtp+tls_port.patch) = 0b4fc2811bf1b358d6229c8ada08a8cf -SHA256 (qmail/qmail-1.03-maxrcpt.freebsd_qmail-smtp+tls_port.patch) = 606f8b1009be41b2c5fa9dc7ee2a0e1836eeac56dfb784351a40ec9721a0ce01 -SIZE (qmail/qmail-1.03-maxrcpt.freebsd_qmail-smtp+tls_port.patch) = 1771 MD5 (qmail/qmail-ldap-1.03-20050401a.patch.gz) = 077254d5034ee966ab5dd111f05ebbf1 SHA256 (qmail/qmail-ldap-1.03-20050401a.patch.gz) = 89016748995546eb2a88f6fa8746d9ca3a15a491885fb1cda800dd6a4f75f5c3 SIZE (qmail/qmail-ldap-1.03-20050401a.patch.gz) = 267930 diff --git a/mail/qmail/files/pkg-message-smtp_auth+tls.in b/mail/qmail/files/pkg-message-smtp_auth+tls.in deleted file mode 100644 index b833bab4dd99..000000000000 --- a/mail/qmail/files/pkg-message-smtp_auth+tls.in +++ /dev/null @@ -1,23 +0,0 @@ - ATTENTION: - -Please make sure that you read %%PREFIX%%/doc/PORT_NOTES. -It contains important information about testing and configuring -qmail, and finally replacing sendmail with qmail. - -You should also add %%PREFIX%%/man to your MANPATH (see manpath(1) -or login.conf(5)). - -Do not forget to read both %%PREFIX%%/doc/SMTP_AUTH+TLS.readme AND -%%PREFIX%%/doc/README.auth. After all, this is NOT our old stock -qmail. - -You can enable qmail as your default mailer executing: -> %%PREFIX%%/scripts/enable-qmail - -==> As you need to provide a working certificate in %%PREFIX%%/control/cert.pem : - -# makes a self-signed certificate -3) do "make certificate" - -# makes a certificate request -4) do "make certificate-req" diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist index b5489bfb1c19..eccaf32c2698 100644 --- a/mail/qmail/pkg-plist +++ b/mail/qmail/pkg-plist @@ -161,7 +161,6 @@ scripts/mkaliasdir %%PORTDOCS%%%%DOCSDIR%%/SECURITY %%PORTDOCS%%%%DOCSDIR%%/SENDMAIL %%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/SMTPREPLY.spamcontrol -%%SMTP_AUTH_TLS%%%%PORTDOCS%%%%DOCSDIR%%/SMTP_AUTH+TLS.readme %%PORTDOCS%%%%DOCSDIR%%/SYSDEPS %%PORTDOCS%%%%DOCSDIR%%/TEST.deliver %%PORTDOCS%%%%DOCSDIR%%/TEST.receive |