- up to 1.4.28, modinit befor fork disabled (needs updating and reviewing)

Changed files:
    data_string_print_escape.patch -> 1.2
    etag-32bit-overflow.patch -> 1.2
    lighttpd.spec -> 1.338
    mod_auth-ip-info.patch -> 1.5

diff --git a/data_string_print_escape.patch b/data_string_print_escape.patch
deleted file mode 100644 (file)
index 4091aa1..0000000
--- a/data_string_print_escape.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- lighttpd-1.4.26/src/data_string.c~ 2010-05-25 00:53:55.000000000 +0300
-+++ lighttpd-1.4.26/src/data_string.c  2010-05-25 00:53:59.407739779 +0300
-@@ -70,8 +70,19 @@
- static void data_string_print(const data_unset *d, int depth) {
-       data_string *ds = (data_string *)d;
-       UNUSED(depth);
-+      unsigned int i = 0;
- 
--      fprintf(stdout, "\"%s\"", ds->value->used ? ds->value->ptr : "");
-+      // print out the string as is, except prepend " with backslash
-+      putc('"', stdout);
-+      for (i = 0; i < ds->value->used - 1; i++) {
-+              unsigned char c = ds->value->ptr[i];
-+              if (c == '"') {
-+                      fputs("\\\"", stdout);
-+              } else {
-+                      putc(c, stdout);
-+              }
-+      }
-+      putc('"', stdout);
- }
- 
- 

diff --git a/etag-32bit-overflow.patch b/etag-32bit-overflow.patch
deleted file mode 100644 (file)
index 7755b56..0000000
--- a/etag-32bit-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/etag.c b/src/etag.c
-index 9ff585f..e7e9e3f 100644
---- a/src/etag.c
-+++ b/src/etag.c
-@@ -44,7 +44,7 @@ int etag_mutate(buffer *mut, buffer *etag) {
- 
-       buffer_reset(mut);
-       buffer_copy_string_len(mut, CONST_STR_LEN("\""));
--      buffer_append_long(mut, h);
-+      buffer_append_off_t(mut, h);
-       buffer_append_string_len(mut, CONST_STR_LEN("\""));
- 
-       return 0;

diff --git a/lighttpd.spec b/lighttpd.spec
index 9bfa6cb0b75801e64fcfd1611d574ae71cac2c32..da92bf38488d8645e9c7d7ac2c9e4779a9977917 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -24,12 +24,12 @@
 Summary:       Fast and light HTTP server
 Summary(pl.UTF-8):     Szybki i lekki serwer HTTP
 Name:          lighttpd
-Version:       1.4.26
-Release:       7
+Version:       1.4.28
+Release:       1
 License:       BSD
 Group:         Networking/Daemons/HTTP
 Source0:       http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2
-# Source0-md5: a682c8efce47a2f4263a247ba0813c9b
+# Source0-md5: 586eb535d31ac299652495b058dd87c4
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.user
@@ -86,16 +86,13 @@ Source134:  %{name}-mod_magnet.conf
 Source135:     %{name}-mod_extforward.conf
 Source136:     %{name}-mod_h264_streaming.conf
 Source137:     %{name}-mod_cgi_php.conf
-Patch100:      %{name}-branch.diff
+#Patch100:     %{name}-branch.diff
 Patch0:                %{name}-use_bin_sh.patch
 Patch1:                %{name}-mod_evasive-status_code.patch
 Patch2:                %{name}-mod_h264_streaming.patch
 Patch3:                %{name}-branding.patch
-Patch4:                %{name}-modinit-before-fork.patch
+#Patch4:               %{name}-modinit-before-fork.patch
 Patch5:                %{name}-mod_deflate.patch
-Patch6:                etag-32bit-overflow.patch
-Patch7:                mod_auth-ip-info.patch
-Patch8:                data_string_print_escape.patch
 #Patch8:               %{name}-errorlog-before-fork.patch
 URL:           http://www.lighttpd.net/
 %{?with_xattr:BuildRequires:   attr-devel}
@@ -816,16 +813,13 @@ Plik monitrc do monitorowania serwera www lighttpd.
 
 %prep
 %setup -q
-%patch100 -p0
-%patch4 -p0
+#%patch100 -p0
+#%patch4 -p0
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %{?with_deflate:%patch5 -p1}
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead
 
@@ -1076,7 +1070,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README doc/lighttpd.conf doc/*.txt doc/rrdtool-graph.sh PLD-TODO
+%doc NEWS README doc/*.txt PLD-TODO
 %dir %attr(751,root,lighttpd) %{_sysconfdir}
 %dir %attr(750,root,root) %{_sysconfdir}/conf.d
 %dir %attr(750,root,root) %{_sysconfdir}/vhosts.d

diff --git a/mod_auth-ip-info.patch b/mod_auth-ip-info.patch
deleted file mode 100644 (file)
index ace322d..0000000
--- a/mod_auth-ip-info.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lighttpd-1.4.26/src/http_auth.c~   2010-02-02 01:28:20.000000000 +0200
-+++ lighttpd-1.4.26/src/http_auth.c    2010-05-24 23:51:13.781442000 +0300
-@@ -869,7 +869,7 @@
-               if (AUTH_BACKEND_UNSET == p->conf.auth_backend) {
-                       log_error_write(srv, __FILE__, __LINE__, "s", "auth.backend is not set");
-               } else {
--                      log_error_write(srv, __FILE__, __LINE__, "s", "get_password failed");
-+                      log_error_write(srv, __FILE__, __LINE__, "ss", "get_password failed, IP:", inet_ntop_cache_get_ip(srv, &(con->dst_addr)));
-               }
- 
-               return 0;
-@@ -877,7 +877,7 @@
- 
-       /* password doesn't match */
-       if (http_auth_basic_password_compare(srv, p, req, username, realm->value, password, pw)) {
--              log_error_write(srv, __FILE__, __LINE__, "sbbss", "password doesn't match for ", con->uri.path, username, ", IP:", inet_ntop_cache_get_ip(srv, &(con->dst_addr)));
-+              log_error_write(srv, __FILE__, __LINE__, "sbsBss", "password doesn't match for", con->uri.path, "username:", username, ", IP:", inet_ntop_cache_get_ip(srv, &(con->dst_addr)));
- 
-               buffer_free(username);
-               buffer_free(password);