[ptxdist] [PATCH 0/7] various version bumps

[ptxdist] [PATCH 0/7] various version bumps

[Marc Kleine-Budde]

Hello,

this series contains a few versions bumps.

regards,
Marc

[ptxdist] [PATCH 1/7] libcurl: version bump to 7.85

[Marc Kleine-Budde]

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 rules/libcurl.make | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/rules/libcurl.make b/rules/libcurl.make
index 0d0ac9ea33d0..1ddefa9a5b4e 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -105,7 +105,6 @@ LIBCURL_CONF_OPT	:= \
 	--without-brotli \
 	--without-zstd \
 	--without-gssapi \
-	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
 	--with-random=/dev/urandom \
 	--with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
 	--with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \
@@ -126,6 +125,14 @@ LIBCURL_CONF_OPT	:= \
 	--without-zsh-functions-dir \
 	--without-fish-functions-dir
 
+ifdef PTXCONF_LIBCURL_SSL
+LIBCURL_CONF_OPT += \
+	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND)
+else
+LIBCURL_CONF_OPT += \
+	--without-ssl
+endif
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
-- 
2.30.2

[ptxdist] [PATCH 2/7] bind: version bump to 9.11.37

[Marc Kleine-Budde]

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 rules/bind.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/bind.make b/rules/bind.make
index b547eeff0993..322edd3926cc 100644
--- a/rules/bind.make
+++ b/rules/bind.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BIND) += bind
 #
 # Paths and names
 #
-BIND_VERSION		:= 9.11.31
-BIND_MD5		:= 40732ca6e4fcc9d022ab0f17b3e55b71
+BIND_VERSION		:= 9.11.37
+BIND_MD5		:= 0a11e9596c46d6728fa3b0989ee75197
 BIND			:= bind-$(BIND_VERSION)
 BIND_SUFFIX		:= tar.gz
 BIND_URL		:= https://ftp.isc.org/isc/bind9/$(BIND_VERSION)/$(BIND).$(BIND_SUFFIX)
-- 
2.30.2

[ptxdist] [PATCH 3/7] dhcp: version bump to 4.4.3

[Marc Kleine-Budde]

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 ...0001-Fixed-gcc-10-compilation-issues.patch | 82 -------------------
 patches/dhcp-4.4.2/series                     |  4 -
 rules/dhcp.make                               |  4 +-
 3 files changed, 2 insertions(+), 88 deletions(-)
 delete mode 100644 patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch
 delete mode 100644 patches/dhcp-4.4.2/series

diff --git a/patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch b/patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch
deleted file mode 100644
index f0e3cc450bbe..000000000000
--- a/patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From: Thomas Markwalder <tmark@isc.org>
-Date: Thu, 30 Jul 2020 10:01:36 -0400
-Subject: [PATCH] Fixed gcc 10 compilation issues
-
-client/dhclient.c
-relay/dhcrelay.c
-    extern'ed local_port,remote_port
-
-common/discover.c
-    init local_port,remote_port to 0
-
-server/mdb.c
-    extern'ed dhcp_type_host
-
-server/mdb6.c
-    create_prefix6() - eliminated memcpy string overflow error
-
-Origin: https://sources.debian.org/patches/isc-dhcp/4.4.1-2.2/Fixed_gcc_10_compilation_issues.patch/
----
- client/dhclient.c | 5 +++--
- relay/dhcrelay.c  | 4 ++--
- server/mdb.c      | 2 +-
- server/mdb6.c     | 2 +-
- 4 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/client/dhclient.c b/client/dhclient.c
-index 189e527094e8..7a7837cb8152 100644
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -83,8 +83,9 @@ static const char message [] = "Internet Systems Consortium DHCP Client";
- static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";
- #endif /* UNIT_TEST */
- 
--u_int16_t local_port = 0;
--u_int16_t remote_port = 0;
-+extern u_int16_t local_port;
-+extern u_int16_t remote_port;
-+
- #if defined(DHCPv6) && defined(DHCP4o6)
- int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
- #endif
-diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index 883d5058f2ee..7211e3bbbec9 100644
---- a/relay/dhcrelay.c
-+++ b/relay/dhcrelay.c
-@@ -95,8 +95,8 @@ enum { forward_and_append,	/* Forward and append our own relay option. */
-        forward_untouched,	/* Forward without changes. */
-        discard } agent_relay_mode = forward_and_replace;
- 
--u_int16_t local_port;
--u_int16_t remote_port;
-+extern u_int16_t local_port;
-+extern u_int16_t remote_port;
- 
- /* Relay agent server list. */
- struct server_list {
-diff --git a/server/mdb.c b/server/mdb.c
-index ff8a707fac1b..8266d76432b8 100644
---- a/server/mdb.c
-+++ b/server/mdb.c
-@@ -67,7 +67,7 @@ static host_id_info_t *host_id_info = NULL;
- 
- int numclasseswritten;
- 
--omapi_object_type_t *dhcp_type_host;
-+extern omapi_object_type_t *dhcp_type_host;
- 
- isc_result_t enter_class(cd, dynamicp, commit)
- 	struct class *cd;
-diff --git a/server/mdb6.c b/server/mdb6.c
-index da7baf6e50df..ebe01e5607cb 100644
---- a/server/mdb6.c
-+++ b/server/mdb6.c
-@@ -1945,7 +1945,7 @@ create_prefix6(struct ipv6_pool *pool, struct iasubopt **pref,
- 		}
- 		new_ds.data = new_ds.buffer->data;
- 		memcpy(new_ds.buffer->data, ds.data, ds.len);
--		memcpy(new_ds.buffer->data + ds.len, &tmp, sizeof(tmp));
-+		memcpy(&new_ds.buffer->data[0] + ds.len, &tmp, sizeof(tmp));
- 		data_string_forget(&ds, MDL);
- 		data_string_copy(&ds, &new_ds, MDL);
- 		data_string_forget(&new_ds, MDL);
diff --git a/patches/dhcp-4.4.2/series b/patches/dhcp-4.4.2/series
deleted file mode 100644
index de5f31877455..000000000000
--- a/patches/dhcp-4.4.2/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Fixed-gcc-10-compilation-issues.patch
-# dd19bdbd49b780e973ed9392604d03fe  - git-ptx-patches magic
diff --git a/rules/dhcp.make b/rules/dhcp.make
index 7feb6ef5b668..b726b8787890 100644
--- a/rules/dhcp.make
+++ b/rules/dhcp.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_DHCP) += dhcp
 #
 # Paths and names
 #
-DHCP_VERSION	:= 4.4.2
-DHCP_MD5	:= 2afdaf8498dc1edaf3012efdd589b3e1
+DHCP_VERSION	:= 4.4.3
+DHCP_MD5	:= 9076af4cc1293dde5a7c6cae7de6ab45
 DHCP		:= dhcp-$(DHCP_VERSION)
 DHCP_SUFFIX	:= tar.gz
 DHCP_URL	:= \
-- 
2.30.2

[ptxdist] [PATCH 4/7] dnsmasq: version bump to 2.86

[Marc Kleine-Budde]

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 .../0001-the-pkg-config-file-is-lua-no-lua5.2.patch           | 2 +-
 patches/{dnsmasq-2.85 => dnsmasq-2.86}/series                 | 0
 rules/dnsmasq.make                                            | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename patches/{dnsmasq-2.85 => dnsmasq-2.86}/0001-the-pkg-config-file-is-lua-no-lua5.2.patch (97%)
 rename patches/{dnsmasq-2.85 => dnsmasq-2.86}/series (100%)

diff --git a/patches/dnsmasq-2.85/0001-the-pkg-config-file-is-lua-no-lua5.2.patch b/patches/dnsmasq-2.86/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
similarity index 97%
rename from patches/dnsmasq-2.85/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
rename to patches/dnsmasq-2.86/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
index 5aebae2dfa13..b53a81cfa7a9 100644
--- a/patches/dnsmasq-2.85/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
+++ b/patches/dnsmasq-2.86/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
@@ -8,7 +8,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index e4c3f5c92a76..fa33af1a0c20 100644
+index 0cd592e91fa6..5bb2b42b5982 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -60,8 +60,8 @@ idn2_cflags =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI
diff --git a/patches/dnsmasq-2.85/series b/patches/dnsmasq-2.86/series
similarity index 100%
rename from patches/dnsmasq-2.85/series
rename to patches/dnsmasq-2.86/series
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index e5be3265ab4f..584d5dbba74c 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_DNSMASQ) += dnsmasq
 #
 # Paths and names
 #
-DNSMASQ_VERSION		:= 2.85
-DNSMASQ_MD5		:= f32403e94a657b93d7fbe0a9c07ebccf
+DNSMASQ_VERSION		:= 2.86
+DNSMASQ_MD5		:= 227fd0e81a5ed8134e1f60e175324c99
 DNSMASQ			:= dnsmasq-$(DNSMASQ_VERSION)
 DNSMASQ_SUFFIX		:= tar.xz
 DNSMASQ_URL		:= http://www.thekelleys.org.uk/dnsmasq/$(DNSMASQ).$(DNSMASQ_SUFFIX)
-- 
2.30.2

[ptxdist] [PATCH 5/7] glib: version bump to 2.72.3

[Marc Kleine-Budde]

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 rules/glib.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/glib.make b/rules/glib.make
index 144814c7700b..8b1fd17f93bc 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib
 #
 # Paths and names
 #
-GLIB_VERSION	:= 2.72.2
-GLIB_MD5	:= 6874205c81e9634fb47f4efb73183d00
+GLIB_VERSION	:= 2.72.3
+GLIB_MD5	:= ef67f7e19e47c8e082256d614f1ab8f4
 GLIB		:= glib-$(GLIB_VERSION)
 GLIB_SUFFIX	:= tar.xz
 GLIB_URL	:= $(call ptx/mirror, GNOME, glib/$(basename $(GLIB_VERSION))/$(GLIB).$(GLIB_SUFFIX))
-- 
2.30.2

[ptxdist] [PATCH 6/7] gnutls: version bump to 3.7.7

[Marc Kleine-Budde]

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 rules/gnutls.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/gnutls.make b/rules/gnutls.make
index 972d12104d51..5420fd4c2cc9 100644
--- a/rules/gnutls.make
+++ b/rules/gnutls.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GNUTLS) += gnutls
 #
 # Paths and names
 #
-GNUTLS_VERSION	:= 3.7.6
-GNUTLS_MD5	:= 5b07c89e53a351209dc23b714da3ef98
+GNUTLS_VERSION	:= 3.7.7
+GNUTLS_MD5	:= 39e5c71af7f444bdf175094a787843a2
 GNUTLS		:= gnutls-$(GNUTLS_VERSION)
 GNUTLS_SUFFIX	:= tar.xz
 GNUTLS_URL	:= https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/$(GNUTLS).$(GNUTLS_SUFFIX)
-- 
2.30.2

[ptxdist] [PATCH 7/7] lz4: version bump to 1.9.4

[Marc Kleine-Budde]

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 rules/lz4.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/lz4.make b/rules/lz4.make
index 79d8600c29db..930ff5a0ef3d 100644
--- a/rules/lz4.make
+++ b/rules/lz4.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LZ4) += lz4
 #
 # Paths and names
 #
-LZ4_VERSION	:= 1.9.3
-LZ4_MD5		:= 3a1ab1684e14fc1afc66228ce61b2db3
+LZ4_VERSION	:= 1.9.4
+LZ4_MD5		:= e9286adb64040071c5e23498bf753261
 LZ4		:= lz4-$(LZ4_VERSION)
 LZ4_SUFFIX	:= tar.gz
 LZ4_URL		:= https://github.com/Cyan4973/lz4/archive/v$(LZ4_VERSION).$(LZ4_SUFFIX)
-- 
2.30.2

Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85

[Alexander Dahl]

Hello Marc,

Am Tue, Sep 20, 2022 at 02:56:59PM +0200 schrieb Marc Kleine-Budde:
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
>  rules/libcurl.make | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/libcurl.make b/rules/libcurl.make
> index 0d0ac9ea33d0..1ddefa9a5b4e 100644
> --- a/rules/libcurl.make
> +++ b/rules/libcurl.make
> @@ -105,7 +105,6 @@ LIBCURL_CONF_OPT	:= \
>  	--without-brotli \
>  	--without-zstd \
>  	--without-gssapi \
> -	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
>  	--with-random=/dev/urandom \
>  	--with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
>  	--with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \
> @@ -126,6 +125,14 @@ LIBCURL_CONF_OPT	:= \
>  	--without-zsh-functions-dir \
>  	--without-fish-functions-dir
>  
> +ifdef PTXCONF_LIBCURL_SSL
> +LIBCURL_CONF_OPT += \
> +	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND)
> +else
> +LIBCURL_CONF_OPT += \
> +	--without-ssl
> +endif

The diff does not match patch subject.

Greets
Alex

> +
>  # ----------------------------------------------------------------------------
>  # Target-Install
>  # ----------------------------------------------------------------------------
> -- 
> 2.30.2
> 
> 

Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]

On 20.09.2022 15:07:22, Alexander Dahl wrote:
> Hello Marc,
> 
> Am Tue, Sep 20, 2022 at 02:56:59PM +0200 schrieb Marc Kleine-Budde:
> > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> > ---
> >  rules/libcurl.make | 9 ++++++++-
> >  1 file changed, 8 insertions(+), 1 deletion(-)
> > 
> > diff --git a/rules/libcurl.make b/rules/libcurl.make
> > index 0d0ac9ea33d0..1ddefa9a5b4e 100644
> > --- a/rules/libcurl.make
> > +++ b/rules/libcurl.make
> > @@ -105,7 +105,6 @@ LIBCURL_CONF_OPT	:= \
> >  	--without-brotli \
> >  	--without-zstd \
> >  	--without-gssapi \
> > -	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
> >  	--with-random=/dev/urandom \
> >  	--with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
> >  	--with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \
> > @@ -126,6 +125,14 @@ LIBCURL_CONF_OPT	:= \
> >  	--without-zsh-functions-dir \
> >  	--without-fish-functions-dir
> >  
> > +ifdef PTXCONF_LIBCURL_SSL
> > +LIBCURL_CONF_OPT += \
> > +	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND)
> > +else
> > +LIBCURL_CONF_OPT += \
> > +	--without-ssl
> > +endif
> 
> The diff does not match patch subject.

Oh, the version bump disappeared after rebasing to current master. Will
send a v2.

Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85

[Michael Olbrich]

On Tue, Sep 20, 2022 at 03:20:29PM +0200, Marc Kleine-Budde wrote:
> On 20.09.2022 15:07:22, Alexander Dahl wrote:
> > Hello Marc,
> > 
> > Am Tue, Sep 20, 2022 at 02:56:59PM +0200 schrieb Marc Kleine-Budde:
> > > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> > > ---
> > >  rules/libcurl.make | 9 ++++++++-
> > >  1 file changed, 8 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/rules/libcurl.make b/rules/libcurl.make
> > > index 0d0ac9ea33d0..1ddefa9a5b4e 100644
> > > --- a/rules/libcurl.make
> > > +++ b/rules/libcurl.make
> > > @@ -105,7 +105,6 @@ LIBCURL_CONF_OPT	:= \
> > >  	--without-brotli \
> > >  	--without-zstd \
> > >  	--without-gssapi \
> > > -	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
> > >  	--with-random=/dev/urandom \
> > >  	--with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
> > >  	--with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \
> > > @@ -126,6 +125,14 @@ LIBCURL_CONF_OPT	:= \
> > >  	--without-zsh-functions-dir \
> > >  	--without-fish-functions-dir
> > >  
> > > +ifdef PTXCONF_LIBCURL_SSL
> > > +LIBCURL_CONF_OPT += \
> > > +	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND)
> > > +else
> > > +LIBCURL_CONF_OPT += \
> > > +	--without-ssl
> > > +endif
> > 
> > The diff does not match patch subject.
> 
> Oh, the version bump disappeared after rebasing to current master. Will
> send a v2.

Why do you need this stuff anyways? From looking at configure.ac, the
existing options should work. What am I missing here?

Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 2558 bytes --]

On 20.09.2022 16:14:32, Michael Olbrich wrote:
> On Tue, Sep 20, 2022 at 03:20:29PM +0200, Marc Kleine-Budde wrote:
> > On 20.09.2022 15:07:22, Alexander Dahl wrote:
> > > Hello Marc,
> > > 
> > > Am Tue, Sep 20, 2022 at 02:56:59PM +0200 schrieb Marc Kleine-Budde:
> > > > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> > > > ---
> > > >  rules/libcurl.make | 9 ++++++++-
> > > >  1 file changed, 8 insertions(+), 1 deletion(-)
> > > > 
> > > > diff --git a/rules/libcurl.make b/rules/libcurl.make
> > > > index 0d0ac9ea33d0..1ddefa9a5b4e 100644
> > > > --- a/rules/libcurl.make
> > > > +++ b/rules/libcurl.make
> > > > @@ -105,7 +105,6 @@ LIBCURL_CONF_OPT	:= \
> > > >  	--without-brotli \
> > > >  	--without-zstd \
> > > >  	--without-gssapi \
> > > > -	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
> > > >  	--with-random=/dev/urandom \
> > > >  	--with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
> > > >  	--with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \
> > > > @@ -126,6 +125,14 @@ LIBCURL_CONF_OPT	:= \
> > > >  	--without-zsh-functions-dir \
> > > >  	--without-fish-functions-dir
> > > >  
> > > > +ifdef PTXCONF_LIBCURL_SSL
> > > > +LIBCURL_CONF_OPT += \
> > > > +	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND)
> > > > +else
> > > > +LIBCURL_CONF_OPT += \
> > > > +	--without-ssl
> > > > +endif
> > > 
> > > The diff does not match patch subject.
> > 
> > Oh, the version bump disappeared after rebasing to current master. Will
> > send a v2.
> 
> Why do you need this stuff anyways? From looking at configure.ac, the
> existing options should work. What am I missing here?

If configure is called with '--with-default-ssl-backend="no"' it fails:

| checking if GSS-API support is requested... no
| checking whether to enable Windows native SSL/TLS... no
| checking whether to enable Secure Transport... no
| checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
| configure: error: TLS not detected, you will not be able to use HTTPS, FTPS, NTLM and more.
| Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-amissl, --with-bearssl or --with-rustls to address this.

Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85

[Michael Olbrich]

On Tue, Sep 20, 2022 at 04:20:35PM +0200, Marc Kleine-Budde wrote:
> On 20.09.2022 16:14:32, Michael Olbrich wrote:
> > On Tue, Sep 20, 2022 at 03:20:29PM +0200, Marc Kleine-Budde wrote:
> > > On 20.09.2022 15:07:22, Alexander Dahl wrote:
> > > > Hello Marc,
> > > > 
> > > > Am Tue, Sep 20, 2022 at 02:56:59PM +0200 schrieb Marc Kleine-Budde:
> > > > > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> > > > > ---
> > > > >  rules/libcurl.make | 9 ++++++++-
> > > > >  1 file changed, 8 insertions(+), 1 deletion(-)
> > > > > 
> > > > > diff --git a/rules/libcurl.make b/rules/libcurl.make
> > > > > index 0d0ac9ea33d0..1ddefa9a5b4e 100644
> > > > > --- a/rules/libcurl.make
> > > > > +++ b/rules/libcurl.make
> > > > > @@ -105,7 +105,6 @@ LIBCURL_CONF_OPT	:= \
> > > > >  	--without-brotli \
> > > > >  	--without-zstd \
> > > > >  	--without-gssapi \
> > > > > -	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
> > > > >  	--with-random=/dev/urandom \
> > > > >  	--with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
> > > > >  	--with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \
> > > > > @@ -126,6 +125,14 @@ LIBCURL_CONF_OPT	:= \
> > > > >  	--without-zsh-functions-dir \
> > > > >  	--without-fish-functions-dir
> > > > >  
> > > > > +ifdef PTXCONF_LIBCURL_SSL
> > > > > +LIBCURL_CONF_OPT += \
> > > > > +	--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND)
> > > > > +else
> > > > > +LIBCURL_CONF_OPT += \
> > > > > +	--without-ssl
> > > > > +endif
> > > > 
> > > > The diff does not match patch subject.
> > > 
> > > Oh, the version bump disappeared after rebasing to current master. Will
> > > send a v2.
> > 
> > Why do you need this stuff anyways? From looking at configure.ac, the
> > existing options should work. What am I missing here?
> 
> If configure is called with '--with-default-ssl-backend="no"' it fails:
> 
> | checking if GSS-API support is requested... no
> | checking whether to enable Windows native SSL/TLS... no
> | checking whether to enable Secure Transport... no
> | checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
> | configure: error: TLS not detected, you will not be able to use HTTPS, FTPS, NTLM and more.
> | Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-amissl, --with-bearssl or --with-rustls to address this.

I think adding ptx/wwo --with{out,}-ssl should work. No need to make the
backend conditional.
Or $(call ptx/ifdef,PTXCONF_LIBCURL_SSL,,--without-ssl). Either one
inserted at the correct place.

Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1843 bytes --]

On 20.09.2022 16:29:07, Michael Olbrich wrote:
> > > Why do you need this stuff anyways? From looking at configure.ac, the
> > > existing options should work. What am I missing here?
> > 
> > If configure is called with '--with-default-ssl-backend="no"' it fails:
> > 
> > | checking if GSS-API support is requested... no
> > | checking whether to enable Windows native SSL/TLS... no
> > | checking whether to enable Secure Transport... no
> > | checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
> > | configure: error: TLS not detected, you will not be able to use HTTPS, FTPS, NTLM and more.
> > | Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-amissl, --with-bearssl or --with-rustls to address this.
> 
> I think adding ptx/wwo --with{out,}-ssl should work. No need to make the
> backend conditional.

No, it doesn't.

> Or $(call ptx/ifdef,PTXCONF_LIBCURL_SSL,,--without-ssl). Either one
> inserted at the correct place.

This works, though:

@@ -105,7 +105,7 @@ LIBCURL_CONF_OPT    := \
        --without-brotli \
        --without-zstd \
        --without-gssapi \
-       --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
+       $(call ptx/ifdef,PTXCONF_LIBCURL_SSL,--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND),--without-ssl)
        --with-random=/dev/urandom \
        --with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
        --with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \

Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [ptxdist] [PATCH 1/7] libcurl: version bump to 7.85

[Michael Olbrich]

On Tue, Sep 20, 2022 at 04:47:20PM +0200, Marc Kleine-Budde wrote:
> On 20.09.2022 16:29:07, Michael Olbrich wrote:
> > > > Why do you need this stuff anyways? From looking at configure.ac, the
> > > > existing options should work. What am I missing here?
> > > 
> > > If configure is called with '--with-default-ssl-backend="no"' it fails:
> > > 
> > > | checking if GSS-API support is requested... no
> > > | checking whether to enable Windows native SSL/TLS... no
> > > | checking whether to enable Secure Transport... no
> > > | checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
> > > | configure: error: TLS not detected, you will not be able to use HTTPS, FTPS, NTLM and more.
> > > | Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-amissl, --with-bearssl or --with-rustls to address this.
> > 
> > I think adding ptx/wwo --with{out,}-ssl should work. No need to make the
> > backend conditional.
> 
> No, it doesn't.

What fails for you?

> > Or $(call ptx/ifdef,PTXCONF_LIBCURL_SSL,,--without-ssl). Either one
> > inserted at the correct place.
> 
> This works, though:
> 
> @@ -105,7 +105,7 @@ LIBCURL_CONF_OPT    := \
>         --without-brotli \
>         --without-zstd \
>         --without-gssapi \
> -       --with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND) \
> +       $(call ptx/ifdef,PTXCONF_LIBCURL_SSL,--with-default-ssl-backend=$(PTXCONF_LIBCURL_SSL_DEFAULT_BACKEND),--without-ssl)
>         --with-random=/dev/urandom \
>         --with-ca-bundle=$(PTXCONF_LIBCURL_SSL_CABUNDLE_PATH) \
>         --with-ca-path=$(PTXCONF_LIBCURL_SSL_CAPATH_PATH) \

I tried this and configure runs without error, with PTXCONF_LIBCURL_SSL
enabled and disabled:

diff --git a/rules/libcurl.make b/rules/libcurl.make
index 0d0ac9ea33d0..5da835d730a8 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -93,6 +93,7 @@ LIBCURL_CONF_OPT	:= \
 	--without-schannel \
 	--without-secure-transport \
 	--without-amissl \
+	--$(call ptx/wwo,PTXCONF_LIBCURL_SSL)-ssl \
 	--with-openssl=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL_OPENSSL,$(SYSROOT)/usr,no) \
 	--with-gnutls=$(call ptx/ifdef, PTXCONF_LIBCURL_SSL_GNUTLS,$(SYSROOT)/usr,no) \
 	--without-mbedtls \

Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |