diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-04-01 15:21:14 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-04-01 15:21:14 +0000 |
| commit | 7e201312d71b69e65dbba227a2ab2a6a49d28f42 (patch) | |
| tree | 0fcd846ecfa056634b3e410d8c2d37261be7ed69 /openwrt/package/nmap/patches | |
| parent | 185ad006574292205c559c530cebe27fb52edc8e (diff) | |
update nmap to 4.01 (thanks to Richard Nadeau)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3566 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/nmap/patches')
| -rw-r--r-- | openwrt/package/nmap/patches/cross-compile.patch | 25 | ||||
| -rw-r--r-- | openwrt/package/nmap/patches/no_strip.patch | 10 |
2 files changed, 19 insertions, 16 deletions
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)/ |