Tor 0.4.0.5

ChatSecure · Jul 14, 2019 · 8ec1630 · 8ec1630
1 parent 5f3e057
commit 8ec1630
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 36 deletions.
diff --git a/ChatSecure.xcodeproj/project.pbxproj b/ChatSecure.xcodeproj/project.pbxproj
@@ -1560,7 +1560,6 @@
 				6396AF971A169D54009F3E6C /* Frameworks */,
 				6396AF981A169D54009F3E6C /* Resources */,
 				D9227C481BA7952100B5E1D0 /* Embed Frameworks */,
-				D9EC47841EFA043B00C39B25 /* [Carthage] Copy Frameworks */,
 				D92F96D821BA1E7A0056EA35 /* LicensePlist */,
 				42829843B1DFA068A70F83E8 /* [CP] Copy Pods Resources */,
 			);
@@ -2038,20 +2037,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/usr/local/bin/carthage copy-frameworks";
 		};
-		D9EC47841EFA043B00C39B25 /* [Carthage] Copy Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[Carthage] Copy Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/usr/local/bin/carthage copy-frameworks\n";
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -2338,10 +2323,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/iOS",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					"COCOAPODS=1",
@@ -2375,10 +2357,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/iOS",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					"COCOAPODS=1",

diff --git a/ChatSecure/Info.plist b/ChatSecure/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.3.7</string>
+	<string>4.3.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -35,7 +35,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>139</string>
+	<string>141</string>
 	<key>FacebookAppID</key>
 	<string>447241325394334</string>
 	<key>FacebookDisplayName</key>

diff --git a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt
@@ -400,7 +400,7 @@ name: ZXingObjC, nameSpecified:
 body:                     …
 version: 3.6.5
 
-name: libevent, nameSpecified: , version: 2.0.22
+name: libevent, nameSpecified: , version: 2.1.10
 body: Libevent is availabl…
 
 name: libgcrypt, nameSpecified: , version: 1.8.1
@@ -409,14 +409,17 @@ body: Libgcrypt - The GNU …
 name: libgpg-error, nameSpecified: , version: 
 body: Package: libgpg-erro…
 
+name: liblzma, nameSpecified: , version: 5.2.4
+body: liblzma is in the pu…
+
 name: libotr, nameSpecified: , version: 4.1.1
 body: Off-the-Record Messa…
 
-name: OpenSSL, nameSpecified: , version: 1.0.2n
+name: OpenSSL, nameSpecified: , version: 1.1.1c
 body: LICENSE ISSUES
   ===…
 
-name: Tor, nameSpecified: , version: 0.3.0.13
+name: Tor, nameSpecified: , version: 0.4.0.5
 body: This file contains t…
 
 add-version-numbers: true

diff --git a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.plist b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.plist
@@ -184,7 +184,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/libevent</string>
 			<key>Title</key>
-			<string>libevent (2.0.22)</string>
+			<string>libevent (2.1.10)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@@ -212,6 +212,14 @@
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
+		<dict>
+			<key>File</key>
+			<string>com.mono0926.LicensePlist/liblzma</string>
+			<key>Title</key>
+			<string>liblzma (5.2.4)</string>
+			<key>Type</key>
+			<string>PSChildPaneSpecifier</string>
+		</dict>
 		<dict>
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/libotr</string>
@@ -280,7 +288,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/OpenSSL</string>
 			<key>Title</key>
-			<string>OpenSSL (1.0.2n)</string>
+			<string>OpenSSL (1.1.1c)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@@ -368,7 +376,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/Tor</string>
 			<key>Title</key>
-			<string>Tor (0.3.0.13)</string>
+			<string>Tor (0.4.0.5)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>

diff --git a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/liblzma.plist b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist/liblzma.plist
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>FooterText</key>
+			<string>liblzma is in the public domain.
+</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/Podfile.lock b/Podfile.lock
@@ -376,7 +376,7 @@ SPEC CHECKSUMS:
   ChatSecureCore: ae0bc3f0fa3d811121d7ec103e1b827aeb344d96
   CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
-  CPAProxy: b1b33221b6ad297169cb813b6bbefd2a69ea9aad
+  CPAProxy: 863aae0e93ca45401e9148db05abab5b940e7284
   DTFoundation: f03be9fd786f11e505bb8fc44e2a3732bf0917df
   FormatterKit: 184db51bf120b633693a73624a4cede89ec51a41
   GCDWebServer: ead88cd14596dd4eae4f5830b8877c87c8728990

diff --git a/Submodules/CPAProxy b/Submodules/CPAProxy
diff --git a/license_plist.yml b/license_plist.yml
@@ -59,7 +59,7 @@ manual:
       these additional notices to be distributed.
   - source: https://www.openssl.org
     name: OpenSSL
-    version: 1.0.2n
+    version: 1.1.1c
     body: |
       LICENSE ISSUES
         ==============
@@ -188,7 +188,7 @@ manual:
        */
   - source: http://libevent.org
     name: libevent
-    version: 2.0.22
+    version: 2.1.10
     body: |
       Libevent is available for use under the following license, commonly known
       as the 3-clause (or "modified") BSD license:
@@ -265,7 +265,7 @@ manual:
          OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   - source: https://dist.torproject.org
     name: Tor
-    version: 0.3.0.13
+    version: 0.4.0.5
     body: |
       This file contains the license for Tor,
               a free software project to provide anonymity on the Internet.
@@ -648,6 +648,11 @@ manual:
        "This product includes software developed by the OpenSSL Project
        for use in the OpenSSL Toolkit (http://www.openssl.org/)"
       ===============================================================================
+  - source: https://tukaani.org/xz/
+    name: liblzma
+    version: 5.2.4
+    body: |
+      liblzma is in the public domain.
 
 
 ## Specify GitHub's library manually.
+6 −4		CPAProxy.podspec
+2 −2		CPAProxy/CPAProxyManager.m
+5 −3		README.md
+17 −6		scripts/build-all.sh
+2 −5		scripts/build-libevent.sh
+48 −0		scripts/build-lzma.sh
+7 −8		scripts/build-openssl.sh
+14 −20		scripts/build-tor.sh
+0 −11		scripts/patches/libevent-configure.diff
+0 −11		scripts/patches/openssl-omit-frame-pointer.diff
+0 −37		scripts/patches/tor-nsenviron.diff
+0 −25		scripts/patches/tor-ptrace.diff
+2 −6		scripts/setup-prerequisites.sh