gentoo resync : 16.01.2021

8 files changed, 130 insertions, 36 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 9666d1edeefb..75e3c43ccfe1 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 655d0b14190a..fd39fe3957df 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -4,9 +4,11 @@ DIST libreswan-3.32.tar.gz 4141631 BLAKE2B 37a4cb5c1f52d69b17ba60abd2b7a181d9f55
 DIST libreswan-4.3.tar.gz 3489322 BLAKE2B 36908bf043fb1085f40b4a5f35ca6dc1563e1a1701f9cced9cb6765094bb2ef603b6d6d4b076a333d540f6454c10b6350d9b8c20de8bc3f27b19915b4cf42b9f SHA512 4687c867d34655cd33997edf4ab7887b2121af41c99d1bd9c794fce1c1eef412f5528de7a338e92a44c1c5d0aaa8fbeb756b89849fcad3deb45a418751e64045
 DIST libreswan-4.4.tar.gz 3503201 BLAKE2B c6c5cb2d7141afe52128e71051fd39b058a06fe4972074c853dbba2937f4c113548392d9c202badac5c1350e4d05f60d4a4d0aed453b1ee91c38a3245b0cf209 SHA512 108b2ac7a36454c48ce448a83ddd81e72d7fbb7cf8b042116d9bd31f195cdab4ccd6311d72af7ab4cc6d054df50d30a6bfc50b56fe7cbfd35d54a68804a6678b
 DIST libreswan-4.5.tar.gz 3529355 BLAKE2B 7485a8c77b997026681b3b99194ee54176f1cd7230af72a2aa231e5caa97946c40b0178f0ffa1dd200085b5919883697d7300bb328561501789707035f045337 SHA512 451a4f71099aa4776624a4c127fdaff492acc38a44228255dcbf955efa0982fd963c989d63522f56279eec6a9ef738febb573dde34aa541724ab11e37a554f9e
+DIST libreswan-4.6.tar.gz 3579760 BLAKE2B 56099e753d9da882ea9e4b7966706f39bac36cd88adcba5fa1c3201cbe0a2ba7a02042cb9eeb8fd52a7b1ba0f3128b854114abc748fe9bf6d9059937a72eb0e4 SHA512 c1c3efd7665dee6caaf08cb5aa50fcd37c299acad4b62648284fdb04edd50ba8fc8d33a9fb210edaf2312697f8cd251f33a6b16587eb2cfefd1269b4482dd499
 EBUILD libreswan-3.32-r4.ebuild 3191 BLAKE2B 256ae0b37e6efc53174ba4b1e5dce166ec49e719bd3b768f19d40f2a0aa2ecd820ad4f8fa40fc6896e070b70041e50730736be026bf22a439b6d9aa93e44131f SHA512 8f29ae93e948b912dd581b011e9ad03f3069bd1a0dc54ac24341ea75bcf067f61c65d08361145191f25a6b2da9987079514b0bfeb725cb522dce7676290ee60a
 EBUILD libreswan-4.3-r2.ebuild 3297 BLAKE2B 0349de254a56a9a375f734981326b46a8798a553842fb0030344f09ea797a4cba421dd29bba2a7af7116cac27c5f0290161a694539989c9148daf46610102262 SHA512 8eb0e3189d38b9432d8a879faa96a98536f034743194ceb27ec282562693bd547e4da8bcf162f6e6d0674c555854fcae355f1f7c4b31d1f4fbdfe675fea02342
 EBUILD libreswan-4.4-r4.ebuild 3298 BLAKE2B d580c97b4da77e574ab25a8b163942c302f19c22823799ba780bf9340f34a0cffe7ed2a6cf800891dafebbe564cda92a7b6399a1a4bf9dcfbdbfd028f8bc61fb SHA512 0c075d4992460e9731e183780e11d99f3dc303fff2410b90c019f08c2b317c8a0b6e2ac444044c5570d6578e91275ee0fca57c5a3793fa31d0d9a95ef110a87b
 EBUILD libreswan-4.4-r5.ebuild 3320 BLAKE2B d4561524d0b71852a80ea3e43461afd081e41098c950819e40f5cded38e6933f93304fdab3936f30817b418a3ce1343ce536b75f25d50442d900dc9eaeef973b SHA512 37f35d7df3106394edf664f023a22c6133c5d89bc8262249dbb58f065e8f46c39e7940056642d4bc363841abe0fc7143f89608cfe0e491af8504fae592edac6c
-EBUILD libreswan-4.5.ebuild 3322 BLAKE2B 72d157245c7d6759d704df541614a6194b277b064e631d1d41ba76f9781c50c5b04d8a453787582ab4df58f28773ca55e9e8f8523d84db6da2df25260c5ee7ea SHA512 a6386f61655bc2afb438ec6a10b8d07de6b14d1088ffe7ad7685ecc75e3b409af08c92c046423c2faef3d1ef2066218128f5888d10a1d420024e5b8ea5ebcb29
+EBUILD libreswan-4.5.ebuild 3320 BLAKE2B eace0fea2828dd0734fcd1d3bfc0a5cef72f12ac03f6954cde4a27a6ae8d2d12be388331cfc09d82d9e6b10965d9d95fb5d8d1d0425235618740dd8a6fb25739 SHA512 1f2b745471019daf23d76cf77f0a17bc3c2a52ee340727dfa2b3cd627e6d895397643dd5052dcdfe511c94950580bc40f71c0e0d358ada933bb972641d787842
+EBUILD libreswan-4.6.ebuild 3322 BLAKE2B c10fe54b4859cd2258496a1e922ed7c8f3e4895bcb44f3d55d3401d8321cfa455da5313f7633b299b2feb2455409b5d52a9236941616f9ab0ba214ae45806231 SHA512 66f6561a6a276eb483dee0a25f93bc63eb254bad949a10adfe44f191ff7b85606226198667a0e6d2e0734f7344c3c19ccfb0f4bd8bea8c235e379a9aa33ef97a
 MISC metadata.xml 320 BLAKE2B 0c27b16d57b404aa7307e58f0fe31a368595acf482fca1efcb5f2ebf3b98487cbe9f77b10862820443c2dc13d98664bf4bf5944abf9ca5dec393af2e1eb19668 SHA512 b313c55f0d9de7f3ff3d5a8fb7b0d010b3240388fb0b808b7108c7d2f43d926896a13e64ac365bf4a6156d429857c99809f0d034298b2bb6e55c4b0bc56e36ab
diff --git a/net-vpn/libreswan/libreswan-4.5.ebuild b/net-vpn/libreswan/libreswan-4.5.ebuild
index 06f4baa533ab..6e63e0b26f56 100644
--- a/net-vpn/libreswan/libreswan-4.5.ebuild
+++ b/net-vpn/libreswan/libreswan-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.libreswan.org/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD-4 RSA DES"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-vpn/libreswan/libreswan-4.6.ebuild b/net-vpn/libreswan/libreswan-4.6.ebuild
new file mode 100644
index 000000000000..cd32e99023da
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-4.6.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="caps curl dnssec ldap networkmanager 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
+	virtual/libcrypt:=
+	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}-4.2-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 PREFIX=/usr
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=$(usex systemd systemd openrc)
+	export INITDDIRS=
+	export INITDDIR_DEFAULT=/etc/init.d
+	export USERCOMPILE=${CFLAGS}
+	export USERLINK=${LDFLAGS}
+	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_NM=$(usetf networkmanager)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_AUTHPAM=$(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
+
+	keepdir /var/lib/ipsec/nss
+	fperms 0700 /var/lib/ipsec/nss
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process libreswan.conf
+
+	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
+	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
+}
diff --git a/net-vpn/protonvpn-cli/Manifest b/net-vpn/protonvpn-cli/Manifest
index 29a073de33ae..7aacdbb62f5b 100644
--- a/net-vpn/protonvpn-cli/Manifest
+++ b/net-vpn/protonvpn-cli/Manifest
@@ -1,5 +1,3 @@
 DIST protonvpn-cli-2.2.11.tar.gz 641106 BLAKE2B 916560e32716e1d29dbfa3ae513df3976dbe4bb667ad9b541f96caefba89636f74f2c13dc8b7d08b22dcc90b380904aa497cc529af8c6ca5865fad67f885acd9 SHA512 95d1681ccdd91ad43d4b0e4976c10e0d9c99bc6264fe9324a59d3495235a8439450574a18ed38c86dc4513cf754684328f2d060389e0a49bd61b5ce81356cfcb
-DIST protonvpn-cli-2.2.6.tar.gz 640528 BLAKE2B 546fbea204b9809035dae7c8e29094ad09ab70aea7eeb3e80c5c554c642a48d2823ff9aef04a5253ded9d131e560e5216d4f3985abd8f55d0a1a453760aaa296 SHA512 553cc6fa1ddadb50318b4430de6fb743d44078ca0b64b8c3ef86ed43d5b274fc527d0dd94eee882157dc7823611d305047df62ba8ea1c415affc5a0abf581ed3
 EBUILD protonvpn-cli-2.2.11-r1.ebuild 746 BLAKE2B fb95129694fb39f479eb2b0f5f23d7af5767de40a6bd511dfdc2be59d841208cae5f9d450382c48fed6c388ddc69c9cd07ac4748c6dd782670cd63842432597b SHA512 87d9acff8a1de48f8306d1314034cb7a649713f4f906d671fcc4b8c65a9c089663a552a0675952563be5d88ad02db478de3136b37050fc59927f594e3f9f17a8
-EBUILD protonvpn-cli-2.2.6.ebuild 725 BLAKE2B 1f8954c156b802ab37bc6abb0222688cf5f225dbfc2e87d3e965a2b236951f8ca7321995712dd80252a01665446357cf4566767552e22fa15621c0398d6a5a24 SHA512 97b62a78bef8ad5ffbfae05a8bf10d6eecbc1b174d9bf4710e7d7917aef6a1bc94b818a59483affc4e0aacd6e04b5efb0576f9a151dae1961df310752d1ddaa8
 MISC metadata.xml 367 BLAKE2B 89d5f6cdcf9023b4c400d5f699d1509b5cf90976d4406e13e8b17c1b2e599b6936a35d9155dba46c8d2cc9c06e35d83549fb4ac47cf8dc56892a6b94d4f1b146 SHA512 b0de06efe1a8258b2118a12949926fc8f8723775a932814701fdd13c632d51b3515de0a995813d43e467f8891bf62050e53196b2ca56a148c9f1dfef13eb1495
diff --git a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.6.ebuild b/net-vpn/protonvpn-cli/protonvpn-cli-2.2.6.ebuild
deleted file mode 100644
index 94370134e8e6..000000000000
--- a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A VPN command-line tool from protonvpn - python rewrite"
-HOMEPAGE="https://protonvpn.com https://github.com/ProtonVPN/protonvpn-cli-ng"
-SRC_URI="https://github.com/ProtonVPN/linux-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/pythondialog:0[${PYTHON_USEDEP}]
-	net-vpn/openvpn"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/linux-cli-${PV}"
-
-DOCS=( CHANGELOG.md README.md USAGE.md )
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index d2a553d9d1a9..58c45889f089 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -1,6 +1,6 @@
 AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf3bc0629fe99cf9936b9cdb464627c1a8c121b8485f164166efda428825a55aab557d18 SHA512 d11ccc36ee89df5974547441fdb6c539dd3a7a5e235e318c1beddca7d4f5cace857f2dc75752e6fa913177eec9c3afcbed52de5bc08e8c314096d439cbc3bc6c
 DIST strongswan-5.9.2.tar.bz2 4607281 BLAKE2B 84f5457bc970f49c9bc99d0ef41182d815e39b8a88be349ad0a78b531a983d3b3919d5c9f3b97793b0b2569f2c6b151cc3b5d9b145a8bfd663db6f79d8ff3dd6 SHA512 dca30b9be7847e0af59d1526c2e38d440b6729055cb3f0f0637d50d7381df465c7b59e79662efe63870a7a5a44eef696c02231274d2764f9e3c430ce2fd694f6
 DIST strongswan-5.9.4.tar.bz2 4651000 BLAKE2B 071a0a0a144b369a7e4069d92340cecca9eef0c004949d91993c8f1cc0f39f7868749020d6e135fa59d5899d146f39172f87eb32a26ad788cb8a4c160597e328 SHA512 796356c1d5c1ad410f0ed944ab4a131076d26f120ec6fa57796fe4060b0741201199625883ddc9ebd8a7ad299495f073cec76a6780ebd8f375605aae16750cf3
-EBUILD strongswan-5.9.2-r1.ebuild 9476 BLAKE2B 224e5c6d8b9e4bc44efc05088487aa1c967172ff3b8aeb6cc0cbbf945b9ca94456d719f3a04d37310fc8df03dbbba2adb57160327e5917797ed028a1318195e3 SHA512 7d08af11744fbd85e84197b0ccbfcb0eb665293d8326c4600685b781c77d99229943f7ff08b107498c0d617a2bb2249463861285708958df5ee6493fdb3b4c67
+EBUILD strongswan-5.9.2-r2.ebuild 9498 BLAKE2B 08e05cff5db3d9ebcdd8c57214eac65f85d1aef2dd9d68ceb076c52c75f753dd6ae2153254c086f67de5fde6264021f929e542cb38ab6ab3c2c213290f7ad640 SHA512 25801fac161b550c188e4cb06822afdb0afd3951864fdd11b221c37d85574dd838047a95839e45f0617f4b6f015e7d73dcd0ab225eaaa1ad2443bf615761e050
 EBUILD strongswan-5.9.4-r1.ebuild 9541 BLAKE2B d92ad450c4d2d0e1f004eb432c14b38b80d53e2662beef0dd02f50e780135425e8f452b741e919d3e79e6889274375bbb6cdd483603abef3fce0b051be9752d8 SHA512 f1fc1e8cc72dd158db388869d1babeca199e891d8de2d27c78888bc0d70facc207a1936d0e60af83c8ff26a606ac52c3881bf96abd1caa50df875a220f9294a9
 MISC metadata.xml 4614 BLAKE2B 36dda05c64629c1eb1a84af07c7e87fc473d887cb72828e8293f6333682ec71092d67ea4e6b29722402ff556111823d295b4c43a5142500ac8a682243ba6a903 SHA512 11bb9cdbd59efce68c5467d3615ddf32b94c497fbeaf69ac3d2aeb16cee733ab0db08d045e6b5f20f11c00139bd027bf3f65defcab31dc8cb12b638aa9b8e941
diff --git a/net-vpn/strongswan/strongswan-5.9.2-r1.ebuild b/net-vpn/strongswan/strongswan-5.9.2-r2.ebuild
index cd1ecbe44da2..b537c194e061 100644
--- a/net-vpn/strongswan/strongswan-5.9.2-r1.ebuild
+++ b/net-vpn/strongswan/strongswan-5.9.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -32,7 +32,7 @@ COMMON_DEPEND="non-root? (
 	caps? ( sys-libs/libcap )
 	curl? ( net-misc/curl )
 	ldap? ( net-nds/openldap )
-	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] )
+	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] <dev-libs/openssl-3:= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	sqlite? ( >=dev-db/sqlite-3.3.1 )
 	systemd? ( sys-apps/systemd )