diff --git a/Podfile b/Podfile index 2cce1c50..a46404c6 100644 --- a/Podfile +++ b/Podfile @@ -12,8 +12,8 @@ target 'ShadowsocksX-NG' do pod 'MASShortcut', '~> 2' # https://github.com/ReactiveX/RxSwift/blob/master/Documentation/GettingStarted.md - pod 'RxSwift', '~> 6.2.0' - pod 'RxCocoa', '~> 6.2.0' + pod 'RxSwift', '~> 6.5.0' + pod 'RxCocoa', '~> 6.5.0' target 'ShadowsocksX-NGTests' do inherit! :search_paths diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index f4979091..c5c7495f 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -2701,6 +2701,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; + MARKETING_VERSION = 6.5.0; MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap"; PRODUCT_MODULE_NAME = RxSwift; PRODUCT_NAME = RxSwift; @@ -2761,6 +2762,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; + MARKETING_VERSION = 6.5.0; MODULEMAP_FILE = "Target Support Files/RxCocoa/RxCocoa.modulemap"; PRODUCT_MODULE_NAME = RxCocoa; PRODUCT_NAME = RxCocoa; @@ -2791,6 +2793,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; + MARKETING_VERSION = 6.5.0; MODULEMAP_FILE = "Target Support Files/RxCocoa/RxCocoa.modulemap"; PRODUCT_MODULE_NAME = RxCocoa; PRODUCT_NAME = RxCocoa; @@ -2931,7 +2934,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -3053,6 +3056,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; + MARKETING_VERSION = 6.5.0; MODULEMAP_FILE = "Target Support Files/RxRelay/RxRelay.modulemap"; PRODUCT_MODULE_NAME = RxRelay; PRODUCT_NAME = RxRelay; @@ -3254,6 +3258,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -3342,6 +3347,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; + MARKETING_VERSION = 6.5.0; MODULEMAP_FILE = "Target Support Files/RxRelay/RxRelay.modulemap"; PRODUCT_MODULE_NAME = RxRelay; PRODUCT_NAME = RxRelay; @@ -3372,6 +3378,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; + MARKETING_VERSION = 6.5.0; MODULEMAP_FILE = "Target Support Files/RxSwift/RxSwift.modulemap"; PRODUCT_MODULE_NAME = RxSwift; PRODUCT_NAME = RxSwift; diff --git a/Pods/Target Support Files/RxCocoa/RxCocoa-Info.plist b/Pods/Target Support Files/RxCocoa/RxCocoa-Info.plist index 45024a7b..1f916508 100644 --- a/Pods/Target Support Files/RxCocoa/RxCocoa-Info.plist +++ b/Pods/Target Support Files/RxCocoa/RxCocoa-Info.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - ${PRODUCT_BUNDLE_IDENTIFIER} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 6.2.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + diff --git a/Pods/Target Support Files/RxRelay/RxRelay-Info.plist b/Pods/Target Support Files/RxRelay/RxRelay-Info.plist index 45024a7b..1f916508 100644 --- a/Pods/Target Support Files/RxRelay/RxRelay-Info.plist +++ b/Pods/Target Support Files/RxRelay/RxRelay-Info.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - ${PRODUCT_BUNDLE_IDENTIFIER} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 6.2.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + diff --git a/Pods/Target Support Files/RxSwift/RxSwift-Info.plist b/Pods/Target Support Files/RxSwift/RxSwift-Info.plist index 45024a7b..1f916508 100644 --- a/Pods/Target Support Files/RxSwift/RxSwift-Info.plist +++ b/Pods/Target Support Files/RxSwift/RxSwift-Info.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - ${PRODUCT_BUNDLE_IDENTIFIER} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 6.2.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + diff --git a/ShadowsocksX-NG.xcodeproj/project.pbxproj b/ShadowsocksX-NG.xcodeproj/project.pbxproj index 612380f3..b67d0824 100644 --- a/ShadowsocksX-NG.xcodeproj/project.pbxproj +++ b/ShadowsocksX-NG.xcodeproj/project.pbxproj @@ -41,7 +41,7 @@ 9B5DD7B02683A354005EFEF7 /* ShadowsocksX_NGTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B5DD7AF2683A354005EFEF7 /* ShadowsocksX_NGTests.swift */; }; 9B5DD7B82683A369005EFEF7 /* ServerProfileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B5DD7B72683A369005EFEF7 /* ServerProfileTests.swift */; }; 9B6BF9541E27B2570061B9A7 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B6BF9531E27B2570061B9A7 /* ServiceManagement.framework */; }; - 9B7297E7214D69C300FD24AA /* libmbedcrypto.2.12.0.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 9B7297E5214D68F800FD24AA /* libmbedcrypto.2.12.0.dylib */; }; + 9B7297E7214D69C300FD24AA /* libmbedcrypto.2.25.0.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 9B7297E5214D68F800FD24AA /* libmbedcrypto.2.25.0.dylib */; }; 9B7297EA214D7C6B00FD24AA /* ShareServerProfilesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B7297E8214D7C6B00FD24AA /* ShareServerProfilesWindowController.swift */; }; 9B7297EC214DA88A00FD24AA /* ShareServerProfilesWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9B7297EE214DA88A00FD24AA /* ShareServerProfilesWindowController.xib */; }; 9B72FB62232782A300C6AAAE /* ImportWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B72FB60232782A300C6AAAE /* ImportWindowController.swift */; }; @@ -86,6 +86,7 @@ 9BEEF0751D04EF3E00FC52B3 /* PreferencesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BEEF0731D04EF3E00FC52B3 /* PreferencesWindowController.swift */; }; 9BEEF0781D04FE8A00FC52B3 /* LaunchAgentUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BEEF0771D04FE8A00FC52B3 /* LaunchAgentUtils.swift */; }; B5A2AB04221A72EC003F77B7 /* install_v2ray_plugin.sh in Resources */ = {isa = PBXBuildFile; fileRef = B5A2AB02221A72EC003F77B7 /* install_v2ray_plugin.sh */; }; + BB57CC36258FA0F000D7AA1A /* libpcreposix.0.dylib in Resources */ = {isa = PBXBuildFile; fileRef = BB57CC34258FA0F000D7AA1A /* libpcreposix.0.dylib */; }; C6D429931DA75988002A5711 /* install_privoxy.sh in Resources */ = {isa = PBXBuildFile; fileRef = C6D4298E1DA75988002A5711 /* install_privoxy.sh */; }; C6D429941DA75988002A5711 /* privoxy in Resources */ = {isa = PBXBuildFile; fileRef = C6D4298F1DA75988002A5711 /* privoxy */; }; C6D429961DA75988002A5711 /* start_privoxy.sh in Resources */ = {isa = PBXBuildFile; fileRef = C6D429911DA75988002A5711 /* start_privoxy.sh */; }; @@ -202,7 +203,7 @@ 9B5DD7B12683A354005EFEF7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9B5DD7B72683A369005EFEF7 /* ServerProfileTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServerProfileTests.swift; sourceTree = ""; }; 9B6BF9531E27B2570061B9A7 /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; }; - 9B7297E5214D68F800FD24AA /* libmbedcrypto.2.12.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libmbedcrypto.2.12.0.dylib; sourceTree = ""; }; + 9B7297E5214D68F800FD24AA /* libmbedcrypto.2.25.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libmbedcrypto.2.25.0.dylib; sourceTree = ""; }; 9B7297E8214D7C6B00FD24AA /* ShareServerProfilesWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareServerProfilesWindowController.swift; sourceTree = ""; }; 9B7297ED214DA88A00FD24AA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ShareServerProfilesWindowController.xib; sourceTree = ""; }; 9B7297F0214DA89000FD24AA /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/ShareServerProfilesWindowController.strings"; sourceTree = ""; }; @@ -252,6 +253,7 @@ 9BEEF0771D04FE8A00FC52B3 /* LaunchAgentUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LaunchAgentUtils.swift; sourceTree = ""; }; B4E6A97CA843F3943524B686 /* Pods-proxy_conf_helper.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-proxy_conf_helper.debug.xcconfig"; path = "Pods/Target Support Files/Pods-proxy_conf_helper/Pods-proxy_conf_helper.debug.xcconfig"; sourceTree = ""; }; B5A2AB02221A72EC003F77B7 /* install_v2ray_plugin.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = install_v2ray_plugin.sh; sourceTree = ""; }; + BB57CC34258FA0F000D7AA1A /* libpcreposix.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpcreposix.0.dylib; path = "ShadowsocksX-NG/privoxy/libpcreposix.0.dylib"; sourceTree = ""; }; C6D4298E1DA75988002A5711 /* install_privoxy.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = install_privoxy.sh; sourceTree = ""; }; C6D4298F1DA75988002A5711 /* privoxy */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = privoxy; sourceTree = ""; }; C6D429911DA75988002A5711 /* start_privoxy.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = start_privoxy.sh; sourceTree = ""; }; @@ -337,6 +339,7 @@ 9B0BFFDC1D0460A70040E62B = { isa = PBXGroup; children = ( + BB57CC34258FA0F000D7AA1A /* libpcreposix.0.dylib */, 9B5831FA1E73098F009D5B7D /* README.md */, 9B172A601D0ADA5B00B87B9A /* genstrings.py */, 9B9F13A11E8A282C00DE4794 /* LaunchHelper.xcodeproj */, @@ -428,7 +431,7 @@ 9B5AA0A9209C41EC00E8B659 /* ss-local */ = { isa = PBXGroup; children = ( - 9B7297E5214D68F800FD24AA /* libmbedcrypto.2.12.0.dylib */, + 9B7297E5214D68F800FD24AA /* libmbedcrypto.2.25.0.dylib */, 9B3F7BF71E82BF2D00C68B75 /* libev.4.dylib */, 9B5AA09F209C100C00E8B659 /* libsodium.23.dylib */, 9B5AA0A2209C103900E8B659 /* libcares.2.dylib */, @@ -659,8 +662,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + BB57CC36258FA0F000D7AA1A /* libpcreposix.0.dylib in Resources */, 9B5D132A2154A62600F99F03 /* install_kcptun.sh in Resources */, - 9B7297E7214D69C300FD24AA /* libmbedcrypto.2.12.0.dylib in Resources */, + 9B7297E7214D69C300FD24AA /* libmbedcrypto.2.25.0.dylib in Resources */, 9BCB1D6C20A15B0E005BABE7 /* libsodium.23.dylib in Resources */, 9BCB1D6D20A15B0E005BABE7 /* libcares.2.dylib in Resources */, 9BBE7B751F508A0E00E8FFE5 /* fix_dir_owner.sh in Resources */, @@ -1058,7 +1062,8 @@ "$(PROJECT_DIR)/ShadowsocksX-NG/simple-obfs", ); MACOSX_DEPLOYMENT_TARGET = 10.12; - MARKETING_VERSION = 1.9.4; + MARKETING_VERSION = 1.9.5; + ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1093,7 +1098,8 @@ "$(PROJECT_DIR)/ShadowsocksX-NG/simple-obfs", ); MACOSX_DEPLOYMENT_TARGET = 10.12; - MARKETING_VERSION = 1.9.4; + MARKETING_VERSION = 1.9.5; + ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.qiuyuzhou.ShadowsocksX-NG"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/ShadowsocksX-NG/LaunchAgentUtils.swift b/ShadowsocksX-NG/LaunchAgentUtils.swift index f81d1c51..259a7e20 100644 --- a/ShadowsocksX-NG/LaunchAgentUtils.swift +++ b/ShadowsocksX-NG/LaunchAgentUtils.swift @@ -278,13 +278,19 @@ func generatePrivoxyLauchAgentPlist() -> Bool { let arguments = [privoxyPath, "--no-daemon", "privoxy.config"] + let dyld_library_paths = [ + NSHomeDirectory() + APP_SUPPORT_DIR + "ss-local-latest/", + NSHomeDirectory() + APP_SUPPORT_DIR + "privoxy-latest/", + ] + // For a complete listing of the keys, see the launchd.plist manual page. let dict: NSMutableDictionary = [ "Label": "com.qiuyuzhou.shadowsocksX-NG.http", "WorkingDirectory": NSHomeDirectory() + APP_SUPPORT_DIR, "StandardOutPath": logFilePath, "StandardErrorPath": logFilePath, - "ProgramArguments": arguments + "ProgramArguments": arguments, + "EnvironmentVariables": ["DYLD_LIBRARY_PATH": dyld_library_paths.joined(separator: ":")] ] dict.write(toFile: plistFilepath, atomically: true) let Sha1Sum = getFileSHA1Sum(plistFilepath) diff --git a/ShadowsocksX-NG/privoxy/install_privoxy.sh b/ShadowsocksX-NG/privoxy/install_privoxy.sh index dc9d4b8d..09e26c17 100755 --- a/ShadowsocksX-NG/privoxy/install_privoxy.sh +++ b/ShadowsocksX-NG/privoxy/install_privoxy.sh @@ -9,10 +9,20 @@ cd "$(dirname "${BASH_SOURCE[0]}")" -privoxyVersion=3.0.26.static -mkdir -p "$HOME/Library/Application Support/ShadowsocksX-NG/privoxy-$privoxyVersion" -cp -f privoxy "$HOME/Library/Application Support/ShadowsocksX-NG/privoxy-$privoxyVersion/" +privoxyVersion=3.0.29 +targetDir="$HOME/Library/Application Support/ShadowsocksX-NG/privoxy-$privoxyVersion" +latestDir="$HOME/Library/Application Support/ShadowsocksX-NG/privoxy-latest" + +mkdir -p "$targetDir" +cp -f privoxy "$targetDir" + +# libpcreposix +cp -f libpcreposix.0.dylib "$targetDir" + +rm -f "$latestDir" +ln -s "$targetDir" "$latestDir" + rm -f "$HOME/Library/Application Support/ShadowsocksX-NG/privoxy" -ln -s "$HOME/Library/Application Support/ShadowsocksX-NG/privoxy-$privoxyVersion/privoxy" "$HOME/Library/Application Support/ShadowsocksX-NG/privoxy" +ln -s "$targetDir/privoxy" "$HOME/Library/Application Support/ShadowsocksX-NG/privoxy" echo done diff --git a/ShadowsocksX-NG/privoxy/libpcreposix.0.dylib b/ShadowsocksX-NG/privoxy/libpcreposix.0.dylib new file mode 100644 index 00000000..2fb7b82d Binary files /dev/null and b/ShadowsocksX-NG/privoxy/libpcreposix.0.dylib differ diff --git a/ShadowsocksX-NG/privoxy/privoxy b/ShadowsocksX-NG/privoxy/privoxy index 8c84e79c..991faa06 100755 Binary files a/ShadowsocksX-NG/privoxy/privoxy and b/ShadowsocksX-NG/privoxy/privoxy differ diff --git a/ShadowsocksX-NG/ss-local/install_ss_local.sh b/ShadowsocksX-NG/ss-local/install_ss_local.sh index 477ba90f..324b6a8b 100755 --- a/ShadowsocksX-NG/ss-local/install_ss_local.sh +++ b/ShadowsocksX-NG/ss-local/install_ss_local.sh @@ -10,12 +10,12 @@ cd "$(dirname "${BASH_SOURCE[0]}")" NGDir="$HOME/Library/Application Support/ShadowsocksX-NG" -TargetDir="$NGDir/ss-local-3.2.5" +TargetDir="$NGDir/ss-local-3.3.5" LatestTargetDir="$NGDir/ss-local-latest" echo ngdir: ${NGDir} -# 3.2.5 https://bintray.com/homebrew/bottles/shadowsocks-libev/ +# 3.3.5 https://bintray.com/homebrew/bottles/shadowsocks-libev/ mkdir -p "$TargetDir" cp -f ss-local "$TargetDir" rm -f "$LatestTargetDir" @@ -23,12 +23,11 @@ ln -s "$TargetDir" "$LatestTargetDir" cp -f libev.4.dylib "$TargetDir" -# 2.8.0 https://bintray.com/homebrew/bottles/mbedtls -cp -f libmbedcrypto.2.12.0.dylib "$TargetDir" -ln -sfh "$TargetDir/libmbedcrypto.2.12.0.dylib" "$TargetDir/libmbedcrypto.2.dylib" -ln -sfh "$TargetDir/libmbedcrypto.2.12.0.dylib" "$TargetDir/libmbedcrypto.3.dylib" +# 2.25.0 https://bintray.com/homebrew/bottles/mbedtls +cp -f libmbedcrypto.2.25.0.dylib "$TargetDir" +ln -sfh "$TargetDir/libmbedcrypto.2.25.0.dylib" "$TargetDir/libmbedcrypto.6.dylib" -# 8.42 https://bintray.com/homebrew/bottles/pcre +# 8.44 https://bintray.com/homebrew/bottles/pcre cp -f libpcre.1.dylib "$TargetDir" # 1.0.18 https://bintray.com/homebrew/bottles/libsodium @@ -37,7 +36,7 @@ ln -sfh "$TargetDir/libsodium.23.dylib" "$TargetDir/libsodium.dylib" #cp -f libudns.0.dylib "$TargetDir" -# 1.15.0 https://bintray.com/homebrew/bottles/c-ares +# 1.17.1 https://bintray.com/homebrew/bottles/c-ares cp -f libcares.2.dylib "$TargetDir" ln -sfh "$TargetDir/libcares.2.dylib" "$TargetDir/libcares.dylib" diff --git a/ShadowsocksX-NG/ss-local/libcares.2.dylib b/ShadowsocksX-NG/ss-local/libcares.2.dylib index 0d69f798..a9b5eff4 100644 Binary files a/ShadowsocksX-NG/ss-local/libcares.2.dylib and b/ShadowsocksX-NG/ss-local/libcares.2.dylib differ diff --git a/ShadowsocksX-NG/ss-local/libev.4.dylib b/ShadowsocksX-NG/ss-local/libev.4.dylib index fba40d3e..9ead2ff2 100644 Binary files a/ShadowsocksX-NG/ss-local/libev.4.dylib and b/ShadowsocksX-NG/ss-local/libev.4.dylib differ diff --git a/ShadowsocksX-NG/ss-local/libmbedcrypto.2.12.0.dylib b/ShadowsocksX-NG/ss-local/libmbedcrypto.2.12.0.dylib deleted file mode 100644 index bfc970f6..00000000 Binary files a/ShadowsocksX-NG/ss-local/libmbedcrypto.2.12.0.dylib and /dev/null differ diff --git a/ShadowsocksX-NG/ss-local/libmbedcrypto.2.25.0.dylib b/ShadowsocksX-NG/ss-local/libmbedcrypto.2.25.0.dylib new file mode 100644 index 00000000..cbec37ae Binary files /dev/null and b/ShadowsocksX-NG/ss-local/libmbedcrypto.2.25.0.dylib differ diff --git a/ShadowsocksX-NG/ss-local/libpcre.1.dylib b/ShadowsocksX-NG/ss-local/libpcre.1.dylib index e1b13874..69dde6c3 100644 Binary files a/ShadowsocksX-NG/ss-local/libpcre.1.dylib and b/ShadowsocksX-NG/ss-local/libpcre.1.dylib differ diff --git a/ShadowsocksX-NG/ss-local/libsodium.23.dylib b/ShadowsocksX-NG/ss-local/libsodium.23.dylib index 1ae6e505..93b973ee 100644 Binary files a/ShadowsocksX-NG/ss-local/libsodium.23.dylib and b/ShadowsocksX-NG/ss-local/libsodium.23.dylib differ diff --git a/ShadowsocksX-NG/ss-local/ss-local b/ShadowsocksX-NG/ss-local/ss-local index f48262d1..8652f5a5 100755 Binary files a/ShadowsocksX-NG/ss-local/ss-local and b/ShadowsocksX-NG/ss-local/ss-local differ