rpms/nmap
7
0
Fork 0
Code Issues Pull Requests Releases Activity

ncat should support UNIX sockets correctly, drop wrapper with socat

Browse Source
This commit is contained in:
Michal Hlavinka 2013-10-17 15:55:42 +02:00
parent af0dc84775
commit 209c7e7374
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nc
View File

@ -1,11 +0,0 @@
#!/bin/sh
if [ "$#" = 2 ]; then
if [ "$1" = "-U" ]; then
exec socat stdio "$2"
elif [ "$2" = "-U" ]; then
exec socat stdio "$1"
fi
fi
exec ncat "$@"

13
nmap.spec
View File

@ -4,7 +4,7 @@ Name: nmap
Epoch: 2 Epoch: 2
Version: 6.40 Version: 6.40
#global prerelease TEST5 #global prerelease TEST5
Release: 2%{?dist} Release: 3%{?dist}
# nmap is GPLv2 # nmap is GPLv2
# zenmap is GPLv2 and LGPLv2+ (zenmap/higwidgets) and GPLv2+ (zenmap/radialnet) # 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) # 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 Source2: zenmap-root.pamd
Source3: zenmap-root.consoleapps 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 #prevent possible race condition for shtool, rhbz#158996
Patch1: nmap-4.03-mktemp.patch Patch1: nmap-4.03-mktemp.patch
@ -73,7 +69,6 @@ Group: Applications/System
Summary: Nmap's Netcat replacement Summary: Nmap's Netcat replacement
Obsoletes: nc < 1.109.20120711-2 Obsoletes: nc < 1.109.20120711-2
Provides: nc Provides: nc
Requires: socat
%description ncat %description ncat
Ncat is a feature packed networking utility which will read and Ncat is a feature packed networking utility which will read and
write data across a network from the command line. It uses both write data across a network from the command line. It uses both
@ -148,8 +143,7 @@ popd
#we provide 'nc' replacement #we provide 'nc' replacement
ln -s ncat.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/nc.1.gz ln -s ncat.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/nc.1.gz
#ln -s ncat $RPM_BUILD_ROOT%{_bindir}/nc ln -s ncat $RPM_BUILD_ROOT%{_bindir}/nc
install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/nc
desktop-file-install --vendor nmap \ desktop-file-install --vendor nmap \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@ -226,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xnmap.1.gz %{_mandir}/man1/xnmap.1.gz
%changelog %changelog
* Thu Oct 17 2013 Michal Hlavinka <mhlavink@redhat.com> - 2:6.40-3
- ncat should support UNIX sockets correctly, drop wrapper with socat
* Thu Aug 08 2013 Michal Hlavinka <mhlavink@redhat.com> - 2:6.40-2 * Thu Aug 08 2013 Michal Hlavinka <mhlavink@redhat.com> - 2:6.40-2
- do not print debug messages during normal use (#994376) - do not print debug messages during normal use (#994376)