From 701b5621b44e9b37c4d84042588a33a314cf26e9 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Mon, 15 Feb 2016 21:48:50 +0200 Subject: main/apache2: upgrade to 2.4.18 --- main/apache2/conf/0001-httpd.conf-ServerRoot.patch | 4 ++-- .../conf/0002-httpd.conf-ServerTokens.patch | 4 ++-- .../conf/0003-httpd.conf-ServerSignature.patch | 4 ++-- main/apache2/conf/0004-httpd.conf-User-Group.patch | 4 ++-- ...httpd.conf-ErrorLog-CustomLog-TransferLog.patch | 4 ++-- .../conf/0006-httpd-dav.conf-DavLockDB.patch | 2 +- .../conf/0007-httpd-ssl.conf-SSLSessionCache.patch | 2 +- .../conf/0008-httpd-ssl.conf-SSLRandomSeed.patch | 24 +++++++++++----------- .../conf/0009-httpd-ssl.conf-SSL-File.patch | 2 +- .../conf/0010-httpd-ssl.conf-SSL-CipherSuite.patch | 2 +- .../conf/0011-httpd.conf-IncludeOptional.patch | 19 ++++++----------- .../conf/0012-httpd.conf-MIMEMagicFile.patch | 4 ++-- main/apache2/conf/0013-httpd-.conf-IfModule.patch | 2 +- .../apache2/conf/0014-httpd-.conf-LoadModule.patch | 4 ++-- 14 files changed, 37 insertions(+), 44 deletions(-) (limited to 'main/apache2/conf') diff --git a/main/apache2/conf/0001-httpd.conf-ServerRoot.patch b/main/apache2/conf/0001-httpd.conf-ServerRoot.patch index e69dea402d..26f9b5a388 100644 --- a/main/apache2/conf/0001-httpd.conf-ServerRoot.patch +++ b/main/apache2/conf/0001-httpd.conf-ServerRoot.patch @@ -1,4 +1,4 @@ -From 6f3ae7182eff18a41f6e6762c3f98c6516d79270 Mon Sep 17 00:00:00 2001 +From 8d6011f6009c74a6dc701017c629f21516142256 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Mon, 21 Sep 2015 12:16:16 +0300 Subject: [PATCH 01/14] httpd.conf: ServerRoot @@ -8,7 +8,7 @@ Subject: [PATCH 01/14] httpd.conf: ServerRoot 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in -index 6e41891..ddf9470 100644 +index 966d2c3..c97b18d 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -28,7 +28,7 @@ diff --git a/main/apache2/conf/0002-httpd.conf-ServerTokens.patch b/main/apache2/conf/0002-httpd.conf-ServerTokens.patch index e4b0529e9b..d688592683 100644 --- a/main/apache2/conf/0002-httpd.conf-ServerTokens.patch +++ b/main/apache2/conf/0002-httpd.conf-ServerTokens.patch @@ -1,4 +1,4 @@ -From a581696f06b6ad80530bbee138cb4e870379284b Mon Sep 17 00:00:00 2001 +From efe4452d812db7bdb0885ba89cf488c2eade7c70 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 11:10:55 +0300 Subject: [PATCH 02/14] httpd.conf: ServerTokens @@ -30,7 +30,7 @@ index 7196922..a05ebc1 100644 # name to server-generated pages (internal error documents, FTP directory # listings, mod_status and mod_info output etc., but not CGI generated diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in -index ddf9470..6a746e0 100644 +index c97b18d..0cceb2a 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -19,6 +19,16 @@ diff --git a/main/apache2/conf/0003-httpd.conf-ServerSignature.patch b/main/apache2/conf/0003-httpd.conf-ServerSignature.patch index 1c921ea5f3..c6c4f4ffda 100644 --- a/main/apache2/conf/0003-httpd.conf-ServerSignature.patch +++ b/main/apache2/conf/0003-httpd.conf-ServerSignature.patch @@ -1,4 +1,4 @@ -From 1155dc5d32cceb5444d9c6ea7a3e560472c2c478 Mon Sep 17 00:00:00 2001 +From ca039c67e17d45f641b018e76d90b36b1325ab16 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 11:46:25 +0300 Subject: [PATCH 03/14] httpd.conf: ServerSignature @@ -30,7 +30,7 @@ index a05ebc1..dcc2fb5 100644 # e.g., www.apache.org (on) or 204.62.129.132 (off). # The default is off because it'd be overall better for the net if people diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in -index 6a746e0..e92fefa 100644 +index 0cceb2a..5835643 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -109,6 +109,16 @@ Group daemon diff --git a/main/apache2/conf/0004-httpd.conf-User-Group.patch b/main/apache2/conf/0004-httpd.conf-User-Group.patch index 51decc9487..264ae3a494 100644 --- a/main/apache2/conf/0004-httpd.conf-User-Group.patch +++ b/main/apache2/conf/0004-httpd.conf-User-Group.patch @@ -1,4 +1,4 @@ -From c312314571194da82ca1e6124d55a44bcbff755d Mon Sep 17 00:00:00 2001 +From 1ac121e7d4ea97b2a2fa5c678fd989ad1081d541 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 11:31:31 +0300 Subject: [PATCH 04/14] httpd.conf: User/Group @@ -8,7 +8,7 @@ Subject: [PATCH 04/14] httpd.conf: User/Group 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in -index e92fefa..a1cf630 100644 +index 5835643..2f2bf49 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -84,8 +84,8 @@ Listen @@Port@@ diff --git a/main/apache2/conf/0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch b/main/apache2/conf/0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch index 38cdab43a7..a4aa4d635d 100644 --- a/main/apache2/conf/0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch +++ b/main/apache2/conf/0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch @@ -1,4 +1,4 @@ -From 952a6b229f190aa6b46ecb1a47ec464a092f51b4 Mon Sep 17 00:00:00 2001 +From c48105dca98ec2e4c63cb487f2ce5ab4da6a55c4 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 11:40:22 +0300 Subject: [PATCH 05/14] httpd.conf: ErrorLog/CustomLog/TransferLog @@ -33,7 +33,7 @@ index f093b32..65dae32 100644 diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in -index a1cf630..565fb01 100644 +index 2f2bf49..8386312 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -201,7 +201,7 @@ DocumentRoot "@exp_htdocsdir@" diff --git a/main/apache2/conf/0006-httpd-dav.conf-DavLockDB.patch b/main/apache2/conf/0006-httpd-dav.conf-DavLockDB.patch index 1e508074d5..6b4b21b38d 100644 --- a/main/apache2/conf/0006-httpd-dav.conf-DavLockDB.patch +++ b/main/apache2/conf/0006-httpd-dav.conf-DavLockDB.patch @@ -1,4 +1,4 @@ -From eb772e4dde3d849ce46836b3715c1990565781bd Mon Sep 17 00:00:00 2001 +From 6b0ea0ffe5dda6d6d24535c2be57304e0cbbe484 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 12:46:16 +0300 Subject: [PATCH 06/14] httpd-dav.conf: DavLockDB diff --git a/main/apache2/conf/0007-httpd-ssl.conf-SSLSessionCache.patch b/main/apache2/conf/0007-httpd-ssl.conf-SSLSessionCache.patch index aaf7d027af..3de8608948 100644 --- a/main/apache2/conf/0007-httpd-ssl.conf-SSLSessionCache.patch +++ b/main/apache2/conf/0007-httpd-ssl.conf-SSLSessionCache.patch @@ -1,4 +1,4 @@ -From df8d7d5c9ec68e47d1edc2fcd566c2422ae7b71a Mon Sep 17 00:00:00 2001 +From ff4cb257ca2f5f6705776683dc6c26c65a8fffd3 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 12:53:13 +0300 Subject: [PATCH 07/14] httpd-ssl.conf: SSLSessionCache diff --git a/main/apache2/conf/0008-httpd-ssl.conf-SSLRandomSeed.patch b/main/apache2/conf/0008-httpd-ssl.conf-SSLRandomSeed.patch index 7088022070..0f461bcb73 100644 --- a/main/apache2/conf/0008-httpd-ssl.conf-SSLRandomSeed.patch +++ b/main/apache2/conf/0008-httpd-ssl.conf-SSLRandomSeed.patch @@ -1,12 +1,12 @@ -From ca356e7aa8b3b2fb441a831059d41ca53f705026 Mon Sep 17 00:00:00 2001 +From 2270e11bbe1ba3a0b489ecd941ef3a7a944ba151 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 12:58:01 +0300 Subject: [PATCH 08/14] httpd-ssl.conf: SSLRandomSeed --- docs/conf/extra/httpd-ssl.conf.in | 3 ++- - docs/conf/httpd.conf.in | 10 +--------- - 2 files changed, 3 insertions(+), 10 deletions(-) + docs/conf/httpd.conf.in | 13 ------------- + 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in index 1680430..da506c8 100644 @@ -23,13 +23,16 @@ index 1680430..da506c8 100644 #SSLRandomSeed connect file:/dev/urandom 512 diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in -index 565fb01..47fe513 100644 +index 8386312..de6ee33 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in -@@ -417,15 +417,7 @@ Include @rel_sysconfdir@/extra/proxy-html.conf - - # Secure (SSL/TLS) connections - #Include @rel_sysconfdir@/extra/httpd-ssl.conf +@@ -414,16 +414,3 @@ LogLevel warn + + Include @rel_sysconfdir@/extra/proxy-html.conf + +- +-# Secure (SSL/TLS) connections +-#Include @rel_sysconfdir@/extra/httpd-ssl.conf -# -# Note: The following must must be present to support -# starting without SSL on platforms with no /dev/random equivalent @@ -39,10 +42,7 @@ index 565fb01..47fe513 100644 -SSLRandomSeed startup builtin -SSLRandomSeed connect builtin - -+ - # - # uncomment out the below to deal with user agents that deliberately - # violate open standards by misusing DNT (DNT *must* be a specific +- -- 2.5.0 diff --git a/main/apache2/conf/0009-httpd-ssl.conf-SSL-File.patch b/main/apache2/conf/0009-httpd-ssl.conf-SSL-File.patch index efa4971073..851130fe3d 100644 --- a/main/apache2/conf/0009-httpd-ssl.conf-SSL-File.patch +++ b/main/apache2/conf/0009-httpd-ssl.conf-SSL-File.patch @@ -1,4 +1,4 @@ -From 50a5336a5c7f9ceb7d8e74175c7d5a6884283416 Mon Sep 17 00:00:00 2001 +From deef08a02706efc731555d4d4d1c43ca126d6d3e Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 13:03:38 +0300 Subject: [PATCH 09/14] httpd-ssl.conf SSL*File diff --git a/main/apache2/conf/0010-httpd-ssl.conf-SSL-CipherSuite.patch b/main/apache2/conf/0010-httpd-ssl.conf-SSL-CipherSuite.patch index 62fc5172d1..7c806c3519 100644 --- a/main/apache2/conf/0010-httpd-ssl.conf-SSL-CipherSuite.patch +++ b/main/apache2/conf/0010-httpd-ssl.conf-SSL-CipherSuite.patch @@ -1,4 +1,4 @@ -From 68116c6b50712b4e3733da43292d066e3797cbcc Mon Sep 17 00:00:00 2001 +From 9ddd6227e5e0c38b869a77ce04c93877a2b1fc85 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 13:32:31 +0300 Subject: [PATCH 10/14] httpd-ssl.conf: SSL*CipherSuite diff --git a/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch b/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch index 1a8056989d..bc38c2753c 100644 --- a/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch +++ b/main/apache2/conf/0011-httpd.conf-IncludeOptional.patch @@ -1,21 +1,22 @@ -From 537f190142ce17f01db06d0f9cdd4c8b163eee9c Mon Sep 17 00:00:00 2001 +From 1013806f1128c2cf289b20362484f64379dda619 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 11:27:24 +0300 Subject: [PATCH 11/14] httpd.conf: IncludeOptional --- - docs/conf/httpd.conf.in | 46 +++------------------------------------------- - 1 file changed, 3 insertions(+), 43 deletions(-) + docs/conf/httpd.conf.in | 42 ++---------------------------------------- + 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in -index 47fe513..545e663 100644 +index de6ee33..66d20fe 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in -@@ -373,50 +373,10 @@ LogLevel warn +@@ -373,44 +373,6 @@ LogLevel warn #EnableMMAP off #EnableSendfile on -# Supplemental configuration ++# Load config files from the config directory "/etc/apache2/conf.d". # -# The configuration files in the @rel_sysconfdir@/extra/ directory can be -# included to add extra features or to modify the default configuration of @@ -56,15 +57,7 @@ index 47fe513..545e663 100644 - -Include @rel_sysconfdir@/extra/proxy-html.conf - -- --# Secure (SSL/TLS) connections --#Include @rel_sysconfdir@/extra/httpd-ssl.conf -+# Load config files from the config directory "/etc/apache2/conf.d". -+# +IncludeOptional /etc/apache2/conf.d/*.conf - - # - # uncomment out the below to deal with user agents that deliberately -- 2.5.0 diff --git a/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch b/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch index c83694eaf7..2db338d16f 100644 --- a/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch +++ b/main/apache2/conf/0012-httpd.conf-MIMEMagicFile.patch @@ -1,4 +1,4 @@ -From 8496740e67572c4f0db4f06b6496bbe8b85e4e7b Mon Sep 17 00:00:00 2001 +From 867d4c6caac66cb458316b97cd24761f339861ca Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 14:59:32 +0300 Subject: [PATCH 12/14] httpd.conf: MIMEMagicFile @@ -8,7 +8,7 @@ Subject: [PATCH 12/14] httpd.conf: MIMEMagicFile 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in -index 545e663..c6092b3 100644 +index 66d20fe..4266f87 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -341,7 +341,9 @@ LogLevel warn diff --git a/main/apache2/conf/0013-httpd-.conf-IfModule.patch b/main/apache2/conf/0013-httpd-.conf-IfModule.patch index 4707ae9592..20693109b7 100644 --- a/main/apache2/conf/0013-httpd-.conf-IfModule.patch +++ b/main/apache2/conf/0013-httpd-.conf-IfModule.patch @@ -1,4 +1,4 @@ -From 5e2bee3638ad1b2a76b1512cc37382ec719f90df Mon Sep 17 00:00:00 2001 +From 5dfde3ec458ddda04b070709b60803144ce29d9a Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 15:05:30 +0300 Subject: [PATCH 13/14] httpd-*.conf: IfModule diff --git a/main/apache2/conf/0014-httpd-.conf-LoadModule.patch b/main/apache2/conf/0014-httpd-.conf-LoadModule.patch index e011386795..fbf0757bed 100644 --- a/main/apache2/conf/0014-httpd-.conf-LoadModule.patch +++ b/main/apache2/conf/0014-httpd-.conf-LoadModule.patch @@ -1,4 +1,4 @@ -From e84023a765cff2a2c75b1176db4f7e962c2e80c8 Mon Sep 17 00:00:00 2001 +From a15f4e83f0c5b6a3974af01427e3facf9191d0ef Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 11 Sep 2015 15:12:08 +0300 Subject: [PATCH 14/14] httpd*.conf: LoadModule @@ -55,7 +55,7 @@ index 683a091..0648e8e 100644 # For Windows (I don't know if there's a standard path for the libraries) # LoadFile C:/path/zlib.dll diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in -index c6092b3..929ebfc 100644 +index 4266f87..df1f2a1 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -75,6 +75,8 @@ Listen @@Port@@ -- cgit v1.2.3