commit 76b21714d81f106d3b5d60ead5171b0d42a29e92 Author: Nathan Freitas nathan@freitas.net Date: Fri Jan 15 12:50:38 2016 -0500

update pdnsd and tun2socks to Android-16 add stpcpy function not present before Android-21 --- jni/Application.mk | 4 ++-- jni/pdnsd/src/cache.c | 6 ++++++ libs/arm64-v8a/pdnsd | Bin 202752 -> 202752 bytes libs/armeabi-v7a/libtun2socks.so | Bin 121308 -> 125316 bytes libs/armeabi-v7a/pdnsd | Bin 153252 -> 149168 bytes libs/armeabi/libtun2socks.so | Bin 129492 -> 129408 bytes libs/mips/libtun2socks.so | Bin 284000 -> 283888 bytes libs/mips/pdnsd | Bin 334632 -> 334636 bytes libs/x86/libtun2socks.so | Bin 215452 -> 195160 bytes 9 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/jni/Application.mk b/jni/Application.mk index 3e5c822..a17746e 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,4 +1,4 @@ APP_ABI := armeabi armeabi-v7a arm64-v8a mips x86 -APP_PLATFORM := android-21 +APP_PLATFORM := android-16 APP_STL := stlport_static -NDK_TOOLCHAIN_VERSION := 4.9 +NDK_TOOLCHAIN_VERSION := 4.6 diff --git a/jni/pdnsd/src/cache.c b/jni/pdnsd/src/cache.c index 4fbb7fb..82d7088 100644 --- a/jni/pdnsd/src/cache.c +++ b/jni/pdnsd/src/cache.c @@ -2697,6 +2697,12 @@ int dump_cache(int fd, const unsigned char *name, int exact) return rv; }

+char *stpcpy(char *dest, char const *src) +{ + strcpy(dest, src); + return dest + strlen(dest); +} +

#if DEBUG>0

diff --git a/libs/arm64-v8a/pdnsd b/libs/arm64-v8a/pdnsd index 6fd98ca..4dd1af4 100755 Binary files a/libs/arm64-v8a/pdnsd and b/libs/arm64-v8a/pdnsd differ diff --git a/libs/armeabi-v7a/libtun2socks.so b/libs/armeabi-v7a/libtun2socks.so index 26b6d08..02db968 100755 Binary files a/libs/armeabi-v7a/libtun2socks.so and b/libs/armeabi-v7a/libtun2socks.so differ diff --git a/libs/armeabi-v7a/pdnsd b/libs/armeabi-v7a/pdnsd index 88d8c85..38eb74c 100755 Binary files a/libs/armeabi-v7a/pdnsd and b/libs/armeabi-v7a/pdnsd differ diff --git a/libs/armeabi/libtun2socks.so b/libs/armeabi/libtun2socks.so index 6eaf2ac..d43f63b 100755 Binary files a/libs/armeabi/libtun2socks.so and b/libs/armeabi/libtun2socks.so differ diff --git a/libs/mips/libtun2socks.so b/libs/mips/libtun2socks.so index 81c1722..1c49467 100755 Binary files a/libs/mips/libtun2socks.so and b/libs/mips/libtun2socks.so differ diff --git a/libs/mips/pdnsd b/libs/mips/pdnsd index eaa1898..acd2c6b 100755 Binary files a/libs/mips/pdnsd and b/libs/mips/pdnsd differ diff --git a/libs/x86/libtun2socks.so b/libs/x86/libtun2socks.so index 0548a83..be3b8f7 100755 Binary files a/libs/x86/libtun2socks.so and b/libs/x86/libtun2socks.so differ