From nobody Wed Sep 28 15:54:37 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Md1Js5zTtz4cfSc; Wed, 28 Sep 2022 15:54:37 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Md1Js5YYBz3lxN; Wed, 28 Sep 2022 15:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664380477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yY83s21zzr0p0dcC+WGxf9MsIOdneLDjbfosLZdYz3U=; b=gjNEQd94hrdXMhzYw2tEm+C59iChIQ7SBCXNs56ahnMlv93YKKp4rFIdSKQHB6DWkAds0X UjlQuFmiuQxvn9r+OL1ktrYkDemmqlZWwPRF92g/5MAKwfWhoeFCOZTTxV9p3+EdA+OZJW vkwtqL+NjWp+y8u3ChzLlqrLrIGjHCFJlcbDL7kzgIdUVJbjZdqbZdDG0wjS3TivWj9jUl RTfpMHWWGyFCcebgq1Dj8L1Zs5yIIy7w2M9vx4aH3FYwhUWO8njnDkQVg/LLpg13K2Ae5s SA0aWdT4WBSl0BAUyH6su5WMsSX5H6Tn8SiLrY9kM9pZW0yurLxapxwMJCpySQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Md1Js4XvZzX3N; Wed, 28 Sep 2022 15:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28SFsbT8051012; Wed, 28 Sep 2022 15:54:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28SFsbir051011; Wed, 28 Sep 2022 15:54:37 GMT (envelope-from git) Date: Wed, 28 Sep 2022 15:54:37 GMT Message-Id: <202209281554.28SFsbir051011@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: c98084fc137f - main - security/nmap: Add LibreSSL support List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c98084fc137f5a45e08162123f0642ad626d7f74 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664380477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yY83s21zzr0p0dcC+WGxf9MsIOdneLDjbfosLZdYz3U=; b=wfPAUIMWvkJ9qnbdxSSYPGvCule/daQC+irXtDPxYkEdkjIUtarlKMNOnWhTD7nbcBqP8n d6HVxihtuHimeywatfNIsy9KUld29l3VzRXyEOPuPatuiqL54NA1+IcyjlWxb95J+F8JUa BfoZGT6pGphZSqij+UST4UJ+SyNn5fpUyODt5rX8EM6lOzDKW4L9olFEFQJL+cxvnVHDTn GAjOnYTBQat84LY1dKN1aFmrppmLRDJYGDbsZjdQDUuYcMLrv3GdYf7f16YBXN9elqujY2 ihQXFjp0W3UcTKZmhdaftVvf5HED21lYre1aGfP96JFBV4G1oq3jtztUoePDSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664380477; a=rsa-sha256; cv=none; b=kJVipwLgtggH8HPo6kdXyOd3Fckc2c69RAx+HEVnhF4auOm1lj4qnHWvkV3OtWaQ0kAOIb kFMOhogGFCTR4HRe7ydejRA0U+Dbwnjy8zU7/2nudB79PCsjO8VtdZaqJneOuG9Nr1IlpK OfQNyUdRnOd4HxoEjofj98afKXDh67zbZDMPI3UA1s5Eud8l6vEW5K3wLjimdZDVTHZdki Gfp6ZFtK1ReL89Wf9k2jalzx0tkHvxp9jcs1yoyn47cEMTbp5Laeml7UYqyXdjykhw8VF/ qRch2lXcwybmz9YYmDFb1USTkvFn0N9CIMzO+I41cG3JRmm6SnG93477mDMa2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c98084fc137f5a45e08162123f0642ad626d7f74 commit c98084fc137f5a45e08162123f0642ad626d7f74 Author: Cy Schubert AuthorDate: 2022-09-28 15:25:20 +0000 Commit: Cy Schubert CommitDate: 2022-09-28 15:54:31 +0000 security/nmap: Add LibreSSL support PR: 266623 Submitted by: takefu@airport.fm Reported by: takefu@airport.fm --- security/nmap/files/patch-libssh2_src_openssl.h | 14 ++++++++++++++ security/nmap/files/patch-ncat__ncat_ssl.c | 13 +++++++++++++ security/nmap/files/patch-nping_Crypto.cc | 13 +++++++++++++ security/nmap/files/patch-nse__openssl.cc | 13 +++++++++++++ security/nmap/files/patch-nse__ssl__cert.cc | 13 +++++++++++++ 5 files changed, 66 insertions(+) diff --git a/security/nmap/files/patch-libssh2_src_openssl.h b/security/nmap/files/patch-libssh2_src_openssl.h new file mode 100644 index 000000000000..a43c568b30cb --- /dev/null +++ b/security/nmap/files/patch-libssh2_src_openssl.h @@ -0,0 +1,14 @@ +--- libssh2/src/openssl.h.orig 2022-06-29 20:40:29 UTC ++++ libssh2/src/openssl.h +@@ -57,8 +57,9 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ +- !defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ ((!defined LIBRESSL_VERSION_NUMBER) || \ ++ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L)) + # define HAVE_OPAQUE_STRUCTS 1 + #endif + diff --git a/security/nmap/files/patch-ncat__ncat_ssl.c b/security/nmap/files/patch-ncat__ncat_ssl.c new file mode 100644 index 000000000000..59468e4b465b --- /dev/null +++ b/security/nmap/files/patch-ncat__ncat_ssl.c @@ -0,0 +1,13 @@ +--- ncat/ncat_ssl.c.orig 2022-08-29 17:09:47 UTC ++++ ncat/ncat_ssl.c +@@ -73,7 +73,9 @@ + #include + #include + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined LIBRESSL_VERSION_NUMBER ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ ((!defined LIBRESSL_VERSION_NUMBER) || \ ++ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L)) + #define HAVE_OPAQUE_STRUCTS 1 + #define FUNC_ASN1_STRING_data ASN1_STRING_get0_data + #else diff --git a/security/nmap/files/patch-nping_Crypto.cc b/security/nmap/files/patch-nping_Crypto.cc new file mode 100644 index 000000000000..c234e6c8d6cf --- /dev/null +++ b/security/nmap/files/patch-nping_Crypto.cc @@ -0,0 +1,13 @@ +--- nping/Crypto.cc.orig 2022-02-18 17:38:46 UTC ++++ nping/Crypto.cc +@@ -70,7 +70,9 @@ + #include + #include + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined LIBRESSL_VERSION_NUMBER ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ ((!defined LIBRESSL_VERSION_NUMBER) || \ ++ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L)) + #define HAVE_OPAQUE_EVP_PKEY 1 + #define FUNC_EVP_MD_CTX_init EVP_MD_CTX_reset + #define FUNC_EVP_MD_CTX_cleanup EVP_MD_CTX_reset diff --git a/security/nmap/files/patch-nse__openssl.cc b/security/nmap/files/patch-nse__openssl.cc new file mode 100644 index 000000000000..43474fefa8b6 --- /dev/null +++ b/security/nmap/files/patch-nse__openssl.cc @@ -0,0 +1,13 @@ +--- nse_openssl.cc.orig 2022-09-01 22:22:29 UTC ++++ nse_openssl.cc +@@ -13,7 +13,9 @@ + #include + #include + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined LIBRESSL_VERSION_NUMBER ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ ((!defined LIBRESSL_VERSION_NUMBER) || \ ++ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L)) + #define HAVE_OPAQUE_STRUCTS 1 + #define FUNC_EVP_MD_CTX_init EVP_MD_CTX_reset + #define FUNC_EVP_MD_CTX_cleanup EVP_MD_CTX_reset diff --git a/security/nmap/files/patch-nse__ssl__cert.cc b/security/nmap/files/patch-nse__ssl__cert.cc new file mode 100644 index 000000000000..3f02236bb5af --- /dev/null +++ b/security/nmap/files/patch-nse__ssl__cert.cc @@ -0,0 +1,13 @@ +--- nse_ssl_cert.cc.orig 2022-08-31 13:43:38 UTC ++++ nse_ssl_cert.cc +@@ -80,7 +80,9 @@ + #include + #include + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined LIBRESSL_VERSION_NUMBER ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ ++ ((!defined LIBRESSL_VERSION_NUMBER) || \ ++ (defined LIBRESSL_VERSION_NUMBER && LIBRESSL_VERSION_NUMBER >= 0x30500000L)) + /* Technically some of these things were added in 0x10100006 + * but that was pre-release. */ + #define HAVE_OPAQUE_STRUCTS 1