* [ptxdist] [PATCH] lighttpd: Version bump, 1.4.74 -> 1.4.76
@ 2024-06-24 16:36 Andreas Helmcke
2024-06-25 7:32 ` Alexander Dahl
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Helmcke @ 2024-06-24 16:36 UTC (permalink / raw)
To: ptxdist; +Cc: Andreas Helmcke
Important changes
- detect VU#421644 HTTP/2 CONTINUATION Flood
- avoid CVE-2024-3094 xz supply chain attack
- incrementally stronger TLS cipher defaults
bugfixes
Link: https://www.lighttpd.net/2024/4/12/1.4.76/
Link: https://www.lighttpd.net/2024/3/13/1.4.75/
Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
---
rules/lighttpd.make | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
mode change 100644 => 100755 rules/lighttpd.make
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
old mode 100644
new mode 100755
index 96382b86a..fcb543818
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
#
# Paths and names
#
-LIGHTTPD_VERSION := 1.4.74
-LIGHTTPD_MD5 := f38c400232151c69cc608fca35e593a9
+LIGHTTPD_VERSION := 1.4.76
+LIGHTTPD_MD5 := f9018cda389b1aa6dae4c5f962c20825
LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
LIGHTTPD_SUFFIX := tar.xz
LIGHTTPD_URL := http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
@@ -77,6 +77,14 @@ LIGHTTPD_CONF_OPT := \
--without-maxminddb \
--$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
+$(STATEDIR)/lighttpd.prepare:
+ @$(call targetinfo)
+ @$(call world/execute, LIGHTTPD, ./autogen.sh)
+ @$(call world/prepare, LIGHTTPD)
+ @$(call touch)
+
+
+
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] lighttpd: Version bump, 1.4.74 -> 1.4.76
2024-06-24 16:36 [ptxdist] [PATCH] lighttpd: Version bump, 1.4.74 -> 1.4.76 Andreas Helmcke
@ 2024-06-25 7:32 ` Alexander Dahl
2024-06-25 15:38 ` Andreas Helmcke
0 siblings, 1 reply; 6+ messages in thread
From: Alexander Dahl @ 2024-06-25 7:32 UTC (permalink / raw)
To: ptxdist; +Cc: Andreas Helmcke
Hello Andreas,
Am Mon, Jun 24, 2024 at 06:36:05PM +0200 schrieb Andreas Helmcke:
> Important changes
> - detect VU#421644 HTTP/2 CONTINUATION Flood
> - avoid CVE-2024-3094 xz supply chain attack
> - incrementally stronger TLS cipher defaults
>
> bugfixes
>
> Link: https://www.lighttpd.net/2024/4/12/1.4.76/
> Link: https://www.lighttpd.net/2024/3/13/1.4.75/
> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> ---
> rules/lighttpd.make | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
> mode change 100644 => 100755 rules/lighttpd.make
>
> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> old mode 100644
> new mode 100755
> index 96382b86a..fcb543818
> --- a/rules/lighttpd.make
> +++ b/rules/lighttpd.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
> #
> # Paths and names
> #
> -LIGHTTPD_VERSION := 1.4.74
> -LIGHTTPD_MD5 := f38c400232151c69cc608fca35e593a9
> +LIGHTTPD_VERSION := 1.4.76
> +LIGHTTPD_MD5 := f9018cda389b1aa6dae4c5f962c20825
> LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
> LIGHTTPD_SUFFIX := tar.xz
> LIGHTTPD_URL := http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
> @@ -77,6 +77,14 @@ LIGHTTPD_CONF_OPT := \
> --without-maxminddb \
> --$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
>
> +$(STATEDIR)/lighttpd.prepare:
> + @$(call targetinfo)
> + @$(call world/execute, LIGHTTPD, ./autogen.sh)
> + @$(call world/prepare, LIGHTTPD)
> + @$(call touch)
This probably works, but it is not the way ptxdist usually handles
this. For packages not distributing ./configure you create a folder
in patches and symlink autogen.sh from the abovce folder. See
dropwatch or evtest for example.
A short note in commit message about lighttpd not distributing
./configure anymore would be nice.
By chance, do you know how lighttpd is going forward on this? I saw
buildroot switching to meson for building lighttpd.
Greets
Alex
> +
> +
> +
> # ----------------------------------------------------------------------------
> # Install
> # ----------------------------------------------------------------------------
> --
> 2.43.0
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] lighttpd: Version bump, 1.4.74 -> 1.4.76
2024-06-25 7:32 ` Alexander Dahl
@ 2024-06-25 15:38 ` Andreas Helmcke
2024-06-25 15:56 ` Michael Olbrich
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Helmcke @ 2024-06-25 15:38 UTC (permalink / raw)
To: ptxdist
Hello Alex,
Am 25.06.24 um 09:32 schrieb Alexander Dahl:
> Hello Andreas,
>
> Am Mon, Jun 24, 2024 at 06:36:05PM +0200 schrieb Andreas Helmcke:
>> Important changes
>> - detect VU#421644 HTTP/2 CONTINUATION Flood
>> - avoid CVE-2024-3094 xz supply chain attack
>> - incrementally stronger TLS cipher defaults
>>
>> bugfixes
>>
>> Link: https://www.lighttpd.net/2024/4/12/1.4.76/
>> Link: https://www.lighttpd.net/2024/3/13/1.4.75/
>> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
>> ---
>> rules/lighttpd.make | 12 ++++++++++--
>> 1 file changed, 10 insertions(+), 2 deletions(-)
>> mode change 100644 => 100755 rules/lighttpd.make
>>
>> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
>> old mode 100644
>> new mode 100755
>> index 96382b86a..fcb543818
>> --- a/rules/lighttpd.make
>> +++ b/rules/lighttpd.make
>> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
>> #
>> # Paths and names
>> #
>> -LIGHTTPD_VERSION := 1.4.74
>> -LIGHTTPD_MD5 := f38c400232151c69cc608fca35e593a9
>> +LIGHTTPD_VERSION := 1.4.76
>> +LIGHTTPD_MD5 := f9018cda389b1aa6dae4c5f962c20825
>> LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
>> LIGHTTPD_SUFFIX := tar.xz
>> LIGHTTPD_URL := http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
>> @@ -77,6 +77,14 @@ LIGHTTPD_CONF_OPT := \
>> --without-maxminddb \
>> --$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
>>
>> +$(STATEDIR)/lighttpd.prepare:
>> + @$(call targetinfo)
>> + @$(call world/execute, LIGHTTPD, ./autogen.sh)
>> + @$(call world/prepare, LIGHTTPD)
>> + @$(call touch)
>
> This probably works, but it is not the way ptxdist usually handles
> this. For packages not distributing ./configure you create a folder
> in patches and symlink autogen.sh from the abovce folder. See
> dropwatch or evtest for example.
I don't particularly like this solution, because then with future
updates (and these come regularly with lighttpd) yet another place has
to be adapted which can also be easily overlooked.
But if this is the usual way and there is no better solution (e.g. another
build system) then I'll do it this way.
> A short note in commit message about lighttpd not distributing
> ./configure anymore would be nice.
You are right. I will add this.
> By chance, do you know how lighttpd is going forward on this? I saw
> buildroot switching to meson for building lighttpd.
I can only refer to the official documentation and there are examples
for automake, cmake, meson and scons, without any particular way being
advertised there.
I am willing to convert this to another build system if that helps to
avoid the patches.
Is one of them preferred with ptxdist?
Andreas
> Greets
> Alex
>
>> +
>> +
>> +
>> # ----------------------------------------------------------------------------
>> # Install
>> # ----------------------------------------------------------------------------
>> --
>> 2.43.0
>>
>>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] lighttpd: Version bump, 1.4.74 -> 1.4.76
2024-06-25 15:38 ` Andreas Helmcke
@ 2024-06-25 15:56 ` Michael Olbrich
2024-06-26 9:55 ` [ptxdist] [PATCH v2] " Andreas Helmcke
0 siblings, 1 reply; 6+ messages in thread
From: Michael Olbrich @ 2024-06-25 15:56 UTC (permalink / raw)
To: Andreas Helmcke; +Cc: ptxdist
On Tue, Jun 25, 2024 at 05:38:56PM +0200, Andreas Helmcke wrote:
> Hello Alex,
>
> Am 25.06.24 um 09:32 schrieb Alexander Dahl:
> > Hello Andreas,
> >
> > Am Mon, Jun 24, 2024 at 06:36:05PM +0200 schrieb Andreas Helmcke:
> >> Important changes
> >> - detect VU#421644 HTTP/2 CONTINUATION Flood
> >> - avoid CVE-2024-3094 xz supply chain attack
> >> - incrementally stronger TLS cipher defaults
> >>
> >> bugfixes
> >>
> >> Link: https://www.lighttpd.net/2024/4/12/1.4.76/
> >> Link: https://www.lighttpd.net/2024/3/13/1.4.75/
> >> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> >> ---
> >> rules/lighttpd.make | 12 ++++++++++--
> >> 1 file changed, 10 insertions(+), 2 deletions(-)
> >> mode change 100644 => 100755 rules/lighttpd.make
> >>
> >> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> >> old mode 100644
> >> new mode 100755
> >> index 96382b86a..fcb543818
> >> --- a/rules/lighttpd.make
> >> +++ b/rules/lighttpd.make
> >> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
> >> #
> >> # Paths and names
> >> #
> >> -LIGHTTPD_VERSION := 1.4.74
> >> -LIGHTTPD_MD5 := f38c400232151c69cc608fca35e593a9
> >> +LIGHTTPD_VERSION := 1.4.76
> >> +LIGHTTPD_MD5 := f9018cda389b1aa6dae4c5f962c20825
> >> LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
> >> LIGHTTPD_SUFFIX := tar.xz
> >> LIGHTTPD_URL := http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
> >> @@ -77,6 +77,14 @@ LIGHTTPD_CONF_OPT := \
> >> --without-maxminddb \
> >> --$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
> >>
> >> +$(STATEDIR)/lighttpd.prepare:
> >> + @$(call targetinfo)
> >> + @$(call world/execute, LIGHTTPD, ./autogen.sh)
> >> + @$(call world/prepare, LIGHTTPD)
> >> + @$(call touch)
> >
> > This probably works, but it is not the way ptxdist usually handles
> > this. For packages not distributing ./configure you create a folder
> > in patches and symlink autogen.sh from the abovce folder. See
> > dropwatch or evtest for example.
>
> I don't particularly like this solution, because then with future
> updates (and these come regularly with lighttpd) yet another place has
> to be adapted which can also be easily overlooked.
> But if this is the usual way and there is no better solution (e.g. another
> build system) then I'll do it this way.
I'm seeing a meson.build in the toplevel directory. So if you switch to
that we avoid the whole thing :-). (There is a CMakeLists.txt as well, but
I prefer meson. It works better for cross-compiling in my experience).
Michael
> > A short note in commit message about lighttpd not distributing
> > ./configure anymore would be nice.
>
> You are right. I will add this.
>
> > By chance, do you know how lighttpd is going forward on this? I saw
> > buildroot switching to meson for building lighttpd.
>
> I can only refer to the official documentation and there are examples
> for automake, cmake, meson and scons, without any particular way being
> advertised there.
> I am willing to convert this to another build system if that helps to
> avoid the patches.
>
> Is one of them preferred with ptxdist?
>
> Andreas
>
> > Greets
> > Alex
> >
> >> +
> >> +
> >> +
> >> # ----------------------------------------------------------------------------
> >> # Install
> >> # ----------------------------------------------------------------------------
> >> --
> >> 2.43.0
> >>
> >>
>
>
--
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 |
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH v2] lighttpd: Version bump, 1.4.74 -> 1.4.76
2024-06-25 15:56 ` Michael Olbrich
@ 2024-06-26 9:55 ` Andreas Helmcke
2024-07-02 12:29 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Helmcke @ 2024-06-26 9:55 UTC (permalink / raw)
To: ptxdist
Upstream:
- detect VU#421644 HTTP/2 CONTINUATION Flood
- avoid CVE-2024-3094 xz supply chain attack
- incrementally stronger TLS cipher defaults
- bugfixes
Ptxdist:
- changed from autoconf to meson
source does not contain configure anymore and meson
is easier to use in this case
- changed from pcre to pcre2
Link: https://www.lighttpd.net/2024/4/12/1.4.76/
Link: https://www.lighttpd.net/2024/3/13/1.4.75/
Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
---
v2:
- changed build system to meson
- changed and renamed pcre option to pcre2
rules/lighttpd.in | 15 ++++-----
rules/lighttpd.make | 80 ++++++++++++++++++++-------------------------
2 files changed, 43 insertions(+), 52 deletions(-)
mode change 100644 => 100755 rules/lighttpd.make
diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index b782307f4..d9b7c048f 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -2,6 +2,7 @@
menuconfig LIGHTTPD
tristate
prompt "lighttpd "
+ select HOST_MESON
select LIBC_M
select LIBC_DL
select LIBC_CRYPT
@@ -9,8 +10,8 @@ menuconfig LIGHTTPD
select ZSTD if LIGHTTPD_ZSTD
select BZIP2 if LIGHTTPD_BZ2LIB
select BZIP2_LIBBZ2 if LIGHTTPD_BZ2LIB
- select ATTR if LIGHTTPD_ATTR
- select LIBPCRE if LIGHTTPD_PCRE
+ select ATTR if LIGHTTPD_ATTR
+ select PCRE2 if LIGHTTPD_PCRE2
select LIBXML2 if LIGHTTPD_WEBDAV_PROPS
select SQLITE if LIGHTTPD_WEBDAV_PROPS
select OPENSSL if LIGHTTPD_OPENSSL
@@ -42,7 +43,7 @@ config LIGHTTPD_ATTR
bool
prompt "extended attribute support"
help
- Enable extended attribute support.
+ with xattr-support for the stat-cache
config LIGHTTPD_LUA
bool
@@ -56,13 +57,11 @@ config LIGHTTPD_OPENSSL
help
Include openssl support.
-config LIGHTTPD_PCRE
+config LIGHTTPD_PCRE2
bool
- prompt "pcre support"
+ prompt "pcre2 support"
help
- Enable pcre support.
-
- WARNING: pcre is no longer maintained. Please move to pcre2 instead!
+ Enable pcre2 support.
endmenu
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
old mode 100644
new mode 100755
index 96382b86a..bd399d9e3
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
#
# Paths and names
#
-LIGHTTPD_VERSION := 1.4.74
-LIGHTTPD_MD5 := f38c400232151c69cc608fca35e593a9
+LIGHTTPD_VERSION := 1.4.76
+LIGHTTPD_MD5 := f9018cda389b1aa6dae4c5f962c20825
LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
LIGHTTPD_SUFFIX := tar.xz
LIGHTTPD_URL := http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
@@ -33,49 +33,41 @@ LIGHTTPD_LICENSE_FILES := \
# ----------------------------------------------------------------------------
#
-# autoconf
+# meson
#
-LIGHTTPD_CONF_TOOL := autoconf
+LIGHTTPD_CONF_TOOL := meson
LIGHTTPD_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --libdir=/usr/lib/lighttpd \
- --$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-lfs \
- $(GLOBAL_LARGE_FILE_OPTION) \
- $(GLOBAL_IPV6_OPTION) \
- --disable-mmap \
- --enable-extra-warnings \
- --without-libev \
- --without-mysql \
- --without-pgsql \
- --without-dbi \
- --without-sasl \
- --without-ldap \
- --without-pam \
- --$(call ptx/wwo, PTXCONF_LIGHTTPD_ATTR)-attr \
- --without-valgrind \
- --without-libunwind \
- --without-krb5 \
- --$(call ptx/wwo, PTXCONF_LIGHTTPD_OPENSSL)-openssl \
- --without-wolfssl \
- --without-mbedtls \
- --without-nettle \
- --without-gnutls \
- --without-nss \
- --$(call ptx/wwo, PTXCONF_LIGHTTPD_PCRE)-pcre \
- --without-pcre2 \
- --$(call ptx/wwo, PTXCONF_LIGHTTPD_ZLIB)-zlib \
- --$(call ptx/wwo, PTXCONF_LIGHTTPD_ZSTD)-zstd \
- --$(call ptx/wwo, PTXCONF_LIGHTTPD_BZ2LIB)-bzip2 \
- --without-brotli \
- --without-libdeflate \
- --without-fam \
- --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-webdav-props \
- --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-libxml \
- --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-sqlite \
- --without-webdav-locks \
- --without-xxhash \
- --without-maxminddb \
- --$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
+ $(CROSS_MESON_USR) \
+ -Dwith_brotli=disabled \
+ -Dwith_bzip=$(call ptx/endis,PTXCONF_LIGHTTPD_BZ2LIB)d \
+ -Dwith_dbi=disabled \
+ -Dwith_libdeflate=disabled \
+ -Dwith_fam=disabled \
+ -Dwith_gnutls=false \
+ -Dwith_krb5=disabled \
+ -Dwith_ldap=disabled \
+ -Dwith_libev=disabled \
+ -Dwith_libunwind=disabled \
+ -Dwith_lua=$(call ptx/truefalse,PTXCONF_LIGHTTPD_LUA) \
+ -Dwith_maxminddb=disabled \
+ -Dwith_mbedtls=false \
+ -Dwith_mysql=disabled \
+ -Dwith_nettle=false \
+ -Dwith_nss=false \
+ -Dwith_openssl=$(call ptx/truefalse,PTXCONF_LIGHTTPD_OPENSSL) \
+ -Dwith_pam=disabled \
+ -Dwith_pcre2=$(call ptx/truefalse,PTXCONF_LIGHTTPD_PCRE2) \
+ -Dwith_pcre=$(call ptx/ifdef,PTXCONF_LIGHTTPD_PCRE2, pcre2, disabled) \
+ -Dwith_pgsql=disabled \
+ -Dwith_sasl=disabled \
+ -Dwith_webdav_locks=disabled \
+ -Dwith_webdav_props=$(call ptx/endis,PTXCONF_LIGHTTPD_WEBDAV_PROPS)d \
+ -Dwith_wolfssl=false \
+ -Dwith_xattr=$(call ptx/truefalse,PTXCONF_LIGHTTPD_ATTR) \
+ -Dwith_xxhash=disabled \
+ -Dwith_zlib=$(call ptx/endis,PTXCONF_LIGHTTPD_ZLIB)d \
+ -Dwith_zstd=$(call ptx/endis,PTXCONF_LIGHTTPD_ZSTD)d
+
# ----------------------------------------------------------------------------
# Install
@@ -97,7 +89,7 @@ LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH) += mod_auth
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH) += mod_authn_file
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DEFLATE) += mod_deflate
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DIRLISTING) += mod_dirlisting
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_H2) += mod_h2
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_H2) += mod_h2
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_MAGNET) += mod_magnet
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_OPENSSL) += mod_openssl
LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_WEBDAV) += mod_webdav
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [APPLIED] lighttpd: Version bump, 1.4.74 -> 1.4.76
2024-06-26 9:55 ` [ptxdist] [PATCH v2] " Andreas Helmcke
@ 2024-07-02 12:29 ` Michael Olbrich
0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2024-07-02 12:29 UTC (permalink / raw)
To: ptxdist; +Cc: Andreas Helmcke
Thanks, applied as 5b06e4a08b9373b178a8dc00942675c5e7f7dd8a.
Michael
[sent from post-receive hook]
On Tue, 02 Jul 2024 14:29:56 +0200, Andreas Helmcke <ahelmcke@ela-soft.com> wrote:
> Upstream:
> - detect VU#421644 HTTP/2 CONTINUATION Flood
> - avoid CVE-2024-3094 xz supply chain attack
> - incrementally stronger TLS cipher defaults
> - bugfixes
>
> Ptxdist:
> - changed from autoconf to meson
> source does not contain configure anymore and meson
> is easier to use in this case
> - changed from pcre to pcre2
>
> Link: https://www.lighttpd.net/2024/4/12/1.4.76/
> Link: https://www.lighttpd.net/2024/3/13/1.4.75/
> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> Message-Id: <20240626095524.3471728-2-ahelmcke@ela-soft.com>
> [mol: add migrate helper for pcre]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/lighttpd.in b/rules/lighttpd.in
> index b782307f45ff..d9b7c048fca9 100644
> --- a/rules/lighttpd.in
> +++ b/rules/lighttpd.in
> @@ -2,6 +2,7 @@
> menuconfig LIGHTTPD
> tristate
> prompt "lighttpd "
> + select HOST_MESON
> select LIBC_M
> select LIBC_DL
> select LIBC_CRYPT
> @@ -9,8 +10,8 @@ menuconfig LIGHTTPD
> select ZSTD if LIGHTTPD_ZSTD
> select BZIP2 if LIGHTTPD_BZ2LIB
> select BZIP2_LIBBZ2 if LIGHTTPD_BZ2LIB
> - select ATTR if LIGHTTPD_ATTR
> - select LIBPCRE if LIGHTTPD_PCRE
> + select ATTR if LIGHTTPD_ATTR
> + select PCRE2 if LIGHTTPD_PCRE2
> select LIBXML2 if LIGHTTPD_WEBDAV_PROPS
> select SQLITE if LIGHTTPD_WEBDAV_PROPS
> select OPENSSL if LIGHTTPD_OPENSSL
> @@ -42,7 +43,7 @@ config LIGHTTPD_ATTR
> bool
> prompt "extended attribute support"
> help
> - Enable extended attribute support.
> + with xattr-support for the stat-cache
>
> config LIGHTTPD_LUA
> bool
> @@ -56,13 +57,11 @@ config LIGHTTPD_OPENSSL
> help
> Include openssl support.
>
> -config LIGHTTPD_PCRE
> +config LIGHTTPD_PCRE2
> bool
> - prompt "pcre support"
> + prompt "pcre2 support"
> help
> - Enable pcre support.
> -
> - WARNING: pcre is no longer maintained. Please move to pcre2 instead!
> + Enable pcre2 support.
>
> endmenu
>
> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> old mode 100644
> new mode 100755
> index 96382b86af5b..bd399d9e3e6b
> --- a/rules/lighttpd.make
> +++ b/rules/lighttpd.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
> #
> # Paths and names
> #
> -LIGHTTPD_VERSION := 1.4.74
> -LIGHTTPD_MD5 := f38c400232151c69cc608fca35e593a9
> +LIGHTTPD_VERSION := 1.4.76
> +LIGHTTPD_MD5 := f9018cda389b1aa6dae4c5f962c20825
> LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
> LIGHTTPD_SUFFIX := tar.xz
> LIGHTTPD_URL := http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
> @@ -33,49 +33,41 @@ LIGHTTPD_LICENSE_FILES := \
> # ----------------------------------------------------------------------------
>
> #
> -# autoconf
> +# meson
> #
> -LIGHTTPD_CONF_TOOL := autoconf
> +LIGHTTPD_CONF_TOOL := meson
> LIGHTTPD_CONF_OPT := \
> - $(CROSS_AUTOCONF_USR) \
> - --libdir=/usr/lib/lighttpd \
> - --$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-lfs \
> - $(GLOBAL_LARGE_FILE_OPTION) \
> - $(GLOBAL_IPV6_OPTION) \
> - --disable-mmap \
> - --enable-extra-warnings \
> - --without-libev \
> - --without-mysql \
> - --without-pgsql \
> - --without-dbi \
> - --without-sasl \
> - --without-ldap \
> - --without-pam \
> - --$(call ptx/wwo, PTXCONF_LIGHTTPD_ATTR)-attr \
> - --without-valgrind \
> - --without-libunwind \
> - --without-krb5 \
> - --$(call ptx/wwo, PTXCONF_LIGHTTPD_OPENSSL)-openssl \
> - --without-wolfssl \
> - --without-mbedtls \
> - --without-nettle \
> - --without-gnutls \
> - --without-nss \
> - --$(call ptx/wwo, PTXCONF_LIGHTTPD_PCRE)-pcre \
> - --without-pcre2 \
> - --$(call ptx/wwo, PTXCONF_LIGHTTPD_ZLIB)-zlib \
> - --$(call ptx/wwo, PTXCONF_LIGHTTPD_ZSTD)-zstd \
> - --$(call ptx/wwo, PTXCONF_LIGHTTPD_BZ2LIB)-bzip2 \
> - --without-brotli \
> - --without-libdeflate \
> - --without-fam \
> - --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-webdav-props \
> - --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-libxml \
> - --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-sqlite \
> - --without-webdav-locks \
> - --without-xxhash \
> - --without-maxminddb \
> - --$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
> + $(CROSS_MESON_USR) \
> + -Dwith_brotli=disabled \
> + -Dwith_bzip=$(call ptx/endis,PTXCONF_LIGHTTPD_BZ2LIB)d \
> + -Dwith_dbi=disabled \
> + -Dwith_libdeflate=disabled \
> + -Dwith_fam=disabled \
> + -Dwith_gnutls=false \
> + -Dwith_krb5=disabled \
> + -Dwith_ldap=disabled \
> + -Dwith_libev=disabled \
> + -Dwith_libunwind=disabled \
> + -Dwith_lua=$(call ptx/truefalse,PTXCONF_LIGHTTPD_LUA) \
> + -Dwith_maxminddb=disabled \
> + -Dwith_mbedtls=false \
> + -Dwith_mysql=disabled \
> + -Dwith_nettle=false \
> + -Dwith_nss=false \
> + -Dwith_openssl=$(call ptx/truefalse,PTXCONF_LIGHTTPD_OPENSSL) \
> + -Dwith_pam=disabled \
> + -Dwith_pcre2=$(call ptx/truefalse,PTXCONF_LIGHTTPD_PCRE2) \
> + -Dwith_pcre=$(call ptx/ifdef,PTXCONF_LIGHTTPD_PCRE2, pcre2, disabled) \
> + -Dwith_pgsql=disabled \
> + -Dwith_sasl=disabled \
> + -Dwith_webdav_locks=disabled \
> + -Dwith_webdav_props=$(call ptx/endis,PTXCONF_LIGHTTPD_WEBDAV_PROPS)d \
> + -Dwith_wolfssl=false \
> + -Dwith_xattr=$(call ptx/truefalse,PTXCONF_LIGHTTPD_ATTR) \
> + -Dwith_xxhash=disabled \
> + -Dwith_zlib=$(call ptx/endis,PTXCONF_LIGHTTPD_ZLIB)d \
> + -Dwith_zstd=$(call ptx/endis,PTXCONF_LIGHTTPD_ZSTD)d
> +
>
> # ----------------------------------------------------------------------------
> # Install
> @@ -97,7 +89,7 @@ LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH) += mod_auth
> LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH) += mod_authn_file
> LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DEFLATE) += mod_deflate
> LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DIRLISTING) += mod_dirlisting
> -LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_H2) += mod_h2
> +LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_H2) += mod_h2
> LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_MAGNET) += mod_magnet
> LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_OPENSSL) += mod_openssl
> LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_WEBDAV) += mod_webdav
> diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
> index 9531b3e27a6a..18f9a46529d5 100755
> --- a/scripts/migrate/migrate_ptx
> +++ b/scripts/migrate/migrate_ptx
> @@ -486,3 +486,10 @@ s/^\(# \)\?\(PTXCONF_SYSTEMD\>\)\(.*\)/\1\2_HELPER\3\n\1\2\3/
> #
> s/^\(\(# \)\?PTXCONF_\)ATK/\1AT_SPI2_CORE/
> s/^\(\(# \)\?PTXCONF_\)ATK_INTROSPECTION/\1AT_SPI2_CORE_INTROSPECTION/
> +
> +# from : ptxdist-2024.06.0
> +# to : ptxdist-2024.07.0
> +# symbol : LIGHTTPD_PCRE -> LIGHTTPD_PCRE2
> +# reason : switch to pcre2 in lighttpd
> +#
> +s/^\(\(# \)\?PTXCONF_LIGHTTPD_PCRE\)\>/\12/
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-02 12:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-24 16:36 [ptxdist] [PATCH] lighttpd: Version bump, 1.4.74 -> 1.4.76 Andreas Helmcke
2024-06-25 7:32 ` Alexander Dahl
2024-06-25 15:38 ` Andreas Helmcke
2024-06-25 15:56 ` Michael Olbrich
2024-06-26 9:55 ` [ptxdist] [PATCH v2] " Andreas Helmcke
2024-07-02 12:29 ` [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