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.sh Fri 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.44 Fri 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: Networking/Daemons/HTTP Source0: http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2 @@ -84,14 +84,13 @@ 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 Patch5: %{name}-mod_deflate.patch -Patch6: %{name}-bug-1836.patch #Patch8: %{name}-errorlog-before-fork.patch URL: http://www.lighttpd.net/ %{?with_xattr:BuildRequires: attr-devel} @@ -804,16 +803,13 @@ %prep %setup -q -#%patch100 -p0 +%patch100 -p0 %patch4 -p0 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %{?with_deflate:%patch5 -p1} -cd src -%patch6 -p0 -R -cd .. rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead @@ -930,7 +926,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_deflate.conf %endif -touch $RPM_BUILD_ROOT/var/log/%{name}/{access,error}.log +touch $RPM_BUILD_ROOT/var/log/%{name}/{access,error,breakage}.log %clean rm -rf $RPM_BUILD_ROOT @@ -942,7 +938,7 @@ %addusertogroup lighttpd http %post -for a in access.log error.log; do +for a in access.log error.log breakage.log; do if [ ! -f /var/log/%{name}/$a ]; then touch /var/log/%{name}/$a chown lighttpd:lighttpd /var/log/%{name}/$a @@ -1066,6 +1062,7 @@ %dir %attr(751,root,root) /var/log/%{name} %ghost %attr(644,lighttpd,lighttpd) /var/log/%{name}/access.log %ghost %attr(644,lighttpd,lighttpd) /var/log/%{name}/error.log +%ghost %attr(644,lighttpd,lighttpd) /var/log/%{name}/breakage.log %dir %attr(770,root,lighttpd) /var/run/%{name} %attr(754,root,root) /etc/rc.d/init.d/%{name} %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/* @@ -1289,6 +1286,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.295 2009/08/28 14:03:52 glen +- update branch.diff; add breakage.log + Revision 1.294 2009/06/20 16:00:41 glen - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd-branch.diff?r1=1.54&r2=1.55&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd-branch.sh?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.conf?r1=1.44&r2=1.45&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.spec?r1=1.294&r2=1.295&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
