Merge branch 'hotfix/0.4.3'

lparam · Nov 20, 2015 · 4f77da3 · 4f77da3
2 parents 73b68aa + 3417b3c
commit 4f77da3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+v0.4.3 (2015-10-18)
+-----------
+* Hotfix: Android build script
+
+
 v0.4.2 (2015-10-20)
 -----------
 * Change: Rename program name

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 MAJOR = 0
 MINOR = 4
-PATCH = 2
+PATCH = 3
 NAME = xSocks
 
 ifdef O

diff --git a/dist-build/android-build.sh b/dist-build/android-build.sh
@@ -13,7 +13,7 @@ fi
 
 export MAKE_TOOLCHAIN="${ANDROID_NDK_HOME}/build/tools/make-standalone-toolchain.sh"
 export TOOLCHAIN_DIR="$(pwd)/android-toolchain-${TARGET_ARCH}"
-export PREFIX="$(pwd)/xsocks-android-${TARGET_ARCH}"
+export PREFIX="$(pwd)/xSocks-android-${TARGET_ARCH}"
 export PATH="${PATH}:${TOOLCHAIN_DIR}/bin"
 
 if [ ! -d $TOOLCHAIN_DIR ]; then
@@ -24,6 +24,6 @@ if [ ! -d $TOOLCHAIN_DIR ]; then
 fi
 
 make CROSS="${HOST_COMPILER}-" O="${PREFIX}" android
-${HOST_COMPILER}-strip --strip-unneeded $PREFIX/xsocks
-${HOST_COMPILER}-strip --strip-unneeded $PREFIX/xforwarder
-echo "xsocks has been installed into $PREFIX"
+${HOST_COMPILER}-strip --strip-unneeded $PREFIX/xSocks
+${HOST_COMPILER}-strip --strip-unneeded $PREFIX/xForwarder
+echo "xSocks has been installed into $PREFIX"
diff --git a/openwrt/Makefile b/openwrt/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xSocks
-PKG_VERSION:=0.4.2
+PKG_VERSION:=0.4.3
 PKG_RELEASE=
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/src/common.h b/src/common.h
@@ -4,7 +4,7 @@
 #include "uv.h"
 #include "socks.h"
 
-#define XSOCKS_VERSION      "0.4.2"
+#define XSOCKS_VERSION      "0.4.3"
 
 struct server_context {
     int index;