From 1d41a3c93c489135daa52dd1d8937c756e0c339b Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Tue, 30 Jul 2013 13:01:06 +0800
Subject: [PATCH 1/3] bump version

---
 project/Build.scala         | 4 ++--
 src/main/jni/Android.mk     | 2 +-
 src/main/jni/Application.mk | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/Build.scala b/project/Build.scala
index 7ff47dd8..7672c5a5 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -5,8 +5,8 @@ import sbtandroid._
 import sbtandroid.AndroidKeys._
 
 object App {
-  val version = "1.7.6"
-  val versionCode = 43
+  val version = "1.7.7"
+  val versionCode = 44
 }
 
 object General {
diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk
index c5a450d8..e345ae02 100755
--- a/src/main/jni/Android.mk
+++ b/src/main/jni/Android.mk
@@ -123,7 +123,7 @@ include $(CLEAR_VARS)
 PDNSD_SOURCES  := $(wildcard $(LOCAL_PATH)/pdnsd/*.c)
 
 LOCAL_MODULE    := pdnsd
-LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)%=%)
+LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)/%=%)
 LOCAL_CFLAGS    := -Wall -O2 -I$(LOCAL_PATH)/pdnsd
 
 include $(BUILD_EXECUTABLE)
diff --git a/src/main/jni/Application.mk b/src/main/jni/Application.mk
index e8dd83c6..a52bf0fa 100644
--- a/src/main/jni/Application.mk
+++ b/src/main/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_ABI      			:= armeabi x86
 APP_PLATFORM 			:= android-9
 APP_STL      			:= stlport_static
-NDK_TOOLCHAIN_VERSION 	:= 4.7
+NDK_TOOLCHAIN_VERSION 	:= 4.8

From b248bcf5b25eafff611542c66be40007ae1eae3c Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Tue, 30 Jul 2013 13:09:23 +0800
Subject: [PATCH 2/3] update travis

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7fbc485e..5c932bbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,9 @@ before_install:
 - export ARCH=`uname -m`
 - wget http://dl.google.com/android/android-sdk_r21-linux.tgz
 - tar xf android-sdk_r21-linux.tgz
-- wget http://dl.google.com/android/ndk/android-ndk-r8e-linux-${ARCH}.tar.bz2
-- tar xf android-ndk-r8e-linux-${ARCH}.tar.bz2
-- export ANDROID_NDK_HOME=`pwd`/android-ndk-r8e
+- wget http://dl.google.com/android/ndk/android-ndk-r9-linux-${ARCH}.tar.bz2
+- tar xf android-ndk-r9-linux-${ARCH}.tar.bz2
+- export ANDROID_NDK_HOME=`pwd`/android-ndk-r9
 - export ANDROID_HOME=`pwd`/android-sdk-linux
 - export PATH=${PATH}:${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 - android update sdk --filter tools,platform-tools,android-16 --no-ui --no-https -a

From 9bf232319d8e64598b68fea2abfc0b6092a9bf1e Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Thu, 1 Aug 2013 08:51:42 +0800
Subject: [PATCH 3/3] fix an issue

---
 src/main/scala/com/github/shadowsocks/Utils.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/com/github/shadowsocks/Utils.scala b/src/main/scala/com/github/shadowsocks/Utils.scala
index 0a7e831b..4cbefa0d 100644
--- a/src/main/scala/com/github/shadowsocks/Utils.scala
+++ b/src/main/scala/com/github/shadowsocks/Utils.scala
@@ -196,7 +196,7 @@ object Extra {
     val encMethod = settings.getString(Key.encMethod, "table")
     val remotePort: Int = try {
       if (proxy == BuildConfig.SERVER) {
-        scala.util.Random.shuffle(Seq(20, 21, 23, 443)).toSeq(0)
+        scala.util.Random.shuffle(Seq(20, 21, 23)).toSeq(0)
       } else {
         Integer.valueOf(settings.getString(Key.remotePort, "1984"))
       }