diff --git a/ncat_reg_stdin.diff b/ncat_reg_stdin.diff deleted file mode 100644 index e6034b2..0000000 --- a/ncat_reg_stdin.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -up nmap-6.01/ncat/ncat_main.c.noepoll nmap-6.01/ncat/ncat_main.c ---- nmap-6.01/ncat/ncat_main.c.noepoll 2013-01-04 12:50:18.670295473 +0100 -+++ nmap-6.01/ncat/ncat_main.c 2013-01-04 12:50:18.692295660 +0100 -@@ -280,6 +280,8 @@ int main(int argc, char *argv[]) - #ifdef WIN32 - windows_init(); - #endif -+ -+ nsock_set_default_engine("select"); - - while (1) { - /* handle command line arguments */ diff --git a/ncat_reg_stdin.patch b/ncat_reg_stdin.patch deleted file mode 100644 index e6034b2..0000000 --- a/ncat_reg_stdin.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up nmap-6.01/ncat/ncat_main.c.noepoll nmap-6.01/ncat/ncat_main.c ---- nmap-6.01/ncat/ncat_main.c.noepoll 2013-01-04 12:50:18.670295473 +0100 -+++ nmap-6.01/ncat/ncat_main.c 2013-01-04 12:50:18.692295660 +0100 -@@ -280,6 +280,8 @@ int main(int argc, char *argv[]) - #ifdef WIN32 - windows_init(); - #endif -+ -+ nsock_set_default_engine("select"); - - while (1) { - /* handle command line arguments */ diff --git a/nmap-4.03-mktemp.patch b/nmap-4.03-mktemp.patch deleted file mode 100644 index 68baffe..0000000 --- a/nmap-4.03-mktemp.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- nmap-4.03/shtool.mktemp 2006-05-10 13:09:34.000000000 +0200 -+++ nmap-4.03/shtool 2006-05-10 13:13:58.000000000 +0200 -@@ -579,15 +579,11 @@ - else - tmpdir="/tmp" - fi -- tmpdir="$tmpdir/.shtool.$$" -- ( umask 077 -- rm -rf "$tmpdir" >/dev/null 2>&1 || true -- mkdir "$tmpdir" >/dev/null 2>&1 -- if [ $? -ne 0 ]; then -- echo "$msgprefix:Error: failed to create temporary directory \`$tmpdir'" 1>&2 -- exit 1 -- fi -- ) -+ tmpdir=`mktemp -p $tmpdir -d` -+ if [ $? -ne 0 ]; then -+ echo "$msgprefix:Error: failed to create temporary directory \`$tmpdir'" 1>&2 -+ exit 1 -+ fi - - # create (implicitly) secure temporary file - tmpfile="$tmpdir/shtool.tmp" diff --git a/nmap-4.52-noms.patch b/nmap-4.52-noms.patch deleted file mode 100644 index 2161715..0000000 --- a/nmap-4.52-noms.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up nmap-4.90RC1/docs/nmap.1.noms nmap-4.90RC1/docs/nmap.1 ---- nmap-4.90RC1/docs/nmap.1.noms 2009-06-25 01:12:51.000000000 +0200 -+++ nmap-4.90RC1/docs/nmap.1 2009-07-16 09:58:22.090769947 +0200 -@@ -282,7 +282,7 @@ Nmap 4\&.90RC1 ( http://nmap\&.org ) - Usage: nmap [Scan Type(s)] [Options] {target specification} - TARGET SPECIFICATION: - Can pass hostnames, IP addresses, networks, etc\&. -- Ex: scanme\&.nmap\&.org, microsoft\&.com/24, 192\&.168\&.0\&.1; 10\&.0\&.0\-255\&.1\-254 -+ Ex: scanme\&.nmap\&.org, 192\&.168\&.0\&.1; 10\&.0\&.0\-255\&.1\-254 - \-iL : Input from list of hosts/networks - \-iR : Choose random targets - \-\-exclude : Exclude hosts/networks -diff -up nmap-4.90RC1/docs/nmap.usage.txt.noms nmap-4.90RC1/docs/nmap.usage.txt ---- nmap-4.90RC1/docs/nmap.usage.txt.noms 2009-06-25 01:12:51.000000000 +0200 -+++ nmap-4.90RC1/docs/nmap.usage.txt 2009-07-16 09:56:24.758078049 +0200 -@@ -2,7 +2,7 @@ Nmap 4.90RC1 ( http://nmap.org ) - Usage: nmap [Scan Type(s)] [Options] {target specification} - TARGET SPECIFICATION: - Can pass hostnames, IP addresses, networks, etc. -- Ex: scanme.nmap.org, microsoft.com/24, 192.168.0.1; 10.0.0-255.1-254 -+ Ex: scanme.nmap.org, 192.168.0.1; 10.0.0-255.1-254 - -iL : Input from list of hosts/networks - -iR : Choose random targets - --exclude : Exclude hosts/networks diff --git a/nmap-6.25-displayerror.patch b/nmap-6.25-displayerror.patch deleted file mode 100644 index 6b59845..0000000 --- a/nmap-6.25-displayerror.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up nmap-6.25/zenmap/zenmapGUI/App.py.displayerror nmap-6.25/zenmap/zenmapGUI/App.py ---- nmap-6.25/zenmap/zenmapGUI/App.py.displayerror 2013-05-23 15:11:46.595569883 +0200 -+++ nmap-6.25/zenmap/zenmapGUI/App.py 2013-05-23 15:12:44.786049525 +0200 -@@ -116,7 +116,12 @@ except Exception: - # startup scripts, and for some reason the first connection (the one that - # caused the launch) is rejected. But somehow subsequent connections work - # fine! So if the import fails, try one more time. -- import gtk -+ try: -+ import gtk -+ except Exception, e: -+ print >> sys.stderr, 'Error:', str(e) -+ sys.exit(1) -+ - warnings.resetwarnings() - - from zenmapGUI.higwidgets.higdialogs import HIGAlertDialog diff --git a/nmap.spec b/nmap.spec index 5c431bc..0f136bb 100644 --- a/nmap.spec +++ b/nmap.spec @@ -3,17 +3,13 @@ Name: nmap Epoch: 2 Version: 7.70 -Release: 9 +Release: 10 License: Nmap Summary: A tool for network discovery and security auditing. Requires: %{name}-ncat = %{epoch}:%{version}-%{release} URL: https://nmap.org/ Source0: https://nmap.org/dist/%{name}-%{version}%{?prerelease}.tar.bz2 -Patch1: nmap-4.03-mktemp.patch -Patch2: nmap-4.52-noms.patch -Patch3: ncat_reg_stdin.patch -Patch4: nmap-6.25-displayerror.patch Patch6000: CVE-2017-18594.patch Patch6001: CVE-2018-15173.patch @@ -74,6 +70,12 @@ ln -s ncat %{buildroot}%{_bindir}/nc %{_mandir}/man1/*.1.gz %changelog +* Sat Jan 11 2020 openEuler Buildteam - 2:7.70-10 +- Type:NA +- ID:NA +- SUG:NA +- DESC:delete unused patches + * Sat Dec 21 2019 openEuler Buildteam - 2:7.70-9 - Type:cves - ID:CVE-2018-15173