Port nmap to -ng

SVN-Revision: 4483

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
new file mode 100644 (file)
index 0000000..ce4e607
--- /dev/null
+++ b/net/nmap/Makefile
@@ -0,0 +1,66 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=nmap
+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
+PKG_CAT:=bzcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/nmap
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libdnet +libpcap +libpcre +uclibcxx
+  TITLE:=Network exploration and/or security auditing utility
+  DESCRIPTION:=A free open source utility for network exploration or security auditing.
+  URL:=http://www.insecure.org/nmap/
+endef
+
+define Build/Configure
+$(call Build/Configure/Default,--without-openssl \
+                  --without-nmapfe \
+                  --with-libdnet="$(STAGING_DIR)/usr" \
+                  --with-libpcap="$(STAGING_DIR)/usr" \
+                  --with-libpcre="$(STAGING_DIR)/usr", libpcapdir="$(STAGING_DIR)/usr/lib" \
+               CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \
+               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+               LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               LIBS="-luClibc++ -lc -lm -lgcc" \
+               ac_cv_prog_CXX="$(TARGET_CXX)")
+endef
+
+define Build/Compile   
+       mkdir -p $(PKG_INSTALL_DIR)
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               CCOPT="$(TARGET_CFLAGS) -fno-builtin -nostdinc++" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install
+endef
+
+define Package/nmap/install    
+       install -d -m0755 $(1)/usr/share/nmap
+       for file in mac-prefixes os-fingerprints protocols rpc service-probes services; do \
+               $(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/nmap-$$$$file $(1)/usr/share/nmap; \
+       done
+       install -d -m0755 $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/nmap $(1)/usr/bin/
+endef
+
+
+$(eval $(call BuildPackage,nmap))

diff --git a/net/nmap/patches/cross-compile.patch b/net/nmap/patches/cross-compile.patch
new file mode 100644 (file)
index 0000000..5c3785c
--- /dev/null
+++ b/net/nmap/patches/cross-compile.patch
@@ -0,0 +1,44 @@
+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
+-
+-
+-pcredir=libpcre
+-
+-
+           ac_config_headers="$ac_config_headers config.h"
+ 
+ 
+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@ @LIBDNET_LIBS@ @LIBS@
++LIBS =  @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ -lpcre -lpcap @OPENSSL_LIBS@ -ldnet @LIBS@
+ # LIBS =  -lefence @LIBS@
+ # LIBS =  -lrmalloc @LIBS@
+ SHTOOL = ./shtool
+@@ -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)
+-
+ $(NBASEDIR)/libnbase.a: $(NBASEDIR)/Makefile FORCE
+       @echo Compiling libnbase;
+       cd $(NBASEDIR) && $(MAKE)

diff --git a/net/nmap/patches/no_strip.patch b/net/nmap/patches/no_strip.patch
new file mode 100644 (file)
index 0000000..ffe953e
--- /dev/null
+++ b/net/nmap/patches/no_strip.patch
@@ -0,0 +1,12 @@
+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 -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)/
+       $(INSTALL) -c -m 644 docs/nmap.dtd $(DESTDIR)$(nmapdatadir)/