From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 6 Jan 2007 18:39:10 +0000 (+0000)
Subject: update nmap to 4.20 (patch by jens muecke)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=f882e485c0084855ab4449b86e39488a1cfc8834;hp=f2f58f24516181f0a40b221d14d2893c923f4c6f;ds=sidebyside

update nmap to 4.20 (patch by jens muecke)

SVN-Revision: 6008
---

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 251ba2b460..0670c09bab 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -9,10 +9,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nmap
-PKG_VERSION:=4.01
+PKG_VERSION:=4.20
 PKG_RELEASE:=1
 
-PKG_MD5SUM:=09c259837b24f6c7385c2c1c49760a7c
+PKG_MD5SUM:=ea50419f99472200c4184a304e3831ea
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.insecure.org/nmap/dist
 PKG_CAT:=bzcat
diff --git a/net/nmap/patches/01-cross_compile.patch b/net/nmap/patches/01-cross_compile.patch
index 1a997e8866..9ceedf5090 100644
--- a/net/nmap/patches/01-cross_compile.patch
+++ b/net/nmap/patches/01-cross_compile.patch
@@ -4,20 +4,7 @@
 diff -ruN nmap-4.01-old/configure nmap-4.01-new/configure
 --- nmap-4.01-old/configure	2006-02-02 03:18:42.000000000 +0100
 +++ nmap-4.01-new/configure	2006-10-23 22:08:15.000000000 +0200
-@@ -5765,9 +5765,9 @@
- 
- fi;
- 
--if test $linux = yes; then
--  have_libpcap=no
--fi
-+#if test $linux = yes; then
-+#  have_libpcap=no
-+#fi
- 
- if test $needs_cpp_precomp = yes; then
-   CXXFLAGS="-no-cpp-precomp $CXXFLAGS"
-@@ -5788,8 +5788,8 @@
+@@ -5865,8 +5865,8 @@
    echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5
  echo $ECHO_N "checking if libpcap version is recent enough... $ECHO_C" >&6
    if test "$cross_compiling" = yes; then
diff --git a/net/nmap/patches/02-no_strip.patch b/net/nmap/patches/02-no_strip.patch
index ffe953e285..21c912d41c 100644
--- a/net/nmap/patches/02-no_strip.patch
+++ b/net/nmap/patches/02-no_strip.patch
@@ -1,7 +1,7 @@
 diff -urN nmap-4.01.old/Makefile.in nmap-4.01.dev/Makefile.in
 --- nmap-4.01.old/Makefile.in	2006-02-09 19:22:27.000000000 -0700
 +++ nmap-4.01.dev/Makefile.in	2006-03-29 23:14:12.000000000 -0700
-@@ -144,7 +135,7 @@
+@@ -152,7 +152,7 @@
  
  install-nmap: $(TARGET)
  	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)