From acffa859497cdf4f1589a9b1a982197008ae2df3 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 10 Feb 2023 15:20:05 +0000
Subject: [PATCH] Add Snowflake 2.5.1, update upstream URLs, update snapshot
date.
---
install.sh | 2 +-
template-snowflake-android.pom | 8 ++++----
template-snowflake-linux.pom | 8 ++++----
template-snowflake-windows.pom | 8 ++++----
versions.json | 6 +++---
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/install.sh b/install.sh
index dc582c5..82dd84d 100755
--- a/install.sh
+++ b/install.sh
@@ -3,7 +3,7 @@ set -e
set -x
# use snapshot repos for deterministic package versions
-DATE="20221108T000000Z"
+DATE="20230209T000000Z"
cat << EOF > /etc/apt/sources.list
deb http://snapshot.debian.org/archive/debian/${DATE}/ bullseye main
deb http://snapshot.debian.org/archive/debian/${DATE}/ bullseye-updates main
diff --git a/template-snowflake-android.pom b/template-snowflake-android.pom
index 874baba..9588ce5 100644
--- a/template-snowflake-android.pom
+++ b/template-snowflake-android.pom
@@ -10,7 +10,7 @@
<licenses>
<license>
<name>BSD-3-clause</name>
- <url>https://gitweb.torproject.org/pluggable-transports/snowflake.git/tree/LICENSE</url>
+ <url>https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/blob/main/LICENSE</url>
</license>
</licenses>
<developers>
@@ -21,8 +21,8 @@
</developer>
</developers>
<scm>
- <connection>scm:https://git.torproject.org/pluggable-transports/snowflake.git</connection>
- <developerConnection>scm:git@gitweb.torproject.org/pluggable-transports/snowflake.git</developerConnection>
- <url>scm:https://gitweb.torproject.org/pluggable-transports/snowflake.git</url>
+ <connection>scm:https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git</connection>
+ <developerConnection>scm:git@gitlab.torproject.org:tpo/anti-censorship/pluggable-transports/snowflake.git</developerConnection>
+ <url>scm:https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git</url>
</scm>
</project>
diff --git a/template-snowflake-linux.pom b/template-snowflake-linux.pom
index 4d2b1c7..e4a3292 100644
--- a/template-snowflake-linux.pom
+++ b/template-snowflake-linux.pom
@@ -10,7 +10,7 @@
<licenses>
<license>
<name>BSD-3-clause</name>
- <url>https://gitweb.torproject.org/pluggable-transports/snowflake.git/tree/LICENSE</url>
+ <url>https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/blob/main/LICENSE</url>
</license>
</licenses>
<developers>
@@ -21,8 +21,8 @@
</developer>
</developers>
<scm>
- <connection>scm:https://git.torproject.org/pluggable-transports/snowflake.git</connection>
- <developerConnection>scm:git@gitweb.torproject.org/pluggable-transports/snowflake.git</developerConnection>
- <url>scm:https://gitweb.torproject.org/pluggable-transports/snowflake.git</url>
+ <connection>scm:https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git</connection>
+ <developerConnection>scm:git@gitlab.torproject.org:tpo/anti-censorship/pluggable-transports/snowflake.git</developerConnection>
+ <url>scm:https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git</url>
</scm>
</project>
diff --git a/template-snowflake-windows.pom b/template-snowflake-windows.pom
index 5bb59ac..3ee94ae 100644
--- a/template-snowflake-windows.pom
+++ b/template-snowflake-windows.pom
@@ -10,7 +10,7 @@
<licenses>
<license>
<name>BSD-3-clause</name>
- <url>https://gitweb.torproject.org/pluggable-transports/snowflake.git/tree/LICENSE</url>
+ <url>https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/blob/main/LICENSE</url>
</license>
</licenses>
<developers>
@@ -21,8 +21,8 @@
</developer>
</developers>
<scm>
- <connection>scm:https://git.torproject.org/pluggable-transports/snowflake.git</connection>
- <developerConnection>scm:git@gitweb.torproject.org/pluggable-transports/snowflake.git</developerConnection>
- <url>scm:https://gitweb.torproject.org/pluggable-transports/snowflake.git</url>
+ <connection>scm:https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git</connection>
+ <developerConnection>scm:git@gitlab.torproject.org:tpo/anti-censorship/pluggable-transports/snowflake.git</developerConnection>
+ <url>scm:https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git</url>
</scm>
</project>
diff --git a/versions.json b/versions.json
index 1fd3bd2..d5ae820 100644
--- a/versions.json
+++ b/versions.json
@@ -128,9 +128,9 @@
}
},
"snowflake": {
- "2.3.1-1": {
- "repo_url": "https://git.torproject.org/pluggable-transports/snowflake.git",
- "revision": "36f03dfd4483922b3e7400dedc71df9cf2f30b6b",
+ "2.5.1": {
+ "repo_url": "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git",
+ "revision": "7b77001eaa90e09d41172a2b170dabd3f1922b4a",
"build_path": "client",
"repo_dir": "snowflake",
"go": {
--
GitLab