[lighttpd] Update to 1.4.30
Matthias Saou
thias at fedoraproject.org
Mon Mar 26 14:33:56 UTC 2012
commit 1c3f70930939387473a8c991e285e5f49c88f918
Author: Matthias Saou <matthias at saou.eu>
Date: Mon Mar 26 16:33:42 2012 +0200
Update to 1.4.30
.gitignore | 1 +
..._geoip.patch => lighttpd-1.4.30-mod_geoip.patch | 30 ++++++++++----------
lighttpd.spec | 13 +++++---
lighttpd_1.4.29_ssl_no_ecdh.patch | 17 -----------
sources | 3 +-
5 files changed, 25 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4629be3..80f217f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/lighttpd-1.4.26.tar.bz2
/lighttpd-1.4.28.tar.bz2
/lighttpd-1.4.29.tar.bz2
+/lighttpd-1.4.30.tar.bz2
diff --git a/lighttpd-1.4.29-mod_geoip.patch b/lighttpd-1.4.30-mod_geoip.patch
similarity index 86%
rename from lighttpd-1.4.29-mod_geoip.patch
rename to lighttpd-1.4.30-mod_geoip.patch
index 6e6825d..957a3a6 100644
--- a/lighttpd-1.4.29-mod_geoip.patch
+++ b/lighttpd-1.4.30-mod_geoip.patch
@@ -1,7 +1,7 @@
-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
+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
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,9 +10,9 @@ diff -Naupr lighttpd-1.4.29.orig/configure lighttpd-1.4.29/configure
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
+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
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.29.orig/configure.ac lighttpd-1.4.29/configure.ac
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
+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
@@ -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,9 +37,9 @@ diff -Naupr lighttpd-1.4.29.orig/src/Makefile.am lighttpd-1.4.29/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.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
+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_
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(mod_accesslog_la_LDFLAGS) $(LDFLAGS) \
@@ -91,7 +91,7 @@ diff -Naupr lighttpd-1.4.29.orig/src/Makefile.in lighttpd-1.4.29/src/Makefile.in
+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 \
+ settings.h http_chunk.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)
@@ -101,7 +101,7 @@ diff -Naupr lighttpd-1.4.29.orig/src/Makefile.in lighttpd-1.4.29/src/Makefile.in
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:
+@@ -1100,6 +1113,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 7279c09..a98280f 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -54,8 +54,8 @@
Summary: Lightning fast webserver with light system requirements
Name: lighttpd
-Version: 1.4.29
-Release: 3%{?dist}
+Version: 1.4.30
+Release: 1%{?dist}
License: BSD
Group: System Environment/Daemons
URL: http://www.lighttpd.net/
@@ -72,8 +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.29-mod_geoip.patch
-Patch100: http://redmine.lighttpd.net/attachments/download/1294/lighttpd_1.4.29_ssl_no_ecdh.patch
+Patch1: lighttpd-1.4.30-mod_geoip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# For the target poweredby.png image (skip requirement + provide image on RHEL)
%if %{with systemlogos}
@@ -151,7 +150,6 @@ Virtual host module for lighttpd that uses a MySQL database.
%setup -q
%patch0 -p1 -b .defaultconf
%patch1 -p1 -b .mod_geoip
-%patch100 -p1
install -p -m 0644 %{SOURCE100} src/mod_geoip.c
install -p -m 0644 %{SOURCE101} mod_geoip.txt
@@ -334,6 +332,11 @@ fi
%changelog
+* Mon Mar 26 2012 Matthias Saou <matthias at saou.eu> 1.4.30-1
+- Update to 1.4.30 (#768903).
+- Update mod_geoip patch.
+- Remove upstreamed ssl_no_ecdh patch.
+
* Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 1.4.29-3
- Rebuild against PCRE 8.30
diff --git a/sources b/sources
index dda13e4..864bc47 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-586eb535d31ac299652495b058dd87c4 lighttpd-1.4.28.tar.bz2
-e6e67b09986cb504db630b5a86b2dd76 lighttpd-1.4.29.tar.bz2
+63f9df52dcae0ab5689a95c99c54e48a lighttpd-1.4.30.tar.bz2
More information about the scm-commits
mailing list