[lighttpd] Update to 1.4.28.
Matthias Saou
thias at fedoraproject.org
Sun Jul 10 20:29:26 UTC 2011
commit 55713591b43e780d0f50d40e1661f2b23e55c81f
Author: Matthias Saou <thias at marmotte.net>
Date: Sun Jul 10 22:28:55 2011 +0200
Update to 1.4.28.
.gitignore | 4 +-
lighttpd-1.4.23-defaultconf.patch | 59 -------------------
lighttpd-1.4.23-ssl-2157.patch | 13 ----
lighttpd-1.4.28-defaultconf.patch | 21 +++++++
lighttpd-1.4.29-mod_geoip.patch | 111 +++++++++++++++++++++++++++++++++++++
lighttpd.spec | 52 ++++++++++++++----
sources | 3 +-
7 files changed, 178 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f10a53f..4629be3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-lighttpd-1.4.26.tar.bz2
+/lighttpd-1.4.26.tar.bz2
+/lighttpd-1.4.28.tar.bz2
+/lighttpd-1.4.29.tar.bz2
diff --git a/lighttpd-1.4.28-defaultconf.patch b/lighttpd-1.4.28-defaultconf.patch
new file mode 100644
index 0000000..350d1b8
--- /dev/null
+++ b/lighttpd-1.4.28-defaultconf.patch
@@ -0,0 +1,21 @@
+diff -Naupr lighttpd-1.4.28.orig/doc/config/lighttpd.conf lighttpd-1.4.28/doc/config/lighttpd.conf
+--- lighttpd-1.4.28.orig/doc/config/lighttpd.conf 2010-07-11 19:01:32.000000000 +0200
++++ lighttpd-1.4.28/doc/config/lighttpd.conf 2010-11-08 13:38:39.698064278 +0100
+@@ -14,7 +14,7 @@
+ ## chroot example aswell.
+ ##
+ var.log_root = "/var/log/lighttpd"
+-var.server_root = "/srv/www"
++var.server_root = "/var/www"
+ var.state_dir = "/var/run"
+ var.home_dir = "/var/lib/lighttpd"
+ var.conf_dir = "/etc/lighttpd"
+@@ -112,7 +112,7 @@ server.groupname = "lighttpd"
+ ##
+ ## Document root
+ ##
+-server.document-root = server_root + "/htdocs"
++server.document-root = server_root + "/lighttpd"
+
+ ##
+ ## The value for the "Server:" response field.
diff --git a/lighttpd-1.4.29-mod_geoip.patch b/lighttpd-1.4.29-mod_geoip.patch
new file mode 100644
index 0000000..6e6825d
--- /dev/null
+++ b/lighttpd-1.4.29-mod_geoip.patch
@@ -0,0 +1,111 @@
+diff -Naupr lighttpd-1.4.29.orig/configure lighttpd-1.4.29/configure
+--- lighttpd-1.4.29.orig/configure 2011-07-03 16:14:35.000000000 +0200
++++ lighttpd-1.4.29/configure 2011-07-09 20:45:49.880755825 +0200
+@@ -18503,7 +18503,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.29.orig/configure.ac lighttpd-1.4.29/configure.ac
+--- lighttpd-1.4.29.orig/configure.ac 2011-06-13 16:10:46.000000000 +0200
++++ lighttpd-1.4.29/configure.ac 2011-07-09 20:45:49.881755822 +0200
+@@ -626,7 +626,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.29.orig/src/Makefile.am lighttpd-1.4.29/src/Makefile.am
+--- lighttpd-1.4.29.orig/src/Makefile.am 2011-06-13 16:10:46.000000000 +0200
++++ lighttpd-1.4.29/src/Makefile.am 2011-07-09 20:45:49.882755820 +0200
+@@ -265,6 +265,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.29.orig/src/Makefile.in lighttpd-1.4.29/src/Makefile.in
+--- lighttpd-1.4.29.orig/src/Makefile.in 2011-07-03 16:14:34.000000000 +0200
++++ lighttpd-1.4.29/src/Makefile.in 2011-07-09 20:45:49.883755819 +0200
+@@ -150,6 +150,12 @@ mod_accesslog_la_LINK = $(LIBTOOL) $(AM_
+ $(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)
+@@ -462,7 +468,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) \
+@@ -481,7 +488,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
+@@ -677,7 +685,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) $(LIBEV_CFLAGS)
+ @NO_RDYNAMIC_TRUE at liblightcomp_la_LDFLAGS = -avoid-version -no-undefined
+@@ -784,6 +792,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 \
+@@ -892,6 +903,8 @@ mod_access.la: $(mod_access_la_OBJECTS)
+ $(AM_V_CCLD)$(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)
+ $(AM_V_CCLD)$(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)
+ $(AM_V_CCLD)$(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)
+@@ -1101,6 +1114,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@
diff --git a/lighttpd.spec b/lighttpd.spec
index b94bd27..88532cb 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -5,12 +5,12 @@
Summary: Lightning fast webserver with light system requirements
Name: lighttpd
-Version: 1.4.26
-Release: 4%{?dist}
+Version: 1.4.28
+Release: 1%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://www.lighttpd.net/
-Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2
+Source0: http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-%{version}.tar.bz2
Source1: lighttpd.logrotate
Source2: php.d-lighttpd.ini
Source3: lighttpd.init
@@ -21,9 +21,9 @@ 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.23-defaultconf.patch
-Patch1: lighttpd-1.4.26-mod_geoip.patch
-Patch2: lighttpd-1.4.23-ssl-2157.patch
+Patch0: lighttpd-1.4.28-defaultconf.patch
+Patch1: lighttpd-1.4.29-mod_geoip.patch
+#Patch100: lighttpd-1.4.29-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}
@@ -98,7 +98,6 @@ Virtual host module for lighttpd that uses a MySQL database.
%setup -q
%patch0 -p1 -b .defaultconf
%patch1 -p1 -b .mod_geoip
-%patch2 -p0 -b .ssl-2157
%{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c
%{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt
@@ -123,7 +122,7 @@ Virtual host module for lighttpd that uses a MySQL database.
%{__make} install DESTDIR=%{buildroot}
# Install (*patched above*) sample config file
-%{__install} -D -p -m 0640 doc/lighttpd.conf \
+%{__install} -D -p -m 0640 doc/config/lighttpd.conf \
%{buildroot}%{_sysconfdir}/lighttpd/lighttpd.conf
%{__mkdir_p} %{buildroot}%{_sysconfdir}/lighttpd/conf.d
@@ -152,11 +151,24 @@ Virtual host module for lighttpd that uses a MySQL database.
%endif
%{buildroot}%{webroot}/poweredby.png
+# Example configuration to be included as %%doc
+%{__rm} -rf config
+%{__cp} -a doc/config config
+find config -name 'Makefile*' | xargs rm -f
+# Remove +x from scripts to be included as %%doc to avoid auto requirement
+%{__chmod} -x doc/scripts/*.sh
+
# 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
+%if 0%{?fedora} >= 15
+# Setup tmpfiles.d config for the above
+mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
+echo 'D /var/run/lighttpd 0750 lighttpd lighttpd -' > \
+ %{buildroot}%{_sysconfdir}/tmpfiles.d/lighttpd.conf
+%endif
%clean
@@ -185,12 +197,15 @@ fi
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
-%doc doc/*.txt doc/lighttpd.conf doc/lighttpd.user
+%doc doc/*.txt config/ doc/scripts/rrdtool-graph.sh
%dir %{_sysconfdir}/lighttpd/
%dir %{_sysconfdir}/lighttpd/conf.d/
%config(noreplace) %{_sysconfdir}/lighttpd/lighttpd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
%{_sysconfdir}/rc.d/init.d/lighttpd
+%if 0%{?fedora} >= 15
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/lighttpd.conf
+%endif
%{_sbindir}/lighttpd
%{_sbindir}/lighttpd-angel
%{_libdir}/lighttpd/
@@ -200,7 +215,11 @@ fi
%exclude %{_libdir}/lighttpd/mod_mysql_vhost.so
%{_mandir}/man8/lighttpd.8*
%attr(0750, lighttpd, lighttpd) %{_var}/log/lighttpd/
+%if 0%{?fedora} >= 15
+%ghost %attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
+%else
%attr(0750, lighttpd, lighttpd) %{_var}/run/lighttpd/
+%endif
%dir %{webroot}/
%{webroot}/*.ico
%{webroot}/*.png
@@ -209,7 +228,7 @@ fi
%files fastcgi
%defattr(-,root,root,-)
-%doc doc/fastcgi*.txt
+%doc doc/fastcgi*.txt doc/scripts/spawn-php.sh
%config(noreplace) %{_sysconfdir}/php.d/lighttpd.ini
%dir %{_libdir}/lighttpd/
%{_libdir}/lighttpd/mod_fastcgi.so
@@ -228,12 +247,23 @@ fi
%changelog
+* Sat Jul 9 2011 Matthias Saou <http://freshrpms.net/> 1.4.28-1
+- Rebase F15 master to the 1.4.28 update
+- Try to update to 1.4.29 (#625737).
+- Rebase geoip patch for 1.4.29.
+- Update /var/run to work with F15+ (#656612).
+
* Wed Mar 23 2011 Dan Horák <dan at danny.cz> - 1.4.26-4
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.26-3
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Mon Nov 8 2010 Matthias Saou <http://freshrpms.net/> 1.4.28-1
+- Update to 1.4.28.
+- Update defaultconf patch.
+- Remove upstreamed ssl-2157 patch.
+
* Fri Apr 16 2010 Matthias Saou <http://freshrpms.net/> 1.4.26-2
- Update to 1.4.26.
- Update the geoip patch.
diff --git a/sources b/sources
index d970f46..dda13e4 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-a682c8efce47a2f4263a247ba0813c9b lighttpd-1.4.26.tar.bz2
+586eb535d31ac299652495b058dd87c4 lighttpd-1.4.28.tar.bz2
+e6e67b09986cb504db630b5a86b2dd76 lighttpd-1.4.29.tar.bz2
More information about the scm-commits
mailing list