Changes - j0ke.net Open Build Service

Changes of Revision 30

[-] [+]	Changed	lighttpd-CentOS_5.spec
@@ -17,7 +17,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd -Version: 1.4.25 +Version: 1.4.26 Release: 10 License: BSD Group: System Environment/Daemons @@ -28,6 +28,7 @@ Source: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2 Patch0: lighttpd-1.4.23-defaultconf.patch +Patch1: 08-ssl-retval-fix.patch ## included in 1.4.23 ##Patch1: log-cronolog2.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -81,6 +82,7 @@ %prep %setup %patch0 -p1 -b .defaultconf +%patch1 -p1 -b .sslretvalfix ##%patch1 -p0 -b .cronolog2 %{__cat} <<EOF >lighttpd.logrotate @@ -199,6 +201,9 @@ %{_libdir}/lighttpd/mod_fastcgi.so %changelog +* Fri Apr 02 2010 Carsten Schoene <cs@linux-administrator.com> - 1.4.26-10 +- updated to release 1.4.26 + * Sat Nov 21 2009 Carsten Schoene <cs@linux-administrator.com> - 1.4.25-1 - updated to release 1.4.25
[-] [+]	Changed	lighttpd-RHEL_5.spec ^
@@ -17,7 +17,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd -Version: 1.4.25 +Version: 1.4.26 Release: 10 License: BSD Group: System Environment/Daemons @@ -28,6 +28,7 @@ Source: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2 Patch0: lighttpd-1.4.23-defaultconf.patch +Patch1: 08-ssl-retval-fix.patch ## included in 1.4.23 ##Patch1: log-cronolog2.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -81,6 +82,7 @@ %prep %setup %patch0 -p1 -b .defaultconf +%patch1 -p1 -b .sslretvalfix ##%patch1 -p0 -b .cronolog2 %{__cat} <<EOF >lighttpd.logrotate @@ -199,6 +201,9 @@ %{_libdir}/lighttpd/mod_fastcgi.so %changelog +* Fri Apr 02 2010 Carsten Schoene <cs@linux-administrator.com> - 1.4.26-10 +- updated to release 1.4.26 + * Sat Nov 21 2009 Carsten Schoene <cs@linux-administrator.com> - 1.4.25-1 - updated to release 1.4.25
[-] [+]	Changed	lighttpd.spec ^
@@ -1,5 +1,5 @@ # -# spec file for package lighttpd (Version 1.4.25) +# spec file for package lighttpd (Version 1.4.26) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: lighttpd -Version: 1.4.25 +Version: 1.4.26 Release: 10 # %define pkg_name lighttpd @@ -77,6 +77,7 @@ Source4: lightytest.sh Source5: lighttpd.SuSEfirewall Source6: lighttpd-ssl.SuSEfirewall +Patch0: 08-ssl-retval-fix.patch #Patch1: lighttpd-1.4.16_testsuite.patch Patch2: lighttpd-1.4.13_geoip.patch ## included in 1.4.23 @@ -257,6 +258,7 @@ %debug_package %prep %setup -a 3 +%patch0 -p1 #%patch1 %if 0%{?with_geoip} %patch2
[-] [+]	Added	08-ssl-retval-fix.patch ^
@@ -0,0 +1,12 @@ +diff -purN orig/src/network.c lighttpd-1.4.25/src/network.c +--- orig/src/network.c 2010-01-28 10:43:33.829209750 -0500 ++++ lighttpd-1.4.25/src/network.c 2010-01-28 10:44:22.639208732 -0500 +@@ -525,7 +525,7 @@ int network_init(server srv) { + + 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;
	Added	lighttpd-1.4.26.tar.bz2 ^