update nmap to 4.01 (thanks to Richard Nadeau)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3566 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 25 insertions, 20 deletions

diff --git a/openwrt/package/nmap/Config.in b/openwrt/package/nmap/Config.in
index d8ab98c64..ed85f9ca0 100644
--- a/openwrt/package/nmap/Config.in
+++ b/openwrt/package/nmap/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_NMAP
 	prompt "nmap.............................. Network exploration and/or security auditing utility"
 	tristate
 	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBDNET
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBPCRE
 	select BR2_PACKAGE_UCLIBCXX
diff --git a/openwrt/package/nmap/Makefile b/openwrt/package/nmap/Makefile
index 23997b88f..b60558f6f 100644
--- a/openwrt/package/nmap/Makefile
+++ b/openwrt/package/nmap/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nmap
-PKG_VERSION:=3.81
-PKG_RELEASE:=2
-PKG_MD5SUM:=0713306dda85aee2c95ef31b4b7d2838
+PKG_VERSION:=4.01
+PKG_RELEASE:=1
+PKG_MD5SUM:=09c259837b24f6c7385c2c1c49760a7c
 
 PKG_SOURCE_URL:=http://download.insecure.org/nmap/dist
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -50,6 +50,7 @@ $(PKG_BUILD_DIR)/.configured:
 		  $(DISABLE_NLS) \
 		  --without-openssl \
 		  --without-nmapfe \
+		  --with-libdnet="$(STAGING_DIR)/usr" \
 		  --with-libpcap="$(STAGING_DIR)/usr" \
 		  --with-libpcre="$(STAGING_DIR)/usr" \
 	);
diff --git a/openwrt/package/nmap/ipkg/nmap.control b/openwrt/package/nmap/ipkg/nmap.control
index 56253fda0..e5bedd47d 100644
--- a/openwrt/package/nmap/ipkg/nmap.control
+++ b/openwrt/package/nmap/ipkg/nmap.control
@@ -1,5 +1,5 @@
 Package: nmap
 Priority: optional
 Section: net
-Depends: libgcc, libpcap, libpcre, uclibc++
+Depends: libgcc, libdnet, libpcap, libpcre, uclibc++
 Description: Nmap is a free open source utility for network exploration or security auditing.
diff --git a/openwrt/package/nmap/patches/cross-compile.patch b/openwrt/package/nmap/patches/cross-compile.patch
index 4319a6b0e..5c3785c4b 100644
--- a/openwrt/package/nmap/patches/cross-compile.patch
+++ b/openwrt/package/nmap/patches/cross-compile.patch
@@ -1,11 +1,11 @@
-diff -urN nmap-3.81.old/configure nmap-3.81.dev/configure
---- nmap-3.81.old/configure	2004-10-17 05:49:33.000000000 +0200
-+++ nmap-3.81.dev/configure	2005-04-26 14:47:42.000000000 +0200
-@@ -1339,12 +1339,6 @@
+diff -urN nmap-4.01.old/configure nmap-4.01.dev/configure
+--- nmap-4.01.old/configure	2006-02-01 19:18:42.000000000 -0700
++++ nmap-4.01.dev/configure	2006-03-29 23:14:28.000000000 -0700
+@@ -1341,12 +1341,6 @@
     fi
  fi
  
--libpcapdir=libpcap-possiblymodified
+-libpcapdir=libpcap
 -
 -
 -pcredir=libpcre
@@ -14,25 +14,28 @@ diff -urN nmap-3.81.old/configure nmap-3.81.dev/configure
            ac_config_headers="$ac_config_headers config.h"
  
  
-diff -urN nmap-3.81.old/Makefile.in nmap-3.81.dev/Makefile.in
---- nmap-3.81.old/Makefile.in	2005-02-07 07:14:03.000000000 +0100
-+++ nmap-3.81.dev/Makefile.in	2005-04-26 14:52:39.000000000 +0200
+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
 @@ -29,7 +29,7 @@
  # CFLAGS = $(DEFS) $(INCLS)
  STATIC =
  LDFLAGS = @LDFLAGS@ $(STATIC)
--LIBS =  @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ @OPENSSL_LIBS@ @LIBS@
-+LIBS =  @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ -lpcre -lpcap @OPENSSL_LIBS@ @LIBS@
+-LIBS =  @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ @OPENSSL_LIBS@ @LIBDNET_LIBS@ @LIBS@
++LIBS =  @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ -lpcre -lpcap @OPENSSL_LIBS@ -ldnet @LIBS@
  # LIBS =  -lefence @LIBS@
  # LIBS =  -lrmalloc @LIBS@
  SHTOOL = ./shtool
-@@ -69,12 +69,6 @@
+@@ -68,15 +68,6 @@
  # all of the prerequisites (e.g. recursive makes and such)
  FORCE:
  
 -$(LIBPCREDIR)/libpcre.a: $(LIBPCREDIR)/Makefile FORCE
 -	@echo Compiling libpcre; cd $(LIBPCREDIR) && $(MAKE)
 -
+-$(LIBDNETDIR)/src/.libs/libdnet.a: $(LIBDNETDIR)/Makefile FORCE
+-	@echo Compiling libdnet; cd $(LIBDNETDIR) && $(MAKE)
+-
 -$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile FORCE
 -	@echo Compiling libpcap; cd $(LIBPCAPDIR) && $(MAKE)
 -
diff --git a/openwrt/package/nmap/patches/no_strip.patch b/openwrt/package/nmap/patches/no_strip.patch
index fa5825173..ffe953e28 100644
--- a/openwrt/package/nmap/patches/no_strip.patch
+++ b/openwrt/package/nmap/patches/no_strip.patch
@@ -1,11 +1,11 @@
-diff -ruN nmap-3.81-old/Makefile.in nmap-3.81-new/Makefile.in
---- nmap-3.81-old/Makefile.in	2005-10-02 16:32:52.000000000 +0200
-+++ nmap-3.81-new/Makefile.in	2005-10-02 16:34:46.000000000 +0200
-@@ -262,7 +262,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 @@
  
  install-nmap: $(TARGET)
  	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
--	$(INSTALL) -c -m 755 nmap -s $(DESTDIR)$(bindir)/nmap
+-	$(INSTALL) -c -m 755 -s nmap $(DESTDIR)$(bindir)/nmap
 +	$(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap
  	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1
  	$(INSTALL) -c -m 644 docs/nmap.xsl $(DESTDIR)$(nmapdatadir)/