From owner-svn-ports-all@freebsd.org Sun Jan 26 05:48:17 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D1AA230668; Sun, 26 Jan 2020 05:48:17 +0000 (UTC) (envelope-from fox@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48523j1lbCz4ZfV; Sun, 26 Jan 2020 05:48:17 +0000 (UTC) (envelope-from fox@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 18F821C62F; Sun, 26 Jan 2020 05:48:17 +0000 (UTC) (envelope-from fox@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00Q5mGYV084789; Sun, 26 Jan 2020 05:48:16 GMT (envelope-from fox@FreeBSD.org) Received: (from fox@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00Q5mGn8084788; Sun, 26 Jan 2020 05:48:16 GMT (envelope-from fox@FreeBSD.org) Message-Id: <202001260548.00Q5mGn8084788@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fox set sender to fox@FreeBSD.org using -f From: Santhosh Raju Date: Sun, 26 Jan 2020 05:48:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524154 - head/irc/ircd-hybrid X-SVN-Group: ports-head X-SVN-Commit-Author: fox X-SVN-Commit-Paths: head/irc/ircd-hybrid X-SVN-Commit-Revision: 524154 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jan 2020 05:48:17 -0000 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 .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