From 1acd96ba2bf11b4d1e348f517b00fe89f94775d0 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 27 Oct 2020 21:36:06 +0100
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/nmap.git#c673aed0aa0330751a3f2dd047a1d76a8c7198e1
---
 ncat-fix-unix-domain-socket-crash.patch | 29 +++++++++++++++++++++++++
 nmap.spec                               |  9 +++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 ncat-fix-unix-domain-socket-crash.patch

diff --git a/ncat-fix-unix-domain-socket-crash.patch b/ncat-fix-unix-domain-socket-crash.patch
new file mode 100644
index 0000000..be9efbb
--- /dev/null
+++ b/ncat-fix-unix-domain-socket-crash.patch
@@ -0,0 +1,29 @@
+From f6b40614e4a8131394792d590965f8af3c635323 Mon Sep 17 00:00:00 2001
+From: nnposter <nnposter@e0a8ed71-7df4-0310-8962-fdc924857419>
+Date: Fri, 16 Oct 2020 02:54:52 +0000
+Subject: [PATCH] Fix a Unix domain socket crash. Fixes #2154
+
+Upstream: https://github.com/nmap/nmap/commit/f6b40614e4a8131394792d590965f8af3c635323
+
+diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c
+index d59b951..92eccad 100644
+--- a/ncat/ncat_main.c
++++ b/ncat/ncat_main.c
+@@ -848,7 +848,7 @@ int main(int argc, char *argv[])
+             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
+@@ -867,7 +867,7 @@ int main(int argc, char *argv[])
+                 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
diff --git a/nmap.spec b/nmap.spec
index e45457c..b5b91a9 100644
--- a/nmap.spec
+++ b/nmap.spec
@@ -7,7 +7,7 @@ Name: nmap
 Epoch: 2
 Version: 7.91
 #global prerelease TEST5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Network exploration tool and security scanner
 URL: http://nmap.org/
 # Uses combination of licenses based on GPL license, but with extra modification
@@ -26,6 +26,9 @@ Patch2: nmap-4.52-noms.patch
 Patch3: ncat_reg_stdin.diff
 Patch4: nmap-6.25-displayerror.patch
 
+# Upstream patch to prevent crash with UNIX domain sockets.
+Patch5: ncat-fix-unix-domain-socket-crash.patch
+
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: gcc-c++
@@ -133,6 +136,10 @@ ln -s ncat %{buildroot}%{_bindir}/nc
 %{_mandir}/man1/ncat.1.gz
 
 %changelog
+* Thu Oct 22 2020 Sergio Correia <scorreia@redhat.com>  2:7.91-2
+- Backport fix for UNIX domain socket crash
+  Upstream: https://github.com/nmap/nmap/commit/f6b40614e4a8131394792d590965f8af3c635323
+
 * Thu Aug 20 2020 Pavel Zhukov <pzhukov@redhat.com> - 2:7.80-6
 - Drop libssh from eln