gentoo Easter resync : 12.04.2020

3 files changed, 120 insertions, 2 deletions

diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 8411f09cbb73..08d85111f76a 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,6 +1,8 @@
 AUX libreswan-3.30-ip-path.patch 563 BLAKE2B 838ae401b4e7c04378e8cbb2561a6d348896883942683682c8ac3b31de56d360460bc2ea2c26f579a6f36078101270167b775579fd2502c72dd680620c12a585 SHA512 a8a391386014cff3b867fb8c0ba8c83ecb93c11d35aea205877b66e3104712311e19f13eb9659ee158833512c199d0104b5a796ebef37a1bc210e254abc6f573
 DIST libreswan-3.29.tar.gz 3848730 BLAKE2B 32dc839186fb511534a4959014082f8efe27708da7bc09dc5977532ffc7ea0ccdc92407932b3c3166f14b9ff85933e9a3f76325bbe620e09a5fa5a5c496d1f44 SHA512 4b4d91204d8b1724e0a9ad3ed55fc232c9a526211c3b47b6cc33fd160feb72538ef1661becca250bde815b9d7b75709bf16c7b372476605557b47c785cdf2535
 DIST libreswan-3.30.tar.gz 4119139 BLAKE2B 64c528b84bce10a01dceece473016a1836c47da0d1878c4fd413f859e6c5edc05bded1ac54d60e6979005f6654ab4819b8b05aba5b16658d493bb300bf773823 SHA512 1ea3505938231bacb762ec13c278b584239660e20994030423f0200ff32fcc0f0a0c74649b1470bbfc1165a762d3b60d0b1c5c56bff81a52415c7666736b5b99
+DIST libreswan-3.31.tar.gz 4127675 BLAKE2B 0b773e4cfda761a88e8cb6ed412ecdd50bb52df7a58029141d41c77f959ad06c6cd04625b9094efa8586328381e3c75050ff68c2d8dd6d832ed5dd6e747d9391 SHA512 edaddeb209c4fb974b16790ba843a41f4f1d269dd28333aa02b820801a222435c2ca5622e77558d1e95970b4ef24a663d9c44ef4ede7ff4e66e1f0d9b6e880d2
 EBUILD libreswan-3.29.ebuild 3062 BLAKE2B 5d6b9ef04607c52c292d0c509129cfb82dc2d8ed2d30b90ecbc81a76de048c45b0c945f22cafbdc3c4fb35511bb9cb5b7992968fccd041cfc06e48f5a3cafef9 SHA512 640827da7fc1e7acce3b53d555e782cf685f0937b1ddab1c89888533fa067b19a9a931fbeb62ece60b474e576401d7a06b1f8fa6893adb748a09260d62716704
-EBUILD libreswan-3.30.ebuild 3143 BLAKE2B eb0ab4332f1f14e43022e6ca477ae07c031a2d1d801d96de0a6b20216a2ea3d3ad591490234f7b7807239bba8896b45c3af4132b418ceb1f80528b1b0c5dd37f SHA512 2e040ad807983db86e91542fc9ddce4c3e0168f2049d675d442577542d0febe001e6ecf69cb6f8162a240a4e60ad8a1020e4c22db25335b20815bc81d98bf7da
+EBUILD libreswan-3.30.ebuild 3123 BLAKE2B 01a683f167efff93f2b2afd44a464ef7e33e09c57ca7f4c80a490016f35ddd3f62085905bb3ad12ad4527f82d3cafee594e224e9e7940b10d0f8a05bf49b8333 SHA512 9dbd057008e18b106d7ea71ef66af59661dd5ed953a9b3224a67706ed181ac7af659a56793db1250da326e27598f1477e3b09c1e7ad89ef64918dd2a4d5cf13b
+EBUILD libreswan-3.31.ebuild 3129 BLAKE2B 898c335ac5250ef25dbf1197799158bea2a8ee562f2dce91eff51086fc0149c49665689a5b27c65eca26cc80b2c35ab1c3c5ef8c403f5b54e48fa9ed9cc643b7 SHA512 b221c0dc62b3326072dd05fda6e6b3dacca223b2fba0f2db38fa1114716b800071f804365c0051653f2b7c24a39cfacb532095d75c8a02216470538715da659e
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.30.ebuild b/net-vpn/libreswan/libreswan-3.30.ebuild
index bf8f6a939631..b16d469b9d07 100644
--- a/net-vpn/libreswan/libreswan-3.30.ebuild
+++ b/net-vpn/libreswan/libreswan-3.30.ebuild
@@ -43,7 +43,6 @@ BDEPEND="
 RDEPEND="${DEPEND}
 	dev-libs/nss[utils(+)]
 	sys-apps/iproute2
-	!net-misc/openswan
 	!net-vpn/strongswan
 	selinux? ( sec-policy/selinux-ipsec )
 "
diff --git a/net-vpn/libreswan/libreswan-3.31.ebuild b/net-vpn/libreswan/libreswan-3.31.ebuild
new file mode 100644
index 000000000000..f81f028d3f9b
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-3.31.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+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 seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	>=dev-libs/nss-3.42
+	>=sys-kernel/linux-headers-4.19
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-3.30-ip-path.patch" )
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || 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_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_XAUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" 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 && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}