[ptxdist] [PATCH v1 0/3] libmicrohttpd: version bump

[ptxdist] [PATCH v1 0/3] libmicrohttpd: version bump

[Alexander Dahl]

Hei hei,

you might have some questions or remarks on this.

Greets
Alex

Alexander Dahl (3):
  libmicrohttpd: Pin down more configure options
  libmicrohttpd: Update license handling
  libmicrohttpd: version bump 0.9.66 -> 0.9.73

 rules/libmicrohttpd.make | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)


base-commit: 70205d7cc77ff2bd36860291bf767f91bb4bc989
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v1 1/3] libmicrohttpd: Pin down more configure options

[Alexander Dahl]

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libmicrohttpd.make | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make
index e79b29ce4..2a4700ead 100644
--- a/rules/libmicrohttpd.make
+++ b/rules/libmicrohttpd.make
@@ -34,13 +34,26 @@ LIBMICROHTTPD_LICENSE	:= LGPL-2.1-only OR GPL-2.0-only WITH eCos-exception-2.0
 LIBMICROHTTPD_CONF_TOOL	:= autoconf
 LIBMICROHTTPD_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_LARGE_FILE_OPTION) \
+	--disable-nls \
+	--disable-rpath \
+	--disable-thread-names \
+	--disable-doc \
+	--disable-examples \
+	--enable-poll \
+	--enable-epoll \
+	--enable-itc=eventfd \
 	--disable-curl \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--enable-sendfile \
 	--$(call ptx/endis, PTXCONF_LIBMICROHTTPD_MESSAGES)-messages \
+	--enable-postprocessor \
 	--$(call ptx/endis, PTXCONF_LIBMICROHTTPD_HTTPS)-https \
 	--enable-bauth \
 	--disable-dauth \
-	--disable-coverage
+	--disable-httpupgrade \
+	--disable-coverage \
+	--enable-asserts \
+	--disable-experimental
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v1 2/3] libmicrohttpd: Update license handling

[Alexander Dahl]

License options depend on whether gnutls is linked or not.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libmicrohttpd.make | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make
index 2a4700ead..313a52c9b 100644
--- a/rules/libmicrohttpd.make
+++ b/rules/libmicrohttpd.make
@@ -22,7 +22,17 @@ LIBMICROHTTPD_SUFFIX	:= tar.gz
 LIBMICROHTTPD_URL	:= $(call ptx/mirror, GNU, libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX))
 LIBMICROHTTPD_SOURCE	:= $(SRCDIR)/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX)
 LIBMICROHTTPD_DIR	:= $(BUILDDIR)/$(LIBMICROHTTPD)
+
+LIBMICROHTTPD_LICENSE_FILES := \
+	file://README;startline=10;endline=11;md5=c6f1444a4efd67e04f3452dc1e97c24d \
+	file://COPYING;md5=57d09285feac8a64efa878e692b14f36
+ifdef PTXCONF_LIBMICROHTTPD_HTTPS
+LIBMICROHTTPD_LICENSE	:= LGPL-2.1-only
+else
 LIBMICROHTTPD_LICENSE	:= LGPL-2.1-only OR GPL-2.0-only WITH eCos-exception-2.0
+LIBMICROHTTPD_LICENSE_FILES += \
+	file://doc/ecos.texi;md5=2f39d254e3e5ed800a68ed0fc265b8a1
+endif
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v1 3/3] libmicrohttpd: version bump 0.9.66 -> 0.9.73

[Alexander Dahl]

Noteworthy changes:

- added compiler and linker hardening options
- performance improvements
- improved test coverage
- bugfixes
  - url encoding keys without values in postprocessor
  - 100 continue handling
  - buffer overflow in URL parser
  - more postprocessor parser bugs
  - potential postprocessor crashes
  - resource leaks in error handlers
  - thread safety
- improve code robustness
  - introduce enum MHD_result
- build fixes
  - restored parallel build
  - build with disabled features (messages, https, …)

eCos license text was split up in two files.

Link: https://bugs.gnunet.org/view.php?id=5868
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 rules/libmicrohttpd.make | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make
index 313a52c9b..6955449a7 100644
--- a/rules/libmicrohttpd.make
+++ b/rules/libmicrohttpd.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBMICROHTTPD) += libmicrohttpd
 #
 # Paths and names
 #
-LIBMICROHTTPD_VERSION	:= 0.9.66
-LIBMICROHTTPD_MD5	:= ce4050e75cc40d68506e2b403e1a76f9
+LIBMICROHTTPD_VERSION	:= 0.9.73
+LIBMICROHTTPD_MD5	:= 2b15949b1633e4fa487e08cdcc97f0e3
 LIBMICROHTTPD		:= libmicrohttpd-$(LIBMICROHTTPD_VERSION)
 LIBMICROHTTPD_SUFFIX	:= tar.gz
 LIBMICROHTTPD_URL	:= $(call ptx/mirror, GNU, libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX))
@@ -31,7 +31,8 @@ LIBMICROHTTPD_LICENSE	:= LGPL-2.1-only
 else
 LIBMICROHTTPD_LICENSE	:= LGPL-2.1-only OR GPL-2.0-only WITH eCos-exception-2.0
 LIBMICROHTTPD_LICENSE_FILES += \
-	file://doc/ecos.texi;md5=2f39d254e3e5ed800a68ed0fc265b8a1
+	file://doc/gpl-2.0.texi;md5=677a43782a1741516a301d9bc9ba9bf6 \
+	file://doc/ecos.texi;md5=3d1924c9f32fb6f323cca650df416f54
 endif
 
 # ----------------------------------------------------------------------------
@@ -46,9 +47,13 @@ LIBMICROHTTPD_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-nls \
 	--disable-rpath \
+	--enable-gcc-hardening \
+	--enable-linker-hardening \
+	--disable-sanitizer \
 	--disable-thread-names \
 	--disable-doc \
 	--disable-examples \
+	--disable-heavy-tests \
 	--enable-poll \
 	--enable-epoll \
 	--enable-itc=eventfd \
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] libmicrohttpd: Pin down more configure options

[Michael Olbrich]

Thanks, applied as 4702b6a81f20d018f244a9cb2546d1607eb567b1.

Michael

[sent from post-receive hook]

On Fri, 10 Dec 2021 14:07:12 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20211203100103.3476-2-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make
> index e79b29ce4792..2a4700ead249 100644
> --- a/rules/libmicrohttpd.make
> +++ b/rules/libmicrohttpd.make
> @@ -34,13 +34,26 @@ LIBMICROHTTPD_LICENSE	:= LGPL-2.1-only OR GPL-2.0-only WITH eCos-exception-2.0
>  LIBMICROHTTPD_CONF_TOOL	:= autoconf
>  LIBMICROHTTPD_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> -	$(GLOBAL_LARGE_FILE_OPTION) \
> +	--disable-nls \
> +	--disable-rpath \
> +	--disable-thread-names \
> +	--disable-doc \
> +	--disable-examples \
> +	--enable-poll \
> +	--enable-epoll \
> +	--enable-itc=eventfd \
>  	--disable-curl \
> +	$(GLOBAL_LARGE_FILE_OPTION) \
> +	--enable-sendfile \
>  	--$(call ptx/endis, PTXCONF_LIBMICROHTTPD_MESSAGES)-messages \
> +	--enable-postprocessor \
>  	--$(call ptx/endis, PTXCONF_LIBMICROHTTPD_HTTPS)-https \
>  	--enable-bauth \
>  	--disable-dauth \
> -	--disable-coverage
> +	--disable-httpupgrade \
> +	--disable-coverage \
> +	--enable-asserts \
> +	--disable-experimental
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] libmicrohttpd: Update license handling

[Michael Olbrich]

Thanks, applied as 44dc6d6a3111c379afb2349abb3caa9fb92e2355.

Michael

[sent from post-receive hook]

On Fri, 10 Dec 2021 14:07:14 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> License options depend on whether gnutls is linked or not.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20211203100103.3476-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make
> index 2a4700ead249..313a52c9b751 100644
> --- a/rules/libmicrohttpd.make
> +++ b/rules/libmicrohttpd.make
> @@ -22,7 +22,17 @@ LIBMICROHTTPD_SUFFIX	:= tar.gz
>  LIBMICROHTTPD_URL	:= $(call ptx/mirror, GNU, libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX))
>  LIBMICROHTTPD_SOURCE	:= $(SRCDIR)/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX)
>  LIBMICROHTTPD_DIR	:= $(BUILDDIR)/$(LIBMICROHTTPD)
> +
> +LIBMICROHTTPD_LICENSE_FILES := \
> +	file://README;startline=10;endline=11;md5=c6f1444a4efd67e04f3452dc1e97c24d \
> +	file://COPYING;md5=57d09285feac8a64efa878e692b14f36
> +ifdef PTXCONF_LIBMICROHTTPD_HTTPS
> +LIBMICROHTTPD_LICENSE	:= LGPL-2.1-only
> +else
>  LIBMICROHTTPD_LICENSE	:= LGPL-2.1-only OR GPL-2.0-only WITH eCos-exception-2.0
> +LIBMICROHTTPD_LICENSE_FILES += \
> +	file://doc/ecos.texi;md5=2f39d254e3e5ed800a68ed0fc265b8a1
> +endif
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] libmicrohttpd: version bump 0.9.66 -> 0.9.73

[Michael Olbrich]

Thanks, applied as cff5fd989337cfd77343087b24f5c865f8d37276.

Michael

[sent from post-receive hook]

On Fri, 10 Dec 2021 14:07:15 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> Noteworthy changes:
> 
> - added compiler and linker hardening options
> - performance improvements
> - improved test coverage
> - bugfixes
>   - url encoding keys without values in postprocessor
>   - 100 continue handling
>   - buffer overflow in URL parser
>   - more postprocessor parser bugs
>   - potential postprocessor crashes
>   - resource leaks in error handlers
>   - thread safety
> - improve code robustness
>   - introduce enum MHD_result
> - build fixes
>   - restored parallel build
>   - build with disabled features (messages, https, …)
> 
> eCos license text was split up in two files.
> 
> Link: https://bugs.gnunet.org/view.php?id=5868
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20211203100103.3476-4-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make
> index 313a52c9b751..6955449a7490 100644
> --- a/rules/libmicrohttpd.make
> +++ b/rules/libmicrohttpd.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBMICROHTTPD) += libmicrohttpd
>  #
>  # Paths and names
>  #
> -LIBMICROHTTPD_VERSION	:= 0.9.66
> -LIBMICROHTTPD_MD5	:= ce4050e75cc40d68506e2b403e1a76f9
> +LIBMICROHTTPD_VERSION	:= 0.9.73
> +LIBMICROHTTPD_MD5	:= 2b15949b1633e4fa487e08cdcc97f0e3
>  LIBMICROHTTPD		:= libmicrohttpd-$(LIBMICROHTTPD_VERSION)
>  LIBMICROHTTPD_SUFFIX	:= tar.gz
>  LIBMICROHTTPD_URL	:= $(call ptx/mirror, GNU, libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX))
> @@ -31,7 +31,8 @@ LIBMICROHTTPD_LICENSE	:= LGPL-2.1-only
>  else
>  LIBMICROHTTPD_LICENSE	:= LGPL-2.1-only OR GPL-2.0-only WITH eCos-exception-2.0
>  LIBMICROHTTPD_LICENSE_FILES += \
> -	file://doc/ecos.texi;md5=2f39d254e3e5ed800a68ed0fc265b8a1
> +	file://doc/gpl-2.0.texi;md5=677a43782a1741516a301d9bc9ba9bf6 \
> +	file://doc/ecos.texi;md5=3d1924c9f32fb6f323cca650df416f54
>  endif
>  
>  # ----------------------------------------------------------------------------
> @@ -46,9 +47,13 @@ LIBMICROHTTPD_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--disable-nls \
>  	--disable-rpath \
> +	--enable-gcc-hardening \
> +	--enable-linker-hardening \
> +	--disable-sanitizer \
>  	--disable-thread-names \
>  	--disable-doc \
>  	--disable-examples \
> +	--disable-heavy-tests \
>  	--enable-poll \
>  	--enable-epoll \
>  	--enable-itc=eventfd \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de