From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] ncat: Update to 7.91 and fix #12647 ncat segfault if
 virtmanager try to connect libvirt
Date: Tue, 03 Aug 2021 15:11:11 +0200
Message-ID: <20210803131111.1523787-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6541786453926490967=="
List-Id: <development.lists.ipfire.org>

--===============6541786453926490967==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- Update from 7.80 to 7.91
- Update of rootfile
- Changelog is too long to include here
   Full details can be found in the CHANGELOG file in the source tarball
- Added patch to fix segfault - https://github.com/nmap/nmap/issues/2154
- Ran with unpatched 7.91 version
   $ touch /tmp/foo
   $ nc -U /tmp/foo
   Segmentation fault - flagged problem in #12647
- Ran with patched 7.91 version
   $ touch /tmp/foo
   $ nc -U /tmp/foo
   Ncat: Connection refused. - Expected behaviour

Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 lfs/ncat                                      |  7 ++++---
 ...-7.91-fix-a-unix-domain-socket-crash.patch | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 src/patches/ncat-7.91-fix-a-unix-domain-socket-crash.patch

diff --git a/lfs/ncat b/lfs/ncat
index b8c8768dc..0e327a043 100644
--- a/lfs/ncat
+++ b/lfs/ncat
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 7.80
+VER        =3D 7.91
=20
 THISAPP    =3D ncat-$(VER)
 DL_FILE    =3D nmap-$(VER).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/nmap-$(VER)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D ncat
-PAK_VER    =3D 6
+PAK_VER    =3D 7
=20
 DEPS       =3D
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D d37b75b06d1d40f27b76d60db420a1f5
+$(DL_FILE)_MD5 =3D 239cef725863ab454590a1bb8793b72b
=20
 install : $(TARGET)
=20
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ncat-7.91-fix-a-unix-d=
omain-socket-crash.patch=09
 	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && mkdir -p build
 	cd $(DIR_APP) && ./configure	\
diff --git a/src/patches/ncat-7.91-fix-a-unix-domain-socket-crash.patch b/src=
/patches/ncat-7.91-fix-a-unix-domain-socket-crash.patch
new file mode 100644
index 000000000..7ffad08b2
--- /dev/null
+++ b/src/patches/ncat-7.91-fix-a-unix-domain-socket-crash.patch
@@ -0,0 +1,21 @@
+--- a/ncat/ncat_main.c	2020-10-07 17:21:42.253789857 -0600
++++ b/ncat/ncat_main.c	2020-10-14 21:37:31.527610020 -0600
+@@ -846,7 +846,7 @@
+             targetaddrs->addr.un.sun_family =3D AF_UNIX;
+             strncpy(targetaddrs->addr.un.sun_path, argv[optind], sizeof(tar=
getaddrs->addr.un.sun_path));
+             targetaddrs->addrlen =3D SUN_LEN(&targetaddrs->addr.un);
+-            o.target =3D argv[optind];
++            o.sslservername =3D o.target =3D argv[optind];
+             optind++;
+         } else
+ #endif
+@@ -865,7 +865,7 @@
+                 targetaddrs->addr.vm.svm_cid =3D long_cid;
+=20
+                 targetaddrs->addrlen =3D sizeof(targetaddrs->addr.vm);
+-                o.target =3D argv[optind];
++                o.sslservername =3D o.target =3D argv[optind];
+                 optind++;
+             }
+         } else
+
--=20
2.32.0


--===============6541786453926490967==--