- up to 1.4.31

Changed files:
    lighttpd-openssl_TLSEXT_SNI.patch -> 1.2
    lighttpd.spec -> 1.365

diff --git a/lighttpd-openssl_TLSEXT_SNI.patch b/lighttpd-openssl_TLSEXT_SNI.patch
deleted file mode 100644 (file)
index 8c0e9d7..0000000
--- a/lighttpd-openssl_TLSEXT_SNI.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur lighttpd-1.4.30-orig/src/connections.c lighttpd-1.4.30/src/connections.c
---- lighttpd-1.4.30-orig/src/connections.c     2012-01-30 09:21:37.665413503 +0100
-+++ lighttpd-1.4.30/src/connections.c  2012-01-30 09:23:09.432936999 +0100
-@@ -1360,9 +1360,7 @@
-                       }
- 
-                       con->renegotiations = 0;
--#ifndef OPENSSL_NO_TLSEXT
-                       SSL_set_app_data(con->ssl, con);
--#endif
-                       SSL_set_accept_state(con->ssl);
-                       con->conf.is_ssl=1;
- 

diff --git a/lighttpd.spec b/lighttpd.spec
index 1c271fda978f0c31cc60d8386212329b023440fe..474d7a6c1192aca9d46b9fc9f186fcfe04845760 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -28,12 +28,12 @@
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
-Version:       1.4.30
-Release:       10
+Version:       1.4.31
+Release:       1
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2
-# Source0-md5: 63f9df52dcae0ab5689a95c99c54e48a
+# Source0-md5: c718cc27658240d307b8a1d1c7c4bb54
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
@@ -99,7 +99,6 @@ Patch2:               %{name}-mod_h264_streaming.patch
 Patch3:                %{name}-branding.patch
 Patch5:                %{name}-mod_deflate.patch
 Patch6:                test-port-setup.patch
-Patch7:                %{name}-openssl_TLSEXT_SNI.patch
 #Patch:                %{name}-modinit-before-fork.patch
 #Patch:                %{name}-errorlog-before-fork.patch
 URL:           http://www.lighttpd.net/
@@ -830,7 +829,6 @@ 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
 
@@ -851,8 +849,6 @@ fi
 %{__automake}
 
 %configure \
-       --enable-maintainer-mode \
-       --with-distribution="PLD Linux" \
        %{!?with_ipv6:--disable-ipv6} \
        %{!?with_largefile:--disable-lfs} \
        %{?with_valgrind:--with-valgrind} \