git: 6adfb16a49e0 - 2021Q3 - security/nmap: Fix broken --proxy

[Cy Schubert]

The branch 2021Q3 has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6adfb16a49e0dce3f3279189bb36cdb643c7c027

commit 6adfb16a49e0dce3f3279189bb36cdb643c7c027
Author:     Cy Schubert <cy at FreeBSD.org>
AuthorDate: 2021-07-06 18:15:56 +0000
Commit:     Cy Schubert <cy at FreeBSD.org>
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 <lantw44 at gmail.com>
    Reported by:    Ting-Wei Lan <lantw44 at gmail.com>
    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 */