From: Elan Ruusamäe <glen@delfi.ee>
Date: Mon, 3 Mar 2014 09:56:09 +0000 (+0200)
Subject: fix build with OPENSSL_NO_TLSEXT (old openssl on ac). lighttpd issue 2547
X-Git-Tag: auto/ac/lighttpd-1.4.34-3
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=48b220455326758536823f8f8d9e1848f6ce8dd9;p=packages%2Flighttpd.git

fix build with OPENSSL_NO_TLSEXT (old openssl on ac). lighttpd issue 2547
---

diff --git a/2547.diff b/2547.diff
new file mode 100644
index 0000000..b435711
--- /dev/null
+++ b/2547.diff
@@ -0,0 +1,15 @@
+URL: http://redmine.lighttpd.net/issues/2547
+
+Index: network.c
+===================================================================
+--- ./src/network.c	(revision 2936)
++++ ./src/network.c	(revision 2937)
+@@ -583,7 +583,7 @@
+ 
+ #ifdef OPENSSL_NO_TLSEXT
+ 	{
+-		data_config *dc = (data_config *)srv->config_context->data[i];
++		data_config *dc = (data_config *)srv->config_context->data[ndx];
+ 		if ((ndx > 0 && (COMP_SERVER_SOCKET != dc->comp || dc->cond != CONFIG_COND_EQ))
+ 			|| !s->ssl_enabled) {
+ 			log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
diff --git a/lighttpd.spec b/lighttpd.spec
index 32263a8..ed708c9 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -30,7 +30,7 @@ Summary:	Fast and light HTTP server
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
 Version:	1.4.34
-Release:	2
+Release:	3
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2
@@ -102,6 +102,7 @@ Patch2:		%{name}-mod_h264_streaming.patch
 Patch3:		%{name}-branding.patch
 Patch5:		%{name}-mod_deflate.patch
 Patch6:		test-port-setup.patch
+Patch7:		2547.diff
 #Patch:		%{name}-modinit-before-fork.patch
 #Patch:		%{name}-errorlog-before-fork.patch
 URL:		http://www.lighttpd.net/
@@ -838,6 +839,7 @@ Plik monitrc do monitorowania serwera www lighttpd.
 %patch3 -p1
 %{?with_deflate:%patch5 -p1}
 %patch6 -p1
+%patch7 -p1
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead