rpms/lighttpd/devel index.html, NONE, 1.1 lighttpd-1.3.10-defaultconf.patch, NONE, 1.1 lighttpd-1.3.11-empty_cgi_handler.patch, NONE, 1.1 lighttpd.logrotate, NONE, 1.1 lighttpd.png, NONE, 1.1 lighttpd.spec, NONE, 1.1 php.d-lighttpd.ini, NONE, 1.1 powered_by_fedora.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Wed Feb 23 00:12:25 UTC 2005
Author: thias
Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14061
Modified Files:
.cvsignore sources
Added Files:
index.html lighttpd-1.3.10-defaultconf.patch
lighttpd-1.3.11-empty_cgi_handler.patch lighttpd.logrotate
lighttpd.png lighttpd.spec php.d-lighttpd.ini
powered_by_fedora.png
Log Message:
Initial import (fixes failed cvs-import.sh import).
***** Error reading new file: [Errno 2] No such file or directory: 'index.html'
lighttpd-1.3.10-defaultconf.patch:
--- NEW FILE lighttpd-1.3.10-defaultconf.patch ---
diff -Naupr lighttpd-1.3.10-cleanconf/doc/lighttpd.conf lighttpd-1.3.10/doc/lighttpd.conf
--- lighttpd-1.3.10-cleanconf/doc/lighttpd.conf 2005-02-18 11:11:30.512994000 +0100
+++ lighttpd-1.3.10/doc/lighttpd.conf 2005-02-18 11:12:13.136515056 +0100
@@ -35,10 +35,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
server.indexfiles = ( "index.php", "index.html",
@@ -46,6 +46,7 @@ server.indexfiles = ( "index.p
# mimetype mapping
mimetype.assign = (
+ ".rpm" => "application/x-rpm",
".pdf" => "application/pdf",
".sig" => "application/pgp-signature",
".spl" => "application/futuresplash",
@@ -103,7 +104,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
#
@@ -127,7 +128,7 @@ url.access-deny = ( "~", ".i
#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
@@ -165,10 +166,10 @@ url.access-deny = ( "~", ".i
#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/"
lighttpd-1.3.11-empty_cgi_handler.patch:
--- NEW FILE lighttpd-1.3.11-empty_cgi_handler.patch ---
from http://trac.lighttpd.net/trac/changeset/35
--- trunk/src/mod_cgi.c (revision 34)
+++ trunk/src/mod_cgi.c (revision 35)
@@ -690,12 +690,14 @@
#ifndef __WIN32
- /* stat the exec file */
- if (-1 == (stat(cgi_handler->ptr, &st))) {
- log_error_write(srv, __FILE__, __LINE__, "sbss",
- "stat for cgi-handler", cgi_handler,
- "failed:", strerror(errno));
- return -1;
+ if (cgi_handler->used > 1) {
+ /* stat the exec file */
+ if (-1 == (stat(cgi_handler->ptr, &st))) {
+ log_error_write(srv, __FILE__, __LINE__, "sbss",
+ "stat for cgi-handler", cgi_handler,
+ "failed:", strerror(errno));
+ return -1;
+ }
}
if (pipe(to_cgi_fds)) {
--- NEW FILE lighttpd.logrotate ---
/var/log/lighttpd/*log {
missingok
notifempty
sharedscripts
postrotate
/bin/kill -USR1 `cat /var/run/lighttpd.pid 2>/dev/null` 2>/dev/null || :
endscript
}
--- NEW FILE lighttpd.spec ---
%define webroot /srv/www/lighttpd
Summary: Lightning fast webserver with light system requirements
Name: lighttpd
Version: 1.3.11
Release: 1
License: BSD
Group: System Environment/Daemons
URL: http://www.lighttpd.net/
Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.gz
Source1: lighttpd.logrotate
Source2: php.d-lighttpd.ini
Source10: index.html
Source11: lighttpd.png
Source12: powered_by_fedora.png
Patch0: lighttpd-1.3.10-defaultconf.patch
Patch1: lighttpd-1.3.11-empty_cgi_handler.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
%{?_with_ldap:BuildRequires: openldap-devel}
%description
Secure, fast, compliant and very flexible web-server which has been optimized
for high-performance environments. It has a very low memory footprint compared
to other webservers and takes care of cpu-load. Its advanced feature-set
(FastCGI, CGI, Auth, Output-Compression, URL-Rewriting and many more) make
it the perfect webserver-software for every server that is suffering load
problems.
Available rpmbuild rebuild options :
--with : ldap
%package mod_mysql_vhost
Summary: Virtual host module for lighttpd that uses a MySQL database
Group: System Environment/Daemons
Requires: %{name} = %{version}
BuildRequires: mysql-devel
%description mod_mysql_vhost
Virtual host module for lighttpd that uses a MySQL database.
%package fastcgi
Summary: FastCGI module and spawning helper for lighttpd and PHP configuration
Group: System Environment/Daemons
Requires: %{name} = %{version}
%description fastcgi
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
%patch0 -p1 -b .defaultconf
%patch1 -p1 -b .empty_cgi_handler
%build
%configure \
--libdir="%{_libdir}/lighttpd" \
--with-openssl \
--with-mysql \
%{?_with_ldap:--with-ldap}
%{__make}
%install
%{__rm} -rf %{buildroot}
%makeinstall \
libdir="%{buildroot}%{_libdir}/lighttpd"
# Install included init script and sysconfig entry
%{__install} -D -m 0755 doc/rc.lighttpd.redhat \
%{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
%{__install} -D -m 0644 doc/sysconfig.lighttpd \
%{buildroot}%{_sysconfdir}/sysconfig/lighttpd
# Install (*patched above*) sample config file
%{__install} -D -m 0640 doc/lighttpd.conf \
%{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf
# Install our own logrotate entry
%{__install} -D -m 0644 %{SOURCE1} \
%{buildroot}%{_sysconfdir}/logrotate.d/lighttpd
# Install our own php.d ini file
%{__install} -D -m 0644 %{SOURCE2} \
%{buildroot}%{_sysconfdir}/php.d/lighttpd.ini
# Install our own default web page and images
%{__mkdir_p} %{buildroot}%{webroot}
%{__install} -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
%{buildroot}%{webroot}/
# Install empty log directory to include
%{__mkdir_p} %{buildroot}%{_var}/log/lighttpd
%clean
%{__rm} -rf %{buildroot}
%pre
/usr/sbin/useradd -s /sbin/nologin -M -r -d %{webroot} \
-c "lighttpd web server" lighttpd &>/dev/null || :
%post
/sbin/chkconfig --add lighttpd
%preun
if [ $1 -eq 0 ]; then
/sbin/service lighttpd stop &>/dev/null || :
/sbin/chkconfig --del lighttpd
fi
%postun
if [ $1 -ge 1 ]; then
/sbin/service lighttpd condrestart &>/dev/null || :
fi
%files
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING README
%doc doc/*.txt doc/lighttpd.conf doc/lighttpd.user
%config(noreplace) %{_sysconfdir}/lighttpd/lighttpd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
%config(noreplace) %{_sysconfdir}/sysconfig/lighttpd
%{_sysconfdir}/rc.d/init.d/lighttpd
%{_sbindir}/lighttpd
%{_libdir}/lighttpd/
%exclude %{_libdir}/lighttpd/*.la
%exclude %{_libdir}/lighttpd/mod_fastcgi.so
%exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
%{_mandir}/man1/lighttpd.1*
%attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
%{webroot}/
%files mod_mysql_vhost
%doc doc/mysqlvhost.txt
%dir %{_libdir}/lighttpd/
%{_libdir}/lighttpd/mod_mysql_vhost.so
%files fastcgi
%doc doc/fastcgi*.txt
%config(noreplace) %{_sysconfdir}/php.d/lighttpd.ini
%{_bindir}/spawn-fcgi
%dir %{_libdir}/lighttpd/
%{_libdir}/lighttpd/mod_fastcgi.so
%changelog
* Mon Feb 21 2005 Matthias Saou <http://freshrpms.net/> 1.3.11-0
- Update to 1.3.11.
- Remove cleanconf and init.d patches (merged upstream).
- Add empty_cgi_handler patch.
* Fri Feb 18 2005 Matthias Saou <http://freshrpms.net/> 1.3.10-0
- Split off -fastcgi sub-package.
- Include php.d entry to set sane FastCGI defaults.
* Wed Feb 16 2005 Matthias Saou <http://freshrpms.net/> 1.3.10-0
- Spec file cleanup for freshrpms.net/Extras.
- Compile OpenSSL support unconditionally.
- Put modules in a subdirectory of libdir.
- Don't include all of libdir's content to avoid debuginfo content.
- Add optional LDAP support.
- Add patch to change the default configuration.
- Add dedicated lighttpd user/group creation.
- Add logrotate entry.
- Include a nice little default page for the default setup.
- Split off mod_mysql_vhost sub-package, get dep only there.
- Use webroot in /srv by default.
- Exclude .la files, I doubt anyone will need them.
* Thu Sep 30 2004 <jan at kneschke.de> 1.3.1
- upgraded to 1.3.1
* Tue Jun 29 2004 <jan at kneschke.de> 1.2.3
- rpmlint'ed the package
- added URL
- added (noreplace) to start-script
- change group to Networking/Daemon (like apache)
* Sun Feb 23 2003 <jan at kneschke.de>
- initial version
--- NEW FILE php.d-lighttpd.ini ---
; Required so that PHP_SELF gets set correctly when using PHP through
; FastCGI with lighttpd (see main php.ini for more about this option)
cgi.fix_pathinfo = 1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Feb 2005 23:56:00 -0000 1.1
+++ .cvsignore 23 Feb 2005 00:12:23 -0000 1.2
@@ -0,0 +1 @@
+lighttpd-1.3.11.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Feb 2005 23:56:00 -0000 1.1
+++ sources 23 Feb 2005 00:12:23 -0000 1.2
@@ -0,0 +1 @@
+730c9b9d743360d23e523968ab4fe7c5 lighttpd-1.3.11.tar.gz
More information about the fedora-extras-commits
mailing list