[lighttpd] 1.4.34.
Jon Ciesla
limb at fedoraproject.org
Wed Feb 5 16:14:44 UTC 2014
commit 73b29dddf16a7d8f0b2cf1be98cbf2af69da7137
Author: Jon Ciesla <limburgher at gmail.com>
Date: Wed Feb 5 10:12:58 2014 -0600
1.4.34.
.gitignore | 1 +
lighttpd-1.4.34-mod_geoip.patch | 112 +++++++++++++++++++++++++++++++++++++++
lighttpd.spec | 10 +++-
sources | 2 +-
4 files changed, 121 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5731f6b..4d1647a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/lighttpd-1.4.30.tar.bz2
/lighttpd-1.4.31.tar.bz2
/lighttpd-1.4.32.tar.bz2
+/lighttpd-1.4.34.tar.bz2
diff --git a/lighttpd-1.4.34-mod_geoip.patch b/lighttpd-1.4.34-mod_geoip.patch
new file mode 100644
index 0000000..47854ec
--- /dev/null
+++ b/lighttpd-1.4.34-mod_geoip.patch
@@ -0,0 +1,112 @@
+diff -Naupr lighttpd-1.4.32.orig/configure lighttpd-1.4.32/configure
+--- lighttpd-1.4.32.orig/configure 2012-11-20 12:56:24.000000000 +0200
++++ lighttpd-1.4.32/configure 2013-08-22 18:27:23.000000000 +0300
+@@ -18731,7 +18731,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.32.orig/configure.ac lighttpd-1.4.32/configure.ac
+--- lighttpd-1.4.32.orig/configure.ac 2012-11-19 12:05:29.000000000 +0200
++++ lighttpd-1.4.32/configure.ac 2013-08-22 18:28:07.000000000 +0300
+@@ -645,7 +645,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.32.orig/src/Makefile.in lighttpd-1.4.32/src/Makefile.in
+--- lighttpd-1.4.32.orig/src/Makefile.in 2012-11-20 12:56:23.000000000 +0200
++++ lighttpd-1.4.32/src/Makefile.in 2013-08-22 18:33:33.000000000 +0300
+@@ -173,6 +173,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)
+@@ -485,7 +491,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) \
+@@ -504,7 +511,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)
+ am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+@@ -704,7 +712,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
+@@ -1131,6 +1144,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@
+--- lighttpd-1.4.34/src/Makefile.in~ 2014-01-20 06:09:11.000000000 -0600
++++ lighttpd-1.4.34/src/Makefile.in 2014-02-05 09:39:10.656755370 -0600
+@@ -865,6 +865,9 @@
+ mod_accesslog_la_SOURCES = mod_accesslog.c
+ mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version
+ 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 \
+@@ -978,6 +981,9 @@
+ mod_access.la: $(mod_access_la_OBJECTS) $(mod_access_la_DEPENDENCIES) $(EXTRA_mod_access_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(mod_access_la_LINK) -rpath $(libdir) $(mod_access_la_OBJECTS) $(mod_access_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_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)
+
+--- lighttpd-1.4.34/src/Makefile.am~ 2013-12-03 10:17:52.000000000 -0600
++++ lighttpd-1.4.34/src/Makefile.am 2014-02-05 09:42:49.456761395 -0600
+@@ -265,6 +265,10 @@
+ mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version
+ 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 --git a/lighttpd.spec b/lighttpd.spec
index 727b3b9..8a989f9 100644
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -54,7 +54,7 @@
Summary: Lightning fast webserver with light system requirements
Name: lighttpd
-Version: 1.4.32
+Version: 1.4.34
Release: 1%{?dist}
License: BSD
Group: System Environment/Daemons
@@ -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.32-mod_geoip.patch
+Patch1: lighttpd-1.4.34-mod_geoip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# For the target poweredby.png image (skip requirement + provide image on RHEL)
%if %{with systemlogos}
@@ -90,7 +90,7 @@ Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service
%endif
Provides: webserver
-BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel
+BuildRequires: openssl-devel, pcre-devel, bzip2-devel, zlib-devel, autoconf, automake, libtool
BuildRequires: /usr/bin/awk
%{?with_ldap:BuildRequires: openldap-devel}
%{?with_fam:BuildRequires: gamin-devel}
@@ -155,6 +155,7 @@ install -p -m 0644 %{SOURCE101} mod_geoip.txt
%build
+autoreconf -if
%configure \
--libdir='%{_libdir}/lighttpd' \
%{confswitch mysql} \
@@ -332,6 +333,9 @@ fi
%changelog
+* Wed Feb 05 2014 Jon Ciesla <limburgher at gmail.com> - 1.4.34-1
+- 1.4.34, multiple security fixes.
+
* Mon Aug 26 2013 Jon Ciesla <limburgher at gmail.com> - 1.4.32-1
- Update to 1.4.32, BZ 878915.
diff --git a/sources b/sources
index 3853693..eaf9cd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e2d4ae8e918d4de1aeb9842584d170b lighttpd-1.4.32.tar.bz2
+1071c172ccdd3ba31b56292661236d4b lighttpd-1.4.34.tar.bz2
More information about the scm-commits
mailing list