From owner-svn-src-projects@freebsd.org Mon May 4 23:49:38 2020 Return-Path: Delivered-To: svn-src-projects@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 1D8612C74D7 for ; Mon, 4 May 2020 23:49:38 +0000 (UTC) (envelope-from rmacklem@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) server-signature RSA-PSS (4096 bits) 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 49GKMj6yplz40Gb; Mon, 4 May 2020 23:49:37 +0000 (UTC) (envelope-from rmacklem@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 E5F4E48C0; Mon, 4 May 2020 23:49:37 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 044NnbqW083689; Mon, 4 May 2020 23:49:37 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 044Nnbek083688; Mon, 4 May 2020 23:49:37 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202005042349.044Nnbek083688@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 4 May 2020 23:49:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r360646 - projects/nfs-over-tls X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls X-SVN-Commit-Revision: 360646 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2020 23:49:38 -0000 Author: rmacklem Date: Mon May 4 23:49:37 2020 New Revision: 360646 URL: https://svnweb.freebsd.org/changeset/base/360646 Log: Replace openssl3.patch with a slightly cleaner one. Modified: projects/nfs-over-tls/openssl3.patch Modified: projects/nfs-over-tls/openssl3.patch ============================================================================== --- projects/nfs-over-tls/openssl3.patch Mon May 4 23:05:11 2020 (r360645) +++ projects/nfs-over-tls/openssl3.patch Mon May 4 23:49:37 2020 (r360646) @@ -1,18 +1,22 @@ --- conf.h.sav 2020-05-02 08:36:38.880690000 -0700 -+++ conf.h 2020-05-02 08:37:15.173793000 -0700 -@@ -34,6 +34,7 @@ typedef struct { ++++ conf.h 2020-04-03 13:13:12.140750000 -0700 +@@ -33,9 +33,6 @@ typedef struct { + char *value; } CONF_VALUE; - DEFINE_OR_DECLARE_STACK_OF(CONF_VALUE) -+typedef struct conf_module_st CONF_MODULE; - DEFINE_OR_DECLARE_STACK_OF(CONF_MODULE) - +-DEFINE_OR_DECLARE_STACK_OF(CONF_VALUE) +-DEFINE_OR_DECLARE_STACK_OF(CONF_MODULE) +- DEFINE_LHASH_OF(CONF_VALUE); -@@ -58,7 +59,6 @@ struct conf_method_st { - /* Module definitions */ + struct conf_st; +@@ -59,6 +56,9 @@ struct conf_method_st { + typedef struct conf_imodule_st CONF_IMODULE; --typedef struct conf_module_st CONF_MODULE; + typedef struct conf_module_st CONF_MODULE; ++ ++DEFINE_OR_DECLARE_STACK_OF(CONF_VALUE) ++DEFINE_OR_DECLARE_STACK_OF(CONF_MODULE) STACK_OF(CONF_IMODULE);