[lighttpd] Update to 1.4.31 (#828198)

Matthias Saou thias at fedoraproject.org
Wed Jun 6 11:41:44 UTC 2012 

commit ffc10d2d9128c1c49873cfe80394d5a5120dc9d2
Author: Matthias Saou <matthias at saou.eu>
Date:   Wed Jun 6 13:41:34 2012 +0200

    Update to 1.4.31 (#828198)

 ..._geoip.patch => lighttpd-1.4.31-mod_geoip.patch |   48 ++++++++++----------
 lighttpd.spec                                      |    9 +++-
 2 files changed, 30 insertions(+), 27 deletions(-)
---
diff --git a/lighttpd-1.4.30-mod_geoip.patch b/lighttpd-1.4.31-mod_geoip.patch
similarity index 79%
rename from lighttpd-1.4.30-mod_geoip.patch
rename to lighttpd-1.4.31-mod_geoip.patch
index 957a3a6..e80e6a4 100644
--- a/lighttpd-1.4.30-mod_geoip.patch
+++ b/lighttpd-1.4.31-mod_geoip.patch
@@ -1,7 +1,7 @@
-diff -Naupr lighttpd-1.4.30.orig/configure lighttpd-1.4.30/configure
---- lighttpd-1.4.30.orig/configure	2011-12-18 15:54:03.000000000 +0100
-+++ lighttpd-1.4.30/configure	2012-03-26 16:23:09.303671959 +0200
-@@ -18555,7 +18555,7 @@ fi
+diff -Naupr lighttpd-1.4.31.orig/configure lighttpd-1.4.31/configure
+--- lighttpd-1.4.31.orig/configure	2012-05-31 17:10:37.000000000 +0200
++++ lighttpd-1.4.31/configure	2012-06-06 13:25:14.448129276 +0200
+@@ -18625,7 +18625,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"
  
@@ -10,10 +10,10 @@ diff -Naupr lighttpd-1.4.30.orig/configure lighttpd-1.4.30/configure
  features="regex-conditionals"
  if test ! "x$PCRE_LIB" = x; then
  	do_build="$do_build $plugins"
-diff -Naupr lighttpd-1.4.30.orig/configure.ac lighttpd-1.4.30/configure.ac
---- lighttpd-1.4.30.orig/configure.ac	2011-07-03 18:33:11.000000000 +0200
-+++ lighttpd-1.4.30/configure.ac	2012-03-26 16:23:09.304610002 +0200
-@@ -626,7 +626,7 @@ AC_OUTPUT
+diff -Naupr lighttpd-1.4.31.orig/configure.ac lighttpd-1.4.31/configure.ac
+--- lighttpd-1.4.31.orig/configure.ac	2012-05-31 16:49:18.000000000 +0200
++++ lighttpd-1.4.31/configure.ac	2012-06-06 13:25:14.449128563 +0200
+@@ -642,7 +642,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"
  
@@ -22,9 +22,9 @@ diff -Naupr lighttpd-1.4.30.orig/configure.ac lighttpd-1.4.30/configure.ac
  features="regex-conditionals"
  if test ! "x$PCRE_LIB" = x; then
  	do_build="$do_build $plugins"
-diff -Naupr lighttpd-1.4.30.orig/src/Makefile.am lighttpd-1.4.30/src/Makefile.am
---- lighttpd-1.4.30.orig/src/Makefile.am	2011-07-30 11:13:01.000000000 +0200
-+++ lighttpd-1.4.30/src/Makefile.am	2012-03-26 16:23:09.306671670 +0200
+diff -Naupr lighttpd-1.4.31.orig/src/Makefile.am lighttpd-1.4.31/src/Makefile.am
+--- lighttpd-1.4.31.orig/src/Makefile.am	2011-07-30 11:13:01.000000000 +0200
++++ lighttpd-1.4.31/src/Makefile.am	2012-06-06 13:25:14.455128235 +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)
@@ -37,10 +37,10 @@ diff -Naupr lighttpd-1.4.30.orig/src/Makefile.am lighttpd-1.4.30/src/Makefile.am
  
  hdr = server.h buffer.h network.h log.h keyvalue.h \
        response.h request.h fastcgi.h chunk.h \
-diff -Naupr lighttpd-1.4.30.orig/src/Makefile.in lighttpd-1.4.30/src/Makefile.in
---- lighttpd-1.4.30.orig/src/Makefile.in	2011-12-18 15:54:02.000000000 +0100
-+++ lighttpd-1.4.30/src/Makefile.in	2012-03-26 16:23:09.308627456 +0200
-@@ -150,6 +150,12 @@ mod_accesslog_la_LINK = $(LIBTOOL) $(AM_
+diff -Naupr lighttpd-1.4.31.orig/src/Makefile.in lighttpd-1.4.31/src/Makefile.in
+--- lighttpd-1.4.31.orig/src/Makefile.in	2012-05-31 17:10:35.000000000 +0200
++++ lighttpd-1.4.31/src/Makefile.in	2012-06-06 13:28:31.554315865 +0200
+@@ -156,6 +156,12 @@ mod_accesslog_la_LINK = $(LIBTOOL) $(AM_
  	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
  	$(AM_CFLAGS) $(CFLAGS) $(mod_accesslog_la_LDFLAGS) $(LDFLAGS) \
  	-o $@
@@ -53,7 +53,7 @@ diff -Naupr lighttpd-1.4.30.orig/src/Makefile.in lighttpd-1.4.30/src/Makefile.in
  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
+@@ -468,7 +474,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) \
@@ -63,7 +63,7 @@ diff -Naupr lighttpd-1.4.30.orig/src/Makefile.in lighttpd-1.4.30/src/Makefile.in
  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
+@@ -487,7 +494,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) \
@@ -73,7 +73,7 @@ diff -Naupr lighttpd-1.4.30.orig/src/Makefile.in lighttpd-1.4.30/src/Makefile.in
  HEADERS = $(noinst_HEADERS)
  ETAGS = etags
  CTAGS = ctags
-@@ -677,7 +685,7 @@ lib_LTLIBRARIES = $(am__append_1) mod_fl
+@@ -683,7 +691,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 \
@@ -82,7 +82,7 @@ diff -Naupr lighttpd-1.4.30.orig/src/Makefile.in lighttpd-1.4.30/src/Makefile.in
  @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)
+@@ -790,6 +798,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)
@@ -92,16 +92,16 @@ diff -Naupr lighttpd-1.4.30.orig/src/Makefile.in lighttpd-1.4.30/src/Makefile.in
  hdr = server.h buffer.h network.h log.h keyvalue.h \
        response.h request.h fastcgi.h chunk.h \
        settings.h http_chunk.h \
-@@ -892,6 +903,8 @@ mod_access.la: $(mod_access_la_OBJECTS) 
+@@ -898,6 +909,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) 
+ mod_accesslog.la: $(mod_accesslog_la_OBJECTS) $(mod_accesslog_la_DEPENDENCIES) $(EXTRA_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) 
+ mod_alias.la: $(mod_alias_la_OBJECTS) $(mod_alias_la_DEPENDENCIES) $(EXTRA_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) 
-@@ -1100,6 +1113,7 @@ distclean-compile:
+ mod_auth.la: $(mod_auth_la_OBJECTS) $(mod_auth_la_DEPENDENCIES) $(EXTRA_mod_auth_la_DEPENDENCIES) 
+@@ -1106,6 +1119,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@
diff --git a/lighttpd.spec b/lighttpd.spec
index 0f52dfe..7cc82c2 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -54,8 +54,8 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.30
-Release: 2%{?dist}
+Version: 1.4.31
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -72,7 +72,7 @@ Source14: lighttpd-empty.png
 Source100: lighttpd-mod_geoip.c
 Source101: lighttpd-mod_geoip.txt
 Patch0: lighttpd-1.4.28-defaultconf.patch
-Patch1: lighttpd-1.4.30-mod_geoip.patch
+Patch1: lighttpd-1.4.31-mod_geoip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # For the target poweredby.png image (skip requirement + provide image on RHEL)
 %if %{with systemlogos}
@@ -332,6 +332,9 @@ fi
 
 
 %changelog
+* Wed Jun  6 2012 Matthias Saou <matthias at saou.eu> 1.4.31-1
+- Update to 1.4.31 (#828198).
+
 * Tue Apr 17 2012 Jon Ciesla <limburgher at gmail.com> - 1.4.30-2
 - service file patch per BZ 720210.

More information about the scm-commits mailing list