mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH v2] strongswan: version bump 5.9.6 -> 5.9.8
@ 2022-12-15  9:11 Lars Pedersen
  2023-01-03 11:08 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Lars Pedersen @ 2022-12-15  9:11 UTC (permalink / raw)
  To: ptxdist; +Cc: Lars Pedersen

Configure options:

* Disabled pki (--disable-pki)
* Removed install tree /usr/bin since it was only used by pki
* scepclient deprecated and removed
* Disabled AddressSanitizer (--disable-asan)
* New --with-python-sys-prefix unspecified for GNU default values
* New --with-python_prefix unspecified for GNU default values
* New --with-python_exec_prefix unspecified for GNU default values
* Disabled extended compiler warnings (--disable-warnings) because of
  compile error: (OSELAS.Toolchain-2021.07.0)

  cmac.c: In function 'derive_key':
  cmac.c:236:36: error: writing 1 byte into a region of size 0
  [-Werror=stringop-overflow=]
  236 |                 rb.ptr[rb.len - 1] = 0x87;
      |                 ~~~~~~~~~~~~~~~~~~~^~~~~~
  cc1: all warnings being treated as errors

Plugins:

* Fixed missing plugin targetinstall of libstrongswan-acert.so
* Enabled mgf1 since swanctl and starting strongswan gave following
  error:

plugin 'mgf1': failed to load - mgf1_plugin_create not found and no
plugin file available

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

v2 changes:
 * Removed pki since it wasn't used (Not included in Fedora 37 too)

 rules/strongswan.make | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/rules/strongswan.make b/rules/strongswan.make
index 07a7ade73..5f4e840dc 100644
--- a/rules/strongswan.make
+++ b/rules/strongswan.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_STRONGSWAN) += strongswan
 #
 # Paths and names
 #
-STRONGSWAN_VERSION	:= 5.9.6
-STRONGSWAN_MD5		:= 0eeb13eda09fb34e9ab5e2bfcfab1211
+STRONGSWAN_VERSION	:= 5.9.8
+STRONGSWAN_MD5		:= f46b0d3e7aed88824650d0721c887443
 STRONGSWAN		:= strongswan-$(STRONGSWAN_VERSION)
 STRONGSWAN_SUFFIX	:= tar.bz2
 STRONGSWAN_URL		:= https://download.strongswan.org/$(STRONGSWAN).$(STRONGSWAN_SUFFIX)
@@ -54,7 +54,7 @@ STRONGSWAN_CONF_OPT	:= \
 	--enable-hmac \
 	--disable-md4 \
 	--disable-md5 \
-	--disable-mgf1 \
+	--enable-mgf1 \
 	--disable-newhope \
 	--enable-nonce \
 	--disable-ntru \
@@ -193,8 +193,7 @@ STRONGSWAN_CONF_OPT	:= \
 	--disable-medcli \
 	--disable-medsrv \
 	--disable-nm \
-	--enable-pki \
-	--$(call ptx/disen, PTXCONF_STRONGSWAN_SWANCTL)-scepclient \
+	--disable-pki \
 	--enable-scripts \
 	--disable-svc \
 	--$(call ptx/endis, PTXCONF_STRONGSWAN_SYSTEMD_UNIT)-systemd \
@@ -224,6 +223,8 @@ STRONGSWAN_CONF_OPT	:= \
 	--enable-kdf \
 	--enable-dependency-tracking \
 	--enable-shared \
+	--disable-warnings \
+	--disable-asan \
 	--$(call ptx/endis, PTXCONF_GLOBAL_SELINUX)-selinux \
 	--$(call ptx/endis, PTXCONF_STRONGSWAN_SWANCTL)-swanctl \
 	--with-ipseclibdir=/usr/lib \
@@ -236,6 +237,7 @@ STRONGSWAN_LDFLAGS	:= -Wl,-rpath,/usr/lib/plugins
 # ----------------------------------------------------------------------------
 
 STRONGSWAN_PLUGINS := \
+	libstrongswan-acert.so \
 	libstrongswan-aes.so \
 	libstrongswan-attr.so \
 	libstrongswan-cmac.so \
@@ -247,6 +249,7 @@ STRONGSWAN_PLUGINS := \
 	libstrongswan-hmac.so \
 	libstrongswan-kdf.so \
 	libstrongswan-kernel-netlink.so \
+	libstrongswan-mgf1.so \
 	libstrongswan-nonce.so \
 	libstrongswan-pem.so \
 	libstrongswan-pgp.so \
@@ -292,7 +295,6 @@ $(STATEDIR)/strongswan.targetinstall:
 
 	@$(call install_alternative, strongswan, 0, 0, 0644, /etc/strongswan.conf)
 
-	@$(call install_tree, strongswan, 0, 0, -, /usr/bin)
 	@$(call install_tree, strongswan, 0, 0, -, /usr/libexec)
 	@$(call install_tree, strongswan, 0, 0, -, /usr/sbin)
 
-- 
2.38.1




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [APPLIED] strongswan: version bump 5.9.6 -> 5.9.8
  2022-12-15  9:11 [ptxdist] [PATCH v2] strongswan: version bump 5.9.6 -> 5.9.8 Lars Pedersen
@ 2023-01-03 11:08 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2023-01-03 11:08 UTC (permalink / raw)
  To: ptxdist; +Cc: Lars Pedersen

Thanks, applied as 596d5a957df41125c71b32201184e5f81754548f.

Michael

[sent from post-receive hook]

On Tue, 03 Jan 2023 12:08:27 +0100, Lars Pedersen <lapeddk@gmail.com> wrote:
> Configure options:
> 
> * Disabled pki (--disable-pki)
> * Removed install tree /usr/bin since it was only used by pki
> * scepclient deprecated and removed
> * Disabled AddressSanitizer (--disable-asan)
> * New --with-python-sys-prefix unspecified for GNU default values
> * New --with-python_prefix unspecified for GNU default values
> * New --with-python_exec_prefix unspecified for GNU default values
> * Disabled extended compiler warnings (--disable-warnings) because of
>   compile error: (OSELAS.Toolchain-2021.07.0)
> 
>   cmac.c: In function 'derive_key':
>   cmac.c:236:36: error: writing 1 byte into a region of size 0
>   [-Werror=stringop-overflow=]
>   236 |                 rb.ptr[rb.len - 1] = 0x87;
>       |                 ~~~~~~~~~~~~~~~~~~~^~~~~~
>   cc1: all warnings being treated as errors
> 
> Plugins:
> 
> * Fixed missing plugin targetinstall of libstrongswan-acert.so
> * Enabled mgf1 since swanctl and starting strongswan gave following
>   error:
> 
> plugin 'mgf1': failed to load - mgf1_plugin_create not found and no
> plugin file available
> 
> Signed-off-by: Lars Pedersen <lapeddk@gmail.com>
> Message-Id: <20221215091123.31935-1-lapeddk@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/strongswan.make b/rules/strongswan.make
> index 07a7ade73748..5f4e840dc6d7 100644
> --- a/rules/strongswan.make
> +++ b/rules/strongswan.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_STRONGSWAN) += strongswan
>  #
>  # Paths and names
>  #
> -STRONGSWAN_VERSION	:= 5.9.6
> -STRONGSWAN_MD5		:= 0eeb13eda09fb34e9ab5e2bfcfab1211
> +STRONGSWAN_VERSION	:= 5.9.8
> +STRONGSWAN_MD5		:= f46b0d3e7aed88824650d0721c887443
>  STRONGSWAN		:= strongswan-$(STRONGSWAN_VERSION)
>  STRONGSWAN_SUFFIX	:= tar.bz2
>  STRONGSWAN_URL		:= https://download.strongswan.org/$(STRONGSWAN).$(STRONGSWAN_SUFFIX)
> @@ -54,7 +54,7 @@ STRONGSWAN_CONF_OPT	:= \
>  	--enable-hmac \
>  	--disable-md4 \
>  	--disable-md5 \
> -	--disable-mgf1 \
> +	--enable-mgf1 \
>  	--disable-newhope \
>  	--enable-nonce \
>  	--disable-ntru \
> @@ -193,8 +193,7 @@ STRONGSWAN_CONF_OPT	:= \
>  	--disable-medcli \
>  	--disable-medsrv \
>  	--disable-nm \
> -	--enable-pki \
> -	--$(call ptx/disen, PTXCONF_STRONGSWAN_SWANCTL)-scepclient \
> +	--disable-pki \
>  	--enable-scripts \
>  	--disable-svc \
>  	--$(call ptx/endis, PTXCONF_STRONGSWAN_SYSTEMD_UNIT)-systemd \
> @@ -224,6 +223,8 @@ STRONGSWAN_CONF_OPT	:= \
>  	--enable-kdf \
>  	--enable-dependency-tracking \
>  	--enable-shared \
> +	--disable-warnings \
> +	--disable-asan \
>  	--$(call ptx/endis, PTXCONF_GLOBAL_SELINUX)-selinux \
>  	--$(call ptx/endis, PTXCONF_STRONGSWAN_SWANCTL)-swanctl \
>  	--with-ipseclibdir=/usr/lib \
> @@ -236,6 +237,7 @@ STRONGSWAN_LDFLAGS	:= -Wl,-rpath,/usr/lib/plugins
>  # ----------------------------------------------------------------------------
>  
>  STRONGSWAN_PLUGINS := \
> +	libstrongswan-acert.so \
>  	libstrongswan-aes.so \
>  	libstrongswan-attr.so \
>  	libstrongswan-cmac.so \
> @@ -247,6 +249,7 @@ STRONGSWAN_PLUGINS := \
>  	libstrongswan-hmac.so \
>  	libstrongswan-kdf.so \
>  	libstrongswan-kernel-netlink.so \
> +	libstrongswan-mgf1.so \
>  	libstrongswan-nonce.so \
>  	libstrongswan-pem.so \
>  	libstrongswan-pgp.so \
> @@ -292,7 +295,6 @@ $(STATEDIR)/strongswan.targetinstall:
>  
>  	@$(call install_alternative, strongswan, 0, 0, 0644, /etc/strongswan.conf)
>  
> -	@$(call install_tree, strongswan, 0, 0, -, /usr/bin)
>  	@$(call install_tree, strongswan, 0, 0, -, /usr/libexec)
>  	@$(call install_tree, strongswan, 0, 0, -, /usr/sbin)
>  



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-01-03 11:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-15  9:11 [ptxdist] [PATCH v2] strongswan: version bump 5.9.6 -> 5.9.8 Lars Pedersen
2023-01-03 11:08 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox