Updated Apache 2.4

- Updated Apache from 2.4.29 to 2.4.33
- Updated Apr from 1.6.1 to 1.6.3
- Updated Apr-Util from 1.6.0 to 1.6.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index b7d471fe94c9ff443439c331b528141a7f64d795..d10c4f138c6c70ddfbe759b5364f92ab1652e37b 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -910,6 +910,8 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_macro.html
 #srv/web/ipfire/manual/mod/mod_macro.html.en
 #srv/web/ipfire/manual/mod/mod_macro.html.fr
+#srv/web/ipfire/manual/mod/mod_md.html
+#srv/web/ipfire/manual/mod/mod_md.html.en
 #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
@@ -968,6 +970,8 @@ srv/web/ipfire/html/captive
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr
+#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_wstunnel.html
 #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.en
 #srv/web/ipfire/manual/mod/mod_ratelimit.html
@@ -1609,6 +1613,7 @@ usr/lib/apache/mod_proxy_hcheck.so
 usr/lib/apache/mod_proxy_html.so
 usr/lib/apache/mod_proxy_http.so
 usr/lib/apache/mod_proxy_scgi.so
+usr/lib/apache/mod_proxy_uwsgi.so
 usr/lib/apache/mod_proxy_wstunnel.so
 usr/lib/apache/mod_ratelimit.so
 usr/lib/apache/mod_reflector.so

diff --git a/config/rootfiles/common/apr b/config/rootfiles/common/apr
index c71ee01cc7bd583c442f23cbd184352bce300d1a..dfde82400596d3029cb5338e63324cad71bd3fae 100644 (file)
--- a/config/rootfiles/common/apr
+++ b/config/rootfiles/common/apr
@@ -44,7 +44,7 @@ usr/bin/apr-1-config
 #usr/lib/libapr-1.la
 #usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.6.2
+usr/lib/libapr-1.so.0.6.3
 #usr/lib/pkgconfig/apr-1.pc
 #usr/share/apr-1
 #usr/share/apr-1/build

diff --git a/config/rootfiles/common/aprutil b/config/rootfiles/common/aprutil
index e9cf3e0dadee7f86a2b10eec846d7dc4421fa268..8bc51ed00d69d30e1d505c3b0748c3d208d09918 100644 (file)
--- a/config/rootfiles/common/aprutil
+++ b/config/rootfiles/common/aprutil
@@ -43,5 +43,5 @@ usr/lib/apr-util-1/apr_crypto_openssl.so
 #usr/lib/libaprutil-1.la
 #usr/lib/libaprutil-1.so
 usr/lib/libaprutil-1.so.0
-usr/lib/libaprutil-1.so.0.6.0
+usr/lib/libaprutil-1.so.0.6.1
 #usr/lib/pkgconfig/apr-util-1.pc

diff --git a/lfs/apache2 b/lfs/apache2
index 28855fdc5c26578caad5132e03a290f45d1eb7fd..69b05341da653962262b55fe7d536d6263f066e2 100644 (file)
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 2.4.29
+VER        = 2.4.33
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0c599404ef6b69eee95bcd9fcd094407
+$(DL_FILE)_MD5 = 6ef469d3f16fffeb688bc6e0346823e5
 
 install : $(TARGET)
 

diff --git a/lfs/apr b/lfs/apr
index 6f667cffc1604b7a302987df2a880705a1b6d2f1..47c21a32584cd4c1060d5d44ac1599d0c01f48e2 100644 (file)
--- a/lfs/apr
+++ b/lfs/apr
@@ -25,11 +25,11 @@
 
 include Config
 
-VER        = 1.6.2
+VER        = 1.6.3
 
 THISAPP    = apr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = http://archive.apache.org/dist/apr
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e81a851967c79b5ce9bfbc909e4bf735
+$(DL_FILE)_MD5 = 12f2a349483ad6f12db49ba01fbfdbfa
 
 install : $(TARGET)
 

diff --git a/lfs/aprutil b/lfs/aprutil
index c2f80842277b735f49b0604c82f5fc116a406b1e..29ec5df4389e4ff6d8c157a01a341d1c75981835 100644 (file)
--- a/lfs/aprutil
+++ b/lfs/aprutil
@@ -25,11 +25,11 @@
 
 include Config
 
-VER        = 1.6.0
+VER        = 1.6.1
 
 THISAPP    = apr-util-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = http://archive.apache.org/dist/apr
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 069a9a980776acab05212c5f37ef8368
+$(DL_FILE)_MD5 = 8ff5dc36fa39a2a3db1df196d3ed6086
 
 install : $(TARGET)