Use snowflake bridges from the release archive

3 files changed, 8 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7923478de85f..ec86410df2e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = snowflake-pt-client-bin
 	pkgdesc = Pluggable Transport using WebRTC, inspired by Flashproxy
 	pkgver = 2.8.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake
 	install = snowflake-pt-client-bin.install
 	arch = x86_64
@@ -9,8 +9,6 @@ pkgbase = snowflake-pt-client-bin
 	optdepends = tor-browser
 	backup = etc/tor/snowflake
 	source = snowflake-v2.8.1.tar.gz::https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/jobs/441747/artifacts/raw/snowflake-v2.8.1.tar.gz
-	source = snowflake
 	b2sums = a330fd8f4c8b7858dcdf58865a84f0fda8d3c8ce6b8d2e8e9b50a041349d0e3c8de7f028275bc33344cd1e4060572d64a26b1922f94ad01adc75bacfb2caf057
-	b2sums = 915b0d931ce5766267764bc5355d670f134587b794df07e524ce2c7a35fef097cac7ba037644cdf8887b102139d317090cdfe3cd0d840a8cdee23bc8def0b6bb
 
 pkgname = snowflake-pt-client-bin
diff --git a/PKGBUILD b/PKGBUILD
index ca25638c872e..c64b9d40658c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=snowflake-pt-client-bin
 pkgver=2.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Pluggable Transport using WebRTC, inspired by Flashproxy'
 url=https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake
 arch=(x86_64)
@@ -8,14 +8,15 @@ depends=(tor)
 optdepends=(tor-browser)
 backup=(etc/tor/snowflake)
 install=$pkgname.install
-source=(snowflake-v$pkgver.tar.gz::https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/jobs/441747/artifacts/raw/snowflake-v$pkgver.tar.gz
-	snowflake)
-
-b2sums=(a330fd8f4c8b7858dcdf58865a84f0fda8d3c8ce6b8d2e8e9b50a041349d0e3c8de7f028275bc33344cd1e4060572d64a26b1922f94ad01adc75bacfb2caf057
-	915b0d931ce5766267764bc5355d670f134587b794df07e524ce2c7a35fef097cac7ba037644cdf8887b102139d317090cdfe3cd0d840a8cdee23bc8def0b6bb)
+source=(snowflake-v$pkgver.tar.gz::https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/jobs/441747/artifacts/raw/snowflake-v$pkgver.tar.gz)
+b2sums=(a330fd8f4c8b7858dcdf58865a84f0fda8d3c8ce6b8d2e8e9b50a041349d0e3c8de7f028275bc33344cd1e4060572d64a26b1922f94ad01adc75bacfb2caf057)
 
 package() {
 	install -Dm 755 $srcdir/snowflake-v$pkgver/client/client $pkgdir/usr/bin/snowflake-client
+
+	echo -e "UseBridges 1\nClientTransportPlugin snowflake exec /usr/bin/snowflake-client" > snowflake
+	grep -w Bridge $srcdir/snowflake-v$pkgver/client/torrc >> snowflake
+
 	install -Dm 644 snowflake $pkgdir/etc/tor/snowflake
 	install -Dm 644 $srcdir/snowflake-v$pkgver/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/snowflake b/snowflake
deleted file mode 100644
index 027da87d2e01..000000000000
--- a/snowflake
+++ /dev/null
@@ -1,4 +0,0 @@
-ClientTransportPlugin snowflake exec /usr/bin/snowflake-client
-Bridge snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
-Bridge snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=foursquare.com ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn
-UseBridges 1