From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] apache: Update to 2.4.48
Date: Sun, 06 Jun 2021 17:57:55 +0200
Message-ID: <20210606155755.10280-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6589615919500574361=="
List-Id: <development.lists.ipfire.org>

--===============6589615919500574361==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

apache: Update to 2.4.48

For details see:
https://mirror.synyx.de/apache//httpd/CHANGES_2.4.48

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 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  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # 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 @@
=20
 include Config
=20
-VER        =3D 2.4.46
+VER        =3D 2.4.48
=20
 THISAPP    =3D httpd-$(VER)
 DL_FILE    =3D $(THISAPP).tar.bz2
@@ -45,7 +45,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 7d661ea5e736dac5e2761d9f49fe8361
+$(DL_FILE)_MD5 =3D a7088cec171b0d00bf43394ce64d3909
=20
 install : $(TARGET)
=20
--=20
2.18.0


--===============6589615919500574361==--