From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 05733158094 for ; Wed, 29 Jun 2022 15:35:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E6DEE076B; Wed, 29 Jun 2022 15:35:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA6CAE076B for ; Wed, 29 Jun 2022 15:35:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08D1F340FE6 for ; Wed, 29 Jun 2022 15:35:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 858644ED for ; Wed, 29 Jun 2022 15:35:28 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1656516897.bc6546d744d31dabf2805e4f168df1f97a4b3c48.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/strongswan/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/strongswan/metadata.xml net-vpn/strongswan/strongswan-5.9.6-r1.ebuild net-vpn/strongswan/strongswan-5.9.6.ebuild X-VCS-Directories: net-vpn/strongswan/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: bc6546d744d31dabf2805e4f168df1f97a4b3c48 X-VCS-Branch: master Date: Wed, 29 Jun 2022 15:35:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c111073a-7726-40ba-b385-d27d38f53a53 X-Archives-Hash: 4cb3a0b634233994de87c8832d35bd6a commit: bc6546d744d31dabf2805e4f168df1f97a4b3c48 Author: Dennis Eisele dennis-eisele de> AuthorDate: Tue Jun 28 00:16:15 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Wed Jun 29 15:34:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6546d7 net-vpn/strongswan: fix prf-plus plugin usage [ flow: revision bump, because new config option is passed ] Closes: https://bugs.gentoo.org/853091 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Dennis Eisele dennis-eisele.de> Closes: https://github.com/gentoo/gentoo/pull/26103 Signed-off-by: Florian Schmaus gentoo.org> net-vpn/strongswan/metadata.xml | 1 - .../{strongswan-5.9.6.ebuild => strongswan-5.9.6-r1.ebuild} | 13 ++++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) 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 @@ Enable plugin that allows key exchange based on post-quantum computer New Hope algorithm Enable support for the ntru plugin Enable support for the padlock plugin - Enable support for the prf-plus plugin Enable support for the rdrand plugin Enable plugin that saves IKE and/or ESP keys to files compatible with Wireshark (for debugging) Enable support for the unbound plugin diff --git a/net-vpn/strongswan/strongswan-5.9.6.ebuild b/net-vpn/strongswan/strongswan-5.9.6-r1.ebuild similarity index 96% rename from net-vpn/strongswan/strongswan-5.9.6.ebuild rename to 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}"