From: Peter Müller <peter.mueller@ipfire.org>
Date: Fri, 30 Sep 2022 21:18:38 +0000 (+0000)
Subject: ncat: Update to 7.92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a44d68fc77bf72adf2d2d961e044510bfebd4f5;p=people%2Fms%2Fipfire-2.x.git

ncat: Update to 7.92

This was forgotten when updating nmap to 7.92.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---

diff --git a/lfs/ncat b/lfs/ncat
index a5fff2bf07..61c3794f5d 100644
--- a/lfs/ncat
+++ b/lfs/ncat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Network tool to concatenate and redirect sockets
 
-VER        = 7.91
+VER        = 7.92
 
 THISAPP    = ncat-$(VER)
 DL_FILE    = nmap-$(VER).tar.bz2
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/nmap-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ncat
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       =
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded
+$(DL_FILE)_BLAKE2 = 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b
 
 install : $(TARGET)
 
@@ -81,7 +81,6 @@ $(subst %,%_BLAKE2,$(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-domain-socket-crash.patch
 	$(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
deleted file mode 100644
index 7ffad08b29..0000000000
--- a/src/patches/ncat-7.91-fix-a-unix-domain-socket-crash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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 = AF_UNIX;
-             strncpy(targetaddrs->addr.un.sun_path, argv[optind], sizeof(targetaddrs->addr.un.sun_path));
-             targetaddrs->addrlen = SUN_LEN(&targetaddrs->addr.un);
--            o.target = argv[optind];
-+            o.sslservername = o.target = argv[optind];
-             optind++;
-         } else
- #endif
-@@ -865,7 +865,7 @@
-                 targetaddrs->addr.vm.svm_cid = long_cid;
- 
-                 targetaddrs->addrlen = sizeof(targetaddrs->addr.vm);
--                o.target = argv[optind];
-+                o.sslservername = o.target = argv[optind];
-                 optind++;
-             }
-         } else
-