From patchwork Mon Mar 14 21:20:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1605290 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KHTvw0hc9z9sCD for ; Tue, 15 Mar 2022 08:20:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1B73D4092C; Mon, 14 Mar 2022 21:20:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SBSUvot6dSig; Mon, 14 Mar 2022 21:20:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 37CD540930; Mon, 14 Mar 2022 21:20:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 76C611BF308 for ; Mon, 14 Mar 2022 21:20:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 64BA4825CA for ; Mon, 14 Mar 2022 21:20:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g6EuHWnuLQDp for ; Mon, 14 Mar 2022 21:20:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by smtp1.osuosl.org (Postfix) with ESMTPS id 2798182538 for ; Mon, 14 Mar 2022 21:20:04 +0000 (UTC) Received: from fwd75.dcpf.telekom.de (fwd75.aul.t-online.de [10.223.144.101]) by mailout06.t-online.de (Postfix) with SMTP id 801E411AE3 for ; Mon, 14 Mar 2022 22:20:01 +0100 (CET) Received: from fli4l.lan.fli4l ([79.214.197.92]) by fwd75.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1nTs6j-1hZgBt0; Mon, 14 Mar 2022 22:20:01 +0100 Received: from bruckner.lan.fli4l ([192.168.1.1]:56584) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1nTs6i-0007xj-QS for buildroot@buildroot.org; Mon, 14 Mar 2022 22:20:00 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Mon, 14 Mar 2022 22:20:00 +0100 Message-Id: <20220314212000.2949718-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1647292801-000184BD-D24AF4A6/0/0 CLEAN NORMAL X-TOI-MSGID: 55d6ee8a-d24d-45f8-9dac-184449862ab6 Subject: [Buildroot] [PATCH v2 1/1] package/apache: security bump version to 2.4.53 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Fixes CVE-2022-22719, CVE-2022-22720, CVE-2022-22721 & CVE-2022-23943. Switch from pcre to pcre2 following upstream commit: https://github.com/apache/httpd/commit/c602ba14811ede722017c4e59e4e30d9990227b4 Signed-off-by: Bernd Kuhls --- v2: switch from pcre to pcre2 (Peter S.) package/apache/Config.in | 2 +- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/apache/Config.in b/package/apache/Config.in index 8b6a5bf7ea..270296bce4 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772..11dcdefe46 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.53.tar.bz2.{sha256,sha512} +sha256 d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 httpd-2.4.53.tar.bz2 +sha512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 httpd-2.4.53.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index b280d4dc3a..b2c855aa36 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.53 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,11 +17,11 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre +APACHE_DEPENDENCIES = apr apr-util pcre2 APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) APACHE_MPM = event @@ -35,7 +35,7 @@ APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ + --with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \ --enable-http \ --enable-dbd \ --enable-proxy \