packages: lighttpd/lighttpd-branch.diff, lighttpd/lighttpd-branch.sh, light...
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.shSun 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.63r2=1.64f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd-branch.sh?r1=1.18r2=1.19f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.spec?r1=1.314r2=1.315f=u
___
pld-cvs-commit
packages: lighttpd/lighttpd-branch.diff, lighttpd/lighttpd-branch.sh, light...
Author: glen Date: Wed Sep 30 10:08:36 2009 GMT
Module: packages Tag: HEAD
Log message:
- exclude configure.ac from branch.diff to avoid version bump; rel 7
Files affected:
packages/lighttpd:
lighttpd-branch.diff (1.59 - 1.60) , lighttpd-branch.sh (1.15 - 1.16) ,
lighttpd.spec (1.300 - 1.301)
Diffs:
Index: packages/lighttpd/lighttpd-branch.diff
diff -u packages/lighttpd/lighttpd-branch.diff:1.59
packages/lighttpd/lighttpd-branch.diff:1.60
--- packages/lighttpd/lighttpd-branch.diff:1.59 Mon Sep 21 15:24:44 2009
+++ packages/lighttpd/lighttpd-branch.diff Wed Sep 30 12:08:30 2009
@@ -2738,44 +2738,6 @@
return 0;
Index: configure.ac
===
configure.ac (.../tags/lighttpd-1.4.23)
-+++ configure.ac (.../branches/lighttpd-1.4.x)
-@@ -1,9 +1,10 @@
- # -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.57)
--AC_INIT([lighttpd], [1.4.23], [cont...@lighttpd.net])
-+AC_INIT([lighttpd], [1.4.24], [cont...@lighttpd.net])
- AC_CONFIG_SRCDIR([src/server.c])
- AC_CONFIG_HEADER([config.h])
-+AC_CONFIG_MACRO_DIR([m4])
-
- AC_CANONICAL_TARGET
-
-@@ -417,12 +418,18 @@
-AC_DEFINE([HAVE_LUA], [1], [liblua])
-AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
- ],[
-- # for debian based systems
-- PKG_CHECK_MODULES(LUA, lua5.1 = 5.1, [
-- AC_DEFINE([HAVE_LUA], [1], [liblua])
-- AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-- ])
-+ # for debian based systems
-+ PKG_CHECK_MODULES(LUA, lua5.1 = 5.1, [
-+ AC_DEFINE([HAVE_LUA], [1], [liblua])
-+ AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
-+ ],[
-+ # for freebsd
-+ PKG_CHECK_MODULES(LUA, lua-5.1 = 5.1, [
-+ AC_DEFINE([HAVE_LUA], [1], [liblua])
-+ AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
- ])
-+ ])
-+ ])
-
- AC_SUBST(LUA_CFLAGS)
- AC_SUBST(LUA_LIBS)
Index: doc/.cvsignore
===
Index: doc/fastcgi.txt
Index: packages/lighttpd/lighttpd-branch.sh
diff -u packages/lighttpd/lighttpd-branch.sh:1.15
packages/lighttpd/lighttpd-branch.sh:1.16
--- packages/lighttpd/lighttpd-branch.sh:1.15 Mon Sep 21 15:35:25 2009
+++ packages/lighttpd/lighttpd-branch.shWed Sep 30 12:08:31 2009
@@ -21,6 +21,7 @@
-x 'src/mod_uploadprogress.c' \
-x 'tests/.cvsignore' \
-x 'tests/mod-extforward.conf' \
+ -x 'configure.ac' \
| \
# remove revno's for smaller diffs
sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,'
Index: packages/lighttpd/lighttpd.spec
diff -u packages/lighttpd/lighttpd.spec:1.300
packages/lighttpd/lighttpd.spec:1.301
--- packages/lighttpd/lighttpd.spec:1.300 Mon Sep 21 15:36:29 2009
+++ packages/lighttpd/lighttpd.spec Wed Sep 30 12:08:31 2009
@@ -24,7 +24,7 @@
Summary(pl.UTF-8): Szybki i lekki serwer HTTP
Name: lighttpd
Version: 1.4.23
-Release: 6
+Release: 7
License: BSD
Group: Networking/Daemons/HTTP
Source0: http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2
@@ -1292,6 +1292,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.301 2009/09/30 10:08:31 glen
+- exclude configure.ac from branch.diff to avoid version bump; rel 7
+
Revision 1.300 2009/09/21 13:36:29 glen
- bugfix for lighty#2068 (mod expires not concating headers); rel 6
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd-branch.diff?r1=1.59r2=1.60f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd-branch.sh?r1=1.15r2=1.16f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.spec?r1=1.300r2=1.301f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: lighttpd/lighttpd-branch.diff, lighttpd/lighttpd-branch.sh, light...
Author: glen Date: Fri Aug 28 14:03:58 2009 GMT Module: packages Tag: HEAD Log message: - update branch.diff; add breakage.log Files affected: packages/lighttpd: lighttpd-branch.diff (1.54 - 1.55) , lighttpd-branch.sh (1.11 - 1.12) , lighttpd.conf (1.44 - 1.45) , lighttpd.spec (1.294 - 1.295) Diffs: Index: packages/lighttpd/lighttpd-branch.diff diff -u packages/lighttpd/lighttpd-branch.diff:1.54 packages/lighttpd/lighttpd-branch.diff:1.55 --- packages/lighttpd/lighttpd-branch.diff:1.54 Mon Aug 17 13:45:06 2009 +++ packages/lighttpd/lighttpd-branch.diff Fri Aug 28 16:03:52 2009 @@ -2181,15 +2181,6 @@ Index: tests/.cvsignore === tests/.cvsignore (.../tags/lighttpd-1.4.23) (revision 2613) -+++ tests/.cvsignore (.../branches/lighttpd-1.4.x) (revision 2613) -@@ -1,6 +0,0 @@ --Makefile.in --Makefile --.deps --.libs --fcgi-auth --fcgi-responder Index: tests/bug-12.conf === --- tests/bug-12.conf (.../tags/lighttpd-1.4.23) (revision 2613) @@ -2228,16 +2219,6 @@ Index: tests/mod-extforward.conf === tests/mod-extforward.conf (.../tags/lighttpd-1.4.23) (revision 2613) -+++ tests/mod-extforward.conf (.../branches/lighttpd-1.4.x) (revision 2613) -@@ -10,6 +10,7 @@ - ## bind to localhost (default: all interfaces) - server.bind= localhost - server.errorlog= env.SRCDIR + /tmp/lighttpd/logs/lighttpd.error.log -+server.breakagelog = env.SRCDIR + /tmp/lighttpd/logs/lighttpd.breakage.log - server.name= www.example.org - server.tag = Apache 1.3.29 - Index: tests/var-include.conf === --- tests/var-include.conf (.../tags/lighttpd-1.4.23) (revision 2613) @@ -2423,13 +2404,6 @@ AC_SUBST(LUA_LIBS) Index: doc/.cvsignore === doc/.cvsignore (.../tags/lighttpd-1.4.23) (revision 2613) -+++ doc/.cvsignore (.../branches/lighttpd-1.4.x) (revision 2613) -@@ -1,4 +0,0 @@ --Makefile.in --Makefile --*.html --*.ps.gz Index: doc/fastcgi.txt === --- doc/fastcgi.txt(.../tags/lighttpd-1.4.23) (revision 2613) Index: packages/lighttpd/lighttpd-branch.sh diff -u packages/lighttpd/lighttpd-branch.sh:1.11 packages/lighttpd/lighttpd-branch.sh:1.12 --- packages/lighttpd/lighttpd-branch.sh:1.11 Mon Aug 17 13:45:29 2009 +++ packages/lighttpd/lighttpd-branch.shFri Aug 28 16:03:52 2009 @@ -10,6 +10,6 @@ LC_ALL=C svn diff --old=$old --new=$new lighttpd-branch.diff.tmp echo Excluding files which change version or were not in dist tarball -filterdiff -x ChangeLog -x .cvsignore -x src/.cvsignore -x tests/.cvsignore -x doc/.cvsignore -x 'configure.in' -x 'SConstruct' -x 'CMakeLists.txt' -x 'src/CMakeLists.txt' -x 'src/config.h.cmake' -x 'src/mod_uploadprogress.c' lighttpd-branch.diff.tmp lighttpd-branch.diff.tmp2 +filterdiff -x tests/mod-extforward.conf -x ChangeLog -x .cvsignore -x src/.cvsignore -x tests/.cvsignore -x doc/.cvsignore -x 'configure.in' -x 'SConstruct' -x 'CMakeLists.txt' -x 'src/CMakeLists.txt' -x 'src/config.h.cmake' -x 'src/mod_uploadprogress.c' lighttpd-branch.diff.tmp lighttpd-branch.diff.tmp2 mv -f lighttpd-branch.diff.tmp2 lighttpd-branch.diff rm -f lighttpd-branch.diff.tmp Index: packages/lighttpd/lighttpd.conf diff -u packages/lighttpd/lighttpd.conf:1.44 packages/lighttpd/lighttpd.conf:1.45 --- packages/lighttpd/lighttpd.conf:1.44Fri Feb 6 03:39:14 2009 +++ packages/lighttpd/lighttpd.conf Fri Aug 28 16:03:52 2009 @@ -11,6 +11,10 @@ server.errorlog = /var/log/lighttpd/error.log #server.errorlog-use-syslog = enable +## http://redmine.lighttpd.net/projects/lighttpd/repository/revisions/2550 +## NOTE: It is not reopened in log_error_cycle, so don't setup logrotate to this. +server.breakagelog = /var/log/lighttpd/breakage.log + server.pid-file = /var/run/lighttpd.pid # mimetype mapping Index: packages/lighttpd/lighttpd.spec diff -u packages/lighttpd/lighttpd.spec:1.294 packages/lighttpd/lighttpd.spec:1.295 --- packages/lighttpd/lighttpd.spec:1.294 Sat Jun 20 18:00:41 2009 +++ packages/lighttpd/lighttpd.spec Fri Aug 28 16:03:52 2009 @@ -24,7 +24,7 @@ Summary(pl.UTF-8): Szybki i lekki serwer HTTP Name: lighttpd Version: 1.4.23 -Release: 2 +Release: 3 License: BSD Group:
