gentoo resync : 09.07.2022

7 files changed, 20 insertions, 10 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 464905fbb8b6..d88d559ca095 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index e57b7b7ff270..3a1ef7113ac7 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -7,5 +7,5 @@ DIST strongswan-5.9.6.tar.bz2 4750894 BLAKE2B 4021a10611e66f9e2e4e432bdfb9de0f94
 EBUILD strongswan-5.9.2-r3.ebuild 9206 BLAKE2B 95f105fcce29680c9d8dfcdf645bc00ee84747c83eeb13106b54b216963fc8c8f442f4a45e02507b521db3b1fea54c1020186c6a555f0dfc29173d6d13f25409 SHA512 f34d860ce53c62225ba6c1868f368a920c5164a2fdfb8554ba6e3611ca02b1356bc68f121f9c126131c0381f59c2f1d9d1203c029b1c1513ef0d88257be654e5
 EBUILD strongswan-5.9.4-r2.ebuild 9264 BLAKE2B 7ccb1b346acbbc88f80f0a1b96b28e28955773af78ddc946e72eda3097df2e45f5067e40406520cbbe41360209f406a0ef4ec7acd49edb2591b97effec739183 SHA512 29548972e0463c8dcab82c27e48c43519ddd813a5bf4e05211a83fb2f27ad9ee0a03226d777199972cb02f417263e647eee4561568807ffa9f91d19dfc90f7c4
 EBUILD strongswan-5.9.5-r1.ebuild 9244 BLAKE2B cd9406736089a9fb075974418655203120964a0030a4e761a603100dcc23cb66482d4832e631f2910369021618042d2dc1b9e79960a2d612168aa462f351f8b7 SHA512 d30ef479396196dce01c074f2e23d2f4b50c48f67a6d7c02f61edaa118ef9666ba9959400a38ef93c88b0c918829cc898bfc048ad9c115b2e72ef57006bbe9cf
-EBUILD strongswan-5.9.6.ebuild 9357 BLAKE2B 29150532e1c073c5fd23fba2060e8e068a7e8eac844637acef2788b3003395548dd5b5431ae22c592a2991470e03b64e0dfe7718ccd61efa653432e4f20d5753 SHA512 86b3227195bc824568375b2f6c302a15690268eb7fbf352cddd5669439f425f3661ee68a998e2efc036157dde4b45f1fc7b9cbdf018b42063c871a595afb035a
-MISC metadata.xml 4977 BLAKE2B 104157b4e323c72ffc20ecdc2d177f2b767f7a3265996f1de48e7c035dc7876d50dd426bb899b8a06adecabce6c9e00e317a17b1585385905ee949a88e775879 SHA512 3f866b48c0be3660e39f545683acf5206fead1a0828dde0f1000f2271b787b39be201ff3ca244a1eb2cbb2bb209968dac5e1207ff5bfb44ba1aa3062481b6b99
+EBUILD strongswan-5.9.6-r1.ebuild 9610 BLAKE2B f132b0e96a6321118e936601ad7518a756cd4d739913bae1ac79b5ab32c19541e18d424af8722c4b7d2c9d470dea89a5bf43b163bd07c1db744eccaf37cc7fbf SHA512 a9667f354ee632c03a77c647e57734c0d14813ffbf22eb6af9a85b6692065336ed996155e9916e67b5df6db60b9eac884361654ccf960461918499aca42e0b08
+MISC metadata.xml 4888 BLAKE2B ffb26d9fec8ad8c5fbb68ae92a92efbf32c40b4a0a4b829d8fd287ebc80d135e3ca95ca50663acb6fc7d629570ed7f4264921a8838e2ff0a8e5dbbadb3f0fc50 SHA512 84491cbd33b325b1d960c32eafb479927d5651244fb13ee9ec8b2abddfff71f1b90b18524e044dd0cc63ccd49ef9bb0c2437ab6cf504994b8ad0a9137cd04fb4
diff --git a/net-vpn/strongswan/metadata.xml b/net-vpn/strongswan/metadata.xml
index 895902c71494..e44bbb6b7298 100644
--- a/net-vpn/strongswan/metadata.xml
+++ b/net-vpn/strongswan/metadata.xml
@@ -51,7 +51,6 @@
 		<flag name="strongswan_plugins_newhope">Enable plugin that allows key exchange based on post-quantum computer New Hope algorithm</flag>
 		<flag name="strongswan_plugins_ntru">Enable support for the ntru plugin</flag>
 		<flag name="strongswan_plugins_padlock">Enable support for the padlock plugin</flag>
-		<flag name="strongswan_plugins_prf-plus">Enable support for the prf-plus plugin</flag>
 		<flag name="strongswan_plugins_rdrand">Enable support for the rdrand plugin</flag>
 		<flag name="strongswan_plugins_save-keys">Enable plugin that saves IKE and/or ESP keys to files compatible with Wireshark (for debugging)</flag>
 		<flag name="strongswan_plugins_unbound">Enable support for the unbound plugin</flag>
diff --git a/net-vpn/strongswan/strongswan-5.9.6.ebuild b/net-vpn/strongswan/strongswan-5.9.6-r1.ebuild
index 9de7b103de17..ed618ee5eb72 100644
--- a/net-vpn/strongswan/strongswan-5.9.6.ebuild
+++ b/net-vpn/strongswan/strongswan-5.9.6-r1.ebuild
@@ -14,13 +14,18 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT_DISABLE="kdf"
 STRONGSWAN_PLUGINS_OPT="addrblock aesni blowfish bypass-lan ccm chapoly ctr error-notify forecast gcm
-ha ipseckey kdf newhope ntru padlock prf-plus rdrand save-keys unbound whitelist
+ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist
 xauth-noauth"
 for mod in $STRONGSWAN_PLUGINS_STD; do
 	IUSE="${IUSE} +strongswan_plugins_${mod}"
 done
 
+for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
 for mod in $STRONGSWAN_PLUGINS_OPT; do
 	IUSE="${IUSE} strongswan_plugins_${mod}"
 done
@@ -133,6 +138,12 @@ src_configure() {
 		fi
 	done
 
+	for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
+		if ! use strongswan_plugins_${mod}; then
+			myconf+=" --disable-${mod}"
+		fi
+	done
+
 	for mod in $STRONGSWAN_PLUGINS_OPT; do
 		if use strongswan_plugins_${mod}; then
 			myconf+=" --enable-${mod}"
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 86afe55ef7fd..6e64e7e8825e 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -7,6 +7,6 @@ AUX tincd.conf 728 BLAKE2B fdfe320df4ac8112fb5ee64cd88cd228bef8d1e701a00598691a3
 AUX tincd_at.service 197 BLAKE2B f568007b8872e105eb001333d24d7446ff8fb1995edaf77d98679078bfddd2ad9a534e1ed7d8ac743aaf026863dd9952e96e3bf2a8f950115c9f059a2660afc6 SHA512 866f8adbc9c39cc6030e6046e4265a4f6e893960045df15abc0a1865599cf2576ac12468bd1a286df47248ebe2c6b16ba64a60f0ebeeb0212d850a9d7886c98a
 DIST tinc-1.0.36.tar.gz 500320 BLAKE2B 6f799ab04f9553fa389baf9d60121540b1fc7d5b5c2b62b2ebe0bf7478f5f69e8638a9c1b15f8ab84268d813ac1b1978c73b12a478b682cd808747fd2eed951c SHA512 23af9162f7ae700bad01e1f59f23f32d1b183b185ec35f4a69a987c52c53cfebfa9e852203b399f035988078e9131e5d59b018554a52a30044f34df6e64b5289
 DIST tinc-1.1pre18.tar.gz 732111 BLAKE2B b236a8a0b7f8b755d71f2e2564af6bd13f5d87aec512b7db388ac1e23110cfdac80d8b642644a4b35fa81d37765e9ced65cc535d48e34b79190c2eddb107a9e2 SHA512 d8b03c78fd579df58d4c8a03f5d2241d2c95edb660ce9aa34441f6e75df09e3fff7524215c7c4b3622311e80f5bb452a6ac1205f3fd13424d56135f70b973183
-EBUILD tinc-1.0.36.ebuild 1006 BLAKE2B 088b3312aaeba6322fcc60b89a1177ef8fa4c7d443971243aacd1431efcdc4e15c4830c2e34bfa0bbf95fd933d4430cdc22ea325d1bba74e6144074d9c38c741 SHA512 d593139ebf10eb19a8efde3ad50df0d9e52114a120b24adbf021094300ec3f1dd4ed674833c60b29464ebc987a709f33339674d7b02df6c0913dc9c65962f6fb
-EBUILD tinc-1.1_pre18.ebuild 1942 BLAKE2B 39584a217e422ca9a7b60b11b77688d78ce02a210ecad486c21d64c965442a786dc727023308908588b1e000cd954712716c41146f13182e81d3e5eb96c3765c SHA512 f1a814d42049ff208e56a09801aac388040c3947fad718aba70f4685edde56fe692329c6db3fec201aab5037fd9dabd4fae5d2e3e572b55f735bd959c537ad30
+EBUILD tinc-1.0.36.ebuild 1008 BLAKE2B a09b3ee3cb09c307ca71ace6a13cfc36c180804bff6ffd51b7bcf6f8871e87568a15327cd40cee2586e6438a765e9799918029cad6ac6a74709cd3dcf7bfc367 SHA512 afbf53a377eaed7c938bd75c9891cc388b190b8ffe38682170e5ec4e05a8cc62bb6db298ace9daf4191c0898d7906c00dd8e6427419f10a8f36bb0fa77bb61e0
+EBUILD tinc-1.1_pre18.ebuild 1944 BLAKE2B 7982364b9e7f4e2b1d459e0e5366c10ef38e7f1f8feb570aba5816542644e9e513f07e3eb06d2d905808c92ca6601ff888f3a9e8f4e6275722ff65e45f28010d SHA512 ab845b1688a6e8582777bc4ccd15951a52a23404790dee5ad8214d4abc3a67cd2ba7651594710129aff73c989546df6f468e25d6a1f645471ef365d9fbed9487
 MISC metadata.xml 639 BLAKE2B b8bff909efa31d5ee849cbccd45fe5832d1e9a7ce2de6ad97ee3760ff80d5d3339d19aeb14bef00dca8cb8e985345d626a7d720db4b2fbe819bcfb0ae7336aaf SHA512 2fba205a3fca5069cb025ec0d9343a80a7ab7a9c2ae311c152980e812015f3f68e4a06700cedb2cd430a00e36f17caeb4f8142aacdaa34f726c7561ea87b36a3
diff --git a/net-vpn/tinc/tinc-1.0.36.ebuild b/net-vpn/tinc/tinc-1.0.36.ebuild
index a5126df2ce23..37a9ad73c249 100644
--- a/net-vpn/tinc/tinc-1.0.36.ebuild
+++ b/net-vpn/tinc/tinc-1.0.36.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 inherit systemd
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
+HOMEPAGE="https://www.tinc-vpn.org/"
 
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
+SRC_URI="https://www.tinc-vpn.org/packages/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-vpn/tinc/tinc-1.1_pre18.ebuild b/net-vpn/tinc/tinc-1.1_pre18.ebuild
index fe12962f130f..58f8b912f8d8 100644
--- a/net-vpn/tinc/tinc-1.1_pre18.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre18.ebuild
@@ -9,9 +9,9 @@ MY_P=${PN}-${MY_PV}
 inherit autotools systemd
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
+HOMEPAGE="https://www.tinc-vpn.org/"
 
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz"
+SRC_URI="https://www.tinc-vpn.org/packages/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"