From 9b9cf5e703f034c24b96a3c9992978d3dfc35123 Mon Sep 17 00:00:00 2001
From: Chen Yufei <cyfdecyf@gmail.com>
Date: Mon, 27 May 2013 09:37:16 +0800
Subject: [PATCH 1/4] go get go.crypto ciphers to fix Travis-CI build.

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

diff --git a/.travis.yml b/.travis.yml
index 4fb4081..89d0689 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: go
 install:
   - go get github.com/cyfdecyf/leakybuf
-  - mkdir -p $GOPATH/src/github.com/shadowsocks/shadowsocks-go/shadowsocks
-  - mv * $GOPATH/src/github.com/shadowsocks/shadowsocks-go
-  - pushd $GOPATH/src/github.com/shadowsocks/shadowsocks-go
+  - go get code.google.com/p/go.crypto/blowfish
+  - go get code.google.com/p/go.crypto/cast5
+  - pushd $TRAVIS_BUILD_DIR
   - go install ./cmd/shadowsocks-local
   - go install ./cmd/shadowsocks-server
   - popd

From 261a4a02a6c14916ece0247558e4d90c9ae81d79 Mon Sep 17 00:00:00 2001
From: Chen Yufei <cyfdecyf@gmail.com>
Date: Mon, 27 May 2013 09:41:22 +0800
Subject: [PATCH 2/4] Add unnecessary return statement to make Go 1.0 compiler
 happy.

---
 shadowsocks/encrypt.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shadowsocks/encrypt.go b/shadowsocks/encrypt.go
index 21b1f0b..1626107 100644
--- a/shadowsocks/encrypt.go
+++ b/shadowsocks/encrypt.go
@@ -224,4 +224,6 @@ func (c *Cipher) Copy() *Cipher {
 		nc.dec = nil
 		return &nc
 	}
+	// should not reach here, keep it to make go 1.0.x compiler happy
+	return nil
 }

From 43f818aa2f594f229bc693b00d263087dd16ebd9 Mon Sep 17 00:00:00 2001
From: Chen Yufei <cyfdecyf@gmail.com>
Date: Mon, 27 May 2013 09:47:05 +0800
Subject: [PATCH 3/4] Remove "method":null in config.json to make travis happy.

---
 config.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config.json b/config.json
index 029aa20..0a9f319 100644
--- a/config.json
+++ b/config.json
@@ -3,6 +3,5 @@
     "server_port":8388,
     "local_port":1080,
     "password":"barfoo!",
-    "method": null,
     "timeout":600
 }

From e1e09f9590f9aa72cf466b92d17e0a5b5d416c0b Mon Sep 17 00:00:00 2001
From: Chen Yufei <cyfdecyf@gmail.com>
Date: Mon, 27 May 2013 10:02:56 +0800
Subject: [PATCH 4/4] Fix test script empty string testing.

---
 script/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/test.sh b/script/test.sh
index a936672..41a9fdf 100755
--- a/script/test.sh
+++ b/script/test.sh
@@ -82,7 +82,7 @@ SERVER="shadowsocks-server"
 LOCAL="shadowsocks-local"
 test_server_local_pair
 
-if [ -n $SS_NODEJS ]; then
+if [[ -n $SS_NODEJS ]]; then
     pushd $SS_NODEJS
 
     SERVER="node server.js"