Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 26 Jan 2020 05:48:16 +0000 (UTC)
From:      Santhosh Raju <fox@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r524154 - head/irc/ircd-hybrid
Message-ID:  <202001260548.00Q5mGn8084788@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fox
Date: Sun Jan 26 05:48:16 2020
New Revision: 524154
URL: https://svnweb.freebsd.org/changeset/ports/524154

Log:
  irc/ircd-hybrid: Adds support for alternative TLS.
  
  - Adds options for GnuTLS and WolfSSL.
  - Minor portlint / portfmt fixes.
  
  Reviewed by:	philip

Modified:
  head/irc/ircd-hybrid/Makefile

Modified: head/irc/ircd-hybrid/Makefile
==============================================================================
--- head/irc/ircd-hybrid/Makefile	Sun Jan 26 05:39:41 2020	(r524153)
+++ head/irc/ircd-hybrid/Makefile	Sun Jan 26 05:48:16 2020	(r524154)
@@ -11,12 +11,14 @@ COMMENT=	Fast irc daemon with a number of new features
 
 LICENSE=	GPLv2
 
-INSTALL_IGNORES=	ircu-* ircd-rat* charby*
-
 # :keepla because port uses lt_dlopen
 USES=		cpe gmake libtool:keepla tar:tgz
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
+LIB_DEPENDS+=	libltdl.so:devel/libltdl
+
 USERS=		ircd
 GROUPS=		${USERS}
 
@@ -24,27 +26,47 @@ USE_RC_SUBR=	ircd-hybrid
 SUB_FILES=	pkg-message
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-OPTIONS_DEFINE=	OPENSSL ASSERT
-OPTIONS_DEFAULT=OPENSSL
+OPTIONS_DEFINE=		ASSERT
+OPTIONS_RADIO=		TLS
+OPTIONS_RADIO_TLS=	GNUTLS OPENSSL WOLFSSL
+OPTIONS_DEFAULT=	OPENSSL
+OPTIONS_SUB=		yes
 
 ASSERT_CONFIGURE_ENABLE=	assert
-ASSERT_DESC=	Enable parts of the debugging code
+ASSERT_DESC=			Enable parts of the debugging code
 
 OPENSSL_DESC=	Enable openssl - allows use of CHALLENGE and encrypted links
 
 INSTALL_TARGET=	install-strip
 
+INSTALL_IGNORES=	charby* ircd-rat* ircu-*
+
+CERTSFILE=	${LOCALBASE}/share/certs/ca-root-nss.crt
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
-USES	+=	ssl
+USES+=			ssl
 CONFIGURE_ARGS+=	--with-tls=openssl
+CONFIGURE_ENV+=		libssl_CFLAGS="-I${OPENSSLINC}" \
+			libssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
+.elif ${PORT_OPTIONS:MGNUTLS}
+LIB_DEPENDS+=		libgnutls.so:security/gnutls
+CONFIGURE_ARGS+=	--with-tls=gnutls
+.elif ${PORT_OPTIONS:MWOLFSSL}
+LIB_DEPENDS+=		libwolfssl.so:security/wolfssl
+CONFIGURE_ARGS+=	--with-tls=wolfssl
+.else
+CONFIGURE_ARGS+=	--with-tls=none
 .endif
 
-CONFIGURE_ARGS+=	\
-	--sysconfdir=${PREFIX}/etc/ircd-hybrid \
-	--datarootdir=${PREFIX}/share/${PORTNAME}-${PORTVERSION} \
-	--localstatedir=/var
+.if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MWOLFSSL}
+RUN_DEPENDS+=	${CERTSFILE}:security/ca_root_nss
+.endif
+
+CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/share/${PORTNAME}-${PORTVERSION} \
+			--localstatedir=/var \
+			--sysconfdir=${PREFIX}/etc/ircd-hybrid
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/bin/mkpasswd ${STAGEDIR}${PREFIX}/bin/ircd-hybrid-mkpasswd



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001260548.00Q5mGn8084788>