main/apache2: upgrade to 2.4.18

15 files changed, 84 insertions, 91 deletions

diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 930570cfbd..ad1288e30f 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 pkgname=apache2
 _pkgreal=httpd
-pkgver=2.4.17
-pkgrel=7
+pkgver=2.4.18
+pkgrel=0
 pkgdesc="A high performance Unix-based HTTP server"
 url="http://httpd.apache.org/"
 arch="all"
@@ -274,7 +274,7 @@ _lua() {
 	install -D -m644 "$srcdir"/lua.conf \
 		"$subpkgdir"/etc/apache2/conf.d/lua.conf || return 1
 }
-md5sums="cf4dfee11132cde836022f196611a8b7  httpd-2.4.17.tar.bz2
+md5sums="3690b3cc991b7dfd22aea9e1264a11b9  httpd-2.4.18.tar.bz2
 257d2572921dd4506b0464441f88fab4  apache2.confd
 8519af87c57b50441866ad4216e4d663  apache2.logrotate
 11b2718d7a0550498aaddf41e940ad04  apache2.initd
@@ -282,21 +282,21 @@ b70fe826486043e3953cfe21f9e6fa16  ldap.conf
 96eddccfca1ec0349f844e2460cf655b  proxy.conf
 449a4aea60473ac4a16f025fca4463e3  lua.conf
 699aec01d2f7c5a67c10d0fe280780b7  alpine.layout
-619e6564f8f3d34e08e0b908b3e8858f  0001-httpd.conf-ServerRoot.patch
-c87199fbee0354d058b7d2ac4bcd80d5  0002-httpd.conf-ServerTokens.patch
-483cbd360ce74aada662628a43c20ccd  0003-httpd.conf-ServerSignature.patch
-3ba9f3744cc236d11f711721601c489f  0004-httpd.conf-User-Group.patch
-02a693528319b50d6f778eeb4f8bff0e  0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch
-60488b68b6cbfce717f8ddf975aae266  0006-httpd-dav.conf-DavLockDB.patch
-ff4260cb5868781d409bd44b7fae639b  0007-httpd-ssl.conf-SSLSessionCache.patch
-71631c214e9ac4227710a354a464ffa5  0008-httpd-ssl.conf-SSLRandomSeed.patch
-f969c0eb55e63285e4e95bd48a475c15  0009-httpd-ssl.conf-SSL-File.patch
-52232ad656627372d9ccc8da4dc258e0  0010-httpd-ssl.conf-SSL-CipherSuite.patch
-e13a95fb3cfbd3ae1fca538eacc4b815  0011-httpd.conf-IncludeOptional.patch
-5c838af084c09d6f4eea1a2b3053b4f5  0012-httpd.conf-MIMEMagicFile.patch
-1e100376e89febdd8d0d65b21df38367  0013-httpd-.conf-IfModule.patch
-8a17db7a1c574621a161b14db6907c4d  0014-httpd-.conf-LoadModule.patch"
-sha256sums="331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798  httpd-2.4.17.tar.bz2
+56bbe9e4e83bbea1366dc107471ab64e  0001-httpd.conf-ServerRoot.patch
+3bd91de3d0063eafa0a07a950fb9041d  0002-httpd.conf-ServerTokens.patch
+29a501f82c81c00cd51cc8de91eee988  0003-httpd.conf-ServerSignature.patch
+968d320d0dead0eeb10a425e0c9e2e59  0004-httpd.conf-User-Group.patch
+88f9a51476a813b97510d2bdb4b2ccd4  0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch
+592ed15071a0d1b47315a06e395b03e2  0006-httpd-dav.conf-DavLockDB.patch
+0c3a6b8826876098fee8ccae5f732758  0007-httpd-ssl.conf-SSLSessionCache.patch
+42d0ebb0d5cdf66611eb45316d27bb44  0008-httpd-ssl.conf-SSLRandomSeed.patch
+52513e71652fc180458d367f4d8b866b  0009-httpd-ssl.conf-SSL-File.patch
+794a51cec6712b6c0a1359d1812d2c7c  0010-httpd-ssl.conf-SSL-CipherSuite.patch
+aa73ec65c4c67819f297e48da8d3fb8e  0011-httpd.conf-IncludeOptional.patch
+605536ff208f88ea97331b6b5d03278f  0012-httpd.conf-MIMEMagicFile.patch
+78f648c86a895107a9381374d5497f51  0013-httpd-.conf-IfModule.patch
+3c873b99a197a7fa1792bc7fa5b05233  0014-httpd-.conf-LoadModule.patch"
+sha256sums="0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c  httpd-2.4.18.tar.bz2
 6ca904ad65c1a4122d8ea4a3303ea8184429a4a4d7fb81defc30f3e184258c0a  apache2.confd
 8e2a8870d51796cf04cc7d8985c43e36afe9ae79e2d6765050a0e72c0de8dce7  apache2.logrotate
 8761faa68c2db7114b3f463f3b8ef1aec8f8373da9908d943cc765765914ab36  apache2.initd
@@ -304,21 +304,21 @@ sha256sums="331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798  ht
 00c42b7806eaa73e732be9d9e92c3e841b20c6d91a9920be47f19db8aee3513e  proxy.conf
 edf701795137566c7cf4b9c0c95ecd5f8c58269f5600217a0a4d289d2bf15384  lua.conf
 c40668ae8384d0555488660b68eda16ad8ccb11fde16a8197d33bed739fed1e8  alpine.layout
-69c717cdb99633c12797acdf9296288e0708687394915a8885e0cac7e794d9dc  0001-httpd.conf-ServerRoot.patch
-3aacdf3d21bf5e73d8aa1d10d49c13adaca51a26ce9211d70829e7badc552f3e  0002-httpd.conf-ServerTokens.patch
-4321b2eeec26d2d17806da8281acebc277ca0dd814cae47cf883bd2e949a35f9  0003-httpd.conf-ServerSignature.patch
-34e105220bb88aec1cf53e5c77b32104f059911bee48a2c41b0dd4fe2c3078f7  0004-httpd.conf-User-Group.patch
-32d76f092504162caa78c2397e4eb2c3be1525546840fb3e7710cec60f854961  0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch
-403704866ade4984cf478101a597e4b2903859e728a17dbbdb9351d21950409b  0006-httpd-dav.conf-DavLockDB.patch
-690decacf6d8229689e380be4323415d6c574ce027b65dd3b56c1d8ea0d7206b  0007-httpd-ssl.conf-SSLSessionCache.patch
-875a0d71a0e447c2d856c03ca6b80123d556544dfe8d1a04c9d409b509502ab2  0008-httpd-ssl.conf-SSLRandomSeed.patch
-8140c9e8dfa782deff8debbc9ce1b807768ab935100fb12d4f8f832f8f96d895  0009-httpd-ssl.conf-SSL-File.patch
-637260187fd2642cd3d5a300665dbe578592c1cd260e56050d3a9d99ee77527f  0010-httpd-ssl.conf-SSL-CipherSuite.patch
-0e3aa81eb70040f883c940090956ade949b5e420a360e07d24d95fc1662b16dd  0011-httpd.conf-IncludeOptional.patch
-0904e780bbb08bb660b0a4385242f3837d35833b3305d6ea0a5dcb4c688ed3a7  0012-httpd.conf-MIMEMagicFile.patch
-e466a446f600831d5f46a317ac6108b812cec83320f034306f19366bd8d5a25c  0013-httpd-.conf-IfModule.patch
-36cc6923cfc307db46b01c18727ded2ef05773608f4b8cb25acf913a346e99b3  0014-httpd-.conf-LoadModule.patch"
-sha512sums="d818dbd4b138db592a98fecdf5ae13dfadc19f9553e98bdafbdadd4693ae19bb44c96c8c279e9546978bbce55b9286ce3c4ae69cf701a9812be134a3a517b1f6  httpd-2.4.17.tar.bz2
+2e078ca7c99d78b0bf1d7eaa471d257f98af0aeb3d442e761552749981c8f503  0001-httpd.conf-ServerRoot.patch
+f9ad9b6fbdb6dd77b77e39410f061e4d155e83ac7943d4f3c8e783b75c4bca78  0002-httpd.conf-ServerTokens.patch
+8e38e5b285b5d7aabe3c03ce8d99555888de4a193f6ee52e725a40fc9380b42b  0003-httpd.conf-ServerSignature.patch
+6787eb526fe550c4bf4a507a23c33453e5e24731a88d662f230566f221c44cda  0004-httpd.conf-User-Group.patch
+262cab44115d07f0ee2397efd7a9ff8100ef9cbf6a94d856bee7de3831536a24  0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch
+0395f58e5f1d13e8ee8f88ea40862f54d1e94d361e43831337478af3ff39034d  0006-httpd-dav.conf-DavLockDB.patch
+38c27c17b9ed1b0440a69e594e5f45b52f59db193e03bbc9697bc784a9c5e308  0007-httpd-ssl.conf-SSLSessionCache.patch
+908c6a3f360e268caaf87f6d581443e7e0e3356b9a7be204d3b30423904dde81  0008-httpd-ssl.conf-SSLRandomSeed.patch
+d5129c7bd958a9a801527a3a07ad45a390fb23bc1754edf9274dbf32e68568ee  0009-httpd-ssl.conf-SSL-File.patch
+f22abd948065649d9972be320a1feb855b5807ca9f45af3ad354b9560cb257d1  0010-httpd-ssl.conf-SSL-CipherSuite.patch
+9ecd79e4a084d876c56000ccc2fa88463fb57617b575fe4f8104c099715c691b  0011-httpd.conf-IncludeOptional.patch
+5bad32417abc9fdf3e430aabd1ac8d13d90304911d6bd76515896df0aaa3e8d7  0012-httpd.conf-MIMEMagicFile.patch
+9603bf79c7eab05e635ee7c9b2ecc67c49146f955b59852a88f2c618bd489a78  0013-httpd-.conf-IfModule.patch
+34d0202635660c961ee5186a4950e2af714b27bbd4aef23901c1f05a5e6c6fcd  0014-httpd-.conf-LoadModule.patch"
+sha512sums="8e342cc447313c07275869381c2d6f2314a96547f0c86ee1c617975d0f7ad8efb47113ab5995c733108ae4dec31ad79847e397ecea859b60414ffe1680617a31  httpd-2.4.18.tar.bz2
 8e62b101f90c67babe864bcb74f711656180b011df3fd4b541dc766b980b72aa409e86debf3559a55be359471c1cad81b8779ef3a55add8d368229fc7e9544fc  apache2.confd
 18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b  apache2.logrotate
 81a2d2a297d8049ba1b021b879ec863767149e056d9bdb2ac8acf63572b254935ec96c2e1580eba86639ea56433eec5c41341e4f1501f9072745dccdb3602701  apache2.initd
@@ -326,17 +326,17 @@ fbdc28ea4b94af91640794945ac4e1f45e4200e54d5bdf64c0c03fc8bdb589e444cc4f7dd0b70b69
 aabbe171219f15efe47f8e972fc1a43f98b48977aae91b597b65bb447027992bf81757bde68b26a67e5e3b9f2e748d94b3c85d5c07433627b6048d60a51d400b  proxy.conf
 f2950005ac0d8c7a5e34958f1274c9ed0f5f634a5bc766e12834917937df9db901c5fc2460da70e1a62f17440d4719163cd4213496dbf579c80a789b8e18f65c  lua.conf
 177c58d049fc4476fd9b9b36b67725145777c84cf81948105c9314cb09312dff6c1931fe21aaa243597abaefded6c6dfd80d83839e45a23950b50de615d73b06  alpine.layout
-21cf156127b8f568326f8a1a90c34f380910ecdad592efe35d165bedc9ef1e7e3a570b613c8a7c6c095e6b3203b5346b11e71d4031eb35a52955417720e2ae0c  0001-httpd.conf-ServerRoot.patch
-253cf44fa48d16e34855a6ec7598a0cddcc6f64abdabf49f40a040c52a584558e42e24bc3ac806b965732f02358a84a1d832a598a2bdc328d7635187cea66e2c  0002-httpd.conf-ServerTokens.patch
-b8f7bf67608e61839c191ebedc64c1bf84b16553406bb2e05be0f6e2f508f5748b038a9858e173a151e5d25334e115beaae324583395465500cd1aefc7f224a6  0003-httpd.conf-ServerSignature.patch
-b84a4b8693ceb00c298704c8cfeea906ef51567a117ebbb9f5d76b2ecdad8003abf2020afb6dd2030b1671dbb86332e5a818b941de9d8d042dd7e3696c0ba1fe  0004-httpd.conf-User-Group.patch
-8a6b29b802c109ded61d3474080e38c06f961e46c99304d36152f75da5d1f08808d3d7c4b1a2b9018ea9d361e92443d0958f38d8733186a84a525a4d744c83a8  0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch
-d343b98f7fbdb85e3a98002a99500149249aeba0ffd89a80c542d9fb94409278d4a6b2a1c23750fcd44c0a22ea98eca4ef11da84eb5f0031db6b42887ca94eb4  0006-httpd-dav.conf-DavLockDB.patch
-9429fdc1ca5df8a7c635b61f24fa4b39fa19af98fc90a10e3f896ff12549e0ed5b9a9e8a44ffde1275f9ad9e9239f43afb1027c72438bf682b7b75efaea8dcf7  0007-httpd-ssl.conf-SSLSessionCache.patch
-65e518b4901450085e49c91cfe0ca32e90053d580c4545f9c1e5e4dc943d9cb33d4f524827afbd9e0677760a8728f3e3d7fef6bf669b82f3266cd9907c5922c8  0008-httpd-ssl.conf-SSLRandomSeed.patch
-99b1c04b2f1f09de59e23c58634a199bc51cd982c9f3adc078010916c394cc77dee1da3d5ed3860bef4ee0f4cd7a603e11a10ea657dfd0b422a52f7ffa46ca05  0009-httpd-ssl.conf-SSL-File.patch
-052783619ba130ce583ab2156a48853a5827e643c9fbabb5031232002f6423feb0806a429e44c499134a15a83e28364790df2184c27b38bff3afeee5e7ea4c9e  0010-httpd-ssl.conf-SSL-CipherSuite.patch
-ebbb702aa0d789eb69abe0784de7d5ede651d8be2fc6eeb1be62dc337af1aa027921f324a959895b15af8c5744fb2d37e063cd659744a13d655237772c4ccf5a  0011-httpd.conf-IncludeOptional.patch
-f6b333723fc5fdcd8447586766762baf9e28f21f2fdecff1e10779d8c50be84408d32bad2f9d8f03083846c04967b821c44038f6fd3a57053b157e0c5c0fcce4  0012-httpd.conf-MIMEMagicFile.patch
-4af68fb9330657a7b5fa24ee25176ae28603e1a6e9c642966f7f4e7817717b18597f7582a75f18f483be21f1ecc9feef7423aee0482faeef6016d6a5a957fd52  0013-httpd-.conf-IfModule.patch
-029b90d80d945bd756c3c1b0c9b403e4e9e34a682438d542695a5d042800e36bfcad156a781b733832e90eddd87edce89e28896d3ddc680a21cb89d18e075c68  0014-httpd-.conf-LoadModule.patch"
+b55051f1358fb957cb24ea5d7cf6106822935c5fe3d1f4bb071d4caff5daa46c31c4fc81ec1f2ce0335a634e8b7545f2265c3d28bea3b0799b9ff589ba36c24a  0001-httpd.conf-ServerRoot.patch
+948299dd3b5b004276394a4ce94005a011cfe14e032e7cdce060bf0f6123835020419226cc0fe78cbefba996c0c2eebd1b8d713d2f1b424e0e6f58b1e589bc3f  0002-httpd.conf-ServerTokens.patch
+360d67fae5882f460509bfe3a295055602480902aa135f914cfd3c6d16c43fa92e77ef5de0360b2eab11ca0d0ad6bd46bf093a156a64718696635a6c3d328ad3  0003-httpd.conf-ServerSignature.patch
+2bf81ded68ccca5d893233bede8cd002d05b7e26fe1a6d341c41a5e439e16c816ffdcb03fd093b45ff0ea1b905f423420e45b07b9da91181ac73fb533e1b68c1  0004-httpd.conf-User-Group.patch
+9aa4bc57702c2b4adb91885558504318ebc5d4129aea259bff08d19d8350c82e308c801db77f1dadbbeae4bf284a7939c2f16a8fd26798b71e8510985540c1e4  0005-httpd.conf-ErrorLog-CustomLog-TransferLog.patch
+238f6b3572f6a39ed778aab33b7adc5023fb8d82cbea1af21b16587aac2c9056d025608c20232e3017531513b4b49e4272ab59c82a7a39b17291c93256037387  0006-httpd-dav.conf-DavLockDB.patch
+5c32f20f883055f47e796b9fd5dcea5e794c7a5375712e384a7093ca38629259beda376d0ba2c78c44329f75e2c75fda987bc38ff22669a8421a7825bdef78b7  0007-httpd-ssl.conf-SSLSessionCache.patch
+9eca9eca008af801adc067eb0ecfe19cff7e77e7e675cd005d3ac1d551c638bb6ea5dd9b30a019db9c650fba53ab6ce88202118361e53f018283f6794d3f09d3  0008-httpd-ssl.conf-SSLRandomSeed.patch
+377c89510dc165dfb88922aeaf923aa1efd69e7cfd10cb6f8b1e1f015865187f287c0a5090f31f76137de8b9973fcbf5bd17f7003fc275c87a6bf3cf32758c33  0009-httpd-ssl.conf-SSL-File.patch
+e151a8ebb23b1a3a92ea9a8b83b6bf64c950ec8ded8d514df8f16f074c5f712de7c44cb42190ca15a2010bac2c4ff57f26947e87625d40f7791ec1e77cf88cc7  0010-httpd-ssl.conf-SSL-CipherSuite.patch
+fc3352b50bee11e7560594398948a1af0279d339e891915e38766c9c0f930cc01f207e438afe9a43329b6d23fe438939666309e8ad77938dbe8dc784aaae4113  0011-httpd.conf-IncludeOptional.patch
+da3a99ccf54c8d4adc633cceb3e520e48b47e868e8f1be33c81027ce3173401c8b9b79af4f75c73c94f77a50452219a4d23774b03a74f6271a677ec271396ada  0012-httpd.conf-MIMEMagicFile.patch
+564866cadebd957eb9b23624286deb8cadb0ebeda0e3e80ec2cd8912731c8273f5ef5fa9f2d8295accb304da40c850772a854eb0c76c3aa08bb93b059c730882  0013-httpd-.conf-IfModule.patch
+3742b8ed06cfd081a02c171b5ddf42652d2848fd520e0ff1a4799fce90300e70ab8edbbecc7111a1083133077a57703a631879143777565e6918099a873d4aa0  0014-httpd-.conf-LoadModule.patch"
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 <kaarle.ritvanen@datakunkku.fi>
 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 <kaarle.ritvanen@datakunkku.fi>
 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 <kaarle.ritvanen@datakunkku.fi>
 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 <kaarle.ritvanen@datakunkku.fi>
 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 <kaarle.ritvanen@datakunkku.fi>
 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
  
  </VirtualHost>                                  
 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 <kaarle.ritvanen@datakunkku.fi>
 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 <kaarle.ritvanen@datakunkku.fi>
 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 <kaarle.ritvanen@datakunkku.fi>
 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
+ <IfModule proxy_html_module>
+ Include @rel_sysconfdir@/extra/proxy-html.conf
+ </IfModule>
+-
+-# 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
 -</IfModule>
-+
- #
- # 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 <kaarle.ritvanen@datakunkku.fi>
 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 <kaarle.ritvanen@datakunkku.fi>
 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 <kaarle.ritvanen@datakunkku.fi>
 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
 -<IfModule proxy_html_module>
 -Include @rel_sysconfdir@/extra/proxy-html.conf
 -</IfModule>
--
--# 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 <kaarle.ritvanen@datakunkku.fi>
 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 <kaarle.ritvanen@datakunkku.fi>
 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 <kaarle.ritvanen@datakunkku.fi>
 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@@