Re: [ptxdist] [PATCH] strongswan: version bump 5.9.2 -> 5.9.6

[Christian Melki]

Hi.

On 6/16/22 9:25 AM, Lars Pedersen wrote:

Hello Alex,

On Thu, 16 Jun 2022 at 08:48, Alexander Dahl <a...@thorsis.com> wrote:

Hello Lars,

Am Thu, Jun 16, 2022 at 08:42:35AM +0200 schrieb Lars Pedersen:

New configure options --with-selinux and --disable-kdf

That first option is not considered in the patch below, is it?

--with-selinux is implicitly disabled (without). Should I explicitly
set it --without-selinux?

I think you can use:

--$(call ptx/wwo, PTXCONF_GLOBAL_SELINUX)-selinux \

/Christian

Greets
Alex

Enabled generic modularized KDF (prf/prf+) implementation

Signed-off-by: Lars Pedersen <lape...@gmail.com>
---
  rules/strongswan.make | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rules/strongswan.make b/rules/strongswan.make
index a64e67cc8..2bea6c839 100644
--- a/rules/strongswan.make
+++ b/rules/strongswan.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_STRONGSWAN) += strongswan
  #
  # Paths and names
  #
-STRONGSWAN_VERSION   := 5.9.2
-STRONGSWAN_MD5               := 8918e6675e1be3784817641f07eadeb8
+STRONGSWAN_VERSION   := 5.9.6
+STRONGSWAN_MD5               := 0eeb13eda09fb34e9ab5e2bfcfab1211
  STRONGSWAN           := strongswan-$(STRONGSWAN_VERSION)
  STRONGSWAN_SUFFIX    := tar.bz2
  STRONGSWAN_URL               := 
https://download.strongswan.org/$(STRONGSWAN).$(STRONGSWAN_SUFFIX)
@@ -221,6 +221,7 @@ STRONGSWAN_CONF_OPT       := \
       --disable-log-thread-ids \
       --disable-monolithic \
       --disable-defaults \
+     --enable-kdf \
       --enable-dependency-tracking \
       --enable-shared \
       --$(call ptx/endis, PTXCONF_STRONGSWAN_SWANCTL)-swanctl \
@@ -243,6 +244,7 @@ STRONGSWAN_PLUGINS := \
       libstrongswan-gcm.so \
       libstrongswan-gmp.so \
       libstrongswan-hmac.so \
+     libstrongswan-kdf.so \
       libstrongswan-kernel-netlink.so \
       libstrongswan-nonce.so \
       libstrongswan-pem.so \
--
2.36.1