From owner-svn-ports-head@freebsd.org Wed May 11 14:33:35 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 50818B374A0; Wed, 11 May 2016 14:33:35 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 082B110B2; Wed, 11 May 2016 14:33:34 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4BEXYwg092279; Wed, 11 May 2016 14:33:34 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BEXYQl092277; Wed, 11 May 2016 14:33:34 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201605111433.u4BEXYQl092277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Wed, 11 May 2016 14:33:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414996 - head/www/lighttpd/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 May 2016 14:33:35 -0000 Author: brnrd Date: Wed May 11 14:33:34 2016 New Revision: 414996 URL: https://svnweb.freebsd.org/changeset/ports/414996 Log: www/lighttpd: Fix run-time issue with LibreSSL 2.3 - Add upstream fix for SSL_OP_NO_SSLv2/v3 [1] [1] https://redmine.lighttpd.net/projects/lighttpd/repository/revisions/1ca52fdce3b87f7748dd5db6f59d738ed7a9efe1/diff PR: 209266 Submitted by: Christian Heckendorf Approved by: Piotr Kubaj (maintaner) Added: head/www/lighttpd/files/patch-src_network.c (contents, props changed) Added: head/www/lighttpd/files/patch-src_network.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/lighttpd/files/patch-src_network.c Wed May 11 14:33:34 2016 (r414996) @@ -0,0 +1,23 @@ +Cherry-picked from upstream +https://redmine.lighttpd.net/projects/lighttpd/repository/revisions/1ca52fdce3b87f7748dd5db6f59d738ed7a9efe1/diff + +--- src/network.c.orig 2015-12-04 21:13:47 UTC ++++ src/network.c +@@ -769,7 +769,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)) != SSL_OP_NO_SSLv2) { + log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:", + ERR_error_string(ERR_get_error(), NULL)); + return -1; +@@ -778,7 +778,7 @@ int network_init(server *srv) { + + if (!s->ssl_use_sslv3) { + /* disable SSLv3 */ +- if (!(SSL_OP_NO_SSLv3 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv3))) { ++ if ((SSL_OP_NO_SSLv3 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv3)) != SSL_OP_NO_SSLv3) { + log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:", + ERR_error_string(ERR_get_error(), NULL)); + return -1;