[SVN] r2954 - in trunk: docs rpms/lighttpd

svn-commits at rpmforge.net svn-commits at rpmforge.net
Sun Mar 6 19:30:01 CET 2005


Author: thias
Date: 2005-03-06 19:30:00 +0100 (Sun, 06 Mar 2005)
New Revision: 2954

Removed:
   trunk/rpms/lighttpd/lighttpd-1.3.11-empty_cgi_handler.patch
Modified:
   trunk/docs/mega-merge.txt
   trunk/docs/rpmforge-packages.txt
   trunk/rpms/lighttpd/lighttpd.spec
Log:
Update lighttpd to 1.3.13.


Modified: trunk/docs/mega-merge.txt
===================================================================
--- trunk/docs/mega-merge.txt	2005-03-06 13:47:34 UTC (rev 2953)
+++ trunk/docs/mega-merge.txt	2005-03-06 18:30:00 UTC (rev 2954)
@@ -744,6 +744,7 @@
 libXvMCW			matthias
 libzvt				matthias
 liferea				dag
+lighttpd			matthias
 lilo				dag
 lincity				dries
 lincvs				dag

Modified: trunk/docs/rpmforge-packages.txt
===================================================================
--- trunk/docs/rpmforge-packages.txt	2005-03-06 13:47:34 UTC (rev 2953)
+++ trunk/docs/rpmforge-packages.txt	2005-03-06 18:30:00 UTC (rev 2954)
@@ -648,6 +648,7 @@
 libxml++ dag
 libXvMCW matthias
 liferea dag
+lighttpd matthias
 lilo dag
 lincity dries
 lincvs dag

Deleted: trunk/rpms/lighttpd/lighttpd-1.3.11-empty_cgi_handler.patch
===================================================================
--- trunk/rpms/lighttpd/lighttpd-1.3.11-empty_cgi_handler.patch	2005-03-06 13:47:34 UTC (rev 2953)
+++ trunk/rpms/lighttpd/lighttpd-1.3.11-empty_cgi_handler.patch	2005-03-06 18:30:00 UTC (rev 2954)
@@ -1,25 +0,0 @@
-from http://trac.lighttpd.net/trac/changeset/35
-
---- trunk/src/mod_cgi.c	(revision 34)
-+++ trunk/src/mod_cgi.c	(revision 35)
-@@ -690,12 +690,14 @@
- 	
- #ifndef __WIN32	
- 	
--	/* stat the exec file */
--	if (-1 == (stat(cgi_handler->ptr, &st))) {
--		log_error_write(srv, __FILE__, __LINE__, "sbss", 
--				"stat for cgi-handler", cgi_handler,
--				"failed:", strerror(errno));
--		return -1;
-+	if (cgi_handler->used > 1) {
-+		/* stat the exec file */
-+		if (-1 == (stat(cgi_handler->ptr, &st))) {
-+			log_error_write(srv, __FILE__, __LINE__, "sbss", 
-+					"stat for cgi-handler", cgi_handler,
-+					"failed:", strerror(errno));
-+			return -1;
-+		}
- 	}
- 	
- 	if (pipe(to_cgi_fds)) {

Modified: trunk/rpms/lighttpd/lighttpd.spec
===================================================================
--- trunk/rpms/lighttpd/lighttpd.spec	2005-03-06 13:47:34 UTC (rev 2953)
+++ trunk/rpms/lighttpd/lighttpd.spec	2005-03-06 18:30:00 UTC (rev 2954)
@@ -1,3 +1,6 @@
+# $Id$
+# Authority: matthias
+
 %define webroot /srv/www/lighttpd
 
 Summary: Lightning fast webserver with light system requirements
@@ -2,4 +5,4 @@
 Name: lighttpd
-Version: 1.3.11
-Release: 0
+Version: 1.3.13
+Release: 1
 License: BSD
@@ -14,7 +17,6 @@
 Source11: lighttpd.png
 Source12: powered_by_fedora.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
-Patch1: lighttpd-1.3.11-empty_cgi_handler.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -46,7 +48,7 @@
 
 
 %package fastcgi
-Summary: FastCGI spawning helper for lighttpd and PHP configuration
+Summary: FastCGI module and spawning helper for lighttpd and PHP configuration
 Group: System Environment/Daemons
 Requires: %{name} = %{version}
 
@@ -62,7 +64,6 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
-%patch1 -p1 -b .empty_cgi_handler
 
 
 %build
@@ -147,19 +148,32 @@
 %{webroot}/
 
 %files mod_mysql_vhost
+%defattr(-, root, root, 0755)
 %doc doc/mysqlvhost.txt
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
 %files fastcgi
+%defattr(-, root, root, 0755)
 %doc doc/fastcgi*.txt
 %config(noreplace) %{_sysconfdir}/php.d/lighttpd.ini
 %{_bindir}/spawn-fcgi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_fastcgi.so
+%{_mandir}/man1/spawn-fcgi.1*
 
 
 %changelog
+* Sun Mar  6 2005 Matthias Saou <http://freshrpms.net/> 1.3.13-1
+- Update to 1.3.13.
+
+* Wed Mar  2 2005 Matthias Saou <http://freshrpms.net/> 1.3.12-1
+- Update to 1.3.12.
+- Remove obsolete empty_cgi_handler patch.
+
+* Tue Mar  1 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-2
+- Add missing defattr to sub-packages (#150018).
+
 * Mon Feb 21 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-0
 - Update to 1.3.11.
 - Remove cleanconf and init.d patches (merged upstream).
@@ -194,3 +208,4 @@
 
 * Sun Feb 23 2003 <jan at kneschke.de>
 - initial version
+




More information about the commits mailing list