rpms/lighttpd/EL-5 lighttpd-1.4.20-defaultconf.patch, NONE, 1.1 lighttpd-1.4.20-initinfo.patch, NONE, 1.1 lighttpd-empty.png, NONE, 1.1 .cvsignore, 1.21, 1.22 index.html, 1.2, 1.3 lighttpd-mod_geoip.txt, 1.1, 1.2 lighttpd.spec, 1.36, 1.37 sources, 1.21, 1.22 lighttpd-1.4.17-defaultconf.patch, 1.1, NONE lighttpd-1.4.18-Fix-372-and-1562.patch, 1.1, NONE lighttpd-1.4.18-mod_cgi-fix.patch, 1.1, NONE powered_by_fedora.png, 1.2, NONE

Wed Dec 24 17:27:48 UTC 2008

Author: thias

Update of /cvs/extras/rpms/lighttpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26121

Modified Files:
	.cvsignore index.html lighttpd-mod_geoip.txt lighttpd.spec 
	sources 
Added Files:
	lighttpd-1.4.20-defaultconf.patch 
	lighttpd-1.4.20-initinfo.patch lighttpd-empty.png 
Removed Files:
	lighttpd-1.4.17-defaultconf.patch 
	lighttpd-1.4.18-Fix-372-and-1562.patch 
	lighttpd-1.4.18-mod_cgi-fix.patch powered_by_fedora.png 
Log Message:
Update to 1.4.20.


lighttpd-1.4.20-defaultconf.patch:

--- NEW FILE lighttpd-1.4.20-defaultconf.patch ---
diff -Naupr lighttpd-1.4.20.orig/doc/lighttpd.conf lighttpd-1.4.20/doc/lighttpd.conf
--- lighttpd-1.4.20.orig/doc/lighttpd.conf	2008-09-23 21:05:42.000000000 +0200
+++ lighttpd-1.4.20/doc/lighttpd.conf	2008-12-22 16:41:52.526309388 +0100
@@ -37,7 +37,7 @@ server.modules              = (
 
 ## a static document-root, for virtual-hosting take look at the
 ## server.virtual-* options
-server.document-root        = "/srv/www/htdocs/"
+server.document-root        = "/var/www/lighttpd/"
 
 ## where to send error-messages to
 server.errorlog             = "/var/log/lighttpd/error.log"
@@ -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",
@@ -148,7 +149,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
@@ -189,10 +190,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         = "/var/cache/lighttpd/compress/"
@@ -216,7 +217,7 @@ static-file.exclude-extensions = ( ".php
 #                               ( "localhost" =>
 #                                 (
 #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
-#                                   "bin-path" => "/usr/local/bin/php-cgi"
+#                                   "bin-path" => "/usr/bin/php-cgi"
 #                                 )
 #                               )
 #                            )
@@ -326,3 +327,7 @@ static-file.exclude-extensions = ( ".php
 #include_shell "echo var.a=1"
 ## the above is same as:
 #var.a=1
+
+## include configuration snippets, usually provided by packages
+include_shell "find /etc/lighttpd/conf.d -maxdepth 1 -name '*.conf' -exec cat {} \;"
+

lighttpd-1.4.20-initinfo.patch:

--- NEW FILE lighttpd-1.4.20-initinfo.patch ---
diff -Naupr lighttpd-1.4.20.orig/doc/rc.lighttpd.redhat lighttpd-1.4.20/doc/rc.lighttpd.redhat
--- lighttpd-1.4.20.orig/doc/rc.lighttpd.redhat	2006-10-04 15:26:23.000000000 +0200
+++ lighttpd-1.4.20/doc/rc.lighttpd.redhat	2008-12-22 16:59:12.767381943 +0100
@@ -14,6 +14,14 @@
 # by lighttpd (config: server.pid-file).
 # If not, uncomment 'pidof' line.
 
+### BEGIN INIT INFO
+# Provides: httpd
+# Required-Start: $local_fs $remote_fs $network $named
+# Required-Stop: $local_fs $remote_fs $network
+# Short-Description: start and stop Lighttpd HTTP Server
+# Description: Lightning fast webserver with light system requirements.
+### END INIT INFO
+
 # Source function library
 . /etc/rc.d/init.d/functions
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	10 Sep 2007 15:45:36 -0000	1.21
+++ .cvsignore	24 Dec 2008 17:27:17 -0000	1.22
@@ -1 +1 @@
-lighttpd-1.4.18.tar.bz2
+lighttpd-1.4.20.tar.bz2


Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html	13 Sep 2005 14:33:57 -0000	1.2
+++ index.html	24 Dec 2008 17:27:17 -0000	1.3
@@ -2,15 +2,14 @@
 <!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; text-align: center}
-      img  {border: none}
+      body { background: white; color: #666f85; text-align: center }
+      img  { border: none }
     -->
   </style>
 </head>
@@ -21,7 +20,8 @@
 </p>
 
 <p>
-<a href="http://www.fedora.redhat.com/"><img src="powered_by_fedora.png" width="88" height="31" alt="Powered by Fedora" /></a><br/>
+<img src="poweredby.png" width="88" height="31" alt="Powered by GNU/Linux" />
+<br />
 <a href="http://www.lighttpd.net/"><img src="light_button.png" width="80" height="27" alt="Powered by Lighttpd" /></a>
 </p>
 


Index: lighttpd-mod_geoip.txt
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/lighttpd-mod_geoip.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lighttpd-mod_geoip.txt	4 Mar 2008 11:08:09 -0000	1.1
+++ lighttpd-mod_geoip.txt	24 Dec 2008 17:27:17 -0000	1.2
@@ -1,174 +1,174 @@
-==============================
-ip based geographic lookups...
-==============================
-
------------------
-Module: mod_geoip
------------------
-
-
-
-.. contents:: Table of Contents
-
-Requirements
-============
-
-:Packages: GeoIP C API & Library (http://www.maxmind.com/download/geoip/api/c/)
-
-
-
-
-Overview
-============
-
-mod_geoip is a module for fast ip/location lookups. It uses MaxMind GeoIP / GeoCity databases.
-If the ip was found in the database the module sets the appropriate environments variables to the request, thus making other modules/fcgi be informed.
-
-.. note:: 
-
-  Currently only country/city databases are supported because they have a free version that i can test. 
-
-(http://www.maxmind.com/download/geoip/database/ - GeoIP.dat.gz for Countries, GeoLiteCity.dat.gz for Countries & Cities)
-
-
-Installation
-============
-
-NOTE: As of 1.4.14 the lighttpd distribution does not include the compile file required to perform a automake in the source directory. Use "automake -a" instead. 
-
-1) Download mod_geoip.c (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.c)
-   - (for lighttpd 1.5 use http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.4.c and rename it to mod_geoip.c)
-2) Copy mod_geoip.c into lighttpd src directory.
-3) Edit your src/Makefile.am and add this after the last module: 
-
-::
-
-        lib_LTLIBRARIES += mod_geoip.la
-        mod_geoip_la_SOURCES = mod_geoip.c
-        mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
-        mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
-
-4) Go back to lighttpd root directory and first do: aclocal && automake -a && autoconf, after that do: make clean; ./configure --enable-maintainer-mode; make; make install
-   Note: the command of 'make clean' gives error on Fedora 4 and may not be necessary to compile properly. [j lightstone//GlobalAdSales.company]
-
-5) Make sure /usr/local/lib is in your ld.so.conf file and rebuld the ld database (using: ldconfig). 
-
-6) Add to the config file    server.modules  = ("mod_geoip")        [j lightstone//GlobalAdSales.company]
-
-Configuration Options
-========================
-
-NOTE: in lighttpd 1.5.x add the config vars only to the global config - adding into a vhost crashes lighty!
-
-mod_geoip uses two configuration options.
-
-1) geoip.db-filename = <path to the geoip or geocity database>
-2) geoip.memory-cache = <enable|disable> : default disabled
-
-if enabled, mod_geoip will load the database binary file to
-memory for very fast lookups. the only penalty is memory usage.
-
-.. note:: 
-
- mod_geoip will determine the database type automatically so if you enter GeoCity databse path it will load GeoCity Env.
-
-Environment
-===========
-
-Every database sets it's own ENV:
-
-GeoIP (Country):
-----------------
-
-::
-
- GEOIP_COUNTRY_CODE
- GEOIP_COUNTRY_CODE3
- GEOIP_COUNTRY_NAME
-
-GeoCity:
---------
-
-::
-
- GEOIP_COUNTRY_CODE
- GEOIP_COUNTRY_CODE3
- GEOIP_COUNTRY_NAME
- GEOIP_CITY_NAME
- GEOIP_CITY_POSTAL_CODE
- GEOIP_CITY_LATITUDE
- GEOIP_CITY_LONG_LATITUDE
- GEOIP_CITY_DMA_CODE
- GEOIP_CITY_AREA_CODE
-
-Examples
-========
-
-mod_geoip + php
----------------
-
-NOTE: in lighttpd 1.5.x add the config vars only to the global config - adding into a vhost crashes lighty!
-
-when using fastcgi (not only php) you can access mod_geoip env and do as you please. this example just prints all mod_geoip envs to the client, html.
-
-Config-file ::
-
- geoip.db-filename = "/your-geoip-db-path/GeoLiteCity.dat"
- geoip.memory-cache = "enable"
-
-index.php ::
-
- <?php
-         $country_code = $_SERVER['GEOIP_COUNTRY_CODE'];
-         $country_code3 = $_SERVER['GEOIP_COUNTRY_CODE3'];
-         $country_name = $_SERVER['GEOIP_COUNTRY_NAME'];
-
-         $city_region = $_SERVER['GEOIP_CITY_REGION'];
-         $city_name = $_SERVER['GEOIP_CITY_NAME'];
-         $city_postal_code = $_SERVER['GEOIP_CITY_POSTAL_CODE'];
-         $city_latitude = $_SERVER['GEOIP_CITY_LATITUDE'];
-         $city_long_latitude = $_SERVER['GEOIP_CITY_LONG_LATITUDE'];
-         $city_dma_code = $_SERVER['GEOIP_CITY_DMA_CODE'];
-         $city_area_code = $_SERVER['GEOIP_CITY_AREA_CODE'];
-
-         echo "<html>\n<body>\n\t<br>\n";
-         echo 'Country Code: ' . $country_code . '<br>';
-         echo 'Country Code 3: ' . $country_code3 . '<br>';
-         echo 'Country Name: ' . $country_name . '<br>';
-         echo '<br>';
-         echo 'City Region: ' . $city_region . '<br>';
-         echo 'City Name: ' . $city_name . '<br>';
-         echo 'City Postal Code: ' . $city_postal_code . '<br>';
-         echo 'City Latitude: ' . $city_latitude . '<br>';
-         echo 'City Long Latitude: ' . $city_long_latitude . '<br>';
-         echo 'City DMA Code: ' . $city_dma_code . '<br>';
-         echo 'City Area Code: ' . $city_area_code . '<br>';
-         echo "</body>\n</html>";
- ?>
-
-country based redirect
-----------------------
-
-Config-file ::
-
- $HTTP["host"] =~ "www.domain.com" {
-     url.rewrite = ( "" => "/redirect.php")
- }
-
-redirect.php ::
-
- <?php
-        $country_code = $_SERVER['GEOIP_COUNTRY_CODE'];
-        header ('Location: http://' . $country_code . '.domain.com/');
- ?>
-
-.. note::
-
- Currently it is not possible to redirect based on mod_geoip directly in lighttpd config file. But i believe with the     relase of lighttpd mod_magnet it would be. (mod_magnet will be available in lighttpd 1.4.12+)
-
-Downloads
-=========
-mod_geoip.c (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.c)
-
-mod_geoip.c for lighttpd 1.5.x (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.4.c)
+==============================
+ip based geographic lookups...
+==============================
+
+-----------------
+Module: mod_geoip
+-----------------
+
+
+
+.. contents:: Table of Contents
+
+Requirements
+============
+
+:Packages: GeoIP C API & Library (http://www.maxmind.com/download/geoip/api/c/)
+
+
+
+
+Overview
+============
+
+mod_geoip is a module for fast ip/location lookups. It uses MaxMind GeoIP / GeoCity databases.
+If the ip was found in the database the module sets the appropriate environments variables to the request, thus making other modules/fcgi be informed.
+
+.. note:: 
+
+  Currently only country/city databases are supported because they have a free version that i can test. 
+
+(http://www.maxmind.com/download/geoip/database/ - GeoIP.dat.gz for Countries, GeoLiteCity.dat.gz for Countries & Cities)
+
+
+Installation
+============
+
+NOTE: As of 1.4.14 the lighttpd distribution does not include the compile file required to perform a automake in the source directory. Use "automake -a" instead. 
+
+1) Download mod_geoip.c (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.c)
+   - (for lighttpd 1.5 use http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.4.c and rename it to mod_geoip.c)
+2) Copy mod_geoip.c into lighttpd src directory.
+3) Edit your src/Makefile.am and add this after the last module: 
+
+::
+
+        lib_LTLIBRARIES += mod_geoip.la
+        mod_geoip_la_SOURCES = mod_geoip.c
+        mod_geoip_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+        mod_geoip_la_LIBADD = $(common_libadd) -lGeoIP
+
+4) Go back to lighttpd root directory and first do: aclocal && automake -a && autoconf, after that do: make clean; ./configure --enable-maintainer-mode; make; make install
+   Note: the command of 'make clean' gives error on Fedora 4 and may not be necessary to compile properly. [j lightstone//GlobalAdSales.company]
+
+5) Make sure /usr/local/lib is in your ld.so.conf file and rebuld the ld database (using: ldconfig). 
+
+6) Add to the config file    server.modules  = ("mod_geoip")        [j lightstone//GlobalAdSales.company]
+
+Configuration Options
+========================
+
+NOTE: in lighttpd 1.5.x add the config vars only to the global config - adding into a vhost crashes lighty!
+
+mod_geoip uses two configuration options.
+
+1) geoip.db-filename = <path to the geoip or geocity database>
+2) geoip.memory-cache = <enable|disable> : default disabled
+
+if enabled, mod_geoip will load the database binary file to
+memory for very fast lookups. the only penalty is memory usage.
+
+.. note:: 
+
+ mod_geoip will determine the database type automatically so if you enter GeoCity databse path it will load GeoCity Env.
+
+Environment
+===========
+
+Every database sets it's own ENV:
+
+GeoIP (Country):
+----------------
+
+::
+
+ GEOIP_COUNTRY_CODE
+ GEOIP_COUNTRY_CODE3
+ GEOIP_COUNTRY_NAME
+
+GeoCity:
+--------
+
+::
+
+ GEOIP_COUNTRY_CODE
+ GEOIP_COUNTRY_CODE3
+ GEOIP_COUNTRY_NAME
+ GEOIP_CITY_NAME
+ GEOIP_CITY_POSTAL_CODE
+ GEOIP_CITY_LATITUDE
+ GEOIP_CITY_LONG_LATITUDE
+ GEOIP_CITY_DMA_CODE
+ GEOIP_CITY_AREA_CODE
+
+Examples
+========
+
+mod_geoip + php
+---------------
+
+NOTE: in lighttpd 1.5.x add the config vars only to the global config - adding into a vhost crashes lighty!
+
+when using fastcgi (not only php) you can access mod_geoip env and do as you please. this example just prints all mod_geoip envs to the client, html.
+
+Config-file ::
+
+ geoip.db-filename = "/your-geoip-db-path/GeoLiteCity.dat"
+ geoip.memory-cache = "enable"
+
+index.php ::
+
+ <?php
+         $country_code = $_SERVER['GEOIP_COUNTRY_CODE'];
+         $country_code3 = $_SERVER['GEOIP_COUNTRY_CODE3'];
+         $country_name = $_SERVER['GEOIP_COUNTRY_NAME'];
+
+         $city_region = $_SERVER['GEOIP_CITY_REGION'];
+         $city_name = $_SERVER['GEOIP_CITY_NAME'];
+         $city_postal_code = $_SERVER['GEOIP_CITY_POSTAL_CODE'];
+         $city_latitude = $_SERVER['GEOIP_CITY_LATITUDE'];
+         $city_long_latitude = $_SERVER['GEOIP_CITY_LONG_LATITUDE'];
+         $city_dma_code = $_SERVER['GEOIP_CITY_DMA_CODE'];
+         $city_area_code = $_SERVER['GEOIP_CITY_AREA_CODE'];
+
+         echo "<html>\n<body>\n\t<br>\n";
+         echo 'Country Code: ' . $country_code . '<br>';
+         echo 'Country Code 3: ' . $country_code3 . '<br>';
+         echo 'Country Name: ' . $country_name . '<br>';
+         echo '<br>';
+         echo 'City Region: ' . $city_region . '<br>';
+         echo 'City Name: ' . $city_name . '<br>';
+         echo 'City Postal Code: ' . $city_postal_code . '<br>';
+         echo 'City Latitude: ' . $city_latitude . '<br>';
+         echo 'City Long Latitude: ' . $city_long_latitude . '<br>';
+         echo 'City DMA Code: ' . $city_dma_code . '<br>';
+         echo 'City Area Code: ' . $city_area_code . '<br>';
+         echo "</body>\n</html>";
+ ?>
+
+country based redirect
+----------------------
+
+Config-file ::
+
+ $HTTP["host"] =~ "www.domain.com" {
+     url.rewrite = ( "" => "/redirect.php")
+ }
+
+redirect.php ::
+
+ <?php
+        $country_code = $_SERVER['GEOIP_COUNTRY_CODE'];
+        header ('Location: http://' . $country_code . '.domain.com/');
+ ?>
+
+.. note::
+
+ Currently it is not possible to redirect based on mod_geoip directly in lighttpd config file. But i believe with the     relase of lighttpd mod_magnet it would be. (mod_magnet will be available in lighttpd 1.4.12+)
+
+Downloads
+=========
+mod_geoip.c (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.c)
+
+mod_geoip.c for lighttpd 1.5.x (http://trac.lighttpd.net/trac/attachment/wiki/Docs/ModGeoip/mod_geoip.4.c)
 


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/lighttpd.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- lighttpd.spec	4 Mar 2008 11:08:09 -0000	1.36
+++ lighttpd.spec	24 Dec 2008 17:27:17 -0000	1.37
@@ -1,9 +1,9 @@
-%define webroot /srv/www/lighttpd
+%define webroot /var/www/lighttpd
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.18
-Release: 3%{?dist}
+Version: 1.4.20
+Release: 5%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -12,21 +12,24 @@
 Source2: php.d-lighttpd.ini
 Source10: index.html
 Source11: http://www.lighttpd.net/favicon.ico
-Source12: powered_by_fedora.png
-Source13: http://www.lighttpd.net/light_button.png
-Source14: http://www.lighttpd.net/light_logo.png
+Source12: http://www.lighttpd.net/light_button.png
+Source13: http://www.lighttpd.net/light_logo.png
+Source14: lighttpd-empty.png
 Source100: lighttpd-mod_geoip.c
 Source101: lighttpd-mod_geoip.txt
-Patch0: lighttpd-1.4.17-defaultconf.patch
+Patch0: lighttpd-1.4.20-defaultconf.patch
 Patch1: lighttpd-1.4.18-mod_geoip.patch
-# Security fixes
-Patch10: lighttpd-1.4.18-Fix-372-and-1562.patch
-Patch11: lighttpd-1.4.18-mod_cgi-fix.patch
+Patch2: lighttpd-1.4.20-initinfo.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+# For the target poweredby.png image (skip requirement + provide image on RHEL)
+%if 0%{!?rhel:1}
+Requires: system-logos >= 7.92.1
+%endif
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
+Provides: webserver
 BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
 BuildRequires: /usr/bin/awk
 %{!?_without_ldap:BuildRequires: openldap-devel}
@@ -37,7 +40,7 @@
 %if %{!?fedora:0}%{?fedora} <= 6
 BuildRequires: readline-devel
 %endif
-%if 0%{?el} <= 6
+%if 0%{?rhel} <= 6
 BuildRequires: readline-devel
 %endif
 
@@ -57,7 +60,7 @@
 %package fastcgi
 Summary: FastCGI module and spawning helper for lighttpd and PHP configuration
 Group: System Environment/Daemons
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description fastcgi
 This package contains the spawn-fcgi helper for lighttpd's automatic spawning
@@ -68,7 +71,7 @@
 %package mod_geoip
 Summary: GeoIP module for lighttpd to use for location lookups
 Group: System Environment/Daemons
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: GeoIP-devel
 
 %description mod_geoip
@@ -78,7 +81,7 @@
 %package mod_mysql_vhost
 Summary: Virtual host module for lighttpd that uses a MySQL database
 Group: System Environment/Daemons
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 BuildRequires: mysql-devel
 
 %description mod_mysql_vhost
@@ -89,8 +92,6 @@
 %setup -q
 %patch0 -p1 -b .defaultconf
 %patch1 -p1 -b .mod_geoip
-%patch10 -p1 -b .Fix-372-and-1562
-%patch11 -p1 -b .mod_cgi-fix
 %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c
 %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt
 
@@ -123,6 +124,7 @@
 # Install (*patched above*) sample config file
 %{__install} -D -p -m 0640 doc/lighttpd.conf \
     %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/lighttpd/conf.d
 
 # Install our own logrotate entry
 %{__install} -D -p -m 0644 %{SOURCE1} \
@@ -135,15 +137,30 @@
 # Install our own default web page and images
 %{__mkdir_p} %{buildroot}%{webroot}
 %{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
-    %{SOURCE14} \
     %{buildroot}%{webroot}/
 
+# Symlink for the powered-by-$DISTRO image (install empty image on RHEL)
+%if 0%{!?rhel:1}
+%{__ln_s} %{_datadir}/pixmaps/poweredby.png \
+%else
+%{__install} -p -m 0644 %{SOURCE14} \
+%endif
+    %{buildroot}%{webroot}/poweredby.png
+
 # Install empty log directory to include
 %{__mkdir_p} %{buildroot}%{_var}/log/lighttpd
 
 # Install empty run directory to include (for the example fastcgi socket)
 %{__mkdir_p} %{buildroot}%{_var}/run/lighttpd
 
+# Rename spawn-fastcgi, prefix to avoid clash with other packages
+%{__mv} %{buildroot}%{_bindir}/spawn-fcgi \
+        %{buildroot}%{_bindir}/lighttpd-spawn-fcgi
+%{__mv} %{buildroot}%{_mandir}/man1/spawn-fcgi.1 \
+        %{buildroot}%{_mandir}/man1/lighttpd-spawn-fcgi.1
+# But still provide a compatibility symlink for now
+%{__ln_s} lighttpd-spawn-fcgi %{buildroot}%{_bindir}/spawn-fcgi
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -173,6 +190,7 @@
 %doc AUTHORS ChangeLog COPYING README
 %doc doc/*.txt doc/lighttpd.conf doc/lighttpd.user
 %dir %{_sysconfdir}/lighttpd/
+%dir %{_sysconfdir}/lighttpd/conf.d/
 %config(noreplace) %{_sysconfdir}/lighttpd/lighttpd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
 %config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
@@ -187,16 +205,21 @@
 %{_mandir}/man1/lighttpd.1*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
 %attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
-%{webroot}/
+%dir %{webroot}/
+%{webroot}/*.ico
+%{webroot}/*.png
+# This is not really configuration, but prevent loss of local changes
+%config %{webroot}/index.html
 
 %files fastcgi
 %defattr(-,root,root,-)
 %doc doc/fastcgi*.txt
 %config(noreplace) %{_sysconfdir}/php.d/lighttpd.ini
+%{_bindir}/lighttpd-spawn-fcgi
 %{_bindir}/spawn-fcgi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_fastcgi.so
-%{_mandir}/man1/spawn-fcgi.1*
+%{_mandir}/man1/lighttpd-spawn-fcgi.1*
 
 %files mod_geoip
 %defattr(-,root,root,-)
@@ -212,13 +235,62 @@
 
 
 %changelog
-* Tue Mar  4 2008 Matthias Saou <http://freshrpms.net/> 1.4.18-3
+* Wed Dec 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-5
+- Partially revert last change by creating a "spawn-fastcgi" symlink, so that
+  nothing breaks currently (especially for EL).
+- Install empty poweredby image on RHEL since the symlink's target is missing.
+
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-3
+- Rename spawn-fastcgi to lighttpd-spawn-fastcgi to avoid clash with other
+  packages providing it for their own needs (#472749). It's not used as-is
+  by lighttpd, so it shouldn't be a problem... at worst, some custom scripts
+  will need to be updated.
+
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-2
+- Include conf.d/*.conf configuration snippets (#444953).
+- Mark the default index.html in order to not loose changes upon upgrade if it
+  was edited or replaced with a different file (#438564).
+- Include patch to add the INIT INFO block to the init script (#246973).
+
+* Mon Oct 13 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-1
+- Update to 1.4.20 final.
+
+* Mon Sep 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-0.1.r2303
+- Update to 1.4.20 r2303 pre-release.
+
+* Mon Sep 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-5
+- Include memory leak patch (changeset #2305 from ticket #1774).
+
+* Thu Apr 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-4
+- Merge in second changest from upstream fix for upstream bug #285.
+
+* Thu Mar 27 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-3
+- Include sslshutdown patch, upstream fix to upstream bug #285 (#439066).
+
+* Sat Mar 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-2
+- Provide "webserver" (#437884).
+
+* Wed Mar 12 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-1
+- Update to 1.4.19, which includes all previous security fixes + bugfixes.
+
+* Tue Mar  4 2008 Matthias Saou <http://freshrpms.net/> 1.4.18-6
 - Include patch for CVE-2008-0983 (crash when low on file descriptors).
 - Include patch for CVE-2008-1111 (cgi source disclosure).
 
-* Tue Oct 16 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-2
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
+- Autorebuild for GCC 4.3
+
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org>
+ - Rebuild for deps
+
+* Wed Oct 31 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-3
+- Update mod_geoip source to fix segfault upon stopping lighttpd.
+
+* Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-2
 - Include mod_geoip additional source, make it an optional sub-package.
 - Reorder sub-packages alphabetically in spec file.
+- Make sub-packages require exact release, just in case.
+- Change default webroot back from /srv to /var.
 
 * Mon Sep 10 2007 Matthias Saou <http://freshrpms.net/> 1.4.18-1
 - Update to 1.4.18.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/EL-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	10 Sep 2007 15:45:36 -0000	1.21
+++ sources	24 Dec 2008 17:27:17 -0000	1.22
@@ -1 +1 @@
-26f98dddf9d8c0775221b800986003ee  lighttpd-1.4.18.tar.bz2
+ed6ee0bb714f393219a32768d86984d8  lighttpd-1.4.20.tar.bz2


--- lighttpd-1.4.17-defaultconf.patch DELETED ---


--- lighttpd-1.4.18-Fix-372-and-1562.patch DELETED ---


--- lighttpd-1.4.18-mod_cgi-fix.patch DELETED ---


