From 028eafe79f3cf3363ec3a48e6176f28c22e084d3 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sun, 23 Sep 2018 19:12:06 +0200 Subject: [PATCH] Apache: Update to 2.4.35 For details see: http://apache.mirror.digionline.de//httpd/CHANGES_2.4.35 Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- config/rootfiles/common/apache2 | 38 ++++++++++++++++++++++----------- lfs/apache2 | 4 ++-- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index d10c4f138c..e1b1ca8253 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -46,17 +46,6 @@ etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf etc/httpd/conf/vhosts.d/ipfire-interface.conf #srv/web #srv/web/ipfire -#srv/web/ipfire/manual/howto/access.html.es -#srv/web/ipfire/manual/howto/auth.html.es -#srv/web/ipfire/manual/howto/cgi.html.es -#srv/web/ipfire/manual/howto/htaccess.html.es -#srv/web/ipfire/manual/howto/http2.html.es -#srv/web/ipfire/manual/howto/http2.html.fr -#srv/web/ipfire/manual/howto/index.html.es -#srv/web/ipfire/manual/howto/public_html.html.es -#srv/web/ipfire/manual/mod/directive-dict.html.es -#srv/web/ipfire/manual/mod/mod_brotli.html -#srv/web/ipfire/manual/mod/mod_brotli.html.en #srv/web/ipfire/cgi-bin #srv/web/ipfire/cgi-bin/printenv #srv/web/ipfire/cgi-bin/printenv.vbs @@ -452,42 +441,52 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/howto #srv/web/ipfire/manual/howto/access.html #srv/web/ipfire/manual/howto/access.html.en +#srv/web/ipfire/manual/howto/access.html.es #srv/web/ipfire/manual/howto/access.html.fr #srv/web/ipfire/manual/howto/auth.html #srv/web/ipfire/manual/howto/auth.html.en +#srv/web/ipfire/manual/howto/auth.html.es #srv/web/ipfire/manual/howto/auth.html.fr #srv/web/ipfire/manual/howto/auth.html.ja.utf8 #srv/web/ipfire/manual/howto/auth.html.ko.euc-kr #srv/web/ipfire/manual/howto/auth.html.tr.utf8 #srv/web/ipfire/manual/howto/cgi.html #srv/web/ipfire/manual/howto/cgi.html.en +#srv/web/ipfire/manual/howto/cgi.html.es #srv/web/ipfire/manual/howto/cgi.html.fr #srv/web/ipfire/manual/howto/cgi.html.ja.utf8 #srv/web/ipfire/manual/howto/cgi.html.ko.euc-kr #srv/web/ipfire/manual/howto/htaccess.html #srv/web/ipfire/manual/howto/htaccess.html.en +#srv/web/ipfire/manual/howto/htaccess.html.es #srv/web/ipfire/manual/howto/htaccess.html.fr #srv/web/ipfire/manual/howto/htaccess.html.ja.utf8 #srv/web/ipfire/manual/howto/htaccess.html.ko.euc-kr #srv/web/ipfire/manual/howto/htaccess.html.pt-br #srv/web/ipfire/manual/howto/http2.html #srv/web/ipfire/manual/howto/http2.html.en +#srv/web/ipfire/manual/howto/http2.html.es +#srv/web/ipfire/manual/howto/http2.html.fr #srv/web/ipfire/manual/howto/index.html #srv/web/ipfire/manual/howto/index.html.en +#srv/web/ipfire/manual/howto/index.html.es #srv/web/ipfire/manual/howto/index.html.fr #srv/web/ipfire/manual/howto/index.html.ja.utf8 #srv/web/ipfire/manual/howto/index.html.ko.euc-kr #srv/web/ipfire/manual/howto/index.html.zh-cn.utf8 #srv/web/ipfire/manual/howto/public_html.html #srv/web/ipfire/manual/howto/public_html.html.en +#srv/web/ipfire/manual/howto/public_html.html.es #srv/web/ipfire/manual/howto/public_html.html.fr #srv/web/ipfire/manual/howto/public_html.html.ja.utf8 #srv/web/ipfire/manual/howto/public_html.html.ko.euc-kr #srv/web/ipfire/manual/howto/public_html.html.tr.utf8 #srv/web/ipfire/manual/howto/reverse_proxy.html #srv/web/ipfire/manual/howto/reverse_proxy.html.en +#srv/web/ipfire/manual/howto/reverse_proxy.html.fr #srv/web/ipfire/manual/howto/ssi.html #srv/web/ipfire/manual/howto/ssi.html.en +#srv/web/ipfire/manual/howto/ssi.html.es #srv/web/ipfire/manual/howto/ssi.html.fr #srv/web/ipfire/manual/howto/ssi.html.ja.utf8 #srv/web/ipfire/manual/howto/ssi.html.ko.euc-kr @@ -575,6 +574,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/misc #srv/web/ipfire/manual/misc/index.html #srv/web/ipfire/manual/misc/index.html.en +#srv/web/ipfire/manual/misc/index.html.es #srv/web/ipfire/manual/misc/index.html.fr #srv/web/ipfire/manual/misc/index.html.ko.euc-kr #srv/web/ipfire/manual/misc/index.html.tr.utf8 @@ -606,6 +606,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/core.html.tr.utf8 #srv/web/ipfire/manual/mod/directive-dict.html #srv/web/ipfire/manual/mod/directive-dict.html.en +#srv/web/ipfire/manual/mod/directive-dict.html.es #srv/web/ipfire/manual/mod/directive-dict.html.fr #srv/web/ipfire/manual/mod/directive-dict.html.ja.utf8 #srv/web/ipfire/manual/mod/directive-dict.html.ko.euc-kr @@ -693,6 +694,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_authn_socache.html.fr #srv/web/ipfire/manual/mod/mod_authnz_fcgi.html #srv/web/ipfire/manual/mod/mod_authnz_fcgi.html.en +#srv/web/ipfire/manual/mod/mod_authnz_fcgi.html.fr #srv/web/ipfire/manual/mod/mod_authnz_ldap.html #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.en #srv/web/ipfire/manual/mod/mod_authnz_ldap.html.fr @@ -730,6 +732,9 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_autoindex.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_autoindex.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_autoindex.html.tr.utf8 +#srv/web/ipfire/manual/mod/mod_brotli.html +#srv/web/ipfire/manual/mod/mod_brotli.html.en +#srv/web/ipfire/manual/mod/mod_brotli.html.fr #srv/web/ipfire/manual/mod/mod_buffer.html #srv/web/ipfire/manual/mod/mod_buffer.html.en #srv/web/ipfire/manual/mod/mod_buffer.html.fr @@ -847,6 +852,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_heartmonitor.html.fr #srv/web/ipfire/manual/mod/mod_http2.html #srv/web/ipfire/manual/mod/mod_http2.html.en +#srv/web/ipfire/manual/mod/mod_http2.html.fr #srv/web/ipfire/manual/mod/mod_ident.html #srv/web/ipfire/manual/mod/mod_ident.html.en #srv/web/ipfire/manual/mod/mod_ident.html.fr @@ -959,6 +965,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.fr #srv/web/ipfire/manual/mod/mod_proxy_hcheck.html #srv/web/ipfire/manual/mod/mod_proxy_hcheck.html.en +#srv/web/ipfire/manual/mod/mod_proxy_hcheck.html.fr #srv/web/ipfire/manual/mod/mod_proxy_html.html #srv/web/ipfire/manual/mod/mod_proxy_html.html.en #srv/web/ipfire/manual/mod/mod_proxy_html.html.fr @@ -967,6 +974,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_proxy_http.html.fr #srv/web/ipfire/manual/mod/mod_proxy_http2.html #srv/web/ipfire/manual/mod/mod_proxy_http2.html.en +#srv/web/ipfire/manual/mod/mod_proxy_http2.html.fr #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 @@ -974,6 +982,7 @@ srv/web/ipfire/html/captive #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_proxy_wstunnel.html.fr #srv/web/ipfire/manual/mod/mod_ratelimit.html #srv/web/ipfire/manual/mod/mod_ratelimit.html.en #srv/web/ipfire/manual/mod/mod_ratelimit.html.fr @@ -1081,6 +1090,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_usertrack.html.fr #srv/web/ipfire/manual/mod/mod_version.html #srv/web/ipfire/manual/mod/mod_version.html.en +#srv/web/ipfire/manual/mod/mod_version.html.fr #srv/web/ipfire/manual/mod/mod_version.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_version.html.ko.euc-kr #srv/web/ipfire/manual/mod/mod_vhost_alias.html @@ -1089,6 +1099,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_vhost_alias.html.tr.utf8 #srv/web/ipfire/manual/mod/mod_watchdog.html #srv/web/ipfire/manual/mod/mod_watchdog.html.en +#srv/web/ipfire/manual/mod/mod_watchdog.html.fr #srv/web/ipfire/manual/mod/mod_xml2enc.html #srv/web/ipfire/manual/mod/mod_xml2enc.html.en #srv/web/ipfire/manual/mod/mod_xml2enc.html.fr @@ -1185,6 +1196,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/platform/perf-hp.html.ko.euc-kr #srv/web/ipfire/manual/platform/rpm.html #srv/web/ipfire/manual/platform/rpm.html.en +#srv/web/ipfire/manual/platform/rpm.html.fr #srv/web/ipfire/manual/platform/win_compiling.html #srv/web/ipfire/manual/platform/win_compiling.html.en #srv/web/ipfire/manual/platform/win_compiling.html.fr @@ -1260,6 +1272,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/programs/index.html.zh-cn.utf8 #srv/web/ipfire/manual/programs/log_server_status.html #srv/web/ipfire/manual/programs/log_server_status.html.en +#srv/web/ipfire/manual/programs/log_server_status.html.fr #srv/web/ipfire/manual/programs/logresolve.html #srv/web/ipfire/manual/programs/logresolve.html.en #srv/web/ipfire/manual/programs/logresolve.html.fr @@ -1277,8 +1290,10 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/programs/rotatelogs.html.tr.utf8 #srv/web/ipfire/manual/programs/split-logfile.html #srv/web/ipfire/manual/programs/split-logfile.html.en +#srv/web/ipfire/manual/programs/split-logfile.html.fr #srv/web/ipfire/manual/programs/suexec.html #srv/web/ipfire/manual/programs/suexec.html.en +#srv/web/ipfire/manual/programs/suexec.html.fr #srv/web/ipfire/manual/programs/suexec.html.ko.euc-kr #srv/web/ipfire/manual/programs/suexec.html.tr.utf8 #srv/web/ipfire/manual/rewrite @@ -1644,7 +1659,6 @@ usr/lib/apache/mod_version.so usr/lib/apache/mod_vhost_alias.so usr/lib/apache/mod_watchdog.so usr/lib/apache/mod_xml2enc.so -#usr/sbin/ab usr/sbin/apachectl #usr/sbin/checkgid #usr/sbin/envvars diff --git a/lfs/apache2 b/lfs/apache2 index 1ef6bdec0a..d2175e71c9 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@ include Config -VER = 2.4.34 +VER = 2.4.35 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 818adca52f3be187fe45d6822755be95 +$(DL_FILE)_MD5 = 30c1cde80ffe814a8d16b4fdffda330a install : $(TARGET) -- 2.39.2