diff --git a/shadowsocks/config.json.js b/shadowsocks/config.json.js
index 21e62c9..f421fad 100644
--- a/shadowsocks/config.json.js
+++ b/shadowsocks/config.json.js
@@ -1,8 +1,8 @@
{
"version":"3.0.5",
-"md5":"85056d753a7babd8b494a9b3a4b04266",
+"md5":"8e2dcfc093371d6b90df36170c1d4ed5",
"home_url":"Main_Ss_Content.asp",
"title":"shadowsocks",
"description":"shadowsocks",
-"build_date":"2019-01-15_12:45:31"
+"build_date":"2019-01-15_14:10:56"
}
diff --git a/shadowsocks/history/version b/shadowsocks/history/version
index 3b6754e..729edc5 100644
--- a/shadowsocks/history/version
+++ b/shadowsocks/history/version
@@ -13,3 +13,4 @@
2.8.7 72fc65ae418080a64189a64e76e26756
2.8.8 4e3a0560e3ae648d5d23f51542d29360
2.8.9 47346b43aedc7c91f73bd0d5c51f2df9
+3.0.5 8e2dcfc093371d6b90df36170c1d4ed5
diff --git a/shadowsocks/shadowsocks.tar.gz b/shadowsocks/shadowsocks.tar.gz
index 9cc83d6..fb79d15 100644
Binary files a/shadowsocks/shadowsocks.tar.gz and b/shadowsocks/shadowsocks.tar.gz differ
diff --git a/shadowsocks/shadowsocks/bin/obfs-local b/shadowsocks/shadowsocks/bin/obfs-local
index 17b83a8..53c83f5 100755
Binary files a/shadowsocks/shadowsocks/bin/obfs-local and b/shadowsocks/shadowsocks/bin/obfs-local differ
diff --git a/shadowsocks/shadowsocks/bin/rss-local b/shadowsocks/shadowsocks/bin/rss-local
index d553388..81f0480 100755
Binary files a/shadowsocks/shadowsocks/bin/rss-local and b/shadowsocks/shadowsocks/bin/rss-local differ
diff --git a/shadowsocks/shadowsocks/bin/rss-redir b/shadowsocks/shadowsocks/bin/rss-redir
index 46de07d..cfe4aa9 100755
Binary files a/shadowsocks/shadowsocks/bin/rss-redir and b/shadowsocks/shadowsocks/bin/rss-redir differ
diff --git a/shadowsocks/shadowsocks/bin/ss-local b/shadowsocks/shadowsocks/bin/ss-local
index 0816472..bdf0403 100755
Binary files a/shadowsocks/shadowsocks/bin/ss-local and b/shadowsocks/shadowsocks/bin/ss-local differ
diff --git a/shadowsocks/shadowsocks/bin/ss-redir b/shadowsocks/shadowsocks/bin/ss-redir
index 76de8de..0d4683b 100755
Binary files a/shadowsocks/shadowsocks/bin/ss-redir and b/shadowsocks/shadowsocks/bin/ss-redir differ
diff --git a/shadowsocks/shadowsocks/bin/ss-tunnel b/shadowsocks/shadowsocks/bin/ss-tunnel
index b93eeea..f4c7e1e 100755
Binary files a/shadowsocks/shadowsocks/bin/ss-tunnel and b/shadowsocks/shadowsocks/bin/ss-tunnel differ
diff --git a/shadowsocks/shadowsocks/bin/ssr-redir b/shadowsocks/shadowsocks/bin/ssr-redir
deleted file mode 100755
index 232bb2f..0000000
Binary files a/shadowsocks/shadowsocks/bin/ssr-redir and /dev/null differ
diff --git a/shadowsocks/shadowsocks/install.sh b/shadowsocks/shadowsocks/install.sh
index 1a74f94..ab165b4 100755
--- a/shadowsocks/shadowsocks/install.sh
+++ b/shadowsocks/shadowsocks/install.sh
@@ -74,7 +74,7 @@ rm -rf /tmp/shadowsocks* >/dev/null 2>&1
# transform data in skipd when ss version below 3.0.0
curr_version=`dbus get ss_basic_version_local`
-comp=`/usr/bin/versioncmp $curr_version 3.0.0`
+comp=`/usr/sbin/versioncmp $curr_version 3.0.0`
if [ -n "$curr_version" ] && [ "$comp" == "1" ];then
echo_date 从ss3.0.0版本开始,将对界面内textarea内的值和ss的密码进行base64加密,方便储存!
echo_date 生成当前SS版本:$curr_version的配置文件到/jffs根目录!
diff --git a/shadowsocks/shadowsocks/ss/version b/shadowsocks/shadowsocks/ss/version
index b0f2dcb..eca690e 100755
--- a/shadowsocks/shadowsocks/ss/version
+++ b/shadowsocks/shadowsocks/ss/version
@@ -1 +1 @@
-3.0.4
+3.0.5
diff --git a/shadowsocks/shadowsocks/webs/Main_Ss_Content.asp b/shadowsocks/shadowsocks/webs/Main_Ss_Content.asp
index 0ad7f31..f20be51 100755
--- a/shadowsocks/shadowsocks/webs/Main_Ss_Content.asp
+++ b/shadowsocks/shadowsocks/webs/Main_Ss_Content.asp
@@ -354,13 +354,6 @@ function update_visibility_tab2(){
document.getElementById("show_isp_dns").style.display = "";
$j("#show_isp_dns").html("ChinaDNS方案自带国内cdn加速,请在ChinaDNS国内DNS选取国内DNS");
$j("#user_cdn_span").html("ChinaDNS方案自带国内cdn加速,无需定义cdn加速名单");
- }else if(rdf == "6"){
- document.getElementById("ss_dns_china").style.display = "none";
- document.getElementById("ss_dns_china_user").style.display = "none";
- document.getElementById("ss_isp_website_web").style.display = "none";
- document.getElementById("show_isp_dns").style.display = "";
- $j("#show_isp_dns").html("Pcap_DNSProxy方案自带国内cdn加速,无需定义国内DNS");
- $j("#user_cdn_span").html("Pcap_DNSProxy方案自带国内cdn加速,无需定义cdn加速名单");
}else{
document.getElementById("ss_dns_china").style.display = "";
showhide("ss_dns_china_user", (rdc == "12"));
@@ -2764,7 +2757,6 @@ function write_proc_status(){
-
diff --git a/shadowsocks/version b/shadowsocks/version
index 808a4f5..5dcd817 100644
--- a/shadowsocks/version
+++ b/shadowsocks/version
@@ -1,2 +1,2 @@
3.0.5
-85056d753a7babd8b494a9b3a4b04266
+8e2dcfc093371d6b90df36170c1d4ed5
diff --git a/softcenter/app.json.js b/softcenter/app.json.js
index c1aae1e..1628e5a 100644
--- a/softcenter/app.json.js
+++ b/softcenter/app.json.js
@@ -11,10 +11,10 @@
"version": "0.2.3"
},
{
- "build_date": "2019-01-15_12:45:31",
+ "build_date": "2019-01-15_14:10:56",
"description": "shadowsocks",
"home_url": "Main_Ss_Content.asp",
- "md5": "85056d753a7babd8b494a9b3a4b04266",
+ "md5": "8e2dcfc093371d6b90df36170c1d4ed5",
"name": "shadowsocks",
"tar_url": "shadowsocks/shadowsocks.tar.gz",
"title": "shadowsocks",
@@ -92,7 +92,7 @@
}
],
"home_url": "https://raw.githubusercontent.com/paldier/softcenter/master",
- "md5": "f85034b38f4335d289e69a1228484d45",
+ "md5": "9efbbd79792c6d7eb0fc834a8fcb2ae9",
"tar_url": "softcenter/softcenter.tar.gz",
"version": "1.1.6"
}
\ No newline at end of file
diff --git a/softcenter/config.json.js b/softcenter/config.json.js
index 3945b07..3d87d37 100644
--- a/softcenter/config.json.js
+++ b/softcenter/config.json.js
@@ -1,4 +1,4 @@
{
"version":"1.1.6",
-"md5":"f85034b38f4335d289e69a1228484d45"
+"md5":"9efbbd79792c6d7eb0fc834a8fcb2ae9"
}
diff --git a/softcenter/softcenter.tar.gz b/softcenter/softcenter.tar.gz
index 3e91474..7ea0ea9 100644
Binary files a/softcenter/softcenter.tar.gz and b/softcenter/softcenter.tar.gz differ
diff --git a/softcenter/version b/softcenter/version
index 0456724..9958b64 100644
--- a/softcenter/version
+++ b/softcenter/version
@@ -1,2 +1,2 @@
1.1.6
-f85034b38f4335d289e69a1228484d45
+9efbbd79792c6d7eb0fc834a8fcb2ae9