diff --git a/android/Makefile b/android/Makefile index 9b90964..5a36d36 100644 --- a/android/Makefile +++ b/android/Makefile @@ -1,8 +1,8 @@ # edit line below if you have NDK to reflect the path where NDK is installed -NDK=/tmp/android-ndk-r7 +NDK=/tmp/android-ndk-r10 NDKDEST=/tmp/ndk NDKPLATFORM=android-5 -ANDROIDDEST=/sdcard/opt/nmap-6.25 +ANDROIDDEST=/sdcard/opt/nmap-6.46 OPENSSLOPT= # uncomment if you want openssl support and you have compiled OpenSSL already @@ -17,7 +17,7 @@ HOSTPARM="--host=arm-linux" # HOSTPARM="--host=arm-linux-androideabi" NDKCP=$(NDK)/build/tools/make-standalone-toolchain.sh --platform=$(NDKPLATFORM) --install-dir=$(NDKDEST) -NDKURL="http://dl.google.com/android/ndk/android-ndk-r5b-linux-x86.tar.bz2" +NDKURL="http://dl.google.com/android/ndk/android-ndk32-r10-linux-x86_64.tar.bz2" all: @echo "Type 'make doit' to automatically download Android NDK and build" diff --git a/android/patches.diff b/android/patches.diff index 5719994..8098c13 100644 --- a/android/patches.diff +++ b/android/patches.diff @@ -1,6 +1,6 @@ -diff -ur nmap-6.25/configure nmap-6.25.mod/configure ---- nmap-6.25/configure 2012-11-16 01:54:16.000000000 +0100 -+++ nmap-6.25.mod/configure 2012-12-02 23:03:10.085399648 +0100 +diff -ur nmap-6.46/configure nmap-6.46.mod/configure +--- nmap-6.46/configure 2012-11-16 01:54:16.000000000 +0100 ++++ nmap-6.46.mod/configure 2012-12-02 23:03:10.085399648 +0100 @@ -4500,7 +4500,7 @@ needs_cpp_precomp=no @@ -10,10 +10,10 @@ diff -ur nmap-6.25/configure nmap-6.25.mod/configure case "$host" in *alpha-dec-osf*) -Only in nmap-6.25.mod/: configure.orig -diff -ur nmap-6.25/liblua/llex.c nmap-6.25.mod/liblua/llex.c ---- nmap-6.25/liblua/llex.c 2012-06-16 08:02:57.000000000 +0200 -+++ nmap-6.25.mod/liblua/llex.c 2012-12-02 23:03:43.303360329 +0100 +Only in nmap-6.46.mod/: configure.orig +diff -ur nmap-6.46/liblua/llex.c nmap-6.46.mod/liblua/llex.c +--- nmap-6.46/liblua/llex.c 2012-06-16 08:02:57.000000000 +0200 ++++ nmap-6.46.mod/liblua/llex.c 2012-12-02 23:03:43.303360329 +0100 @@ -211,7 +211,11 @@ */ static void trydecpoint (LexState *ls, SemInfo *seminfo) { @@ -26,9 +26,9 @@ diff -ur nmap-6.25/liblua/llex.c nmap-6.25.mod/liblua/llex.c buffreplace(ls, old, ls->decpoint); /* try new decimal separator */ if (!buff2d(ls->buff, &seminfo->r)) { /* format error with correct decimal point: no more options */ -diff -ur nmap-6.25/nping/nping.h nmap-6.25.mod/nping/nping.h ---- nmap-6.25/nping/nping.h 2012-11-29 20:12:35.000000000 +0100 -+++ nmap-6.25.mod/nping/nping.h 2012-12-02 23:03:10.069400630 +0100 +diff -ur nmap-6.46/nping/nping.h nmap-6.46.mod/nping/nping.h +--- nmap-6.46/nping/nping.h 2012-11-29 20:12:35.000000000 +0100 ++++ nmap-6.46.mod/nping/nping.h 2012-12-02 23:03:10.069400630 +0100 @@ -116,7 +116,7 @@ #endif /* WIN32 */ #endif /* HAVE_CONFIG_H */ @@ -38,4 +38,16 @@ diff -ur nmap-6.25/nping/nping.h nmap-6.25.mod/nping/nping.h #include #endif -Only in nmap-6.25.mod/nping: nping.h.orig +Only in nmap-6.46.mod/nping: nping.h.orig +diff -ru nmap-6.46/libpcap/Makefile.in nmap-6.46.mod/libpcap/Makefile.in +--- nmap-6.46/libpcap/Makefile.in 2012-04-10 02:47:45.000000000 +0200 ++++ nmap-6.46.mod/libpcap/Makefile.in 2014-08-17 06:46:09.425260659 +0200 +@@ -54,7 +54,7 @@ + ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@ + LIBS = @LIBS@ + CFLAGS = @CFLAGS@ +-LDFLAGS = @LDFLAGS@ ++# LDFLAGS = @LDFLAGS@ + DYEXT = @DYEXT@ + V_RPATH_OPT = @V_RPATH_OPT@ + PROG=libpcap