From f09bb66425ea61973a46750e8f37e8292bce286f Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sun, 14 Nov 2021 17:52:40 -0800 Subject: Snap successfully builds meek-client, and WIP getting tor to connect --- snap/snapcraft.yaml | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'snap') diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 7413bf72..e197c207 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -15,6 +15,7 @@ apps: onionshare: common-id: org.onionshare.OnionShare command: onionshare + extensions: [ gnome-3-34 ] plugs: - desktop - home @@ -125,7 +126,7 @@ parts: - setuptools - pynacl - colorama - - git+https://github.com/onionshare/stem.git@1.8.1 + - cepa == 1.8.3 stage-packages: - build-essential - libssl-dev @@ -135,7 +136,7 @@ parts: stage: - -usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 - -usr/share/doc/libssl1.1/changelog.Debian.gz - after: [tor, obfs4, snowflake-client] + after: [tor, obfs4, snowflake-client, meek-client] tor: source: https://dist.torproject.org/tor-0.4.6.8.tar.gz @@ -165,11 +166,17 @@ parts: source: https://git.torproject.org/pluggable-transports/snowflake.git source-type: git source-tag: v2.0.1 + organize: + bin/client: bin/snowflake-client - # meek-client: - # plugin: go - # go-importpath: git.torproject.org/pluggable-transports/meek.git/meek-client - # go-packages: ["google.golang.org/appengine"] - # source: https://git.torproject.org/pluggable-transports/meek.git - # source-type: git - # source-tag: v0.37.0 + meek-client: + plugin: go + go-channel: stable + go-importpath: git.torproject.org/pluggable-transports/meek.git/meek-client + # Not sure why I have to do this, but it works + override-build: | + cd meek-client + go build -o /root/parts/meek-client/install/bin ./... + source: https://git.torproject.org/pluggable-transports/meek.git + source-type: git + source-tag: v0.37.0 -- cgit v1.2.3-54-g00ecf