rpms/lighttpd/devel favicon.ico, NONE, 1.1 light_button.png, NONE, 1.1 light_logo.png, NONE, 1.1 lighttpd-1.4.3-stat_cache.patch, NONE, 1.1 index.html, 1.1, 1.2 lighttpd.spec, 1.13, 1.14 lighttpd.png, 1.1, NONE

Tue Sep 13 14:34:07 UTC 2005

Author: thias

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

Modified Files:
	index.html lighttpd.spec 
Added Files:
	favicon.ico light_button.png light_logo.png 
	lighttpd-1.4.3-stat_cache.patch 
Removed Files:
	lighttpd.png 
Log Message:
Add stat_cache patch to fix memleak and cosmetic changes for the default page.

--- NEW FILE favicon.ico ---

wOQ<0r
Tc!óÈ;;;;Aˆ¡ûâÙŒ¤Œ?Ç·™šï´ÊH_"±r;ÇÊôs^
Eµ®Ž§Ã0àU·™;;è±’8Š6êê·Çs;u»9q‘ÕÄ¤X=Ý´ó¶™sNt/,([³ÊÇ;ô wPV°n§Ã¤¦ÃŒªÙ	çh;;Çïè©B”›N·ùöšL»Eð®ªÄ¤¤ÃÄŒŽ«Ýab·ÇÇZáÏNõsÇKºý¼äÚŒÄ¤¤Ã¦ÔÕØ®a˜Ê·–í<ƒÑ{N[;;Fˆ¡É“n§Ã¤¤ÃÄ}}naòÊôí¹>vríøs|½Ì~®ÅÃ¤ÃŒª×ÝpÇ÷„²WÒt²·Kydû)Ù}¤Ã§§}R‘pUÇ±C&žæ·‰zE•	×¥ÄÓ§QRÜÆÇ´ZDÀ;*EûgÚ¤¥¦G‹Õ×Ûgë!j\WšsÁÜ¤ÄŒÅØ®âatxü…€qÝ¤ÃÄ§=n‘)çAuUåÜ¤¤G=Ö¬°J ·o'¤ÃŒ}ÅÚÞaoª¥Ã§¨}ÕÕŒ¤¤ÃÄXÃ¦¤¥¥¥¦
lighttpd-1.4.3-stat_cache.patch:

--- NEW FILE lighttpd-1.4.3-stat_cache.patch ---
diff -Naupr lighttpd-1.4.3.orig/src/stat_cache.c lighttpd-1.4.3/src/stat_cache.c
--- lighttpd-1.4.3.orig/src/stat_cache.c	2005-08-29 12:39:34.000000000 +0200
+++ lighttpd-1.4.3/src/stat_cache.c	2005-09-13 13:55:03.000000000 +0200
@@ -215,13 +215,15 @@ static int stat_cache_attr_get(buffer *b
 }
 #endif
 
-static int hashme(buffer *str) {
-	int hash = 0;
+static uint32_t hashme(buffer *str) {
+	uint32_t hash = 0;
 	const char *s;
 	for (s = str->ptr; *s; s++) {
 		hash = hash * 53 + *s;
 	}
 
+	hash &= ~(1 << 31); /* strip the highest bit */
+
 	return hash;
 }
 


Index: index.html
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/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	13 Sep 2005 14:33:57 -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.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lighttpd.spec	2 Sep 2005 10:45:33 -0000	1.13
+++ lighttpd.spec	13 Sep 2005 14:33:57 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -11,9 +11,12 @@
 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
+Source13: http://www.lighttpd.net/light_button.png
+Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
+Patch1: lighttpd-1.4.3-stat_cache.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -64,6 +67,7 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
+%patch1 -p1 -b .stat_cache
 
 
 %build
@@ -103,7 +107,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
@@ -168,6 +173,13 @@
 
 
 %changelog
+* 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


