[ptxdist] [PATCH 1/2] strongswan: fix configure flags from previous updates

[ptxdist] [PATCH 1/2] strongswan: fix configure flags from previous updates

[Christoph Fritz]

 - Add missing configure flags from previous updates:

   * bliss 5.2.2
   * winhttp 5.2.0
   * kernel-iph 5.2.0
   * kernel-wfp 5.2.0
   * socket-win 5.2.0
   * vici  5.2.0
   * aikgen ?
   * svc ?
   * ext-auth ?
   * swanctl
   * systemd
   * dbghelp-backtraces ?

 - Reorganize flags to mirror output of ./configure --help

Tested-by: Bruno Thomsen <bth@kamstrup.com>
Signed-off-by: Christoph Fritz <chf@fritzc.com>
---
 rules/strongswan.make | 200 ++++++++++++++++++++++++++------------------------
 1 file changed, 106 insertions(+), 94 deletions(-)

diff --git a/rules/strongswan.make b/rules/strongswan.make
index 033deeb..fe85295 100644
--- a/rules/strongswan.make
+++ b/rules/strongswan.make
@@ -33,55 +33,55 @@ STRONGSWAN_LICENSE	:= GPL
 STRONGSWAN_CONF_TOOL	:= autoconf
 STRONGSWAN_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--$(call ptx/endis, PTXCONF_STRONGSWAN_LIBCURL)-curl \
-	--$(call ptx/endis, PTXCONF_STRONGSWAN_OPENSSL)-openssl \
-	--disable-unbound \
-	--disable-soup \
-	--disable-ldap \
 	--enable-aes \
-	--disable-des \
+	--$(call ptx/endis, PTXCONF_STRONGSWAN_AFALG)-af-alg \
+	--disable-bliss \
 	--disable-blowfish \
+	--disable-ccm \
+	--enable-cmac \
+	--disable-ctr \
+	--disable-des \
+	--enable-fips-prf \
+	--enable-gcm \
+	--disable-gcrypt \
+	--enable-gmp \
+	--enable-hmac \
 	--disable-md4 \
 	--disable-md5 \
+	--enable-nonce \
+	--disable-ntru \
+	--$(call ptx/endis, PTXCONF_STRONGSWAN_OPENSSL)-openssl \
+	--disable-padlock \
+	--enable-random \
+	--disable-rc2 \
+	--disable-rdrand \
 	--disable-aesni \
 	--enable-sha1 \
 	--enable-sha2 \
-	--enable-fips-prf \
-	--enable-gmp \
-	--disable-rdrand \
-	--enable-random \
-	--disable-rc2 \
-	--enable-nonce \
-	--disable-ntru \
-	--enable-x509 \
-	--enable-revocation \
-	--enable-constraints \
-	--enable-pubkey \
-	--disable-sshkey \
+	--enable-xcbc \
+	--enable-dnskey \
+	--enable-pem \
+	--enable-pgp \
 	--enable-pkcs1 \
 	--enable-pkcs7 \
 	--enable-pkcs8 \
 	--disable-pkcs12 \
-	--enable-pgp \
-	--enable-dnskey \
-	--disable-ipseckey \
-	--disable-keychain \
-	--enable-pem \
-	--enable-hmac \
-	--enable-cmac \
-	--enable-xcbc \
-	--$(call ptx/endis, PTXCONF_STRONGSWAN_AFALG)-af-alg \
-	--disable-test-vectors \
+	--enable-pubkey \
+	--disable-sshkey \
+	--enable-x509 \
+	--$(call ptx/endis, PTXCONF_STRONGSWAN_LIBCURL)-curl \
+	--disable-files \
+	--disable-ldap \
+	--disable-soup \
+	--disable-unbound \
+	--disable-winhttp \
 	--disable-mysql \
 	--disable-sqlite \
-	--enable-stroke \
-	--disable-medsrv \
-	--disable-medcli \
-	--disable-smp \
-	--disable-sql \
-	--disable-leak-detective \
-	--disable-lock-profiler \
-	--disable-load-tester \
+	--disable-addrblock \
+	--enable-acert \
+	--disable-agent \
+	--enable-constraints \
+	--disable-coupling \
 	--disable-dnscert \
 	--disable-eap-sim \
 	--disable-eap-sim-file \
@@ -101,92 +101,104 @@ STRONGSWAN_CONF_OPT	:= \
 	--disable-eap-tnc \
 	--disable-eap-dynamic \
 	--disable-eap-radius \
+	--disable-ext-auth \
+	--disable-ipseckey \
+	--disable-keychain \
+	--disable-pkcs11 \
+	--enable-revocation \
+	--disable-whitelist \
 	--enable-xauth-generic \
 	--disable-xauth-eap \
 	--disable-xauth-pam \
 	--disable-xauth-noauth \
-	--disable-tnc-ifmap \
-	--disable-tnc-pdp \
-	--disable-tnc-imc \
-	--disable-tnc-imv \
-	--disable-tnccs-11 \
-	--disable-tnccs-20 \
-	--disable-tnccs-dynamic \
-	--disable-imc-test \
-	--disable-imv-test \
-	--disable-imc-scanner \
-	--disable-imv-scanner \
-	--disable-imc-os \
-	--disable-imv-os \
-	--disable-imc-attestation \
-	--disable-imv-attestation \
-	--disable-imc-swid \
-	--disable-imv-swid \
 	--enable-kernel-netlink \
 	--disable-kernel-pfkey \
 	--disable-kernel-pfroute \
+	--disable-kernel-iph \
 	--disable-kernel-libipsec \
-	--disable-libipsec \
+	--disable-kernel-wfp \
 	--enable-socket-default \
 	--disable-socket-dynamic \
-	--disable-farp \
-	--disable-dumm \
-	--disable-fast \
-	--disable-manager \
-	--disable-mediation \
-	--disable-integrity-test \
-	--enable-load-warning \
-	--enable-ikev1 \
-	--enable-ikev2 \
-	--enable-charon \
-	--disable-cmd \
-	--enable-pki \
-	--enable-scepclient \
-	--enable-scripts \
-	--disable-conftest \
-	--enable-updown \
+	--disable-socket-win \
+	--enable-stroke \
+	--disable-smp \
+	--disable-sql \
+	--disable-uci \
+	--disable-vici \
+	--disable-android-dns \
 	--enable-attr \
 	--disable-attr-sql \
 	--disable-dhcp \
 	--disable-osx-attr \
 	--enable-resolve \
-	--disable-padlock \
-	--disable-gcrypt \
-	--disable-agent \
-	--disable-pkcs11 \
-	--disable-ctr \
-	--disable-ccm \
-	--enable-gcm \
-	--disable-addrblock \
-	--enable-acert \
 	--disable-unity \
-	--disable-uci \
-	--disable-android-dns \
+	--disable-imc-test \
+	--disable-imv-test \
+	--disable-imc-scanner \
+	--disable-imv-scanner \
+	--disable-imc-os \
+	--disable-imv-os \
+	--disable-imc-attestation \
+	--disable-imv-attestation \
+	--disable-imc-swid \
+	--disable-imv-swid \
+	--disable-tnc-ifmap \
+	--disable-tnc-imc \
+	--disable-tnc-imv \
+	--disable-tnc-pdp \
+	--disable-tnccs-11 \
+	--disable-tnccs-20 \
+	--disable-tnccs-dynamic \
 	--disable-android-log \
-	--disable-maemo \
-	--disable-nm \
-	--disable-ha \
-	--disable-whitelist \
-	--disable-lookip \
-	--disable-error-notify \
 	--disable-certexpire \
 	--disable-connmark \
 	--disable-forecast \
-	--disable-systime-fix \
-	--disable-led \
 	--disable-duplicheck \
-	--disable-coupling \
+	--disable-error-notify \
+	--disable-farp \
+	--disable-ha \
+	--disable-led \
+	--disable-load-tester \
+	--disable-lookip \
+	--disable-maemo \
 	--disable-radattr \
-	--disable-monolithic \
+	--disable-systime-fix \
+	--disable-test-vectors \
+	--enable-updown \
+	--disable-aikgen \
+	--enable-charon \
+	--disable-cmd \
+	--disable-conftest \
+	--disable-dumm \
+	--disable-fast \
+	--disable-libipsec \
+	--disable-manager \
+	--disable-medcli \
+	--disable-medsrv \
+	--disable-nm \
+	--enable-pki \
+	--enable-scepclient \
+	--enable-scripts \
+	--disable-svc \
+	--$(call ptx/endis, PTXCONF_STRONGSWAN_SYSTEMD_UNIT)-systemd \
+	--disable-swanctl \
+	--disable-tkm \
 	--disable-bfd-backtraces \
+	--disable-dbghelp-backtraces \
+	--enable-ikev1 \
+	--enable-ikev2 \
+	--disable-integrity-test \
+	--enable-load-warning \
+	--disable-mediation \
 	--disable-unwind-backtraces \
 	--disable-ruby-gems \
 	--disable-ruby-gems-install \
 	--disable-python-eggs \
 	--disable-python-eggs-install \
-	--disable-files \
 	--disable-coverage \
-	--disable-tkm \
+	--disable-leak-detective \
+	--disable-lock-profiler \
+	--disable-monolithic \
 	--disable-defaults \
 	--enable-dependency-tracking \
 	--enable-shared \
@@ -246,7 +258,7 @@ $(STATEDIR)/strongswan.targetinstall:
 	@$(call install_init, strongswan)
 	@$(call install_fixup, strongswan,PRIORITY,optional)
 	@$(call install_fixup, strongswan,SECTION,base)
-	@$(call install_fixup, strongswan,AUTHOR,"Christoph Fritz <chf.fritz@googlemail.com>")
+	@$(call install_fixup, strongswan,AUTHOR,"Christoph Fritz <chf@fritzc.com>")
 	@$(call install_fixup, strongswan,DESCRIPTION,missing)
 
 	@$(call install_alternative, strongswan, 0, 0, 0644, /etc/strongswan.conf)
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/2] strongswan: fix configure flags from previous updates

[Christoph Fritz]

Hi,

 I can see that strongswan gets kicked out of ptxdist because of missing
systemd support - but I was sure that I added systemd...

So I found out that my patches below has never been applied upstream.

Can you please merge the old patch and see if it fixes the issues?

[PATCH 1/2] strongswan: fix configure flags from previous updates
[PATCH 2/2] strongswan: update to 5.3.3

Thanks
  -- Christoph

On Fri, 2015-09-18 at 19:25 +0200, Christoph Fritz wrote:
>  - Add missing configure flags from previous updates:
> 
>    * bliss 5.2.2
>    * winhttp 5.2.0
>    * kernel-iph 5.2.0
>    * kernel-wfp 5.2.0
>    * socket-win 5.2.0
>    * vici  5.2.0
>    * aikgen ?
>    * svc ?
>    * ext-auth ?
>    * swanctl
>    * systemd
>    * dbghelp-backtraces ?
> 
>  - Reorganize flags to mirror output of ./configure --help
> 
> Tested-by: Bruno Thomsen <bth@kamstrup.com>
> Signed-off-by: Christoph Fritz <chf@fritzc.com>
> ---
>  rules/strongswan.make | 200 ++++++++++++++++++++++++++------------------------
>  1 file changed, 106 insertions(+), 94 deletions(-)
> 
> diff --git a/rules/strongswan.make b/rules/strongswan.make
> index 033deeb..fe85295 100644
> --- a/rules/strongswan.make
> +++ b/rules/strongswan.make
> @@ -33,55 +33,55 @@ STRONGSWAN_LICENSE	:= GPL
>  STRONGSWAN_CONF_TOOL	:= autoconf
>  STRONGSWAN_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> -	--$(call ptx/endis, PTXCONF_STRONGSWAN_LIBCURL)-curl \
> -	--$(call ptx/endis, PTXCONF_STRONGSWAN_OPENSSL)-openssl \
> -	--disable-unbound \
> -	--disable-soup \
> -	--disable-ldap \
>  	--enable-aes \
> -	--disable-des \
> +	--$(call ptx/endis, PTXCONF_STRONGSWAN_AFALG)-af-alg \
> +	--disable-bliss \
>  	--disable-blowfish \
> +	--disable-ccm \
> +	--enable-cmac \
> +	--disable-ctr \
> +	--disable-des \
> +	--enable-fips-prf \
> +	--enable-gcm \
> +	--disable-gcrypt \
> +	--enable-gmp \
> +	--enable-hmac \
>  	--disable-md4 \
>  	--disable-md5 \
> +	--enable-nonce \
> +	--disable-ntru \
> +	--$(call ptx/endis, PTXCONF_STRONGSWAN_OPENSSL)-openssl \
> +	--disable-padlock \
> +	--enable-random \
> +	--disable-rc2 \
> +	--disable-rdrand \
>  	--disable-aesni \
>  	--enable-sha1 \
>  	--enable-sha2 \
> -	--enable-fips-prf \
> -	--enable-gmp \
> -	--disable-rdrand \
> -	--enable-random \
> -	--disable-rc2 \
> -	--enable-nonce \
> -	--disable-ntru \
> -	--enable-x509 \
> -	--enable-revocation \
> -	--enable-constraints \
> -	--enable-pubkey \
> -	--disable-sshkey \
> +	--enable-xcbc \
> +	--enable-dnskey \
> +	--enable-pem \
> +	--enable-pgp \
>  	--enable-pkcs1 \
>  	--enable-pkcs7 \
>  	--enable-pkcs8 \
>  	--disable-pkcs12 \
> -	--enable-pgp \
> -	--enable-dnskey \
> -	--disable-ipseckey \
> -	--disable-keychain \
> -	--enable-pem \
> -	--enable-hmac \
> -	--enable-cmac \
> -	--enable-xcbc \
> -	--$(call ptx/endis, PTXCONF_STRONGSWAN_AFALG)-af-alg \
> -	--disable-test-vectors \
> +	--enable-pubkey \
> +	--disable-sshkey \
> +	--enable-x509 \
> +	--$(call ptx/endis, PTXCONF_STRONGSWAN_LIBCURL)-curl \
> +	--disable-files \
> +	--disable-ldap \
> +	--disable-soup \
> +	--disable-unbound \
> +	--disable-winhttp \
>  	--disable-mysql \
>  	--disable-sqlite \
> -	--enable-stroke \
> -	--disable-medsrv \
> -	--disable-medcli \
> -	--disable-smp \
> -	--disable-sql \
> -	--disable-leak-detective \
> -	--disable-lock-profiler \
> -	--disable-load-tester \
> +	--disable-addrblock \
> +	--enable-acert \
> +	--disable-agent \
> +	--enable-constraints \
> +	--disable-coupling \
>  	--disable-dnscert \
>  	--disable-eap-sim \
>  	--disable-eap-sim-file \
> @@ -101,92 +101,104 @@ STRONGSWAN_CONF_OPT	:= \
>  	--disable-eap-tnc \
>  	--disable-eap-dynamic \
>  	--disable-eap-radius \
> +	--disable-ext-auth \
> +	--disable-ipseckey \
> +	--disable-keychain \
> +	--disable-pkcs11 \
> +	--enable-revocation \
> +	--disable-whitelist \
>  	--enable-xauth-generic \
>  	--disable-xauth-eap \
>  	--disable-xauth-pam \
>  	--disable-xauth-noauth \
> -	--disable-tnc-ifmap \
> -	--disable-tnc-pdp \
> -	--disable-tnc-imc \
> -	--disable-tnc-imv \
> -	--disable-tnccs-11 \
> -	--disable-tnccs-20 \
> -	--disable-tnccs-dynamic \
> -	--disable-imc-test \
> -	--disable-imv-test \
> -	--disable-imc-scanner \
> -	--disable-imv-scanner \
> -	--disable-imc-os \
> -	--disable-imv-os \
> -	--disable-imc-attestation \
> -	--disable-imv-attestation \
> -	--disable-imc-swid \
> -	--disable-imv-swid \
>  	--enable-kernel-netlink \
>  	--disable-kernel-pfkey \
>  	--disable-kernel-pfroute \
> +	--disable-kernel-iph \
>  	--disable-kernel-libipsec \
> -	--disable-libipsec \
> +	--disable-kernel-wfp \
>  	--enable-socket-default \
>  	--disable-socket-dynamic \
> -	--disable-farp \
> -	--disable-dumm \
> -	--disable-fast \
> -	--disable-manager \
> -	--disable-mediation \
> -	--disable-integrity-test \
> -	--enable-load-warning \
> -	--enable-ikev1 \
> -	--enable-ikev2 \
> -	--enable-charon \
> -	--disable-cmd \
> -	--enable-pki \
> -	--enable-scepclient \
> -	--enable-scripts \
> -	--disable-conftest \
> -	--enable-updown \
> +	--disable-socket-win \
> +	--enable-stroke \
> +	--disable-smp \
> +	--disable-sql \
> +	--disable-uci \
> +	--disable-vici \
> +	--disable-android-dns \
>  	--enable-attr \
>  	--disable-attr-sql \
>  	--disable-dhcp \
>  	--disable-osx-attr \
>  	--enable-resolve \
> -	--disable-padlock \
> -	--disable-gcrypt \
> -	--disable-agent \
> -	--disable-pkcs11 \
> -	--disable-ctr \
> -	--disable-ccm \
> -	--enable-gcm \
> -	--disable-addrblock \
> -	--enable-acert \
>  	--disable-unity \
> -	--disable-uci \
> -	--disable-android-dns \
> +	--disable-imc-test \
> +	--disable-imv-test \
> +	--disable-imc-scanner \
> +	--disable-imv-scanner \
> +	--disable-imc-os \
> +	--disable-imv-os \
> +	--disable-imc-attestation \
> +	--disable-imv-attestation \
> +	--disable-imc-swid \
> +	--disable-imv-swid \
> +	--disable-tnc-ifmap \
> +	--disable-tnc-imc \
> +	--disable-tnc-imv \
> +	--disable-tnc-pdp \
> +	--disable-tnccs-11 \
> +	--disable-tnccs-20 \
> +	--disable-tnccs-dynamic \
>  	--disable-android-log \
> -	--disable-maemo \
> -	--disable-nm \
> -	--disable-ha \
> -	--disable-whitelist \
> -	--disable-lookip \
> -	--disable-error-notify \
>  	--disable-certexpire \
>  	--disable-connmark \
>  	--disable-forecast \
> -	--disable-systime-fix \
> -	--disable-led \
>  	--disable-duplicheck \
> -	--disable-coupling \
> +	--disable-error-notify \
> +	--disable-farp \
> +	--disable-ha \
> +	--disable-led \
> +	--disable-load-tester \
> +	--disable-lookip \
> +	--disable-maemo \
>  	--disable-radattr \
> -	--disable-monolithic \
> +	--disable-systime-fix \
> +	--disable-test-vectors \
> +	--enable-updown \
> +	--disable-aikgen \
> +	--enable-charon \
> +	--disable-cmd \
> +	--disable-conftest \
> +	--disable-dumm \
> +	--disable-fast \
> +	--disable-libipsec \
> +	--disable-manager \
> +	--disable-medcli \
> +	--disable-medsrv \
> +	--disable-nm \
> +	--enable-pki \
> +	--enable-scepclient \
> +	--enable-scripts \
> +	--disable-svc \
> +	--$(call ptx/endis, PTXCONF_STRONGSWAN_SYSTEMD_UNIT)-systemd \
> +	--disable-swanctl \
> +	--disable-tkm \
>  	--disable-bfd-backtraces \
> +	--disable-dbghelp-backtraces \
> +	--enable-ikev1 \
> +	--enable-ikev2 \
> +	--disable-integrity-test \
> +	--enable-load-warning \
> +	--disable-mediation \
>  	--disable-unwind-backtraces \
>  	--disable-ruby-gems \
>  	--disable-ruby-gems-install \
>  	--disable-python-eggs \
>  	--disable-python-eggs-install \
> -	--disable-files \
>  	--disable-coverage \
> -	--disable-tkm \
> +	--disable-leak-detective \
> +	--disable-lock-profiler \
> +	--disable-monolithic \
>  	--disable-defaults \
>  	--enable-dependency-tracking \
>  	--enable-shared \
> @@ -246,7 +258,7 @@ $(STATEDIR)/strongswan.targetinstall:
>  	@$(call install_init, strongswan)
>  	@$(call install_fixup, strongswan,PRIORITY,optional)
>  	@$(call install_fixup, strongswan,SECTION,base)
> -	@$(call install_fixup, strongswan,AUTHOR,"Christoph Fritz <chf.fritz@googlemail.com>")
> +	@$(call install_fixup, strongswan,AUTHOR,"Christoph Fritz <chf@fritzc.com>")
>  	@$(call install_fixup, strongswan,DESCRIPTION,missing)
>  
>  	@$(call install_alternative, strongswan, 0, 0, 0644, /etc/strongswan.conf)
> -- 
> 2.1.4
> 
> 




_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/2] strongswan: fix configure flags from previous updates

[Roland Hieber]

Hi Christoph,

On Mon, May 28, 2018 at 10:08:23AM +0200, Christoph Fritz wrote:
> So I found out that my patches below has never been applied upstream.

I can see both patches in the Git repository.

> Can you please merge the old patch and see if it fixes the issues?
> 
> [PATCH 1/2] strongswan: fix configure flags from previous updates

See https://git.pengutronix.de/cgit/ptxdist/commit/?id=9f0130981ed111ca380fac88d83bc202abefb52d

> [PATCH 2/2] strongswan: update to 5.3.3

See https://git.pengutronix.de/cgit/ptxdist/commit/?id=1e7a98808fefc05ff670253b10fa7bab2ea3cb6d

-- 
Roland Hieber                     | r.hieber@pengutronix.de     |
Pengutronix e.K.                  | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/2] strongswan: fix configure flags from previous updates

[Christoph Fritz]

On Mon, 2018-05-28 at 18:03 +0200, Roland Hieber wrote:
> Hi Christoph,
> 
> On Mon, May 28, 2018 at 10:08:23AM +0200, Christoph Fritz wrote:
> > So I found out that my patches below has never been applied upstream.

:) oh ... sorry for the noise

 -- Christoph


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/2] strongswan: fix configure flags from previous updates

[Bruno Thomsen]

Hi,

We are using Strongswan 5.6.1 with OSELAS 2018.02.0 (gcc 7.3.1) and it builds just fine.
I can prepare an upstream patch in a few days.


Venlig hilsen / Best regards

Bruno Thomsen
Development engineer
Technology

Kamstrup A/S
Industrivej 28
DK-8660 Skanderborg
T: +45 89 93 10 00
D: +45 89 93 13 94

bth@kamstrup.com
kamstrup.com


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/2] strongswan: fix configure flags from previous updates

[Michael Olbrich]

Hi,

On Mon, May 28, 2018 at 10:08:23AM +0200, Christoph Fritz wrote:
>  I can see that strongswan gets kicked out of ptxdist because of missing
> systemd support - but I was sure that I added systemd...

I moved it to staging because the version we have is over two years old and
fails to build with modern Compilers. It has nothing to do with systemd.
It had systemd support since the initial version of the rule.

I'd be happy to take a patch that updates strongswan to the latest version
and moves it out of staging again.

Regards,
Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de