fix nmap (was stripped twice), bump release number

SVN-Revision: 2018

diff --git a/openwrt/package/nmap/Makefile b/openwrt/package/nmap/Makefile
index 3c28caa399ff286b7c1f9cf5611b0be2a629d519..2cded7e62656a6ee2ccc7160cd51b215c532c7de 100644 (file)
--- a/openwrt/package/nmap/Makefile
+++ b/openwrt/package/nmap/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nmap
 PKG_VERSION:=3.81
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=0713306dda85aee2c95ef31b4b7d2838
 
 PKG_SOURCE_URL:=http://download.insecure.org/nmap/dist
@@ -23,9 +23,10 @@ $(PKG_BUILD_DIR)/.configured:
                $(TARGET_CONFIGURE_OPTS) \
                libpcapdir="$(STAGING_DIR)/usr/lib" \
                CFLAGS="$(TARGET_CFLAGS)" \
-               CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++ -nodefaultlibs " \
+               CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib  -fno-builtin -nostdinc++ -nodefaultlibs -luClibc++ -lc -lm -lgcc_s" \
+               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               LIBS="-nodefaultlibs -luClibc++ -lc -lm" \
                ac_cv_prog_CXX="$(TARGET_CXX)" \
                ./configure \
                  --target=$(GNU_TARGET_NAME) \
@@ -58,7 +59,7 @@ $(PKG_BUILD_DIR)/.built:
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
-               CCOPT="-fno-builtin -nostdinc++ -nodefaultlibs $(TARGET_CFLAGS)" \
+               CCOPT="$(TARGET_CFLAGS) -fno-builtin -nostdinc++" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
        touch $@

diff --git a/openwrt/package/nmap/patches/no_strip.patch b/openwrt/package/nmap/patches/no_strip.patch
new file mode 100644 (file)
index 0000000..fa58251
--- /dev/null
+++ b/openwrt/package/nmap/patches/no_strip.patch
@@ -0,0 +1,12 @@
+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 @@
+ 
+ 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 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)/