From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Andreas Helmcke <ahelmcke@ela-soft.com>
Subject: Re: [ptxdist] [APPLIED] lighttpd: Version bump, 1.4.74 -> 1.4.76
Date: Tue, 2 Jul 2024 14:29:56 +0200 [thread overview]
Message-ID: <20240702122956.4019138-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20240626095524.3471728-2-ahelmcke@ela-soft.com>
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/
prev parent reply other threads:[~2024-07-02 12:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-24 16:36 [ptxdist] [PATCH] " 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 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240702122956.4019138-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ahelmcke@ela-soft.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox