rpms/lighttpd/EL-4 lighttpd-1.4.13-defaultconf.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 index.html, 1.1, 1.2 lighttpd.logrotate, 1.2, 1.3 lighttpd.spec, 1.6, 1.7 powered_by_fedora.png, 1.1, 1.2 sources, 1.5, 1.6 lighttpd-1.3.10-defaultconf.patch, 1.1, NONE

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

Author: thias

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

Modified Files:
	.cvsignore index.html lighttpd.logrotate lighttpd.spec 
	powered_by_fedora.png 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"
 #                                 )
 #                               )
 #                            )


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2005 15:05:07 -0000	1.5
+++ .cvsignore	16 Apr 2007 11:19:50 -0000	1.6
@@ -1 +1 @@
-lighttpd-1.3.16.tar.gz
+lighttpd-1.4.15.tar.bz2


Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.html	23 Feb 2005 00:12:23 -0000	1.1
+++ index.html	16 Apr 2007 11:19:50 -0000	1.2
@@ -1,27 +1,28 @@
-<?xml version="1.0" encoding="iso-8859-15" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <!-- $Id$ -->
 <head>
   <title>Powered by lighttpd</title>
+  <link rel="shortcut icon" href="favicon.ico" />
+  <link rel="icon" href="favicon.ico" />
   <style type="text/css">
     <!--
-      body {background: white; color: #666f85}
+      body {background: white; color: #666f85; text-align: center}
       img  {border: none}
     -->
   </style>
 </head>
-<body style="text-align: center">
-
-<h1>lighttpd - Lightning fast, light system requirements</h1>
+<body>
 
 <p>
-<a href="http://www.lighttpd.net/"><img src="lighttpd.png" width="306" height="76" alt="Powered by lighttpd" /></a>
+<img src="light_logo.png" width="249" height="239" alt="LIGHTTPD - fly light." />
 </p>
 
 <p>
-<a href="http://www.fedora.redhat.com/"><img src="powered_by_fedora.png" width="88" height="31" alt="Powered by Fedora" /></a>
+<a href="http://www.fedora.redhat.com/"><img src="powered_by_fedora.png" width="88" height="31" alt="Powered by Fedora" /></a><br/>
+<a href="http://www.lighttpd.net/"><img src="light_button.png" width="80" height="27" alt="Powered by Lighttpd" /></a>
 </p>
 
 </body>


Index: lighttpd.logrotate
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/lighttpd.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lighttpd.logrotate	4 Apr 2005 19:31:33 -0000	1.2
+++ lighttpd.logrotate	16 Apr 2007 11:19:50 -0000	1.3
@@ -3,6 +3,6 @@
     notifempty
     sharedscripts
     postrotate
-	/bin/kill -HUP `cat /var/run/lighttpd.pid 2>/dev/null` 2>/dev/null || :
+        /usr/bin/killall -HUP lighttpd &>/dev/null || :
     endscript
 }


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/lighttpd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lighttpd.spec	1 Aug 2005 15:05:07 -0000	1.6
+++ lighttpd.spec	16 Apr 2007 11:19:50 -0000	1.7
@@ -2,25 +2,37 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.3.16
+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
-Source11: lighttpd.png
+Source11: http://www.lighttpd.net/favicon.ico
 Source12: powered_by_fedora.png
-Patch0: lighttpd-1.3.10-defaultconf.patch
+Source13: http://www.lighttpd.net/light_button.png
+Source14: http://www.lighttpd.net/light_logo.png
+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, gcc-c++
-%{?_with_ldap:BuildRequires: openldap-devel}
+BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-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
@@ -31,7 +43,8 @@
 problems.
 
 Available rpmbuild rebuild options :
---with : ldap
+--with : gamin webdavprops webdavlocks memcache
+--without : ldap gdbm lua (cml)
 
 
 %package mod_mysql_vhost
@@ -53,29 +66,31 @@
 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
 
 
 %build
 %configure \
     --libdir="%{_libdir}/lighttpd" \
-    --with-openssl \
     --with-mysql \
-    %{?_with_ldap:--with-ldap}
-%{__make}
+    %{!?_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}
+%{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall \
-    libdir="%{buildroot}%{_libdir}/lighttpd"
+%{__make} install DESTDIR=%{buildroot}
 
 # Install included init script and sysconfig entry
 %{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \
@@ -97,7 +112,8 @@
 
 # Install our own default web page and images
 %{__mkdir_p} %{buildroot}%{webroot}
-%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+%{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
+    %{SOURCE14} \
     %{buildroot}%{webroot}/
 
 # Install empty log directory to include
@@ -117,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
@@ -128,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/
@@ -146,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
@@ -162,8 +178,114 @@
 
 
 %changelog
-* Mon Aug  1 2005 Matthias Saou <http://freshrpms.net/> 1.3.16-1
-- Update to 1.3.16.
+* 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.
+
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-2
+- Remove gcc-c++ build req, it's part of the defaults.
+- Add readline-devel build req, needed on RHEL4.
+
+* Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 1.4.13-1
+- Update to 1.4.13, which contains the previous fix.
+
+* Tue Oct  3 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-3
+- Include fix for segfaults (lighttpd bug #876, changeset 1352).
+
+* Mon Sep 25 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-1
+- Update to 1.4.12 final.
+
+* Fri Sep 22 2006 Matthias Saou <http://freshrpms.net/> 1.4.12-0.1.r1332
+- Update to latest 1.4.12 pre-release, fixes SSL issues and other bugs.
+- Update powered_by_fedora.png to the new logo.
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.4.11-2
+- FC6 rebuild.
+
+* Thu Mar  9 2006 Matthias Saou <http://freshrpms.net/> 1.4.11-1
+- Update to 1.4.11.
+
+* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 1.4.10-2
+- FC5 rebuild.
+
+* Wed Feb  8 2006 Matthias Saou <http://freshrpms.net/> 1.4.10-1
+- Update to 1.4.10.
+- Remove now included fix.
+
+* Wed Jan 25 2006 Matthias Saou <http://freshrpms.net/> 1.4.9-2
+- Add mod_fastcgi-fix patch to fix crash on backend overload.
+
+* Mon Jan 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.9-1
+- Update to 1.4.9.
+
+* Wed Nov 23 2005 Matthias Saou <http://freshrpms.net/> 1.4.8-1
+- Update to 1.4.8.
+
+* Fri Nov  4 2005 Matthias Saou <http://freshrpms.net/> 1.4.7-1
+- Update to 1.4.7.
+
+* Wed Oct 12 2005 Matthias Saou <http://freshrpms.net/> 1.4.6-1
+- Update to 1.4.6.
+
+* Mon Oct  3 2005 Matthias Saou <http://freshrpms.net/> 1.4.5-1
+- Update to 1.4.5.
+- Disable gamin/fam support for now, it does not work.
+
+* Tue Sep 27 2005 Matthias Saou <http://freshrpms.net/> 1.4.4-3
+- Update to current SVN to check if it fixes the remaining load problems.
+
+* Wed Sep 21 2005 Matthias Saou <http://freshrpms.net/> 1.4.4-2
+- Patch to SVN 722 revision : Fixes a crash in mod_mysql_vhost and a problem
+  with keepalive and certain browsers.
+
+* Mon Sep 19 2005 Matthias Saou <http://freshrpms.net/> 1.4.4-1
+- Update to 1.4.4 final.
+- Enable ldap auth, gdbm and gamin/fam support by default.
+
+* Thu Sep 15 2005 Matthias Saou <http://freshrpms.net/> 1.4.4-0
+- Update to 1.4.4 pre-release (fixes another fastcgi memleak).
+- Enable lua (cml module) by default.
+- Add --with-webdav-props conditional option.
+
+* Tue Sep 13 2005 Matthias Saou <http://freshrpms.net/> 1.4.3-2
+- Include lighttpd-1.4.3-stat_cache.patch to fix memleak.
+
+* Fri Sep  2 2005 Matthias Saou <http://freshrpms.net/> 1.4.3-1.1
+- Rearrange the included index.html to include the new logo, button and
+  favicon from lighttpd.net.
+
+* Fri Sep  2 2005 Matthias Saou <http://freshrpms.net/> 1.4.3-1
+- Update to 1.4.3.
+- No longer override libdir at make install stage, use DESTDIR instead, as
+  the resulting binary would now have referenced to %%{buildroot} :-(
+
+* Tue Aug 30 2005 Matthias Saou <http://freshrpms.net/> 1.4.2-1
+- Update to 1.4.2.
+
+* Mon Aug 22 2005 Matthias Saou <http://freshrpms.net/> 1.4.1-1
+- Update to 1.4.1.
+
+* Sun Aug 21 2005 Matthias Saou <http://freshrpms.net/> 1.4.0-1
+- Update to 1.4.0.
+- Add conditional of gamin, gdbm, memcache and lua options.
+
+* Mon Aug  1 2005 Matthias Saou <http://freshrpms.net/> 1.3.16-2
+- Update to 1.3.16, rebuild.
 
 * Mon Jul 18 2005 Matthias Saou <http://freshrpms.net/> 1.3.15-1
 - Update to 1.3.15.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2005 15:05:07 -0000	1.5
+++ sources	16 Apr 2007 11:19:50 -0000	1.6
@@ -1 +1 @@
-b73f7a7ace4901b6417b0e450aaa5df5  lighttpd-1.3.16.tar.gz
+b994b8c359da578dec073cae52c4924f  lighttpd-1.4.15.tar.bz2


--- lighttpd-1.3.10-defaultconf.patch DELETED ---

More information about the fedora-extras-commits mailing list