From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 26 Jun 2024 11:58:00 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sMPPc-00CVtZ-0e for lore@lore.pengutronix.de; Wed, 26 Jun 2024 11:58:00 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sMPPb-0002LB-RX; Wed, 26 Jun 2024 11:57:59 +0200 Received: from mail.ela-soft.com ([213.23.49.162]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sMPPG-0002Kp-VJ for ptxdist@pengutronix.de; Wed, 26 Jun 2024 11:57:39 +0200 Received: from tupai.ela-bln.local (tupai.ela-bln.local [10.0.1.140]) by mail.ela-soft.com (mailsystem) with ESMTP id 1457912533 for ; Wed, 26 Jun 2024 11:57:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ela-soft.com; s=2021; t=1719395857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yfcIc/JSZd6wkr+hX4juTVQOXXy2eJrKPlR1edzBK7E=; b=Lgd9u+Wz3zxL4ZCxWe6dFqffjiEayDbjQqQNsCRIsRY5D6ShqDddkaLiyc+69EwDWGoOVF oAx4BDPpPvzY0yNBlPEjFAtBWuMhzfsvIzQFIEpPhFJuh9/XGJLmZ593K1fJmHJ6/ycpBO EOiAT1q+4VDOHvcCIHDezInkmoZqs+az7dm6PdRrcOI1gH34WO0APDOBWr0kJas4O4nmMT uHk9DKHyCepc7w4K5Q0Iy14odcfTBDH5DKo/frIcDo5BrgXnNkAj7bpJUhYo/4uD0bwNee EljlyOK0uBrkwKzfqOzvH1qplEJ5gz7QvpyzI/xgT8WXNy0zQOsqI5Q6y5Z2zQ== Received: by tupai.ela-bln.local (Postfix, from userid 1000) id E50323406A4; Wed, 26 Jun 2024 11:57:36 +0200 (CEST) From: Andreas Helmcke To: ptxdist@pengutronix.de Date: Wed, 26 Jun 2024 11:55:25 +0200 Message-ID: <20240626095524.3471728-2-ahelmcke@ela-soft.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-102.2 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] lighttpd: Version bump, 1.4.74 -> 1.4.76 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false 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 --- 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