From 9fb672a19973487317dd505bc22c288377dd1a68 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 9 May 2014 17:05:46 +0200
Subject: update to latest stable upstream

---
 package/nmap/Makefile                        |  6 +++---
 package/nmap/patches/patch-ncat_ncat_posix_c | 12 ------------
 package/nmap/patches/patch-service_scan_cc   | 11 -----------
 3 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 package/nmap/patches/patch-ncat_ncat_posix_c
 delete mode 100644 package/nmap/patches/patch-service_scan_cc

(limited to 'package/nmap')

diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index cd2e690d7..7c3efda55 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nmap
-PKG_VERSION:=		6.40
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		c0e2f3370e1fb97fb53185b15aa22aff
+PKG_VERSION:=		6.46
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		5a36ad3a63d5b7ea5514f745a397436a
 PKG_DESCR:=		utility for network exploration or security auditing
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libdnet libpcap libpcre libstdcxx
diff --git a/package/nmap/patches/patch-ncat_ncat_posix_c b/package/nmap/patches/patch-ncat_ncat_posix_c
deleted file mode 100644
index da6bb733d..000000000
--- a/package/nmap/patches/patch-ncat_ncat_posix_c
+++ /dev/null
@@ -1,12 +0,0 @@
---- nmap-6.40.orig/ncat/ncat_posix.c	2013-07-29 02:03:01.000000000 +0200
-+++ nmap-6.40/ncat/ncat_posix.c	2013-10-05 11:01:16.000000000 +0200
-@@ -122,7 +122,9 @@
- /* $Id$ */
- 
- #include "ncat.h"
-+#ifdef HAVE_LUA
- #include "ncat_lua.h"
-+#endif
- 
- char **cmdline_split(const char *cmdexec);
- 
diff --git a/package/nmap/patches/patch-service_scan_cc b/package/nmap/patches/patch-service_scan_cc
deleted file mode 100644
index 39a91a8c8..000000000
--- a/package/nmap/patches/patch-service_scan_cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- nmap-6.40.orig/service_scan.cc	2013-07-29 00:08:48.000000000 +0200
-+++ nmap-6.40/service_scan.cc	2013-10-05 11:24:37.000000000 +0200
-@@ -1202,7 +1202,7 @@ bool ServiceProbe::portIsProbable(enum s
- 
-   portv = (tunnel == SERVICE_TUNNEL_SSL)? &probablesslports : &probableports;
-   
--  if (find(portv->begin(), portv->end(), portno) == portv->end())
-+  if (std::find(portv->begin(), portv->end(), portno) == portv->end())
-     return false;
-   return true;
- }
-- 
cgit v1.2.3