| 1 |
commit: bc6546d744d31dabf2805e4f168df1f97a4b3c48 |
| 2 |
Author: Dennis Eisele <kernlpanic <AT> dennis-eisele <DOT> de> |
| 3 |
AuthorDate: Tue Jun 28 00:16:15 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 29 15:34:57 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6546d7 |
| 7 |
|
| 8 |
net-vpn/strongswan: fix prf-plus plugin usage |
| 9 |
|
| 10 |
[ flow: revision bump, because new config option is passed ] |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/853091 |
| 13 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 14 |
Signed-off-by: Dennis Eisele <kernlpanic <AT> dennis-eisele.de> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/26103 |
| 16 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 17 |
|
| 18 |
net-vpn/strongswan/metadata.xml | 1 - |
| 19 |
.../{strongswan-5.9.6.ebuild => strongswan-5.9.6-r1.ebuild} | 13 ++++++++++++- |
| 20 |
2 files changed, 12 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-vpn/strongswan/metadata.xml b/net-vpn/strongswan/metadata.xml |
| 23 |
index 895902c71494..e44bbb6b7298 100644 |
| 24 |
--- a/net-vpn/strongswan/metadata.xml |
| 25 |
+++ b/net-vpn/strongswan/metadata.xml |
| 26 |
@@ -51,7 +51,6 @@ |
| 27 |
<flag name="strongswan_plugins_newhope">Enable plugin that allows key exchange based on post-quantum computer New Hope algorithm</flag> |
| 28 |
<flag name="strongswan_plugins_ntru">Enable support for the ntru plugin</flag> |
| 29 |
<flag name="strongswan_plugins_padlock">Enable support for the padlock plugin</flag> |
| 30 |
- <flag name="strongswan_plugins_prf-plus">Enable support for the prf-plus plugin</flag> |
| 31 |
<flag name="strongswan_plugins_rdrand">Enable support for the rdrand plugin</flag> |
| 32 |
<flag name="strongswan_plugins_save-keys">Enable plugin that saves IKE and/or ESP keys to files compatible with Wireshark (for debugging)</flag> |
| 33 |
<flag name="strongswan_plugins_unbound">Enable support for the unbound plugin</flag> |
| 34 |
|
| 35 |
diff --git a/net-vpn/strongswan/strongswan-5.9.6.ebuild b/net-vpn/strongswan/strongswan-5.9.6-r1.ebuild |
| 36 |
similarity index 96% |
| 37 |
rename from net-vpn/strongswan/strongswan-5.9.6.ebuild |
| 38 |
rename to net-vpn/strongswan/strongswan-5.9.6-r1.ebuild |
| 39 |
index 9de7b103de17..ed618ee5eb72 100644 |
| 40 |
--- a/net-vpn/strongswan/strongswan-5.9.6.ebuild |
| 41 |
+++ b/net-vpn/strongswan/strongswan-5.9.6-r1.ebuild |
| 42 |
@@ -14,13 +14,18 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
| 43 |
IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11" |
| 44 |
|
| 45 |
STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici" |
| 46 |
+STRONGSWAN_PLUGINS_OPT_DISABLE="kdf" |
| 47 |
STRONGSWAN_PLUGINS_OPT="addrblock aesni blowfish bypass-lan ccm chapoly ctr error-notify forecast gcm |
| 48 |
-ha ipseckey kdf newhope ntru padlock prf-plus rdrand save-keys unbound whitelist |
| 49 |
+ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist |
| 50 |
xauth-noauth" |
| 51 |
for mod in $STRONGSWAN_PLUGINS_STD; do |
| 52 |
IUSE="${IUSE} +strongswan_plugins_${mod}" |
| 53 |
done |
| 54 |
|
| 55 |
+for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do |
| 56 |
+ IUSE="${IUSE} strongswan_plugins_${mod}" |
| 57 |
+done |
| 58 |
+ |
| 59 |
for mod in $STRONGSWAN_PLUGINS_OPT; do |
| 60 |
IUSE="${IUSE} strongswan_plugins_${mod}" |
| 61 |
done |
| 62 |
@@ -133,6 +138,12 @@ src_configure() { |
| 63 |
fi |
| 64 |
done |
| 65 |
|
| 66 |
+ for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do |
| 67 |
+ if ! use strongswan_plugins_${mod}; then |
| 68 |
+ myconf+=" --disable-${mod}" |
| 69 |
+ fi |
| 70 |
+ done |
| 71 |
+ |
| 72 |
for mod in $STRONGSWAN_PLUGINS_OPT; do |
| 73 |
if use strongswan_plugins_${mod}; then |
| 74 |
myconf+=" --enable-${mod}" |
Archives