Thu Feb 21 15:50:29 2008 UTC ()
Get rid of the "gnutls" and "ssl" options and replace with a
"courier-gnutls" option/toggle that allows using GNU TLS instead of
defaulting to OpenSSL.

Bump the PKGREVISION of couriertcpd, courier-imap, and courier-mta to 1.


(jlam)
diff -r1.67 -r1.68 pkgsrc/mail/courier-imap/Makefile
diff -r1.1 -r1.2 pkgsrc/mail/courier-imap/options.mk
diff -r1.24 -r1.25 pkgsrc/mail/courier-mta/Makefile
diff -r1.9 -r1.10 pkgsrc/mail/courier-mta/options.mk
diff -r1.14 -r1.15 pkgsrc/net/couriertcpd/Makefile
diff -r1.1 -r1.2 pkgsrc/net/couriertcpd/options.mk
cvs diff -r1.67 -r1.68 pkgsrc/mail/courier-imap/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/courier-imap/Makefile 2008/02/19 18:45:14 1.67
+++ pkgsrc/mail/courier-imap/Makefile 2008/02/21 15:50:29 1.68
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.67 2008/02/19 18:45:14 jlam Exp $ 1# $NetBSD: Makefile,v 1.68 2008/02/21 15:50:29 jlam Exp $
2 2
3DISTNAME= courier-imap-4.3.0 3DISTNAME= courier-imap-4.3.0
 4PKGREVISION= 1
4CATEGORIES= mail 5CATEGORIES= mail
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= jlam@pkgsrc.org 9MAINTAINER= jlam@pkgsrc.org
9COMMENT= IMAP server for access to maildir-style mailboxes 10COMMENT= IMAP server for access to maildir-style mailboxes
10HOMEPAGE= http://www.courier-mta.org/imap/ 11HOMEPAGE= http://www.courier-mta.org/imap/
11 12
12DEPENDS+= courier-maildir>=0.58.0:../../mail/courier-maildir 13DEPENDS+= courier-maildir>=0.58.0:../../mail/courier-maildir
13DEPENDS+= couriertcpd>=0.58.0:../../net/couriertcpd 14DEPENDS+= couriertcpd>=0.58.0:../../net/couriertcpd
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
cvs diff -r1.1 -r1.2 pkgsrc/mail/courier-imap/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/courier-imap/options.mk 2008/02/19 18:45:14 1.1
+++ pkgsrc/mail/courier-imap/options.mk 2008/02/21 15:50:29 1.2
@@ -1,37 +1,34 @@ @@ -1,37 +1,34 @@
1# $NetBSD: options.mk,v 1.1 2008/02/19 18:45:14 jlam Exp $ 1# $NetBSD: options.mk,v 1.2 2008/02/21 15:50:29 jlam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.courier-imap 3PKG_OPTIONS_VAR= PKG_OPTIONS.courier-imap
4PKG_SUPPORTED_OPTIONS= fam 4PKG_SUPPORTED_OPTIONS= courier-gnutls fam
5PKG_OPTIONS_OPTIONAL_GROUPS= tls 5PKG_SUGGESTED_OPTIONS= # empty
6PKG_OPTIONS_GROUP.tls= gnutls ssl 
7PKG_SUGGESTED_OPTIONS= ssl 
8 6
9.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
10 8
11### 9###
12### File Alteration Monitor support. This allows multiple imapd or pop3d 10### Support using the GNU TLS tools for creating certificates; otherwise
13### processes to be notified of changes to the underlying maildirs instead 11### default to using OpenSSL.
14### of needing to poll the maildirs. 
15### 12###
16.if !empty(PKG_OPTIONS:Mfam) 
17. include "../../mk/fam.buildlink3.mk" 
18.endif 
19 
20### 
21### Default to using the OpenSSL or GNUTLS tools for creating certificates. 
22### 
23.if !empty(PKG_OPTIONS:Mgnutls) || !empty(PKG_OPTIONS:Mssl) 
24SUBST_CLASSES+= tls 13SUBST_CLASSES+= tls
25SUBST_FILES.tls= imap/mkimapdcert.in imap/mkpop3dcert.in 14SUBST_FILES.tls= imap/mkimapdcert.in imap/mkpop3dcert.in
26SUBST_STAGE.tls= pre-configure 15SUBST_STAGE.tls= pre-configure
27COURIER_CERTTOOL= ${PREFIX}/bin/certtool 16COURIER_CERTTOOL= ${PREFIX}/bin/certtool
28COURIER_OPENSSL= ${PREFIX}/bin/openssl 17COURIER_OPENSSL= ${PREFIX}/bin/openssl
29.endif 18
30.if !empty(PKG_OPTIONS:Mgnutls) 19.if !empty(PKG_OPTIONS:Mcourier-gnutls)
31SUBST_SED.tls= -e "s|@ssllib@|gnutls|g" 20SUBST_SED.tls= -e "s|@ssllib@|gnutls|g"
32.endif 21.else
33.if !empty(PKG_OPTIONS:Mssl) 
34USE_TOOLS+= openssl:run 22USE_TOOLS+= openssl:run
35COURIER_OPENSSL= ${TOOLS_OPENSSL} 23COURIER_OPENSSL= ${TOOLS_OPENSSL}
36SUBST_SED.tls= -e "s|@ssllib@|openssl|g" 24SUBST_SED.tls= -e "s|@ssllib@|openssl|g"
37.endif 25.endif
 26
 27###
 28### File Alteration Monitor support. This allows multiple imapd or pop3d
 29### processes to be notified of changes to the underlying maildirs instead
 30### of needing to poll the maildirs.
 31###
 32.if !empty(PKG_OPTIONS:Mfam)
 33. include "../../mk/fam.buildlink3.mk"
 34.endif
cvs diff -r1.24 -r1.25 pkgsrc/mail/courier-mta/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/courier-mta/Makefile 2008/02/19 18:45:23 1.24
+++ pkgsrc/mail/courier-mta/Makefile 2008/02/21 15:50:29 1.25
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.24 2008/02/19 18:45:23 jlam Exp $ 1# $NetBSD: Makefile,v 1.25 2008/02/21 15:50:29 jlam Exp $
2 2
3DISTNAME= courier-${COURIER_VERSION} 3DISTNAME= courier-${COURIER_VERSION}
4PKGNAME= ${DISTNAME:S/-/-mta-/} 4PKGNAME= ${DISTNAME:S/-/-mta-/}
 5PKGREVISION= 1
5CATEGORIES= mail 6CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9CONFLICTS+= postfix-[0-9]* qmail-[0-9]* sendmail-[0-9]* 10CONFLICTS+= postfix-[0-9]* qmail-[0-9]* sendmail-[0-9]*
10 11
11MAINTAINER= jlam@pkgsrc.org 12MAINTAINER= jlam@pkgsrc.org
12COMMENT= Courier mail transport agent 13COMMENT= Courier mail transport agent
13HOMEPAGE= http://www.courier-mta.org/ 14HOMEPAGE= http://www.courier-mta.org/
14 15
15DEPENDS+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir 16DEPENDS+= courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
16DEPENDS+= couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd 17DEPENDS+= couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd
17DEPENDS+= maildrop>=2.0.4nb3:../../mail/maildrop 18DEPENDS+= maildrop>=2.0.4nb3:../../mail/maildrop
cvs diff -r1.9 -r1.10 pkgsrc/mail/courier-mta/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/courier-mta/options.mk 2008/02/19 18:45:23 1.9
+++ pkgsrc/mail/courier-mta/options.mk 2008/02/21 15:50:29 1.10
@@ -1,24 +1,21 @@ @@ -1,24 +1,21 @@
1# $NetBSD: options.mk,v 1.9 2008/02/19 18:45:23 jlam Exp $ 1# $NetBSD: options.mk,v 1.10 2008/02/21 15:50:29 jlam Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.courier-mta 5PKG_OPTIONS_VAR= PKG_OPTIONS.courier-mta
6PKG_SUPPORTED_OPTIONS= courier-dsn courier-esmtp courier-local \ 6PKG_SUPPORTED_OPTIONS= courier-dsn courier-esmtp courier-gnutls \
7 courier-uucp inet6 ldap 7 courier-local courier-uucp inet6 ldap
8PKG_OPTIONS_OPTIONAL_GROUPS= tls 8PKG_SUGGESTED_OPTIONS= courier-dsn courier-esmtp courier-local inet6
9PKG_OPTIONS_GROUP.tls= gnutls ssl 
10PKG_SUGGESTED_OPTIONS= courier-dsn courier-esmtp courier-local \ 
11 inet6 ssl 
12 9
13.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
14 11
15###################################################################### 12######################################################################
16### 13###
17### delivery sender notification mail transport 14### delivery sender notification mail transport
18### 15###
19.if !empty(PKG_OPTIONS:Mcourier-dsn) 16.if !empty(PKG_OPTIONS:Mcourier-dsn)
20COURIER_TRANSPORTS+= dsn 17COURIER_TRANSPORTS+= dsn
21PLIST_SRC+= ${PKGDIR}/PLIST.dsn 18PLIST_SRC+= ${PKGDIR}/PLIST.dsn
22 19
23. for _file_ in dsndelayed.txt dsndelivered.txt dsnfailed.txt \ 20. for _file_ in dsndelayed.txt dsndelivered.txt dsnfailed.txt \
24 dsnfooter.txt dsnheader.txt dsnrelayed.txt \ 21 dsnfooter.txt dsnheader.txt dsnrelayed.txt \
@@ -136,30 +133,29 @@ PLIST_SRC+= ${PKGDIR}/PLIST.ldap @@ -136,30 +133,29 @@ PLIST_SRC+= ${PKGDIR}/PLIST.ldap
136FILES_SUBST+= COURIERLDAPALIASD=courierldapaliasd 133FILES_SUBST+= COURIERLDAPALIASD=courierldapaliasd
137 134
138RCD_SCRIPTS+= courierldapaliasd 135RCD_SCRIPTS+= courierldapaliasd
139CONF_FILES_PERMS+= ${EGDIR}/ldapaliasrc.dist \ 136CONF_FILES_PERMS+= ${EGDIR}/ldapaliasrc.dist \
140 ${PKG_SYSCONFDIR}/ldapaliasrc \ 137 ${PKG_SYSCONFDIR}/ldapaliasrc \
141 ${COURIER_USER} ${COURIER_GROUP} 0640 138 ${COURIER_USER} ${COURIER_GROUP} 0640
142.else 139.else
143FILES_SUBST+= COURIERLDAPALIASD= 140FILES_SUBST+= COURIERLDAPALIASD=
144CONFIGURE_ARGS+= --without-ldapaliasd 141CONFIGURE_ARGS+= --without-ldapaliasd
145.endif 142.endif
146 143
147###################################################################### 144######################################################################
148### 145###
149### Default to using the OpenSSL or GNUTLS tools for creating certificates. 146### Support using the GNU TLS tools for creating certificates; otherwise,
 147### default to using OpenSSL.
150### 148###
151.if !empty(PKG_OPTIONS:Mgnutls) || !empty(PKG_OPTIONS:Mssl) 
152SUBST_CLASSES+= tls 149SUBST_CLASSES+= tls
153SUBST_FILES.tls= courier/module.esmtp/mkesmtpdcert.in 150SUBST_FILES.tls= courier/module.esmtp/mkesmtpdcert.in
154SUBST_STAGE.tls= pre-configure 151SUBST_STAGE.tls= pre-configure
155COURIER_CERTTOOL= ${PREFIX}/bin/certtool 152COURIER_CERTTOOL= ${PREFIX}/bin/certtool
156COURIER_OPENSSL= ${PREFIX}/bin/openssl 153COURIER_OPENSSL= ${PREFIX}/bin/openssl
157.endif 154
158.if !empty(PKG_OPTIONS:Mgnutls) 155.if !empty(PKG_OPTIONS:Mcourier-gnutls)
159SUBST_SED.tls= -e "s|@ssllib@|gnutls|g" 156SUBST_SED.tls= -e "s|@ssllib@|gnutls|g"
160.endif 157.else
161.if !empty(PKG_OPTIONS:Mssl) 
162USE_TOOLS+= openssl:run 158USE_TOOLS+= openssl:run
163COURIER_OPENSSL= ${TOOLS_OPENSSL} 159COURIER_OPENSSL= ${TOOLS_OPENSSL}
164SUBST_SED.tls= -e "s|@ssllib@|openssl|g" 160SUBST_SED.tls= -e "s|@ssllib@|openssl|g"
165.endif 161.endif
cvs diff -r1.14 -r1.15 pkgsrc/net/couriertcpd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/couriertcpd/Makefile 2008/02/19 18:45:41 1.14
+++ pkgsrc/net/couriertcpd/Makefile 2008/02/21 15:50:29 1.15
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.14 2008/02/19 18:45:41 jlam Exp $ 1# $NetBSD: Makefile,v 1.15 2008/02/21 15:50:29 jlam Exp $
2 2
3DISTNAME= courier-${COURIER_VERSION} 3DISTNAME= courier-${COURIER_VERSION}
4PKGNAME= ${DISTNAME:S/-/tcpd-/} 4PKGNAME= ${DISTNAME:S/-/tcpd-/}
 5PKGREVISION= 1
5CATEGORIES= net 6CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= jlam@pkgsrc.org 10MAINTAINER= jlam@pkgsrc.org
10COMMENT= Courier TCP socket and TLS servers 11COMMENT= Courier TCP socket and TLS servers
11HOMEPAGE= http://www.courier-mta.org/ 12HOMEPAGE= http://www.courier-mta.org/
12 13
13CONFLICTS= courier-imap<4.1.1 14CONFLICTS= courier-imap<4.1.1
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17USE_TOOLS+= gmake 18USE_TOOLS+= gmake
@@ -37,28 +38,26 @@ WRKSRC_FILES+= Makefile.in courier.spec @@ -37,28 +38,26 @@ WRKSRC_FILES+= Makefile.in courier.spec
37# These are subdirectories containing libraries used by couriertcpd. 38# These are subdirectories containing libraries used by couriertcpd.
38WRKSRC_SUBDIRS= bdbobj numlib soxwrap md5 random128 rfc1035 \ 39WRKSRC_SUBDIRS= bdbobj numlib soxwrap md5 random128 rfc1035 \
39 liblock waitlib tcpd 40 liblock waitlib tcpd
40 41
41EXTRACT_ELEMENTS= ${WRKSRC_FILES:S/^/${DISTNAME}\//} 42EXTRACT_ELEMENTS= ${WRKSRC_FILES:S/^/${DISTNAME}\//}
42EXTRACT_ELEMENTS+= ${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//} 43EXTRACT_ELEMENTS+= ${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
43 44
44BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//} 45BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
45INSTALLATION_DIRS= bin sbin ${PKGMANDIR}/man1 ${DOCDIR} 46INSTALLATION_DIRS= bin sbin ${PKGMANDIR}/man1 ${DOCDIR}
46 47
47REQD_DIRS= ${DOCDIR} 48REQD_DIRS= ${DOCDIR}
48MAKE_DIRS+= ${COURIER_STATEDIR} 49MAKE_DIRS+= ${COURIER_STATEDIR}
49 50
50.include "../../security/openssl/buildlink3.mk" 
51 
52do-install: 51do-install:
53 ${INSTALL_PROGRAM} ${WRKSRC}/tcpd/couriertcpd \ 52 ${INSTALL_PROGRAM} ${WRKSRC}/tcpd/couriertcpd \
54 ${DESTDIR}${PREFIX}/sbin/couriertcpd 53 ${DESTDIR}${PREFIX}/sbin/couriertcpd
55 ${INSTALL_MAN} ${WRKSRC}/tcpd/couriertcpd.1 \ 54 ${INSTALL_MAN} ${WRKSRC}/tcpd/couriertcpd.1 \
56 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/couriertcpd.1 55 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/couriertcpd.1
57 ${INSTALL_DATA} ${WRKSRC}/tcpd/couriertcpd.html \ 56 ${INSTALL_DATA} ${WRKSRC}/tcpd/couriertcpd.html \
58 ${DESTDIR}${DOCDIR}/couriertcpd.html 57 ${DESTDIR}${DOCDIR}/couriertcpd.html
59 58
60 ${INSTALL_PROGRAM} ${WRKSRC}/tcpd/couriertls \ 59 ${INSTALL_PROGRAM} ${WRKSRC}/tcpd/couriertls \
61 ${DESTDIR}${PREFIX}/bin/couriertls 60 ${DESTDIR}${PREFIX}/bin/couriertls
62 ${INSTALL_MAN} ${WRKSRC}/tcpd/couriertls.1 \ 61 ${INSTALL_MAN} ${WRKSRC}/tcpd/couriertls.1 \
63 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/couriertls.1 62 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/couriertls.1
64 ${INSTALL_DATA} ${WRKSRC}/tcpd/couriertls.html \ 63 ${INSTALL_DATA} ${WRKSRC}/tcpd/couriertls.html \
cvs diff -r1.1 -r1.2 pkgsrc/net/couriertcpd/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/net/couriertcpd/Attic/options.mk 2008/02/19 18:45:41 1.1
+++ pkgsrc/net/couriertcpd/Attic/options.mk 2008/02/21 15:50:29 1.2
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1# $NetBSD: options.mk,v 1.1 2008/02/19 18:45:41 jlam Exp $ 1# $NetBSD: options.mk,v 1.2 2008/02/21 15:50:29 jlam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.couriertcpd 3PKG_OPTIONS_VAR= PKG_OPTIONS.couriertcpd
4PKG_SUPPORTED_OPTIONS= inet6 4PKG_SUPPORTED_OPTIONS= courier-gnutls inet6
5PKG_OPTIONS_REQUIRED_GROUPS= tls 5PKG_SUGGESTED_OPTIONS= inet6
6PKG_OPTIONS_GROUP.tls= gnutls ssl 
7PKG_SUGGESTED_OPTIONS= inet6 ssl 
8 6
9.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
10 8
11### 9###
12### Build with OpenSSL or GNU TLS as the underlying crypto library. 10### Support using GNU TLS as the underlying crypto library; otherwise,
 11### default to using OpenSSL.
13### 12###
14.if !empty(PKG_OPTIONS:Mssl) 13.if !empty(PKG_OPTIONS:Mcourier-gnutls)
15. include "../../security/openssl/buildlink3.mk" 
16.elif !empty(PKG_OPTIONS:Mgnutls) 
17. include "../../security/gnutls/buildlink3.mk" 14. include "../../security/gnutls/buildlink3.mk"
18CONFIGURE_ARGS+= --with-gnutls 15CONFIGURE_ARGS+= --with-gnutls
 16.else
 17. include "../../security/openssl/buildlink3.mk"
19.endif 18.endif
20 19
21### 20###
22### IPv6 support. 21### IPv6 support.
23### 22###
24.if !empty(PKG_OPTIONS:Minet6) 23.if !empty(PKG_OPTIONS:Minet6)
25CONFIGURE_ARGS+= --with-ipv6 24CONFIGURE_ARGS+= --with-ipv6
26.else 25.else
27CONFIGURE_ARGS+= --without-ipv6 26CONFIGURE_ARGS+= --without-ipv6
28.endif 27.endif