From 2e2e9bcb1873d4bfa0a28cfb06126a1a657bac30 Mon Sep 17 00:00:00 2001 From: nico Date: Tue, 30 Mar 2010 12:04:24 +0000 Subject: [PATCH] [packages] lighttpd: add a patch fixing upstream issue [http://redmine.lighttpd.net/issues/2157 2157] with recent OpenSSL (closes: #6996) git-svn-id: svn://svn.openwrt.org/openwrt/packages@20600 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/lighttpd/Makefile | 2 +- net/lighttpd/patches/001-issue_2157.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 net/lighttpd/patches/001-issue_2157.patch diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile index 129936748..423c8cc72 100644 --- a/net/lighttpd/Makefile +++ b/net/lighttpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lighttpd PKG_VERSION:=1.4.26 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x/ diff --git a/net/lighttpd/patches/001-issue_2157.patch b/net/lighttpd/patches/001-issue_2157.patch new file mode 100644 index 000000000..8cb3a3fc0 --- /dev/null +++ b/net/lighttpd/patches/001-issue_2157.patch @@ -0,0 +1,13 @@ +http://redmine.lighttpd.net/issues/2157 + +--- a/src/network.c ++++ b/src/network.c +@@ -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; -- 2.11.0