From owner-svn-ports-head@freebsd.org  Sat Jul 11 08:07:07 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id DBDBA35B40B;
 Sat, 11 Jul 2020 08:07:07 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4B3jDq5WLJz4bxL;
 Sat, 11 Jul 2020 08:07:07 +0000 (UTC)
 (envelope-from danfe@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A0A1CFC6D;
 Sat, 11 Jul 2020 08:07:07 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06B877Ex058578;
 Sat, 11 Jul 2020 08:07:07 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06B877Jk058577;
 Sat, 11 Jul 2020 08:07:07 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <202007110807.06B877Jk058577@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Sat, 11 Jul 2020 08:07:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r541954 - in head/security/distcache: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: danfe
X-SVN-Commit-Paths: in head/security/distcache: . files
X-SVN-Commit-Revision: 541954
X-SVN-Commit-Repository: ports
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.33
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Jul 2020 08:07:07 -0000

Author: danfe
Date: Sat Jul 11 08:07:07 2020
New Revision: 541954
URL: https://svnweb.freebsd.org/changeset/ports/541954

Log:
  Minor improvements to r541400:
  - Correct macro to check for is OPENSSL_NO_SSL3_METHOD, not OPENSSL_NO_SSL3
  - While no-op, be formally correct and run the tests from the $TEST_WRKSRC

Modified:
  head/security/distcache/Makefile
  head/security/distcache/files/patch-ssl__swamp__utils.c

Modified: head/security/distcache/Makefile
==============================================================================
--- head/security/distcache/Makefile	Sat Jul 11 07:53:20 2020	(r541953)
+++ head/security/distcache/Makefile	Sat Jul 11 08:07:07 2020	(r541954)
@@ -38,6 +38,6 @@ post-install-DOCS-on:
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 do-test:
-	@cd ${WRKSRC} && ${SH} devel/test.sh
+	@cd ${TEST_WRKSRC} && ${SH} devel/test.sh
 
 .include <bsd.port.mk>

Modified: head/security/distcache/files/patch-ssl__swamp__utils.c
==============================================================================
--- head/security/distcache/files/patch-ssl__swamp__utils.c	Sat Jul 11 07:53:20 2020	(r541953)
+++ head/security/distcache/files/patch-ssl__swamp__utils.c	Sat Jul 11 08:07:07 2020	(r541954)
@@ -8,7 +8,7 @@
  	else if(!strcmp(str_toconvert, "sslv2"))
  		*val = SWAMP_SSLMETH_SSLv2;
 +#endif
-+#ifndef OPENSSL_NO_SSL3
++#ifndef OPENSSL_NO_SSL3_METHOD
  	else if(!strcmp(str_toconvert, "sslv3"))
  		*val = SWAMP_SSLMETH_SSLv3;
 +#endif