[nmap] nmap updated to 6.25

[Michal Hlavinka]

commit d79fb8d93c7498876515a534e4d90278bfdf5ece
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Fri Mar 8 16:07:55 2013 +0100

    nmap updated to 6.25

 .gitignore                    |    1 +
 nmap-6.01-shutdown.patch      |   43 ------------
 nmap-6.01-shutdown_test.patch |  145 -----------------------------------------
 nmap.spec                     |   22 +++---
 sources                       |    2 +-
 5 files changed, 13 insertions(+), 200 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19588de..539fd14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ nmap-5.21.tar.bz2
 /nmap-5.61TEST5.tar.bz2
 /nmap-6.00.tar.bz2
 /nmap-6.01.tar.bz2
+/nmap-6.25.tar.bz2
diff --git a/nmap.spec b/nmap.spec
index 76c5f9d..9d9ded5 100644
--- a/nmap.spec
+++ b/nmap.spec
@@ -2,9 +2,9 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
 Epoch: 2
-Version: 6.01
+Version: 6.25
 #global prerelease TEST5
-Release: 11%{?dist}
+Release: 1%{?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)
@@ -34,16 +34,14 @@ Patch4: zenmap-621887-workaround.patch
 # upstream provided patch for rhbz#845005, not yet in upstream repository
 Patch5: ncat_reg_stdin.diff
 
-# shutdown socket on EOF, sent upstream
-Patch6: nmap-6.01-r29743.patch
-Patch7: nmap-6.01-shutdown.patch
-Patch8: nmap-6.01-shutdown_test.patch
-
 URL: http://nmap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, gtk2-devel, lua-devel, libpcap-devel, pcre-devel
 BuildRequires: desktop-file-utils, dos2unix
 
+# exception granted in FPC ticket 255
+Provides: bundled(lua) = 5.2
+
 %define pixmap_srcdir zenmap/share/pixmaps
 
 %description
@@ -90,12 +88,11 @@ uses.
 %patch2 -p1 -b .noms
 %patch4 -p1 -b .bz637403
 %patch5 -p1 -b .ncat_reg_stdin
-%patch6 -p1 -b .r29743
-%patch7 -p1 -b .shutdown
-%patch8 -p1 -b .shutdown_test
 
 #be sure we're not using tarballed copies of some libraries
-rm -rf liblua libpcap libpcre macosx mswin32
+#rm -rf liblua libpcap libpcre macosx mswin32
+rm -rf         libpcap libpcre macosx mswin32
+
 
 #fix locale dir
 mv zenmap/share/zenmap/locale zenmap/share
@@ -220,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Fri Mar 08 2013 Michal Hlavinka <mhlavink at redhat.com> - 2:6.25-1
+- nmap updated to 6.25
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:6.01-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 431f2de..9a2fc2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1a71940f238abb835dbf3ee7412bcea  nmap-6.01.tar.bz2
+fcc80f94ff3adcb11eedf91092ea6f5e  nmap-6.25.tar.bz2