From patchwork Sun Jun 6 15:57:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 4401 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Fyh3t75Ztz3wgv for ; Sun, 6 Jun 2021 15:58:02 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Fyh3s6MLmz17H; Sun, 6 Jun 2021 15:58:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Fyh3s433Qz2xhq; Sun, 6 Jun 2021 15:58:01 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Fyh3r01w8z2xVn for ; Sun, 6 Jun 2021 15:57:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Fyh3q1S8Bz15t for ; Sun, 6 Jun 2021 15:57:59 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1622995079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=JMSTQHaQqpprixhkdXZPA67DatZOyxPyEWzdWHlAdLc=; b=gcje6W4NM/6KnGdrmmkJNC6gX4uikUyT0STFILPOons8pca7ulbYli0QnVBdSqfZE1DO/2 1FRbA9MGG0mCIEAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1622995079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=JMSTQHaQqpprixhkdXZPA67DatZOyxPyEWzdWHlAdLc=; b=B+1Guug5/y6WKO6UoUIJMDxMDSrUDhKO4/ILn8VuTrUqwHGuvYZcIDRPUUzbpNL8bqDqtc C8tv4najqRT6nnBp8soWbILO8gcwBnSn8YMTxk722DfqE9wzLYgaJuW6iC4sS5iT6VVqSH Zv3dIP9Cm5M2hNzKG7p49ZhPvcpGXs+PMtwGO82vNmphiVni3vzQQKWEG6M7TPhsyDhwtr uAeoWAFjvehSR3VlfhPh5ey7GOuG8hWYNhjFdE+qymuN5yVVN/w94XOA0AEgBQ0saf5XDB h740ycEWBTnLgUW87gcih9C/49MQlaVLUR6dieqmnDhUkJuXOly5Onw5HtevhQ== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] apache: Update to 2.4.48 Date: Sun, 6 Jun 2021 17:57:55 +0200 Message-Id: <20210606155755.10280-1-matthias.fischer@ipfire.org> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" apache: Update to 2.4.48 For details see: https://mirror.synyx.de/apache//httpd/CHANGES_2.4.48 Signed-off-by: Matthias Fischer Reviewed-by: Adolf Belka --- config/rootfiles/common/apache2 | 4 +++- lfs/apache2 | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 4bd3e3794..8442446df 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -422,6 +422,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/getting-started.html #srv/web/ipfire/manual/getting-started.html.en #srv/web/ipfire/manual/getting-started.html.fr.utf8 +#srv/web/ipfire/manual/getting-started.html.ru.utf8 #srv/web/ipfire/manual/glossary.html #srv/web/ipfire/manual/glossary.html.de #srv/web/ipfire/manual/glossary.html.en @@ -545,6 +546,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/index.html.ja.utf8 #srv/web/ipfire/manual/index.html.ko.euc-kr #srv/web/ipfire/manual/index.html.pt-br +#srv/web/ipfire/manual/index.html.ru.utf8 #srv/web/ipfire/manual/index.html.tr.utf8 #srv/web/ipfire/manual/index.html.zh-cn.utf8 #srv/web/ipfire/manual/install.html @@ -1174,7 +1176,6 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/new_features_2_0.html.ja.utf8 #srv/web/ipfire/manual/new_features_2_0.html.ko.euc-kr #srv/web/ipfire/manual/new_features_2_0.html.pt-br -#srv/web/ipfire/manual/new_features_2_0.html.ru.koi8-r #srv/web/ipfire/manual/new_features_2_0.html.tr.utf8 #srv/web/ipfire/manual/new_features_2_2.html #srv/web/ipfire/manual/new_features_2_2.html.en @@ -1515,6 +1516,7 @@ usr/bin/htpasswd #usr/include/apache/http_main.h #usr/include/apache/http_protocol.h #usr/include/apache/http_request.h +#usr/include/apache/http_ssl.h #usr/include/apache/http_vhost.h #usr/include/apache/httpd.h #usr/include/apache/mod_auth.h diff --git a/lfs/apache2 b/lfs/apache2 index 772ac6018..ff9de7eb7 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # +# Copyright (C) 2007-2021 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config -VER = 2.4.46 +VER = 2.4.48 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7d661ea5e736dac5e2761d9f49fe8361 +$(DL_FILE)_MD5 = a7088cec171b0d00bf43394ce64d3909 install : $(TARGET)