Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-04-20 23:46:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the flatpak/org.onionshare.OnionShare.yaml so that it only has to include the go.mod.yml of the respective PTs, with the modules.txt included therein

Browse Source
This commit is contained in:
Miguel Jacq 2025-02-07 15:40:57 +11:00
parent b676936256
commit 344c62e2a8
No known key found for this signature in database
GPG Key ID: 59B3F0C24135C6A9
6 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
RELEASE.md
View File

@ -96,7 +96,7 @@ In `flatpak/org.onionshare.OnionShare.yaml`:
- [ ] Update `tor` and `libevent`
- [ ] Update `obfs4proxy`, `meek-client`, and `snowflake-client` dependencies. To do this, clone the latest tagged release of the following repositories, into a temp directory:
```
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/meek.git (Note: for this one, we need to check out main branch as it has an important dependency fix)
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/meek.git
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
https://gitlab.com/yawning/obfs4.git
```
@ -114,13 +114,13 @@ In `flatpak/org.onionshare.OnionShare.yaml`:
modules.txt
```
Move these files into the respective `flatpak/snowflake`, `flatpak/obfs4proxy` and `flatpak/meek-client` folders.
Move the `go.mod.yml` into the respective `flatpak/snowflake`, `flatpak/obfs4proxy` and `flatpak/meek-client` folders.
Then edit the go.mod.yml in each one and remove the first entry of three lines that looks like this:
Then edit the go.mod.yml in each one and edit the 'path' attribute of the first entry that it has the subfolder set (below example is just the `obfs4proxy/go.mod.yml`, but you should do the same for the other two):
```
- dest: vendor
path: modules.txt
path: obfs4proxy/modules.txt
type: file
```

13
flatpak/meek-client/go.mod.yml
View File

@ -1,4 +1,12 @@
# Workaround for Go modules generated by github.com/dennwc/flatpak-go-mod
- dest: vendor
path: meek-client/modules.txt
type: file
- dest: vendor/git.torproject.org/pluggable-transports/goptlib.git
sha256: f6769c4813dedf933071289bfd9381aa5eb3a012b3a32d1da02aa9bebd3a3b5b
strip-components: 3
type: archive
url: https://proxy.golang.org/git.torproject.org/pluggable-transports/goptlib.git/@v/v1.1.0.zip
- dest: vendor/github.com/andybalholm/brotli
sha256: ebe53f2856e100e273aae3c5a368d114ed57f5183bb03e70708d6c29041ad735
strip-components: 3
@ -14,11 +22,6 @@
strip-components: 3
type: archive
url: https://proxy.golang.org/github.com/refraction-networking/utls/@v/v1.1.5.zip
- dest: vendor/gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib
sha256: ed88f369ec8d4dc2521e74eb5c966bb80a5151eaae18621ac3f008784086472a
strip-components: 5
type: archive
url: https://proxy.golang.org/gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib/@v/v1.4.0.zip
- dest: vendor/golang.org/x/crypto
sha256: 3db244bdc1c8848b910e6e1ebb449aa78b546bd9cf699c61bf8b8a1fb25c5065
strip-components: 3

4
flatpak/meek-client/modules.txt
View File

@ -1,3 +1,5 @@
# git.torproject.org/pluggable-transports/goptlib.git v1.1.0
git.torproject.org/pluggable-transports/goptlib.git
# github.com/andybalholm/brotli v1.0.4
github.com/andybalholm/brotli
# github.com/klauspost/compress v1.15.9
@ -11,8 +13,6 @@ github.com/klauspost/compress/zstd/internal/xxhash
# github.com/refraction-networking/utls v1.1.5
github.com/refraction-networking/utls
github.com/refraction-networking/utls/cpu
# gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib v1.4.0
gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib
# golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
golang.org/x/crypto/acme
golang.org/x/crypto/acme/autocert

3
flatpak/obfs4proxy/go.mod.yml
View File

@ -1,4 +1,7 @@
# Workaround for Go modules generated by github.com/dennwc/flatpak-go-mod
- dest: vendor
path: obfs4proxy/modules.txt
type: file
- dest: vendor/filippo.io/edwards25519
sha256: b08ab9f86a2f0688a6b8b49a03ac5b52f53f87747596ad10dc20cdd668d15bc4
strip-components: 2

18
flatpak/org.onionshare.OnionShare.yaml
View File

@ -55,14 +55,11 @@ modules:
GO11MODULE: on
GOROOT: /usr/lib/sdk/golang
build-commands:
- ". /usr/lib/sdk/golang/enable.sh && go build -o /app/bin/snowflake-client ./client"
- ". /usr/lib/sdk/golang/enable.sh && go build -mod=vendor -o /app/bin/snowflake-client ./client"
sources:
- type: git
url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
tag: v2.10.1
- type : file
path: snowflake/modules.txt
dest: vendor
- snowflake/go.mod.yml
- name: obfs4proxy
buildsystem: simple
@ -73,14 +70,11 @@ modules:
GO11MODULE: on
GOROOT: /usr/lib/sdk/golang
build-commands:
- ". /usr/lib/sdk/golang/enable.sh && go build -o /app/bin/obfs4proxy ./obfs4proxy"
- ". /usr/lib/sdk/golang/enable.sh && go build -mod=vendor -o /app/bin/obfs4proxy ./obfs4proxy"
sources:
- type: git
url: https://gitlab.com/yawning/obfs4.git
tag: obfs4proxy-0.0.14
- type: file
path: obfs4proxy/modules.txt
dest: vendor
- obfs4proxy/go.mod.yml
- name: meek-client
buildsystem: simple
@ -95,10 +89,10 @@ modules:
sources:
- type: git
url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/meek.git
tag: main
- type: file
path: meek-client/modules.txt
dest: vendor
tag: v0.38.0
#- type: file
# path: meek-client/modules.txt
# dest: vendor
- meek-client/go.mod.yml
- name: tor
buildsystem: autotools

3
flatpak/snowflake/go.mod.yml
View File

@ -1,4 +1,7 @@
# Workaround for Go modules generated by github.com/dennwc/flatpak-go-mod
- dest: vendor
path: snowflake/modules.txt
type: file
- dest: vendor/github.com/aws/aws-sdk-go-v2
sha256: 0d233562c07ba86d839ae695a1a7c1f7bf05c87085e2a47975fdc3fcaa70e653
strip-components: 3