up to 1.4.40: major bug-fix release; hundreds of issues resolved in issue tracker

- -mod_evasive-status_code.patch disabled (unmaintained)

diff --git a/lighttpd-branding.patch b/lighttpd-branding.patch
index bcb01c5088f9e89fa315b8ce4bef569678a6cf4b..56b35a9a8def5618ca83d900cd36417f4adfb61c 100644 (file)
--- a/lighttpd-branding.patch
+++ b/lighttpd-branding.patch
@@ -1,11 +1,19 @@
---- lighttpd-1.4.36/src/response.c~    2015-07-26 13:36:36.000000000 +0300
-+++ lighttpd-1.4.36/src/response.c     2015-07-26 18:29:48.302220417 +0300
-@@ -109,7 +109,7 @@
+--- lighttpd-1.4.40/src/response.c~    2016-07-16 13:06:16.000000000 +0300
++++ lighttpd-1.4.40/src/response.c     2016-07-25 14:16:59.131926942 +0300
+@@ -5,6 +5,7 @@
+ #include "log.h"
+ #include "stat_cache.h"
+ #include "chunk.h"
++#include "version.h"

  
  

-       if (!have_server) {
-               if (buffer_is_empty(con->conf.server_tag)) {
--                      buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: " PACKAGE_DESC));
-+                      buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: " PACKAGE_DESC " (PLD Linux)"));
-               } else if (!buffer_string_is_empty(con->conf.server_tag)) {
+ #include "configfile.h"
+ 
+@@ -111,6 +111,8 @@
+               if (!buffer_string_is_empty(con->conf.server_tag)) {

                        buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: "));
                        buffer_append_string_encoded(b, CONST_BUF_LEN(con->conf.server_tag), ENCODING_HTTP_HEADER);
                        buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: "));
                        buffer_append_string_encoded(b, CONST_BUF_LEN(con->conf.server_tag), ENCODING_HTTP_HEADER);

++              } else {
++                      buffer_append_string_len(b, CONST_STR_LEN("\r\nServer: " PACKAGE_DESC " (PLD Linux)"));
+               }
+       }
+ 

diff --git a/lighttpd.spec b/lighttpd.spec
index 8d08c71d9beff38dd499224955a27f8110ec1481..ab7612a07d73da3371e7082e1f3f3f8b12567bde 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -30,12 +30,12 @@
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd

-Version:       1.4.39
+Version:       1.4.40

 Release:       1
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz
 Release:       1
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz

-# Source0-md5: 63c7563be1c7a7a9819a51f07f1af8b2
+# Source0-md5: 89e0da2b6b8a2c4592d549ff10094068

 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user


@@ -838,7 +838,7 @@ Plik monitrc do monitorowania serwera www lighttpd.
 %setup -q
 #%patch100 -p0
 %patch0 -p1
 %setup -q
 #%patch100 -p0
 %patch0 -p1

-%patch1 -p1
+#%patch1 -p1 UPDATE (and submit upstream!) if you need this

 %{?with_h264_streaming:%patch2 -p1}
 %patch3 -p1
 %{?with_deflate:%patch5 -p1}
 %{?with_h264_streaming:%patch2 -p1}
 %patch3 -p1
 %{?with_deflate:%patch5 -p1}