[nmap] ncat should support UNIX sockets correctly, drop wrapper with socat
Michal Hlavinka
mhlavink at fedoraproject.org
Thu Oct 17 13:55:44 UTC 2013
commit 209c7e737464c88dc6ebd1c575c93cc70d9505fc
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Thu Oct 17 15:55:42 2013 +0200
ncat should support UNIX sockets correctly, drop wrapper with socat
nc | 11 -----------
nmap.spec | 13 +++++--------
2 files changed, 5 insertions(+), 19 deletions(-)
---
diff --git a/nmap.spec b/nmap.spec
index 83f9dc2..3d05f9a 100644
--- a/nmap.spec
+++ b/nmap.spec
@@ -4,7 +4,7 @@ Name: nmap
Epoch: 2
Version: 6.40
#global prerelease TEST5
-Release: 2%{?dist}
+Release: 3%{?dist}
# nmap is GPLv2
# zenmap is GPLv2 and LGPLv2+ (zenmap/higwidgets) and GPLv2+ (zenmap/radialnet)
# libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999) with some parts as Public Domain (crc32)
@@ -18,10 +18,6 @@ Source1: zenmap.desktop
Source2: zenmap-root.pamd
Source3: zenmap-root.consoleapps
-# TEMPORARY - obsoleting nc caused troubles for libvirt, because ncat does not support
-# unix sockets, use wrapper with socat failback when unix sockets are required
-Source4: nc
-
#prevent possible race condition for shtool, rhbz#158996
Patch1: nmap-4.03-mktemp.patch
@@ -73,7 +69,6 @@ Group: Applications/System
Summary: Nmap's Netcat replacement
Obsoletes: nc < 1.109.20120711-2
Provides: nc
-Requires: socat
%description ncat
Ncat is a feature packed networking utility which will read and
write data across a network from the command line. It uses both
@@ -148,8 +143,7 @@ popd
#we provide 'nc' replacement
ln -s ncat.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/nc.1.gz
-#ln -s ncat $RPM_BUILD_ROOT%{_bindir}/nc
-install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/nc
+ln -s ncat $RPM_BUILD_ROOT%{_bindir}/nc
desktop-file-install --vendor nmap \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -226,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xnmap.1.gz
%changelog
+* Thu Oct 17 2013 Michal Hlavinka <mhlavink at redhat.com> - 2:6.40-3
+- ncat should support UNIX sockets correctly, drop wrapper with socat
+
* Thu Aug 08 2013 Michal Hlavinka <mhlavink at redhat.com> - 2:6.40-2
- do not print debug messages during normal use (#994376)
More information about the scm-commits
mailing list