summaryrefslogtreecommitdiffstats
path: root/package/nmap/patches/cross-compile.patch
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-04-01 15:21:14 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-04-01 15:21:14 +0000
commit46db3573779f78b9ec7e189ac28756be9d3f598c (patch)
tree4b16d0d37ebe411e654f995f70bca3fc983c22d8 /package/nmap/patches/cross-compile.patch
parentad72bc35144fdfe57870836d3f69ff90584b1722 (diff)
update nmap to 4.01 (thanks to Richard Nadeau)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3566 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/nmap/patches/cross-compile.patch')
-rw-r--r--package/nmap/patches/cross-compile.patch25
1 files changed, 14 insertions, 11 deletions
diff --git a/package/nmap/patches/cross-compile.patch b/package/nmap/patches/cross-compile.patch
index 4319a6b0e..5c3785c4b 100644
--- a/package/nmap/patches/cross-compile.patch
+++ b/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)
-