From owner-dev-commits-ports-all@freebsd.org Tue Jul 6 18:57:30 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 06095665DF5; Tue, 6 Jul 2021 18:57:30 +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 4GKBd56glQz4gPh; Tue, 6 Jul 2021 18:57:29 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CD88E1EED1; Tue, 6 Jul 2021 18:57:29 +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 166IvTSK032968; Tue, 6 Jul 2021 18:57:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 166IvTVF032967; Tue, 6 Jul 2021 18:57:29 GMT (envelope-from git) Date: Tue, 6 Jul 2021 18:57:29 GMT Message-Id: <202107061857.166IvTVF032967@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 6adfb16a49e0 - 2021Q3 - security/nmap: Fix broken --proxy 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/2021Q3 X-Git-Reftype: branch X-Git-Commit: 6adfb16a49e0dce3f3279189bb36cdb643c7c027 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jul 2021 18:57:30 -0000 The branch 2021Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=6adfb16a49e0dce3f3279189bb36cdb643c7c027 commit 6adfb16a49e0dce3f3279189bb36cdb643c7c027 Author: Cy Schubert AuthorDate: 2021-07-06 18:15:56 +0000 Commit: Cy Schubert CommitDate: 2021-07-06 18:57:00 +0000 security/nmap: Fix broken --proxy Upstream broke --proxy in 7.90 and was fixed after 7.91 and is yet to be released. PR: 256968 Submitted by: Ting-Wei Lan Reported by: Ting-Wei Lan Obtained from: Upstream 169d7e5a922ef8e63b51ee2bdf4fd4ad60ed2689 (cherry picked from commit f12ae4971c1a2a049579eba10a3139da49775441) --- security/nmap/Makefile | 2 +- security/nmap/files/patch-ncat_ncat__connect.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/security/nmap/Makefile b/security/nmap/Makefile index 9a989e0a9dec..d66887d252b6 100644 --- a/security/nmap/Makefile +++ b/security/nmap/Makefile @@ -2,7 +2,7 @@ PORTNAME= nmap DISTVERSION= 7.91 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://nmap.org/dist/ \ LOCAL/ohauer diff --git a/security/nmap/files/patch-ncat_ncat__connect.c b/security/nmap/files/patch-ncat_ncat__connect.c new file mode 100644 index 000000000000..8d6260912e07 --- /dev/null +++ b/security/nmap/files/patch-ncat_ncat__connect.c @@ -0,0 +1,23 @@ +--- ncat/ncat_connect.c ++++ ncat/ncat_connect.c +@@ -1064,12 +1064,17 @@ int ncat_connect(void) + bye("Failed to set hostname on iod."); + if (o.ssl) + { ++ /* connect_handler creates stdin_nsi and calls post_connect */ + nsock_reconnect_ssl(mypool, cs.sock_nsi, connect_handler, o.conntimeout, NULL, NULL); + } ++ else ++ { ++ /* Create IOD for nsp->stdin */ ++ if ((cs.stdin_nsi = nsock_iod_new2(mypool, 0, NULL)) == NULL) ++ bye("Failed to create stdin nsiod."); + +- /* Create IOD for nsp->stdin */ +- if ((cs.stdin_nsi = nsock_iod_new2(mypool, 0, NULL)) == NULL) +- bye("Failed to create stdin nsiod."); ++ post_connect(mypool, cs.sock_nsi); ++ } + } + + /* connect */