Merge pull request shadowsocks#1 from shadowsocksr/develop

update from origin
shadowsocksr-backup · May 18, 2017 · 82d074b · 82d074b
2 parents b8bad1a + a5b1e63
commit 82d074b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/ShadowsocksX-NG/Base.lproj/MainMenu.xib b/ShadowsocksX-NG/Base.lproj/MainMenu.xib
@@ -101,13 +101,13 @@
  <modifierMask key="keyEquivalentModifierMask"/>
  <menu key="submenu" title="Proxy Settings" id="YZp-bf-L40">
  <items>
- <menuItem title="Update PAC from GFW List" id="TFc-Ec-duM">
+ <menuItem title="Update PAC file" id="TFc-Ec-duM">
  <modifierMask key="keyEquivalentModifierMask"/>
  <connections>
  <action selector="updateGFWList:" target="Voe-Tx-rLC" id="Ztt-PS-F3T"/>
  </connections>
  </menuItem>
- <menuItem title="Update All Wihte List" id="gde-ZE-086">
+ <menuItem title="Update ACL file" id="gde-ZE-086">
  <modifierMask key="keyEquivalentModifierMask"/>
  <connections>
  <action selector="updateWhiteList:" target="Voe-Tx-rLC" id="2Iv-M4-k9C"/>

diff --git a/ShadowsocksX-NG/Info.plist b/ShadowsocksX-NG/Info.plist
@@ -17,7 +17,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>1.4.0-R8</string>
+ <string>1.4.1-R8</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleURLTypes</key>
@@ -48,7 +48,7 @@
  </dict>
  </array>
  <key>CFBundleVersion</key>
- <string>4</string>
+ <string>1</string>
  <key>LSApplicationCategoryType</key>
  <string>public.app-category.utilities</string>
  <key>LSMinimumSystemVersion</key>

diff --git a/ShadowsocksX-NG/LaunchAgentUtils.swift b/ShadowsocksX-NG/LaunchAgentUtils.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-let SS_LOCAL_VERSION = "2.5.6.56static"
+let SS_LOCAL_VERSION = "2.5.6.7.static"
 let PRIVOXY_VERSION = "3.0.26.static"
 let APP_SUPPORT_DIR = "/Library/Application Support/ShadowsocksX-NG/"
 let LAUNCH_AGENT_DIR = "/Library/LaunchAgents/"

diff --git a/ShadowsocksX-NG/PreferencesWindowController.swift b/ShadowsocksX-NG/PreferencesWindowController.swift
@@ -48,6 +48,7 @@ class PreferencesWindowController: NSWindowController
  profileMgr = ServerProfileManager.instance
 
  methodTextField.addItems(withObjectValues: [
+ "none",
  "table",
  "rc4",
  "rc4-md5-6",
@@ -69,7 +70,7 @@ class PreferencesWindowController: NSWindowController
  "seed-cfb",
  "salsa20",
  "chacha20",
- "chacha20-ietf"
+ "chacha20-ietf",
  ])
  ProtocolTextField.addItems(withObjectValues: [
  "origin",
@@ -79,6 +80,7 @@ class PreferencesWindowController: NSWindowController
  "auth_sha1_v4",
  "auth_aes128_sha1",
  "auth_aes128_md5",
+ "auth_chain_a",
  ])
  ObfsTextField.addItems(withObjectValues: [
  "plain",

diff --git a/ShadowsocksX-NG/install_ss_local.sh b/ShadowsocksX-NG/install_ss_local.sh
@@ -8,7 +8,7 @@
 
 
 cd `dirname "${BASH_SOURCE[0]}"`
-ssLocalVersion=2.5.6.6.static
+ssLocalVersion=2.5.6.7.static
 mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion"
 cp -f ss-local "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local-$ssLocalVersion/"
 rm -f "$HOME/Library/Application Support/ShadowsocksX-NG/ss-local"

diff --git a/ShadowsocksX-NG/ss-local b/ShadowsocksX-NG/ss-local