From fb3fcfac2d9652a32de77370b1e3f8a3d57a666c Mon Sep 17 00:00:00 2001
From: Chen Yufei <cyfdecyf@gmail.com>
Date: Sun, 21 Sep 2014 11:34:30 +0800
Subject: [PATCH] Bump version to 1.1.2

---
 CHANGELOG           |  4 ++++
 README.md           | 12 ++++++------
 script/build.sh     | 32 ++++++++++++++++----------------
 shadowsocks/util.go |  2 +-
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e9f800cb..72826e95 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.1.2 (2014-09-21)
+    * Support new encryption method "rc4-md5"
+    * Use aes-256-cfb as default encryption method for command line app
+
 1.1.1 (2013-07-12)
     * Add -b option to limit listen address for client
     * Fix can't override server address on command line
diff --git a/README.md b/README.md
index abcacf09..7106909a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # shadowsocks-go
 
-Current version: 1.1.1 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png?branch=develop)](https://travis-ci.org/shadowsocks/shadowsocks-go)
+Current version: 1.1.2 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png?branch=develop)](https://travis-ci.org/shadowsocks/shadowsocks-go)
 
 shadowsocks-go is a lightweight tunnel proxy which can help you get through firewalls. It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks).
 
@@ -23,7 +23,7 @@ go get github.com/shadowsocks/shadowsocks-go/cmd/shadowsocks-server
 go get github.com/shadowsocks/shadowsocks-go/cmd/shadowsocks-local
 ```
 
-It's recommend to disable cgo when compiling shadowsocks-go. This will prevent the go runtime from creating too many threads for dns lookup.
+It's recommended to disable cgo when compiling shadowsocks-go. This will prevent the go runtime from creating too many threads for dns lookup.
 
 # Usage
 
@@ -35,8 +35,8 @@ Configuration file is in json format and has the same syntax with [shadowsocks-n
 server          your server ip or hostname
 server_port     server port
 local_port      local socks5 proxy port
-method          encryption method, null by default, the following methods are supported:
-                    aes-128-cfb, aes-192-cfb, aes-256-cfb, bf-cfb, cast5-cfb, des-cfb, rc4
+method          encryption method, null by default (table), the following methods are supported:
+                    aes-128-cfb, aes-192-cfb, aes-256-cfb, bf-cfb, cast5-cfb, des-cfb, rc4-md5, rc4, table
 password        a password used to encrypt transfer
 timeout         server option, in seconds
 ```
@@ -61,10 +61,10 @@ Command line options can override settings from configuration files. Use `-h` op
 
 ```
 shadowsocks-local -s server_address -p server_port -k password
-    -m rc4 -c config.json
+    -m aes-128-cfb -c config.json
     -b local_address -l local_port
 shadowsocks-server -p server_port -k password
-    -m rc4 -c config.json
+    -m aes-128-cfb -c config.json
     -t timeout
 ```
 
diff --git a/script/build.sh b/script/build.sh
index b0d41fed..207b4cfa 100755
--- a/script/build.sh
+++ b/script/build.sh
@@ -43,19 +43,19 @@ build() {
     popd
 }
 
-#build darwin amd64 mac64 local
-#build linux amd64 linux64 local
-#build linux 386 linux32 local
-#build windows amd64 win64 local
-#build windows 386 win32 local
-
-#build linux amd64 linux64 server
-#build linux 386 linux32 server
-#build darwin amd64 mac64 server
-#build windows amd64 win64 server
-#build windows 386 win32 server
-
-script/createdeb.sh amd64
-script/createdeb.sh i386
-mv shadowsocks-go_$version-1-*.deb bin/
-rm -rf shadowsocks-go_$version-1*
+build darwin amd64 mac64 local
+build linux amd64 linux64 local
+build linux 386 linux32 local
+build windows amd64 win64 local
+build windows 386 win32 local
+
+build linux amd64 linux64 server
+build linux 386 linux32 server
+build darwin amd64 mac64 server
+build windows amd64 win64 server
+build windows 386 win32 server
+
+#script/createdeb.sh amd64
+#script/createdeb.sh i386
+#mv shadowsocks-go_$version-1-*.deb bin/
+#rm -rf shadowsocks-go_$version-1*
diff --git a/shadowsocks/util.go b/shadowsocks/util.go
index 801b966a..a026e9f2 100644
--- a/shadowsocks/util.go
+++ b/shadowsocks/util.go
@@ -7,7 +7,7 @@ import (
 )
 
 func PrintVersion() {
-	const version = "1.1.1"
+	const version = "1.1.2"
 	fmt.Println("shadowsocks-go version", version)
 }