commit d1efd498dbc69e1b22a161fadda95dfafdb5dcca
Author: Elan Ruusamäe <[email protected]>
Date: Wed Mar 12 22:02:31 2014 +0200
1.4.35 (March 12, 2014); lighttpd SA-2014-01
2547.diff | 15 ---------------
lighttpd.spec | 8 +++-----
2 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/lighttpd.spec b/lighttpd.spec
index ed708c9..44bcfaf 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -29,12 +29,12 @@
Summary: Fast and light HTTP server
Summary(pl.UTF-8): Szybki i lekki serwer HTTP
Name: lighttpd
-Version: 1.4.34
-Release: 3
+Version: 1.4.35
+Release: 1
License: BSD
Group: Networking/Daemons/HTTP
Source0:
http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2
-# Source0-md5: 1071c172ccdd3ba31b56292661236d4b
+# Source0-md5: f7a88130ee9984b421ad8aa80629750a
Source1: %{name}.init
Source2: %{name}.conf
Source3: %{name}.user
@@ -102,7 +102,6 @@ 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/
@@ -839,7 +838,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
diff --git a/2547.diff b/2547.diff
deleted file mode 100644
index b435711..0000000
--- a/2547.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-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:",
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lighttpd.git/commitdiff/d1efd498dbc69e1b22a161fadda95dfafdb5dcca
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
