From e9bc4b9258a6250a4fe9bb6811a9552476a31623 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Apr 28 2010 09:04:26 +0000 Subject: Update to 1.4.26 and include SSL fix. --- diff --git a/.cvsignore b/.cvsignore index a8f1b22..f10a53f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lighttpd-1.4.23.tar.bz2 +lighttpd-1.4.26.tar.bz2 diff --git a/lighttpd-1.4.23-mod_geoip.patch b/lighttpd-1.4.23-mod_geoip.patch deleted file mode 100644 index a8bbb96..0000000 --- a/lighttpd-1.4.23-mod_geoip.patch +++ /dev/null @@ -1,111 +0,0 @@ -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@liblightcomp_la_SOURCES = $(common_src) - @NO_RDYNAMIC_TRUE@liblightcomp_la_CFLAGS = $(AM_CFLAGS) - @NO_RDYNAMIC_TRUE@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@./$(DEPDIR)/md5.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_access.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_accesslog.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_geoip.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_alias.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_auth.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_cgi.Plo@am__quote@ diff --git a/lighttpd-1.4.23-ssl-2157.patch b/lighttpd-1.4.23-ssl-2157.patch new file mode 100644 index 0000000..c0abd36 --- /dev/null +++ b/lighttpd-1.4.23-ssl-2157.patch @@ -0,0 +1,13 @@ +Index: network.c +=================================================================== +--- src/network.c (revision 2715) ++++ src/network.c (revision 2716) +@@ -525,7 +525,7 @@ + + if (!s->ssl_use_sslv2) { + /* disable SSLv2 */ +- if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) { ++ if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) { + log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:", + ERR_error_string(ERR_get_error(), NULL)); + return -1; diff --git a/lighttpd-1.4.26-mod_geoip.patch b/lighttpd-1.4.26-mod_geoip.patch new file mode 100644 index 0000000..eb2e00a --- /dev/null +++ b/lighttpd-1.4.26-mod_geoip.patch @@ -0,0 +1,111 @@ +diff -Naupr lighttpd-1.4.26.orig/configure lighttpd-1.4.26/configure +--- lighttpd-1.4.26.orig/configure 2010-02-07 21:05:45.000000000 +0100 ++++ lighttpd-1.4.26/configure 2010-04-16 14:21:27.167489691 +0200 +@@ -17395,7 +17395,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.26.orig/configure.ac lighttpd-1.4.26/configure.ac +--- lighttpd-1.4.26.orig/configure.ac 2010-02-02 00:28:20.000000000 +0100 ++++ lighttpd-1.4.26/configure.ac 2010-04-16 14:21:27.169489673 +0200 +@@ -581,7 +581,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.26.orig/src/Makefile.am lighttpd-1.4.26/src/Makefile.am +--- lighttpd-1.4.26.orig/src/Makefile.am 2010-02-02 00:28:20.000000000 +0100 ++++ lighttpd-1.4.26/src/Makefile.am 2010-04-16 14:21:27.169489673 +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.26.orig/src/Makefile.in lighttpd-1.4.26/src/Makefile.in +--- lighttpd-1.4.26.orig/src/Makefile.in 2010-02-07 21:05:44.000000000 +0100 ++++ lighttpd-1.4.26/src/Makefile.in 2010-04-16 14:23:26.470489480 +0200 +@@ -149,6 +149,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) +@@ -461,7 +467,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) \ +@@ -480,7 +487,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 +@@ -669,7 +677,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@liblightcomp_la_SOURCES = $(common_src) + @NO_RDYNAMIC_TRUE@liblightcomp_la_CFLAGS = $(AM_CFLAGS) + @NO_RDYNAMIC_TRUE@liblightcomp_la_LDFLAGS = -avoid-version -no-undefined +@@ -776,6 +784,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 \ +@@ -884,6 +895,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) +@@ -1091,6 +1104,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_access.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_accesslog.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_geoip.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_alias.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_auth.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_cgi.Plo@am__quote@ diff --git a/lighttpd.spec b/lighttpd.spec index b0f7314..9f5f3a2 100644 --- a/lighttpd.spec +++ b/lighttpd.spec @@ -5,8 +5,8 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd -Version: 1.4.23 -Release: 1%{?dist} +Version: 1.4.26 +Release: 2%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -22,7 +22,8 @@ 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.23-mod_geoip.patch +Patch1: lighttpd-1.4.26-mod_geoip.patch +Patch2: lighttpd-1.4.23-ssl-2157.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # For the target poweredby.png image (skip requirement + provide image on RHEL) %if 0%{!?rhel:1} @@ -97,6 +98,7 @@ 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 @@ -182,7 +184,7 @@ fi %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README +%doc AUTHORS COPYING README %doc doc/*.txt doc/lighttpd.conf doc/lighttpd.user %dir %{_sysconfdir}/lighttpd/ %dir %{_sysconfdir}/lighttpd/conf.d/ @@ -226,6 +228,12 @@ fi %changelog +* Fri Apr 16 2010 Matthias Saou 1.4.26-2 +- Update to 1.4.26. +- Update the geoip patch. +- Remove no longer provided ChangeLog from %%doc. +- Include patch to fix upstream SSL related bug #2157. + * Thu Sep 3 2009 Matthias Saou 1.4.23-1 - Update to 1.4.23. - Update defaultconf and mod_geoip patches. diff --git a/sources b/sources index 0052cac..d970f46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ab6bb7b17bf0f515ce7dce68e5e215a lighttpd-1.4.23.tar.bz2 +a682c8efce47a2f4263a247ba0813c9b lighttpd-1.4.26.tar.bz2