From b29303f69e4b1653569576e5b7ac1cdf72c04a46 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 5 Feb 2025 15:17:51 +0000
Subject: [PATCH 1/4] Add Tor 0.4.8.14.
---
tor-versions.json | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/tor-versions.json b/tor-versions.json
index e5f0d00..0aab7d9 100644
--- a/tor-versions.json
+++ b/tor-versions.json
@@ -1,4 +1,39 @@
{
+ "0.4.8.14": {
+ "tor": {
+ "url": "https://gitlab.torproject.org/tpo/core/tor.git",
+ "commit": "tor-0.4.8.14"
+ },
+ "libevent": {
+ "url": "https://github.com/libevent/libevent.git",
+ "commit": "release-2.1.12-stable"
+ },
+ "openssl": {
+ "url": "https://github.com/openssl/openssl.git",
+ "commit": "OpenSSL_1_1_1w"
+ },
+ "xz": {
+ "url": "https://git.tukaani.org/xz.git",
+ "commit": "v5.2.10"
+ },
+ "zlib": {
+ "url": "https://github.com/madler/zlib.git",
+ "commit": "v1.2.12"
+ },
+ "ndk": {
+ "url": "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip",
+ "revision": "21.4.7075529",
+ "sha256": "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e"
+ },
+ "upstream": {
+ "url": "https://code.briarproject.org/briar/tor-browser-build.git",
+ "commit": "tor-0.4.8.13",
+ "tor-browser": "14.0.2",
+ "libevent": "2.1.7",
+ "reproduce-upstream": true
+ },
+ "timestamp": "201001010000.00"
+ },
"0.4.8.13": {
"tor": {
"url": "https://gitlab.torproject.org/tpo/core/tor.git",
--
GitLab
From 9165df992466d182dee62b5551b370590743ac69 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 6 Feb 2025 12:08:25 +0000
Subject: [PATCH 2/4] Build Tor 0.4.8.14 for macOS (not yet bundled upstream).
---
tor-versions.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tor-versions.json b/tor-versions.json
index 0aab7d9..cc6a62e 100644
--- a/tor-versions.json
+++ b/tor-versions.json
@@ -27,10 +27,10 @@
},
"upstream": {
"url": "https://code.briarproject.org/briar/tor-browser-build.git",
- "commit": "tor-0.4.8.13",
- "tor-browser": "14.0.2",
+ "commit": "tor-0.4.8.14",
+ "tor-browser": "14.0.5",
"libevent": "2.1.7",
- "reproduce-upstream": true
+ "reproduce-upstream": false
},
"timestamp": "201001010000.00"
},
--
GitLab
From 622d3dc658c1c5aa7b58bd29f00f361a4bb1ce94 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 6 Feb 2025 12:17:45 +0000
Subject: [PATCH 3/4] Upgrade xz and zstd.
---
tor-versions.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tor-versions.json b/tor-versions.json
index cc6a62e..bb7c39e 100644
--- a/tor-versions.json
+++ b/tor-versions.json
@@ -14,11 +14,11 @@
},
"xz": {
"url": "https://git.tukaani.org/xz.git",
- "commit": "v5.2.10"
+ "commit": "v5.6.4"
},
"zlib": {
"url": "https://github.com/madler/zlib.git",
- "commit": "v1.2.12"
+ "commit": "v1.2.13"
},
"ndk": {
"url": "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip",
--
GitLab
From b8246bd83562da81ff24b4359994c2578d57bb18 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 6 Feb 2025 13:48:48 +0000
Subject: [PATCH 4/4] Fix a typo in the default command (unused).
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 1c40669..341bbb8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,4 +24,4 @@ ADD template-linux.pom ./
ADD template-windows.pom ./
ADD tor-build/Makefile ./tor-build/
-CMD ./build-tor.py
+CMD ./build_tor.py
--
GitLab