apache: Update to 2.4.43

Message ID 20200412122919.8140-1-matthias.fischer@ipfire.org
State Accepted
Commit fb241a29c5d7e48a09d3e3d3995b9cc6cfc57c5c
Headers
Series apache: Update to 2.4.43 |

Commit Message

Matthias Fischer April 12, 2020, 12:29 p.m. UTC
  For details see:
http://mirror.dkd.de/apache//httpd/CHANGES_2.4.43

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 config/rootfiles/common/apache2 | 6 ++++++
 lfs/apache2                     | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)
  

Comments

Michael Tremer April 12, 2020, 2:11 p.m. UTC | #1
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 12 Apr 2020, at 13:29, Matthias Fischer <matthias.fischer@ipfire.org> wrote:
> 
> For details see:
> http://mirror.dkd.de/apache//httpd/CHANGES_2.4.43
> 
> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
> config/rootfiles/common/apache2 | 6 ++++++
> lfs/apache2                     | 6 +++---
> 2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
> index 7a37e7e74..4bd3e3794 100644
> --- a/config/rootfiles/common/apache2
> +++ b/config/rootfiles/common/apache2
> @@ -918,6 +918,7 @@ srv/web/ipfire/html/captive
> #srv/web/ipfire/manual/mod/mod_macro.html.fr.utf8
> #srv/web/ipfire/manual/mod/mod_md.html
> #srv/web/ipfire/manual/mod/mod_md.html.en
> +#srv/web/ipfire/manual/mod/mod_md.html.fr.utf8
> #srv/web/ipfire/manual/mod/mod_mime.html
> #srv/web/ipfire/manual/mod/mod_mime.html.en
> #srv/web/ipfire/manual/mod/mod_mime.html.fr.utf8
> @@ -980,6 +981,7 @@ srv/web/ipfire/html/captive
> #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr.utf8
> #srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html
> #srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html.en
> +#srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html.fr.utf8
> #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html
> #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.en
> #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.fr.utf8
> @@ -1046,6 +1048,7 @@ srv/web/ipfire/html/captive
> #srv/web/ipfire/manual/mod/mod_socache_memcache.html.fr.utf8
> #srv/web/ipfire/manual/mod/mod_socache_redis.html
> #srv/web/ipfire/manual/mod/mod_socache_redis.html.en
> +#srv/web/ipfire/manual/mod/mod_socache_redis.html.fr.utf8
> #srv/web/ipfire/manual/mod/mod_socache_shmcb.html
> #srv/web/ipfire/manual/mod/mod_socache_shmcb.html.en
> #srv/web/ipfire/manual/mod/mod_socache_shmcb.html.fr.utf8
> @@ -1072,6 +1075,9 @@ srv/web/ipfire/html/captive
> #srv/web/ipfire/manual/mod/mod_suexec.html.ja.utf8
> #srv/web/ipfire/manual/mod/mod_suexec.html.ko.euc-kr
> #srv/web/ipfire/manual/mod/mod_suexec.html.tr.utf8
> +#srv/web/ipfire/manual/mod/mod_systemd.html
> +#srv/web/ipfire/manual/mod/mod_systemd.html.en
> +#srv/web/ipfire/manual/mod/mod_systemd.html.fr.utf8
> #srv/web/ipfire/manual/mod/mod_unique_id.html
> #srv/web/ipfire/manual/mod/mod_unique_id.html.en
> #srv/web/ipfire/manual/mod/mod_unique_id.html.fr.utf8
> diff --git a/lfs/apache2 b/lfs/apache2
> index 532abcd3a..d82932f4b 100644
> --- a/lfs/apache2
> +++ b/lfs/apache2
> @@ -1,7 +1,7 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
> +# Copyright (C) 2007-2020  IPFire Team  <info@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 @@
> 
> include Config
> 
> -VER        = 2.4.41
> +VER        = 2.4.43
> 
> THISAPP    = httpd-$(VER)
> DL_FILE    = $(THISAPP).tar.bz2
> @@ -45,7 +45,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = dfc674f8f454e3bc2d4ccd73ad3b5f1e
> +$(DL_FILE)_MD5 = 791c986b1e70fe61eb44060aacc89a64
> 
> install : $(TARGET)
> 
> -- 
> 2.18.0
>
  

Patch

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 7a37e7e74..4bd3e3794 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -918,6 +918,7 @@  srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_macro.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_md.html
 #srv/web/ipfire/manual/mod/mod_md.html.en
+#srv/web/ipfire/manual/mod/mod_md.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_mime.html
 #srv/web/ipfire/manual/mod/mod_mime.html.en
 #srv/web/ipfire/manual/mod/mod_mime.html.fr.utf8
@@ -980,6 +981,7 @@  srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html
 #srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html.en
+#srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html
 #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.en
 #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.fr.utf8
@@ -1046,6 +1048,7 @@  srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_socache_memcache.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_socache_redis.html
 #srv/web/ipfire/manual/mod/mod_socache_redis.html.en
+#srv/web/ipfire/manual/mod/mod_socache_redis.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_socache_shmcb.html
 #srv/web/ipfire/manual/mod/mod_socache_shmcb.html.en
 #srv/web/ipfire/manual/mod/mod_socache_shmcb.html.fr.utf8
@@ -1072,6 +1075,9 @@  srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_suexec.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_suexec.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_suexec.html.tr.utf8
+#srv/web/ipfire/manual/mod/mod_systemd.html
+#srv/web/ipfire/manual/mod/mod_systemd.html.en
+#srv/web/ipfire/manual/mod/mod_systemd.html.fr.utf8
 #srv/web/ipfire/manual/mod/mod_unique_id.html
 #srv/web/ipfire/manual/mod/mod_unique_id.html.en
 #srv/web/ipfire/manual/mod/mod_unique_id.html.fr.utf8
diff --git a/lfs/apache2 b/lfs/apache2
index 532abcd3a..d82932f4b 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@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 @@ 
 
 include Config
 
-VER        = 2.4.41
+VER        = 2.4.43
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -45,7 +45,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dfc674f8f454e3bc2d4ccd73ad3b5f1e
+$(DL_FILE)_MD5 = 791c986b1e70fe61eb44060aacc89a64
 
 install : $(TARGET)