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

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

[Lars Pedersen]

New configure options --enable-selinux and --disable-kdf
Enabled generic modularized KDF (prf/prf+) implementation

Signed-off-by: Lars Pedersen <lapeddk@gmail.com>
---

v3 changes:
Fixed configure option --enable-selinux naming

v2 changes:
Use ptxdist global selinux option

 rules/strongswan.make | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rules/strongswan.make b/rules/strongswan.make
index a64e67cc8..15e9cdb9b 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,8 +221,10 @@ STRONGSWAN_CONF_OPT	:= \
 	--disable-log-thread-ids \
 	--disable-monolithic \
 	--disable-defaults \
+	--enable-kdf \
 	--enable-dependency-tracking \
 	--enable-shared \
+	--$(call ptx/endis, PTXCONF_GLOBAL_SELINUX)-selinux \
 	--$(call ptx/endis, PTXCONF_STRONGSWAN_SWANCTL)-swanctl \
 	--with-ipseclibdir=/usr/lib \
 	--with-systemdsystemunitdir=/usr/lib/systemd/system
@@ -243,6 +245,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

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

[Michael Olbrich]

Thanks, applied as 9c19471d103fbc36cf973e2396650ad8e7455e1f.

Michael

[sent from post-receive hook]

On Mon, 20 Jun 2022 08:19:40 +0200, Lars Pedersen <lapeddk@gmail.com> wrote:
> New configure options --enable-selinux and --disable-kdf
> Enabled generic modularized KDF (prf/prf+) implementation
> 
> Signed-off-by: Lars Pedersen <lapeddk@gmail.com>
> Message-Id: <20220616110651.1553475-1-lapeddk@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/strongswan.make b/rules/strongswan.make
> index a64e67cc8e8c..15e9cdb9be97 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,8 +221,10 @@ STRONGSWAN_CONF_OPT	:= \
>  	--disable-log-thread-ids \
>  	--disable-monolithic \
>  	--disable-defaults \
> +	--enable-kdf \
>  	--enable-dependency-tracking \
>  	--enable-shared \
> +	--$(call ptx/endis, PTXCONF_GLOBAL_SELINUX)-selinux \
>  	--$(call ptx/endis, PTXCONF_STRONGSWAN_SWANCTL)-swanctl \
>  	--with-ipseclibdir=/usr/lib \
>  	--with-systemdsystemunitdir=/usr/lib/systemd/system
> @@ -243,6 +245,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 \