Attachment 226208 Details for Bug 256968 – Fix broken ncat --proxy with upstream patch

[patch] Fix broken ncat --proxy with upstream patch

nmap.patch (text/plain), 1.65 KB, created by Ting-Wei Lan on 2021-07-04 09:23:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ting-Wei Lan

Created: 2021-07-04 09:23:04 UTC

Size: 1.65 KB

patch

obsolete

>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..05b7a33570f5
>--- /dev/null
>+++ b/security/nmap/files/patch-ncat_ncat__connect.c
>@@ -0,0 +1,28 @@
>+From 169d7e5a922ef8e63b51ee2bdf4fd4ad60ed2689 Mon Sep 17 00:00:00 2001
>+From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
>+Date: Thu, 19 Nov 2020 17:34:24 +0000
>+Subject: [PATCH] Restore call to post_connect in non-ssl case. Fixes #2149
>+
>+--- ncat/ncat_connect.c.orig	2020-10-02 16:12:22 UTC
>++++ 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 */

Actions: View | Diff

Attachments on bug 256968: 226208