From owner-svn-ports-all@freebsd.org Mon Sep 12 02:30:44 2016 Return-Path: Delivered-To: svn-ports-all@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 E42EBBD7E0A; Mon, 12 Sep 2016 02:30:44 +0000 (UTC) (envelope-from marino@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 91A928C8; Mon, 12 Sep 2016 02:30:44 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8C2Uhnu096257; Mon, 12 Sep 2016 02:30:43 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8C2UhMe096255; Mon, 12 Sep 2016 02:30:43 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609120230.u8C2UhMe096255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Mon, 12 Sep 2016 02:30:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421897 - in head/www/httest: . 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Sep 2016 02:30:45 -0000 Author: marino Date: Mon Sep 12 02:30:43 2016 New Revision: 421897 URL: https://svnweb.freebsd.org/changeset/ports/421897 Log: www/httest: Document SSL requirement and support LibreSSL Approved by: SSL blanket Added: head/www/httest/files/ head/www/httest/files/patch-src_ssl__module.c (contents, props changed) Modified: head/www/httest/Makefile Modified: head/www/httest/Makefile ============================================================================== --- head/www/httest/Makefile Mon Sep 12 02:20:51 2016 (r421896) +++ head/www/httest/Makefile Mon Sep 12 02:30:43 2016 (r421897) @@ -27,7 +27,7 @@ CONFIGURE_ARGS= --enable-lua-module \ --with-ssl="${OPENSSLLIB}" CPPFLAGS+= -I${LUA_INCDIR} GNU_CONFIGURE= yes -USES= iconv lua libtool bdb +USES= iconv lua libtool bdb ssl USE_OPENSSL= yes USE_LDCONFIG= yes Added: head/www/httest/files/patch-src_ssl__module.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/httest/files/patch-src_ssl__module.c Mon Sep 12 02:30:43 2016 (r421897) @@ -0,0 +1,46 @@ +--- src/ssl_module.c.orig 2015-03-16 15:46:05 UTC ++++ src/ssl_module.c +@@ -349,7 +349,7 @@ static void ssl_message_trace(int write_ + case DTLS1_VERSION: + str_version = "DTLS 1.0"; + break; +-#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL) ++#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && defined(DTLS1_BAD_VER) + case DTLS1_BAD_VER: + str_version = "DTLS 1.0 (bad)"; + break; +@@ -421,7 +421,7 @@ static void ssl_message_trace(int write_ + version == TLS1_1_VERSION || + #endif + version == DTLS1_VERSION +-#if (OPENSSL_VERSION_NUMBER >= 0x1000100fL) ++#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && defined(DTLS1_BAD_VER) + || version == DTLS1_BAD_VER + #endif + ) { +@@ -740,10 +740,12 @@ static int worker_set_client_method(work + config->meth = SSLv2_client_method(); + } + #endif ++#ifndef OPENSSL_NO_SSL3 + else if (strcasecmp(sslstr, "SSL3") == 0) { + is_ssl = 1; + config->meth = SSLv3_client_method(); + } ++#endif + else if (strcasecmp(sslstr, "TLS1") == 0) { + is_ssl = 1; + config->meth = TLSv1_client_method(); +@@ -787,10 +789,12 @@ static int worker_set_server_method(work + config->meth = SSLv2_server_method(); + } + #endif ++#ifndef OPENSSL_NO_SSL3 + else if (strcasecmp(sslstr, "SSL3") == 0) { + is_ssl = 1; + config->meth = SSLv3_server_method(); + } ++#endif + else if (strcasecmp(sslstr, "TLS1") == 0) { + is_ssl = 1; + config->meth = TLSv1_server_method();