net-misc/libreswan: bump to 3.18

Package-Manager: portage-2.3.0_p22

3 files changed, 112 insertions, 4 deletions

diff --git a/net-misc/libreswan/Manifest b/net-misc/libreswan/Manifest
index 2f8ed0a9b6d8..227effa4ca28 100644
--- a/net-misc/libreswan/Manifest
+++ b/net-misc/libreswan/Manifest
@@ -1 +1,2 @@
 DIST libreswan-3.17.tar.gz 9168223 SHA256 28c286f57f6d8d00e1502ea283aac0f9f863edb2d759e50dc89df0e28c0d0d03 SHA512 4503ae82663f060f3af3fd74491ae94feb33a28f13f96cd04bb4a83bba17fe199f4ff7cba83850235829b373f803ba816d7a4199d4afb1da191c7323dd28a362 WHIRLPOOL c771218d7c0a26041bb946c2805f581086e9beae8827c2fbaad49eb032107f322316e6102b3161db014d1d6e5e222d682d23a1ac147ae65fc37b0c364440cbdc
+DIST libreswan-3.18.tar.gz 8766228 SHA256 2ff61178913287567ed2736287df47e7f9a822ddcded967f3af5f03e95b5f17d SHA512 dfc831ae82814a26cac2eb7c8bef4385d8aebb1e62c63f31e0997d49fc6bbcc6e4e2bcd0e07d5c0c1347e5eaca5f6eb1fba98395bc882ab0fddb804a524b57f8 WHIRLPOOL 73ce41988d62d6702837d9ba6c2e123aad678b6d983711e6e5d3a60046bdbf2a37d8f650a8e4ffff24c551a27d50ecbef322bc40a083b852a142b2a5bcda2726
diff --git a/net-misc/libreswan/libreswan-3.18.ebuild b/net-misc/libreswan/libreswan-3.18.ebuild
new file mode 100644
index 000000000000..316039d5d6d5
--- /dev/null
+++ b/net-misc/libreswan/libreswan-3.18.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/libreswan/libreswan.git"
+fi
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+IUSE="caps curl dnssec ldap pam"
+
+COMMON_DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent
+	dev-libs/nspr
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( net-dns/unbound net-libs/ldns )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-misc/openswan
+	!net-misc/strongswan
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export INC_USRLOCAL=/usr
+	export INC_MANDIR=share/man
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=openrc
+	export INC_RCDIRS=
+	export INC_RCDEFAULT=/etc/init.d
+	export USERCOMPILE=
+	export USERLINK=
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LDAP=$(usetf ldap)
+	export USE_XAUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" all
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	local IPSEC_CONFDIR=${ROOT%/}/etc/ipsec.d
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db ]]; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR}"
+		certutil -N -d "${IPSEC_CONFDIR}" -f <(echo)
+		eend $?
+	fi
+}
diff --git a/net-misc/libreswan/libreswan-9999.ebuild b/net-misc/libreswan/libreswan-9999.ebuild
index 2fd8e0c08caa..316039d5d6d5 100644
--- a/net-misc/libreswan/libreswan-9999.ebuild
+++ b/net-misc/libreswan/libreswan-9999.ebuild
@@ -50,6 +50,11 @@ usetf() {
 	usex "$1" true false
 }
 
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	default
+}
+
 src_configure() {
 	tc-export AR CC
 	export INC_USRLOCAL=/usr
@@ -73,17 +78,16 @@ src_configure() {
 
 src_compile() {
 	emake all
+	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" all
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
+	emake -C initsystems INITSYSTEM=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${D}" install
 
 	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
 	fperms 0600 /etc/ipsec.secrets
 
-	systemd_dounit "${FILESDIR}/ipsec.service"
-
-	dodoc CHANGES README
 	dodoc -r docs
 
 	find "${D}" -type d -empty -delete || die