diff --git a/ShadowsocksX-NG.xcodeproj/project.pbxproj b/ShadowsocksX-NG.xcodeproj/project.pbxproj index 71b4cdd..fb12ccd 100755 --- a/ShadowsocksX-NG.xcodeproj/project.pbxproj +++ b/ShadowsocksX-NG.xcodeproj/project.pbxproj @@ -27,7 +27,6 @@ 9B3546731E802B1200B510B4 /* ToastWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9B3546711E802B1200B510B4 /* ToastWindowController.xib */; }; 9B3F7BFF1E82BF5B00C68B75 /* libev.4.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 9B3F7BF71E82BF2D00C68B75 /* libev.4.dylib */; }; 9B3F7C001E82BF5B00C68B75 /* libmbedcrypto.2.4.2.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 9B3F7BF81E82BF2D00C68B75 /* libmbedcrypto.2.4.2.dylib */; }; - 9B3F7C011E82BF5B00C68B75 /* libsodium.18.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 9B3F7BF91E82BF2E00C68B75 /* libsodium.18.dylib */; }; 9B3F7C021E82BF5B00C68B75 /* libudns.0.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 9B3F7BFA1E82BF2E00C68B75 /* libudns.0.dylib */; }; 9B3FFF0D1D05FEB30019A709 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B3FFF0C1D05FEB30019A709 /* Utils.swift */; }; 9B3FFF141D0705810019A709 /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B3FFF131D0705810019A709 /* Notifications.swift */; }; @@ -50,6 +49,9 @@ 9B5832071E7421B2009D5B7D /* virtual-server-icon-3.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B5832061E7421B2009D5B7D /* virtual-server-icon-3.png */; }; 9B58320B1E7422DB009D5B7D /* http.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B58320A1E7422DB009D5B7D /* http.png */; }; 9B5832111E742632009D5B7D /* kcptun_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B5832101E742632009D5B7D /* kcptun_1.png */; }; + 9B5AA0A1209C100C00E8B659 /* libsodium.23.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B5AA09F209C100C00E8B659 /* libsodium.23.dylib */; }; + 9B5AA0A3209C103900E8B659 /* libcares.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B5AA0A2209C103900E8B659 /* libcares.2.dylib */; }; + 9B5AA0A5209C115B00E8B659 /* libmbedcrypto.2.8.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B5AA0A4209C115B00E8B659 /* libmbedcrypto.2.8.0.dylib */; }; 9B6BF9541E27B2570061B9A7 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B6BF9531E27B2570061B9A7 /* ServiceManagement.framework */; }; 9B86459D1E7C2CAD00A84029 /* ProxyInterfacesViewCtrl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B86459C1E7C2CAD00A84029 /* ProxyInterfacesViewCtrl.swift */; }; 9B938D991E864B38005F5636 /* menu_g_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 9B938D931E864B38005F5636 /* menu_g_icon.png */; }; @@ -171,7 +173,6 @@ 9B3546711E802B1200B510B4 /* ToastWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ToastWindowController.xib; sourceTree = ""; }; 9B3F7BF71E82BF2D00C68B75 /* libev.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libev.4.dylib; sourceTree = ""; }; 9B3F7BF81E82BF2D00C68B75 /* libmbedcrypto.2.4.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libmbedcrypto.2.4.2.dylib; sourceTree = ""; }; - 9B3F7BF91E82BF2E00C68B75 /* libsodium.18.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libsodium.18.dylib; sourceTree = ""; }; 9B3F7BFA1E82BF2E00C68B75 /* libudns.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libudns.0.dylib; sourceTree = ""; }; 9B3FFF0C1D05FEB30019A709 /* Utils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = ""; }; 9B3FFF131D0705810019A709 /* Notifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = ""; }; @@ -203,6 +204,9 @@ 9B5832061E7421B2009D5B7D /* virtual-server-icon-3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "virtual-server-icon-3.png"; sourceTree = ""; }; 9B58320A1E7422DB009D5B7D /* http.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = http.png; sourceTree = ""; }; 9B5832101E742632009D5B7D /* kcptun_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = kcptun_1.png; sourceTree = ""; }; + 9B5AA09F209C100C00E8B659 /* libsodium.23.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libsodium.23.dylib; sourceTree = ""; }; + 9B5AA0A2209C103900E8B659 /* libcares.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libcares.2.dylib; sourceTree = ""; }; + 9B5AA0A4209C115B00E8B659 /* libmbedcrypto.2.8.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libmbedcrypto.2.8.0.dylib; sourceTree = ""; }; 9B6BF9531E27B2570061B9A7 /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; }; 9B86459C1E7C2CAD00A84029 /* ProxyInterfacesViewCtrl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProxyInterfacesViewCtrl.swift; sourceTree = ""; }; 9B938D931E864B38005F5636 /* menu_g_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_g_icon.png; sourceTree = ""; }; @@ -253,9 +257,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 9B5AA0A3209C103900E8B659 /* libcares.2.dylib in Frameworks */, 9B6BF9541E27B2570061B9A7 /* ServiceManagement.framework in Frameworks */, 9B3FFF3E1D08D9910019A709 /* SystemConfiguration.framework in Frameworks */, + 9B5AA0A5209C115B00E8B659 /* libmbedcrypto.2.8.0.dylib in Frameworks */, 258E511BA910B0521B24DAB8 /* Pods_ShadowsocksX_NG.framework in Frameworks */, + 9B5AA0A1209C100C00E8B659 /* libsodium.23.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -305,6 +312,9 @@ 9B07EFB01D048E900052D9DF /* Support Files */ = { isa = PBXGroup; children = ( + 9B5AA09F209C100C00E8B659 /* libsodium.23.dylib */, + 9B5AA0A2209C103900E8B659 /* libcares.2.dylib */, + 9B5AA0A4209C115B00E8B659 /* libmbedcrypto.2.8.0.dylib */, 1C82DBA31FA96C7400B32551 /* simple-obfs */, 9B16E5991F99FD0700E54DC5 /* icons8-Blind Filled-50.png */, 9B16E5971F99FD0700E54DC5 /* icons8-Eye Filled-50.png */, @@ -316,7 +326,6 @@ 9B938D981E864B38005F5636 /* menu_p_icon@2x.png */, 9B3F7BF71E82BF2D00C68B75 /* libev.4.dylib */, 9B3F7BF81E82BF2D00C68B75 /* libmbedcrypto.2.4.2.dylib */, - 9B3F7BF91E82BF2E00C68B75 /* libsodium.18.dylib */, 9B3F7BFA1E82BF2E00C68B75 /* libudns.0.dylib */, 9B5832101E742632009D5B7D /* kcptun_1.png */, 9B58320A1E7422DB009D5B7D /* http.png */, @@ -604,7 +613,6 @@ 9B3F7BFF1E82BF5B00C68B75 /* libev.4.dylib in Resources */, 1C82DBAA1FA96FB600B32551 /* install_simple_obfs.sh in Resources */, 9B3F7C001E82BF5B00C68B75 /* libmbedcrypto.2.4.2.dylib in Resources */, - 9B3F7C011E82BF5B00C68B75 /* libsodium.18.dylib in Resources */, 9B3F7C021E82BF5B00C68B75 /* libudns.0.dylib in Resources */, 9B9CBCB41E26453C00FC61AA /* start_kcptun.sh in Resources */, 9B9CBCB51E26453C00FC61AA /* stop_kcptun.sh in Resources */, diff --git a/ShadowsocksX-NG/LaunchAgentUtils.swift b/ShadowsocksX-NG/LaunchAgentUtils.swift index 00051e6..5200443 100644 --- a/ShadowsocksX-NG/LaunchAgentUtils.swift +++ b/ShadowsocksX-NG/LaunchAgentUtils.swift @@ -8,7 +8,7 @@ import Foundation -let SS_LOCAL_VERSION = "3.0.5" +let SS_LOCAL_VERSION = "3.1.3" let KCPTUN_CLIENT_VERSION = "20170322" let PRIVOXY_VERSION = "3.0.26.static" let SIMPLE_OBFS_VERSION = "0.0.2" diff --git a/ShadowsocksX-NG/install_ss_local.sh b/ShadowsocksX-NG/install_ss_local.sh index e37edc3..5d20d47 100755 --- a/ShadowsocksX-NG/install_ss_local.sh +++ b/ShadowsocksX-NG/install_ss_local.sh @@ -10,7 +10,7 @@ cd `dirname "${BASH_SOURCE[0]}"` NGDir="$HOME/Library/Application Support/ShadowsocksX-NG" -TargetDir="$NGDir/ss-local-3.0.5" +TargetDir="$NGDir/ss-local-3.1.3" LatestTargetDir="$NGDir/ss-local-latest" echo ngdir: ${NGDir} @@ -21,10 +21,22 @@ rm -f "$LatestTargetDir" ln -s "$TargetDir" "$LatestTargetDir" cp -f libev.4.dylib "$TargetDir" -cp -f libmbedcrypto.2.4.2.dylib "$TargetDir" -ln -s "$TargetDir/libmbedcrypto.2.4.2.dylib" "$TargetDir/libmbedcrypto.0.dylib" + +# 2.8.0 https://bintray.com/homebrew/bottles/mbedtls +cp -f libmbedcrypto.2.8.0.dylib "$TargetDir" +ln -s "$TargetDir/libmbedcrypto.2.8.0.dylib" "$TargetDir/libmbedcrypto.1.dylib" + +# 8.42 https://bintray.com/homebrew/bottles/pcre cp -f libpcre.1.dylib "$TargetDir" -cp -f libsodium.18.dylib "$TargetDir" -cp -f libudns.0.dylib "$TargetDir" + +# 1.0.16 https://bintray.com/homebrew/bottles/libsodium +cp -f libsodium.23.dylib "$TargetDir" +ln -s "$TargetDir/libsodium.23.dylib" "$TargetDir/libsodium.dylib" + +#cp -f libudns.0.dylib "$TargetDir" + +# 1.14.0 https://bintray.com/homebrew/bottles/c-ares +cp -f libcares.2.dylib "$TargetDir" +ln -s "$TargetDir/libcares.2.dylib" "$TargetDir/libcares.dylib" echo done diff --git a/ShadowsocksX-NG/libcares.2.dylib b/ShadowsocksX-NG/libcares.2.dylib new file mode 100644 index 0000000..66ea616 Binary files /dev/null and b/ShadowsocksX-NG/libcares.2.dylib differ diff --git a/ShadowsocksX-NG/libmbedcrypto.2.8.0.dylib b/ShadowsocksX-NG/libmbedcrypto.2.8.0.dylib new file mode 100644 index 0000000..bbeca0c Binary files /dev/null and b/ShadowsocksX-NG/libmbedcrypto.2.8.0.dylib differ diff --git a/ShadowsocksX-NG/libpcre.1.dylib b/ShadowsocksX-NG/libpcre.1.dylib index a4d7cbe..e1b1387 100644 Binary files a/ShadowsocksX-NG/libpcre.1.dylib and b/ShadowsocksX-NG/libpcre.1.dylib differ diff --git a/ShadowsocksX-NG/libsodium.18.dylib b/ShadowsocksX-NG/libsodium.18.dylib deleted file mode 100644 index 7df9349..0000000 Binary files a/ShadowsocksX-NG/libsodium.18.dylib and /dev/null differ diff --git a/ShadowsocksX-NG/libsodium.23.dylib b/ShadowsocksX-NG/libsodium.23.dylib new file mode 100644 index 0000000..d798e96 Binary files /dev/null and b/ShadowsocksX-NG/libsodium.23.dylib differ diff --git a/ShadowsocksX-NG/ss-local b/ShadowsocksX-NG/ss-local index 7519dea..f25d6c8 100755 Binary files a/ShadowsocksX-NG/ss-local and b/ShadowsocksX-NG/ss-local differ