rpms/lighttpd/devel lighttpd-1.4.13-defaultconf.patch, NONE, 1.1 lighttpd.spec, 1.31, 1.32 lighttpd-1.3.10-defaultconf.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31110

Modified Files:
	lighttpd.spec 
Added Files:
	lighttpd-1.4.13-defaultconf.patch 
Removed Files:
	lighttpd-1.3.10-defaultconf.patch 
Log Message:
Update default configuration (php-cgi path, #219723).


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: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lighttpd.spec	29 Jan 2007 13:33:37 -0000	1.31
+++ lighttpd.spec	2 Feb 2007 13:06:45 -0000	1.32
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.13
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -15,7 +15,7 @@
 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
@@ -80,7 +80,7 @@
     %{?_with_memcache:--with-memcache} \
     %{?!_without_lua:--with-lua} \
     %{?_with_webdavprops:--with-webdav-props}
-%{__make}
+%{__make} %{?_smp_mflags}
 
 
 %install
@@ -173,6 +173,10 @@
 
 
 %changelog
+* 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).
 


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