rpms/lighttpd/F-10 lighttpd-1.4.23-defaultconf.patch, NONE, 1.1 lighttpd-1.4.23-mod_geoip.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 lighttpd.spec, 1.51, 1.52 sources, 1.26, 1.27 lighttpd-1.4.18-mod_geoip.patch, 1.1, NONE lighttpd-1.4.20-defaultconf.patch, 1.1, NONE lighttpd-1.4.20-initinfo.patch, 1.1, NONE

Matthias Saou thias at fedoraproject.org
Tue Oct 6 19:10:32 UTC 2009 

Author: thias

Update of /cvs/extras/rpms/lighttpd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18688/F-10

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.23-defaultconf.patch 
	lighttpd-1.4.23-mod_geoip.patch 
Removed Files:
	lighttpd-1.4.18-mod_geoip.patch 
	lighttpd-1.4.20-defaultconf.patch 
	lighttpd-1.4.20-initinfo.patch 
Log Message:
Update all current branches to the latest 1.4.23.


lighttpd-1.4.23-defaultconf.patch:
 lighttpd.conf |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE lighttpd-1.4.23-defaultconf.patch ---
diff -Naupr lighttpd-1.4.23.orig/doc/lighttpd.conf lighttpd-1.4.23/doc/lighttpd.conf
--- lighttpd-1.4.23.orig/doc/lighttpd.conf	2009-04-09 22:02:00.000000000 +0200
+++ lighttpd-1.4.23/doc/lighttpd.conf	2009-09-03 22:41:33.139052014 +0200
@@ -36,7 +36,7 @@ server.modules              = (
 
 ## A static document-root. For virtual hosting take a look at the
 ## mod_simple_vhost module.
-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"
@@ -50,6 +50,7 @@ index-file.names            = ( "index.p
 
 # mimetype mapping
 mimetype.assign             = (
+  ".rpm"          =>      "application/x-rpm",
   ".pdf"          =>      "application/pdf",
   ".sig"          =>      "application/pgp-signature",
   ".spl"          =>      "application/futuresplash",
@@ -147,7 +148,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
@@ -188,10 +189,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/"
@@ -215,7 +216,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"
 #                                 )
 #                               )
 #                            )
@@ -320,3 +321,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.23-mod_geoip.patch:
 configure       |    2 +-
 configure.ac    |    2 +-
 src/Makefile.am |    5 +++++
 src/Makefile.in |   20 +++++++++++++++++---
 4 files changed, 24 insertions(+), 5 deletions(-)

--- NEW FILE lighttpd-1.4.23-mod_geoip.patch ---
diff -Naupr lighttpd-1.4.23.orig/configure lighttpd-1.4.23/configure
--- lighttpd-1.4.23.orig/configure	2009-06-07 21:26:07.000000000 +0200
+++ lighttpd-1.4.23/configure	2009-09-03 22:59:34.696051769 +0200
@@ -23235,7 +23235,7 @@ fi
 do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
 do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
 
-plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl mod_geoip"
 features="regex-conditionals"
 if test ! "x$PCRE_LIB" = x; then
 	do_build="$do_build $plugins"
diff -Naupr lighttpd-1.4.23.orig/configure.ac lighttpd-1.4.23/configure.ac
--- lighttpd-1.4.23.orig/configure.ac	2009-06-07 21:13:05.000000000 +0200
+++ lighttpd-1.4.23/configure.ac	2009-09-03 22:59:22.781056867 +0200
@@ -571,7 +571,7 @@ AC_OUTPUT
 do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
 do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
 
-plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl mod_geoip"
 features="regex-conditionals"
 if test ! "x$PCRE_LIB" = x; then
 	do_build="$do_build $plugins"
diff -Naupr lighttpd-1.4.23.orig/src/Makefile.am lighttpd-1.4.23/src/Makefile.am
--- lighttpd-1.4.23.orig/src/Makefile.am	2009-06-16 15:45:42.000000000 +0200
+++ lighttpd-1.4.23/src/Makefile.am	2009-09-03 22:46:47.527052167 +0200
@@ -264,6 +264,11 @@ mod_accesslog_la_SOURCES = mod_accesslog
 mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_accesslog_la_LIBADD = $(common_libadd)
 
+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
+
 
 hdr = server.h buffer.h network.h log.h keyvalue.h \
       response.h request.h fastcgi.h chunk.h \
diff -Naupr lighttpd-1.4.23.orig/src/Makefile.in lighttpd-1.4.23/src/Makefile.in
--- lighttpd-1.4.23.orig/src/Makefile.in	2009-06-19 21:19:22.000000000 +0200
+++ lighttpd-1.4.23/src/Makefile.in	2009-09-03 23:02:32.905052466 +0200
@@ -124,6 +124,12 @@ mod_accesslog_la_OBJECTS = $(am_mod_acce
 mod_accesslog_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(mod_accesslog_la_LDFLAGS) $(LDFLAGS) -o $@
+mod_geoip_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_mod_geoip_la_OBJECTS = mod_geoip.lo
+mod_geoip_la_OBJECTS = $(am_mod_geoip_la_OBJECTS)
+mod_geoip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mod_geoip_la_LDFLAGS) $(LDFLAGS) -o $@
 mod_alias_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_mod_alias_la_OBJECTS = mod_alias.lo
 mod_alias_la_OBJECTS = $(am_mod_alias_la_OBJECTS)
@@ -406,7 +412,8 @@ SOURCES = $(liblightcomp_la_SOURCES) $(m
 	$(mod_status_la_SOURCES) $(mod_trigger_b4_dl_la_SOURCES) \
 	$(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \
 	$(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) \
-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+	$(mod_geoip_la_SOURCES)
 DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \
 	$(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \
 	$(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \
@@ -425,7 +432,8 @@ DIST_SOURCES = $(am__liblightcomp_la_SOU
 	$(mod_trigger_b4_dl_la_SOURCES) $(mod_userdir_la_SOURCES) \
 	$(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \
 	$(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \
-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+	$(mod_geoip_la_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -612,7 +620,7 @@ lib_LTLIBRARIES = $(am__append_1) mod_fl
 	mod_ssi.la mod_secdownload.la mod_expire.la mod_evhost.la \
 	mod_simple_vhost.la mod_fastcgi.la mod_extforward.la \
 	mod_access.la mod_compress.la mod_auth.la mod_rewrite.la \
-	mod_redirect.la mod_status.la mod_accesslog.la
+	mod_redirect.la mod_status.la mod_accesslog.la mod_geoip.la
 @NO_RDYNAMIC_TRUE at liblightcomp_la_SOURCES = $(common_src)
 @NO_RDYNAMIC_TRUE at liblightcomp_la_CFLAGS = $(AM_CFLAGS)
 @NO_RDYNAMIC_TRUE at liblightcomp_la_LDFLAGS = -avoid-version -no-undefined
@@ -719,6 +727,9 @@ mod_status_la_LIBADD = $(common_libadd)
 mod_accesslog_la_SOURCES = mod_accesslog.c
 mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
 mod_accesslog_la_LIBADD = $(common_libadd)
+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
 hdr = server.h buffer.h network.h log.h keyvalue.h \
       response.h request.h fastcgi.h chunk.h \
       settings.h http_chunk.h http_auth_digest.h \
@@ -822,6 +833,8 @@ mod_access.la: $(mod_access_la_OBJECTS) 
 	$(mod_access_la_LINK) -rpath $(libdir) $(mod_access_la_OBJECTS) $(mod_access_la_LIBADD) $(LIBS)
 mod_accesslog.la: $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_DEPENDENCIES) 
 	$(mod_accesslog_la_LINK) -rpath $(libdir) $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_LIBADD) $(LIBS)
+mod_geoip.la: $(mod_geoip_la_OBJECTS) $(mod_geoip_la_DEPENDENCIES) 
+	$(mod_geoip_la_LINK) -rpath $(libdir) $(mod_geoip_la_OBJECTS) $(mod_geoip_la_LIBADD) $(LIBS)
 mod_alias.la: $(mod_alias_la_OBJECTS) $(mod_alias_la_DEPENDENCIES) 
 	$(mod_alias_la_LINK) -rpath $(libdir) $(mod_alias_la_OBJECTS) $(mod_alias_la_LIBADD) $(LIBS)
 mod_auth.la: $(mod_auth_la_OBJECTS) $(mod_auth_la_DEPENDENCIES) 
@@ -1012,6 +1025,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_access.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_accesslog.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_geoip.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_alias.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_auth.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mod_cgi.Plo at am__quote@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-10/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	4 Apr 2009 11:21:38 -0000	1.26
+++ .cvsignore	6 Oct 2009 19:10:31 -0000	1.27
@@ -1 +1 @@
-lighttpd-1.4.22.tar.bz2
+lighttpd-1.4.23.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-10/lighttpd.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- lighttpd.spec	4 Apr 2009 11:21:38 -0000	1.51
+++ lighttpd.spec	6 Oct 2009 19:10:32 -0000	1.52
@@ -5,14 +5,15 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.22
-Release: 2%{?dist}
+Version: 1.4.23
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
 Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
+Source3: lighttpd.init
 Source10: index.html
 Source11: http://www.lighttpd.net/favicon.ico
 Source12: http://www.lighttpd.net/light_button.png
@@ -20,9 +21,8 @@ Source13: http://www.lighttpd.net/light_
 Source14: lighttpd-empty.png
 Source100: lighttpd-mod_geoip.c
 Source101: lighttpd-mod_geoip.txt
-Patch0: lighttpd-1.4.20-defaultconf.patch
-Patch1: lighttpd-1.4.18-mod_geoip.patch
-Patch2: lighttpd-1.4.20-initinfo.patch
+Patch0: lighttpd-1.4.23-defaultconf.patch
+Patch1: lighttpd-1.4.23-mod_geoip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # For the target poweredby.png image (skip requirement + provide image on RHEL)
 %if 0%{!?rhel:1}
@@ -93,20 +93,10 @@ BuildRequires: mysql-devel
 Virtual host module for lighttpd that uses a MySQL database.
 
 
-%package -n spawn-fcgi
-Summary: Simple program for spawning FastCGI processes
-Group: System Environment/Daemons
-
-%description -n spawn-fcgi
-This package contains the spawn-fcgi program used for spawning FastCGI
-processes, which can be local or remote.
-
-
 %prep
 %setup -q
 %patch0 -p1 -b .defaultconf
 %patch1 -p1 -b .mod_geoip
-%patch2 -p1 -b .initinfo
 %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c
 %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt
 
@@ -130,12 +120,6 @@ processes, which can be local or remote.
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
-# Install included init script and sysconfig entry
-%{__install} -D -p -m 0755 doc/rc.lighttpd.redhat \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
-%{__install} -D -p -m 0644 doc/sysconfig.lighttpd \
-    %{buildroot}%{_sysconfdir}/sysconfig/lighttpd
-
 # Install (*patched above*) sample config file
 %{__install} -D -p -m 0640 doc/lighttpd.conf \
     %{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf
@@ -149,6 +133,10 @@ processes, which can be local or remote.
 %{__install} -D -p -m 0644 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/php.d/lighttpd.ini
 
+# Install our own init script (the included one is old style)
+%{__install} -D -p -m 0755 %{SOURCE3} \
+    %{buildroot}%{_sysconfdir}/rc.d/init.d/lighttpd
+
 # Install our own default web page and images
 %{__mkdir_p} %{buildroot}%{webroot}
 %{__install} -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
@@ -200,7 +188,6 @@ fi
 %dir %{_sysconfdir}/lighttpd/conf.d/
 %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
 %{_sbindir}/lighttpd-angel
@@ -209,7 +196,7 @@ fi
 %exclude %{_libdir}/lighttpd/mod_fastcgi.so
 %exclude %{_libdir}/lighttpd/mod_geoip.so
 %exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
-%{_mandir}/man1/lighttpd.1*
+%{_mandir}/man8/lighttpd.8*
 %attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
 %attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
 %dir %{webroot}/
@@ -237,12 +224,25 @@ fi
 %dir %{_libdir}/lighttpd/
 %{_libdir}/lighttpd/mod_mysql_vhost.so
 
-%files -n spawn-fcgi
-%defattr(-,root,root,-)
-%{_bindir}/spawn-fcgi
-%{_mandir}/man1/spawn-fcgi.1*
 
 %changelog
+* Thu Sep  3 2009 Matthias Saou <http://freshrpms.net/> 1.4.23-1
+- Update to 1.4.23.
+- Update defaultconf and mod_geoip patches.
+- Remove no longer shipped spawn-fcgi, it's a separate source package now.
+- Remove unused patch to the init script.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.22-5
+- rebuilt with new openssl
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.22-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-3
+- Update init script to new style.
+- No longer include a sysconfig file, though one can be set to override the
+  default configuration file location.
+
 * Mon Mar 30 2009 Matthias Saou <http://freshrpms.net/> 1.4.22-2
 - Update to 1.4.22.
 - Add missing defattr for the spawn-fcgi package.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	4 Apr 2009 11:21:38 -0000	1.26
+++ sources	6 Oct 2009 19:10:32 -0000	1.27
@@ -1 +1 @@
-ed4ca3897eadf419c893b03fee53c982  lighttpd-1.4.22.tar.bz2
+0ab6bb7b17bf0f515ce7dce68e5e215a  lighttpd-1.4.23.tar.bz2


--- lighttpd-1.4.18-mod_geoip.patch DELETED ---


--- lighttpd-1.4.20-defaultconf.patch DELETED ---


--- lighttpd-1.4.20-initinfo.patch DELETED ---

More information about the fedora-extras-commits mailing list