rpms/lighttpd/EL-5 .cvsignore, 1.18, 1.19 lighttpd.spec, 1.32, 1.33 sources, 1.18, 1.19

Matthias Saou (thias) fedora-extras-commits at redhat.com
Mon Apr 16 11:20:28 UTC 2007


Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7547/EL-5

Modified Files:
	.cvsignore lighttpd.spec sources 
Log Message:
Update to 1.4.15.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	11 Oct 2006 10:05:03 -0000	1.18
+++ .cvsignore	16 Apr 2007 11:19:54 -0000	1.19
@@ -1 +1 @@
-lighttpd-1.4.13.tar.gz
+lighttpd-1.4.15.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/lighttpd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- lighttpd.spec	2 Feb 2007 13:06:45 -0000	1.32
+++ lighttpd.spec	16 Apr 2007 11:19:54 -0000	1.33
@@ -2,12 +2,12 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.13
-Release: 5%{?dist}
+Version: 1.4.15
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
-Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.gz
+Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
 Source10: index.html
@@ -26,6 +26,13 @@
 %{?_with_gamin:BuildRequires: gamin-devel}
 %{!?_without_gdbm:BuildRequires: gdbm-devel}
 %{!?_without_lua:BuildRequires: lua-devel}
+# On Fedora <= 6 (and RHEL?), we still need this because of the "broken" lua
+%if %{!?fedora:0}%{?fedora} <= 6
+BuildRequires: readline-devel
+%endif
+%if 0%{?el} <= 6
+BuildRequires: readline-devel
+%endif
 
 %description
 Secure, fast, compliant and very flexible web-server which has been optimized
@@ -36,7 +43,7 @@
 problems.
 
 Available rpmbuild rebuild options :
---with : memcache webdavprops gamin
+--with : gamin webdavprops webdavlocks memcache
 --without : ldap gdbm lua (cml)
 
 
@@ -59,13 +66,10 @@
 This package contains the spawn-fcgi helper for lighttpd's automatic spawning
 of local FastCGI programs. Included is also a PHP .ini file to change a few
 defaults needed for correct FastCGI behavior.
-Note that for FastCGI to work with PHP, you will most likely need to find a
-tweaked PHP package (--enable-fastcgi and --enable-discard-path added) or
-recompile PHP yourself.
 
 
 %prep
-%setup
+%setup -q
 %patch0 -p1 -b .defaultconf
 
 
@@ -76,10 +80,11 @@
     %{!?_without_ldap:--with-ldap} \
     --with-openssl \
     %{?_with_gamin:--with-fam} \
+    %{?_with_webdavprops:--with-webdav-props} \
+    %{?_with_webdavlocks:--with-webdav-locks} \
     %{!?_without_gdbm:--with-gdbm} \
     %{?_with_memcache:--with-memcache} \
-    %{?!_without_lua:--with-lua} \
-    %{?_with_webdavprops:--with-webdav-props}
+    %{?!_without_lua:--with-lua}
 %{__make} %{?_smp_mflags}
 
 
@@ -128,8 +133,8 @@
 
 %preun
 if [ $1 -eq 0 ]; then
-  /sbin/service lighttpd stop &>/dev/null || :
-  /sbin/chkconfig --del lighttpd
+    /sbin/service lighttpd stop &>/dev/null || :
+    /sbin/chkconfig --del lighttpd
 fi
 
 %postun
@@ -139,7 +144,7 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %doc doc/*.txt doc/lighttpd.conf doc/lighttpd.user
 %dir %{_sysconfdir}/lighttpd/
@@ -157,13 +162,13 @@
 %{webroot}/
 
 %files mod_mysql_vhost
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc doc/mysqlvhost.txt
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
 %files fastcgi
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc doc/fastcgi*.txt
 %config(noreplace) %{_sysconfdir}/php.d/lighttpd.ini
 %{_bindir}/spawn-fcgi
@@ -173,6 +178,15 @@
 
 
 %changelog
+* Mon Apr 16 2007 Matthias Saou <http://freshrpms.net/> 1.4.15-1
+- Update to 1.4.15.
+- Remove now included previous patch.
+- Switch to using the bz2 source.
+- Add optional --with-webdav-locks support.
+
+* Fri Feb 16 2007 Matthias Saou <http://freshrpms.net/> 1.4.13-6
+- Include patch to fix 99% cpu bug when client connection is dropped.
+
 * Fri Feb  2 2007 Matthias Saou <http://freshrpms.net/> 1.4.13-5
 - Update defaultconf patch to change php binary to /usr/bin/php-cgi (#219723).
 - Noticed %%{?_smp_mflags} was missing, so add it as it works fine.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	11 Oct 2006 10:05:03 -0000	1.18
+++ sources	16 Apr 2007 11:19:54 -0000	1.19
@@ -1 +1 @@
-d775d6478391b95d841a1018c8db0b95  lighttpd-1.4.13.tar.gz
+b994b8c359da578dec073cae52c4924f  lighttpd-1.4.15.tar.bz2




More information about the fedora-extras-commits mailing list