Bug 183705 - [PATCH] mail/courier-imap: Add GNUTLS option
[PATCH] mail/courier-imap: Add GNUTLS option
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: Oliver Lehmann
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2013-11-05 23:20 UTC by Guido Falsi
Modified: 2014-03-01 16:10 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (3.44 KB, patch)
2013-11-05 23:20 UTC, Guido Falsi
no flags Details | Diff
courier-imap.diff (3.44 KB, patch)
2014-03-01 09:35 UTC, Guido Falsi
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Guido Falsi freebsd_committer 2013-11-05 23:20:01 UTC
- Add GNUTLS option, to compile against gnutls, enabling SNI support

NOTE: GNUTLS option needs to be handled before bsd.port.pre.mk
      because it defines USES=pkgconfig

While here:

- Convert to staging
- Convert to new LIB_DEPENDS format
- Use space iin pkg-descr WWW line
- Remove unneeded dirrmtry from pkg-plist
Comment 1 Edwin Groothuis freebsd_committer 2013-11-05 23:20:16 UTC
Responsible Changed
From-To: freebsd-ports-bugs->oliver

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Guido Falsi freebsd_committer 2014-03-01 09:35:39 UTC
Hi,

I'm attaching a revised patch which applies to the present ports tree.

I've been using this version of the port successfully all this time on
my own email servers.

Is it possible to have this approved or committed?

Thanks in advance.

-- 
Guido Falsi <madpilot@FreeBSD.org>
Comment 3 dfilter freebsd_committer 2014-03-01 16:09:02 UTC
Author: oliver
Date: Sat Mar  1 16:08:54 2014
New Revision: 346638
URL: http://svnweb.freebsd.org/changeset/ports/346638
QAT: https://qat.redports.org/buildarchive/r346638/

Log:
  add GNUTILS option
  
  PR:		ports/183705
  Submitted by:	madpilot

Modified:
  head/mail/courier-imap/Makefile
  head/mail/courier-imap/pkg-descr
  head/mail/courier-imap/pkg-plist

Modified: head/mail/courier-imap/Makefile
==============================================================================
--- head/mail/courier-imap/Makefile	Sat Mar  1 16:06:59 2014	(r346637)
+++ head/mail/courier-imap/Makefile	Sat Mar  1 16:08:54 2014	(r346638)
@@ -3,6 +3,7 @@
 
 PORTNAME=	courier-imap
 PORTVERSION=	4.15
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
@@ -26,15 +27,15 @@ CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_reh
 MAKE_ENV:=	${CONFIGURE_ENV}
 
 #
-NO_STAGE=	yes
 # options available:
 #
 # WITH_SYSLOG_FACILITY:         The syslogfacility to use
 #
 
-OPTIONS_DEFINE=	FAM TRASHQUOTA GDBM IPV6
+OPTIONS_DEFINE=	FAM TRASHQUOTA GDBM IPV6 GNUTLS
 FAM_DESC=	Fam support for IDLE command
 TRASHQUOTA_DESC=	Include deleted mails in the quota
+GNUTLS_DESC=	Use GnuTLS instead of OpenSSL (Enables SNI)
 FAM_USES=	fam
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt)
@@ -57,6 +58,14 @@ CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} 
 		--with-locking-method=fcntl \
 		COURIERAUTHCONFIG=${PREFIX}/bin/courierauthconfig
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGNUTLS}
+CONFIGURE_ARGS+=--with-gnutls
+LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+USES+=		pkgconfig
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
@@ -70,7 +79,7 @@ CONFIGURE_ARGS+=--with-syslog=${WITH_SYS
 .if ${PORT_OPTIONS:MAUTH_USERDB}
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB}
-LIB_DEPENDS+=	gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
 .else
 CONFIGURE_ARGS+=--with-db=db  --with-userdb=${USERDB}
 .endif
@@ -89,11 +98,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
-MAN1=		couriertcpd.1 maildiracl.1 maildirkw.1 \
-		maildirmake.1
-
-MAN8=		deliverquota.8 imapd.8 mkimapdcert.8 mkpop3dcert.8 mkdhparams.8
-
 EXTRA_DOCS=	AUTHORS INSTALL NEWS \
 		libs/imap/ChangeLog \
 		libs/imap/README \
@@ -121,16 +125,15 @@ post-patch:
 
 post-install:
 .for i in imapd pop3d
-	${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${CONFDIR}/${i}.cnf.dist
+	${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for a in ${EXTRA_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
-	cd ${WRKSRC} && ( ${GMAKE} install-configure ; cd - )
+	cd ${WRKSRC} && ( ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} \
+		install-configure ; cd - )
 
 	@${ECHO_MSG} "In case you use authpam, you should put the following lines"
 	@${ECHO_MSG} "in your /etc/pam.d/imap"

Modified: head/mail/courier-imap/pkg-descr
==============================================================================
--- head/mail/courier-imap/pkg-descr	Sat Mar  1 16:06:59 2014	(r346637)
+++ head/mail/courier-imap/pkg-descr	Sat Mar  1 16:08:54 2014	(r346638)
@@ -16,4 +16,4 @@ Features:
      * Virtual mailbox support.
      * Pop3 daemon.
 
-WWW:	http://www.courier-mta.org/imap/
+WWW: http://www.courier-mta.org/imap/

Modified: head/mail/courier-imap/pkg-plist
==============================================================================
--- head/mail/courier-imap/pkg-plist	Sat Mar  1 16:06:59 2014	(r346637)
+++ head/mail/courier-imap/pkg-plist	Sat Mar  1 16:08:54 2014	(r346638)
@@ -28,6 +28,15 @@ bin/pop3d
 %%LIBEXECDIR%%/makedatprog
 %%LIBEXECDIR%%/pop3d-ssl.rc
 %%LIBEXECDIR%%/pop3d.rc
+man/man1/couriertcpd.1.gz
+man/man1/maildiracl.1.gz
+man/man1/maildirkw.1.gz
+man/man1/maildirmake.1.gz
+man/man8/deliverquota.8.gz
+man/man8/imapd.8.gz
+man/man8/mkdhparams.8.gz
+man/man8/mkimapdcert.8.gz
+man/man8/mkpop3dcert.8.gz
 sbin/imaplogin
 sbin/mkdhparams
 sbin/mkimapdcert
@@ -54,7 +63,6 @@ share/courier-imap/mkpop3dcert
 @dirrmtry var
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/courier-imap
-@dirrmtry %%LIBEXECDIR%%/authlib
 @dirrm %%LIBEXECDIR%%
 @dirrm %%CONFDIR%%/shared
 @dirrm %%CONFDIR%%/shared.tmp
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Oliver Lehmann freebsd_committer 2014-03-01 16:09:19 UTC
State Changed
From-To: open->closed

Committed. Sorry that it took so long!