From owner-svn-ports-all@freebsd.org Thu Oct 29 12:42:32 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 124B1A126DC; Thu, 29 Oct 2015 12:42:32 +0000 (UTC) (envelope-from garga@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 mx1.freebsd.org (Postfix) with ESMTPS id DE2AF119D; Thu, 29 Oct 2015 12:42:31 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9TCgVkM092513; Thu, 29 Oct 2015 12:42:31 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9TCgUNP092511; Thu, 29 Oct 2015 12:42:30 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201510291242.t9TCgUNP092511@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Thu, 29 Oct 2015 12:42:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400455 - head/security/strongswan X-SVN-Group: ports-head 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.20 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: Thu, 29 Oct 2015 12:42:32 -0000 Author: garga Date: Thu Oct 29 12:42:30 2015 New Revision: 400455 URL: https://svnweb.freebsd.org/changeset/ports/400455 Log: - Add a new option, SWANCTL, to install swanctll utility - When VICI option is selected, install libvici.h to include directory, it's useful when you need to build a custom code linked to libvici - Pass path to USE_LDCONFIG otherwise libraries will not be visible PR: 204098 Approved by: maintainer Obtained from: pfSense Sponsored by: Rubicon Communications (Netgate) Modified: head/security/strongswan/Makefile head/security/strongswan/pkg-plist Modified: head/security/strongswan/Makefile ============================================================================== --- head/security/strongswan/Makefile Thu Oct 29 12:14:38 2015 (r400454) +++ head/security/strongswan/Makefile Thu Oct 29 12:42:30 2015 (r400455) @@ -17,7 +17,7 @@ USES= cpe execinfo libtool:keepla pkgco USE_OPENSSL= yes USE_RC_SUBR= strongswan GNU_CONFIGURE= yes -USE_LDCONFIG= yes +USE_LDCONFIG= ${PREFIX}/lib/ipsec INSTALL_TARGET= install-strip CONFIGURE_ARGS= --enable-kernel-pfkey \ @@ -42,7 +42,7 @@ CONFIGURE_ARGS= --enable-kernel-pfkey \ OPTIONS_DEFINE= CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE GCM IKEv1 \ IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MYSQL PKI SCEP SMP \ - SQLITE TESTVECTOR UNBOUND UNITY VICI XAUTH + SQLITE SWANCTL TESTVECTOR UNBOUND UNITY VICI XAUTH OPTIONS_DEFAULT= IKEv1 BUILTIN OPTIONS_SINGLE= PRINTF_HOOKS OPTIONS_SINGLE_PRINTF_HOOKS= BUILTIN VSTR LIBC @@ -61,6 +61,7 @@ TESTVECTOR_DESC= Enable crypto test vect PKI_DESC= Enable PKI tools SCEP_DESC= Enable Simple Certificate Enrollment Protocol SMP_DESC= Enable XML-based management protocol (DEPRECATED) +SWANCTL_DESC= Install swanctl UNBOUND_DESC= Enable DNSSEC-enabled resolver UNITY_DESC= Enable Cisco Unity extension plugin VICI_DESC= Enable VICI management protocol @@ -88,6 +89,7 @@ MYSQL_CONFIGURE_ON= --enable-mysql MYSQL_USE= MYSQL=yes SMP_LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 SMP_CONFIGURE_ON= --enable-smp +SWANCTL_CONFIGURE_ON= --enable-swanctl SQLITE_CONFIGURE_ON= --enable-sqlite SQLITE_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 TESTVECTOR_CONFIGURE_ON=--enable-test-vectors @@ -124,4 +126,14 @@ PLIST_SUB+= XAUTHGEN="" PLIST_SUB+= XAUTHGEN="@comment " .endif +post-install: +.if ${PORT_OPTIONS:MVICI} + ${INSTALL_DATA} ${WRKSRC}/src/libcharon/plugins/vici/libvici.h \ + ${STAGEDIR}${PREFIX}/include +.endif +.if ${PORT_OPTIONS:MSWANCTL} + ${MV} ${STAGEDIR}${PREFIX}/etc/swanctl/swanctl.conf \ + ${STAGEDIR}${PREFIX}/etc/swanctl/swanctl.conf.sample +.endif + .include Modified: head/security/strongswan/pkg-plist ============================================================================== --- head/security/strongswan/pkg-plist Thu Oct 29 12:14:38 2015 (r400454) +++ head/security/strongswan/pkg-plist Thu Oct 29 12:42:30 2015 (r400455) @@ -338,6 +338,12 @@ man/man8/charon-cmd.8.gz %%SMP%%lib/ipsec/plugins/libstrongswan-smp.la %%SMP%%lib/ipsec/plugins/libstrongswan-smp.so %%SMP%%@sample %%ETCDIR%%.d/charon/smp.conf.sample +%%SWANCTL%%%%DATADIR%%/templates/config/strongswan.d/swanctl.conf +%%SWANCTL%%sbin/swanctl +%%SWANCTL%%man/man5/swanctl.conf.5.gz +%%SWANCTL%%man/man8/swanctl.8.gz +%%SWANCTL%%@sample %%ETCDIR%%.d/swanctl.conf.sample +%%SWANCTL%%@sample etc/swanctl/swanctl.conf.sample %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.a %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.la %%UNBOUND%%lib/ipsec/plugins/libstrongswan-unbound.so @@ -358,6 +364,7 @@ man/man8/charon-cmd.8.gz %%VICI%%lib/ipsec/plugins/libstrongswan-vici.la %%VICI%%lib/ipsec/plugins/libstrongswan-vici.so %%VICI%%@sample %%ETCDIR%%.d/charon/vici.conf.sample +%%VICI%%include/libvici.h %%XAUTH%%lib/ipsec/plugins/libstrongswan-xauth-eap.a %%XAUTH%%lib/ipsec/plugins/libstrongswan-xauth-eap.la %%XAUTH%%lib/ipsec/plugins/libstrongswan-xauth-eap.so @@ -424,3 +431,12 @@ lib/ipsec/libtls.so.0.0.0 @dir etc/ipsec.d/ocspcerts @dir etc/ipsec.d/private @dir etc/ipsec.d/reqs +%%SWANCTL%%@dir etc/swanctl/ecdsa +%%SWANCTL%%@dir etc/swanctl/pkcs12 +%%SWANCTL%%@dir etc/swanctl/pkcs8 +%%SWANCTL%%@dir etc/swanctl/rsa +%%SWANCTL%%@dir etc/swanctl/x509 +%%SWANCTL%%@dir etc/swanctl/x509aa +%%SWANCTL%%@dir etc/swanctl/x509ac +%%SWANCTL%%@dir etc/swanctl/x509ca +%%SWANCTL%%@dir etc/swanctl/x509crl