From 701b5621b44e9b37c4d84042588a33a314cf26e9 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Mon, 15 Feb 2016 21:48:50 +0200
Subject: main/apache2: upgrade to 2.4.18

---
 .../conf/0008-httpd-ssl.conf-SSLRandomSeed.patch   | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'main/apache2/conf/0008-httpd-ssl.conf-SSLRandomSeed.patch')

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
 
-- 
cgit v1.2.3