packages: lighttpd/lighttpd-branch.diff, lighttpd/lighttpd-branch.sh, light...

[glen]

Author: glen                         Date: Sun Nov 22 22:48:24 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.4.25

---- Files affected:
packages/lighttpd:
   lighttpd-branch.diff (1.63 -> 1.64) , lighttpd-branch.sh (1.18 -> 1.19) , lighttpd.spec (1.314 -> 1.315) 

---- Diffs:

================================================================
Index: packages/lighttpd/lighttpd-branch.diff
diff -u packages/lighttpd/lighttpd-branch.diff:1.63 packages/lighttpd/lighttpd-branch.diff:1.64
--- packages/lighttpd/lighttpd-branch.diff:1.63	Mon Nov  9 13:46:32 2009
+++ packages/lighttpd/lighttpd-branch.diff	Sun Nov 22 23:48:19 2009
@@ -1,4 +1,4 @@
-# Revision 2692
+# Revision 2695
 Index: src/base.h
 ===================================================================
 --- src/base.h	(.../tags/lighttpd-1.4.24)
@@ -623,18 +623,34 @@
  	assert(lua_gettop(L) == 2);
 Index: configure.ac
 ===================================================================
+Index: doc/Makefile.am
+===================================================================
+--- doc/Makefile.am	(.../tags/lighttpd-1.4.24)
++++ doc/Makefile.am	(.../branches/lighttpd-1.4.x)
+@@ -89,7 +89,7 @@
+ 	rst2html $^ > $@
+ 
+ 
+-html: $(HTMLDOCS)
++html-local: $(HTMLDOCS)
+ 
+ #%.ps.gz: %.ps
+ #	gzip $^
 Index: SConstruct
 ===================================================================
 Index: NEWS
 ===================================================================
 --- NEWS	(.../tags/lighttpd-1.4.24)
 +++ NEWS	(.../branches/lighttpd-1.4.x)
-@@ -3,7 +3,18 @@
+@@ -3,7 +3,22 @@
  NEWS
  ====
  
 -- 1.4.24 -
-+- 1.4.25 -
++- 1.4.26 -
++  *
++
++- 1.4.25 - 2009-11-21
 +  * mod_magnet: fix pairs() for normal tables and strings (fixes #1307)
 +  * mod_magnet: add traceback for printing lua errors
 +  * mod_rewrite: fix compile error if compiled without pcre
@@ -644,6 +660,7 @@
 +  * export some SSL_CLIENT_* vars for client cert validation (fixes #1288, thx presbrey)
 +  * mod_fastcgi: fix mod_fastcgi packet parsing
 +  * mod_fastcgi: Don't reconnect after connect() succeeded (fixes #2096)
++  * Fix configure.ac to allow autoreconf, also enables make V=0
 +
 +- 1.4.24 - 2009-10-25
    * Add T_CONFIG_INT for bigger integers from the config (needed for #1966)

================================================================
Index: packages/lighttpd/lighttpd-branch.sh
diff -u packages/lighttpd/lighttpd-branch.sh:1.18 packages/lighttpd/lighttpd-branch.sh:1.19
--- packages/lighttpd/lighttpd-branch.sh:1.18	Sun Nov  1 17:43:02 2009
+++ packages/lighttpd/lighttpd-branch.sh	Sun Nov 22 23:48:19 2009
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 svn=svn://svn.lighttpd.net/lighttpd
-tag=lighttpd-1.4.24
+tag=lighttpd-1.4.25
 branch=lighttpd-1.4.x
 out=lighttpd-branch.diff
 

================================================================
Index: packages/lighttpd/lighttpd.spec
diff -u packages/lighttpd/lighttpd.spec:1.314 packages/lighttpd/lighttpd.spec:1.315
--- packages/lighttpd/lighttpd.spec:1.314	Mon Nov  9 13:47:38 2009
+++ packages/lighttpd/lighttpd.spec	Sun Nov 22 23:48:19 2009
@@ -23,12 +23,12 @@
 Summary:	Fast and light HTTP server
 Summary(pl.UTF-8):	Szybki i lekki serwer HTTP
 Name:		lighttpd
-Version:	1.4.24
-Release:	6
+Version:	1.4.25
+Release:	1
 License:	BSD
 Group:		Networking/Daemons/HTTP
-Source0:	http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	e2324a24e4a5bce74663c21c58ddd200
+Source0:	http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2
+# Source0-md5:	2027c49fb46530e45338c5e2da13c02f
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.user
@@ -85,7 +85,7 @@
 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
@@ -811,7 +811,7 @@
 
 %prep
 %setup -q
-%patch100 -p0
+#%patch100 -p0
 %patch4 -p0
 %patch0 -p1
 %patch1 -p1
@@ -1303,6 +1303,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.315  2009/11/22 22:48:19  glen
+- up to 1.4.25
+
 Revision 1.314  2009/11/09 12:47:38  glen
 - up to Revision 2692 (1.4.25-rc1); rel 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd-branch.diff?r1=1.63&r2=1.64&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd-branch.sh?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.spec?r1=1.314&r2=1.315&f=u