rpms/lighttpd/FC-5 lighttpd-1.4.13-defaultconf.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 lighttpd.spec, 1.25, 1.26 sources, 1.16, 1.17 lighttpd-1.3.10-defaultconf.patch, 1.1, NONE
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Mon Apr 16 11:20:32 UTC 2007
- Previous message: rpms/lighttpd/EL-5 .cvsignore, 1.18, 1.19 lighttpd.spec, 1.32, 1.33 sources, 1.18, 1.19
- Next message: rpms/lighttpd/FC-6 lighttpd-1.4.13-defaultconf.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 lighttpd.spec, 1.30, 1.31 sources, 1.18, 1.19 lighttpd-1.3.10-defaultconf.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thias
Update of /cvs/extras/rpms/lighttpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7547/FC-5
Modified Files:
.cvsignore lighttpd.spec sources
Added Files:
lighttpd-1.4.13-defaultconf.patch
Removed Files:
lighttpd-1.3.10-defaultconf.patch
Log Message:
Update to 1.4.15.
lighttpd-1.4.13-defaultconf.patch:
--- NEW FILE lighttpd-1.4.13-defaultconf.patch ---
diff -Naupr lighttpd-1.4.13.orig/doc/lighttpd.conf lighttpd-1.4.13/doc/lighttpd.conf
--- lighttpd-1.4.13.orig/doc/lighttpd.conf 2006-10-04 15:29:19.000000000 +0200
+++ lighttpd-1.4.13/doc/lighttpd.conf 2007-02-02 13:49:05.000000000 +0100
@@ -37,10 +37,10 @@ server.modules = (
## a static document-root, for virtual-hosting take look at the
## server.virtual-* options
-server.document-root = "/www/pages/"
+server.document-root = "/srv/www/lighttpd/"
## where to send error-messages to
-server.errorlog = "/www/logs/lighttpd.error.log"
+server.errorlog = "/var/log/lighttpd/error_log"
# files to check for if .../ is requested
index-file.names = ( "index.php", "index.html",
@@ -51,6 +51,7 @@ index-file.names = ( "index.p
# mimetype mapping
mimetype.assign = (
+ ".rpm" => "application/x-rpm",
".pdf" => "application/pdf",
".sig" => "application/pgp-signature",
".spl" => "application/futuresplash",
@@ -113,7 +114,7 @@ mimetype.assign = (
# server.tag = "lighttpd"
#### accesslog module
-accesslog.filename = "/www/logs/access.log"
+accesslog.filename = "/var/log/lighttpd/access_log"
## deny access the file-extensions
#
@@ -145,7 +146,7 @@ static-file.exclude-extensions = ( ".php
#server.error-handler-404 = "/error-handler.php"
## to help the rc.scripts
-#server.pid-file = "/var/run/lighttpd.pid"
+server.pid-file = "/var/run/lighttpd.pid"
###### virtual hosts
@@ -183,10 +184,10 @@ static-file.exclude-extensions = ( ".php
#server.chroot = "/"
## change uid to <uid> (default: don't care)
-#server.username = "wwwrun"
+server.username = "lighttpd"
## change uid to <uid> (default: don't care)
-#server.groupname = "wwwrun"
+server.groupname = "lighttpd"
#### compress module
#compress.cache-dir = "/tmp/lighttpd/cache/compress/"
@@ -210,7 +211,7 @@ static-file.exclude-extensions = ( ".php
# ( "localhost" =>
# (
# "socket" => "/tmp/php-fastcgi.socket",
-# "bin-path" => "/usr/local/bin/php"
+# "bin-path" => "/usr/bin/php-cgi"
# )
# )
# )
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 16 Oct 2006 13:45:56 -0000 1.16
+++ .cvsignore 16 Apr 2007 11:19:58 -0000 1.17
@@ -1 +1 @@
-lighttpd-1.4.13.tar.gz
+lighttpd-1.4.15.tar.bz2
Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-5/lighttpd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- lighttpd.spec 6 Nov 2006 10:51:41 -0000 1.25
+++ lighttpd.spec 16 Apr 2007 11:19:58 -0000 1.26
@@ -2,12 +2,12 @@
Summary: Lightning fast webserver with light system requirements
Name: lighttpd
-Version: 1.4.13
-Release: 3%{?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
@@ -15,18 +15,24 @@
Source12: powered_by_fedora.png
Source13: http://www.lighttpd.net/light_button.png
Source14: http://www.lighttpd.net/light_logo.png
-Patch0: lighttpd-1.3.10-defaultconf.patch
+Patch0: lighttpd-1.4.13-defaultconf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires(pre): /usr/sbin/useradd
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service
BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
-BuildRequires: readline-devel
%{!?_without_ldap:BuildRequires: openldap-devel}
%{?_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
@@ -37,7 +43,7 @@
problems.
Available rpmbuild rebuild options :
---with : memcache webdavprops gamin
+--with : gamin webdavprops webdavlocks memcache
--without : ldap gdbm lua (cml)
@@ -60,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
@@ -77,11 +80,12 @@
%{!?_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}
-%{__make}
+ %{?!_without_lua:--with-lua}
+%{__make} %{?_smp_mflags}
%install
@@ -129,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
@@ -140,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/
@@ -158,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
@@ -174,6 +178,22 @@
%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.
+
+* Mon Jan 29 2007 Matthias Saou <http://freshrpms.net/> 1.4.13-4
+- Remove readline-devel build req, added by lua but since fixed (#213895).
+
* Mon Nov 6 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-3
- Switch to using killall for log rotation to fix it when using workers.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/FC-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 16 Oct 2006 13:45:57 -0000 1.16
+++ sources 16 Apr 2007 11:19:58 -0000 1.17
@@ -1 +1 @@
-d775d6478391b95d841a1018c8db0b95 lighttpd-1.4.13.tar.gz
+b994b8c359da578dec073cae52c4924f lighttpd-1.4.15.tar.bz2
--- lighttpd-1.3.10-defaultconf.patch DELETED ---
- Previous message: rpms/lighttpd/EL-5 .cvsignore, 1.18, 1.19 lighttpd.spec, 1.32, 1.33 sources, 1.18, 1.19
- Next message: rpms/lighttpd/FC-6 lighttpd-1.4.13-defaultconf.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 lighttpd.spec, 1.30, 1.31 sources, 1.18, 1.19 lighttpd-1.3.10-defaultconf.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list