[nmap/f20] nmap updated to 6.45

[Michal Hlavinka]

commit 6a98bf1d76d4faeba2a21a82b79804dd383a29f8
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Mon Apr 14 16:50:52 2014 +0200

    nmap updated to 6.45

 .gitignore                     |    1 +
 nmap-6.40-fdsafe.patch         |  202 ----------------------------------------
 nmap.spec                      |   33 ++++---
 sources                        |    2 +-
 zenmap-621887-workaround.patch |   12 ---
 5 files changed, 20 insertions(+), 230 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ee5dc9..8392695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ nmap-5.21.tar.bz2
 /nmap-6.25.tar.bz2
 /nmap-6.25svn20130624.tar.bz2
 /nmap-6.40.tar.bz2
+/nmap-6.45.tar.bz2
diff --git a/nmap.spec b/nmap.spec
index addfcd0..f02911a 100644
--- a/nmap.spec
+++ b/nmap.spec
@@ -1,16 +1,16 @@
 #TODO: stop using local copy of libdnet, once system distributed version supports sctp (grep sctp /usr/include/dnet.h)
+
+%global _hardened_build 1
+
 Summary: Network exploration tool and security scanner
 Name: nmap
 Epoch: 2
-Version: 6.40
+Version: 6.45
 #global prerelease TEST5
-Release: 4%{?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)
-# openssl is OpenSSL
-# openssl and libdnet-striped is removed in %%prep section
-License: GPLv2 and LGPLv2+ and GPLv2+ and BSD
+Release: 1%{?dist}
+# Uses combination of licenses based on GPL license, but with extra modification
+# so it got its own license tag rhbz#1055861
+License: Nmap
 Group: Applications/System
 Requires: %{name}-ncat = %{epoch}:%{version}-%{release}
 Source0: http://nmap.org/dist/%{name}-%{version}%{?prerelease}.tar.bz2
@@ -24,16 +24,12 @@ Patch1: nmap-4.03-mktemp.patch
 #don't suggest to scan microsoft
 Patch2: nmap-4.52-noms.patch
 
-# rhbz#637403, workaround for rhbz#621887=gnome#623965
-Patch4: zenmap-621887-workaround.patch
-
 # upstream provided patch for rhbz#845005, not yet in upstream repository
 Patch5: ncat_reg_stdin.diff
 Patch6: nmap-6.25-displayerror.patch
 
 #rhbz#994376
 Patch7: nmap-6.40-logdebug.patch
-Patch8: nmap-6.40-fdsafe.patch
 
 URL: http://nmap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -84,11 +80,9 @@ uses.
 %setup -q -n %{name}-%{version}%{?prerelease}
 %patch1 -p1 -b .mktemp
 %patch2 -p1 -b .noms
-%patch4 -p1 -b .bz637403
 %patch5 -p1 -b .ncat_reg_stdin
 %patch6 -p1 -b .displayerror
 %patch7 -p1 -b .logdebug
-%patch8 -p1 -b .fdsafe
 
 # for aarch64 support, not needed with autotools 2.69+
 for f in acinclude.m4 configure.ac nping/configure.ac
@@ -222,9 +216,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
-* Wed Apr 09 2014 Michal Hlavinka <mhlavink at redhat.com> - 2:6.40-4
+* Mon Apr 14 2014 Michal Hlavinka <mhlavink at redhat.com> - 2:6.45-1
+- nmap updated to 6.45
+
+* Wed Apr 09 2014 Michal Hlavinka <mhlavink at redhat.com> - 2:6.40-6
 - fix unexpected crash when too much paralelism is used (#1057912)
 
+* Wed Apr 09 2014 Michal Hlavinka <mhlavink at redhat.com> - 2:6.40-5
+- update license tag (#1055861)
+
+* Tue Mar 04 2014 Michal Hlavinka <mhlavink at redhat.com> - 2:6.40-4
+- use _hardened_build
+
 * Thu Oct 17 2013 Michal Hlavinka <mhlavink at redhat.com> - 2:6.40-3
 - ncat should support UNIX sockets correctly, drop wrapper with socat
 
diff --git a/sources b/sources
index 5d9d70d..e2c32c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0e2f3370e1fb97fb53185b15aa22aff  nmap-6.40.tar.bz2
+e8c337456a692bada3ee53e7f5b87bac  nmap-6.45.tar.bz2