From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Sep 2021 20:21:45 +0100 Subject: gentoo resync : 25.09.2021 --- net-vpn/riseup-vpn/Manifest | 3 +- .../riseup-vpn/files/riseup-vpn-respect-AR.patch | 38 ++++++ net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild | 141 +++++++++++++++++++++ net-vpn/riseup-vpn/riseup-vpn-0.21.6.ebuild | 136 -------------------- 4 files changed, 181 insertions(+), 137 deletions(-) create mode 100644 net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch create mode 100644 net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild delete mode 100644 net-vpn/riseup-vpn/riseup-vpn-0.21.6.ebuild (limited to 'net-vpn/riseup-vpn') diff --git a/net-vpn/riseup-vpn/Manifest b/net-vpn/riseup-vpn/Manifest index 4d4b40fe5ded..52a5060e572d 100644 --- a/net-vpn/riseup-vpn/Manifest +++ b/net-vpn/riseup-vpn/Manifest @@ -1,4 +1,5 @@ AUX riseup-vpn-ip-location.patch 445 BLAKE2B d1b43da1c39baad62bca64c922ec5c2666e7be38db6e5402bc616f02e7faef4f3884dc8141c40d25edb147c27c2234d1b90e116696eac022d95066b527222f8c SHA512 051ffb1107d5d4c7fe0be9a158d7b2b5d90ff3aad60918449c56671e541662dfd0163f1d62eb88ac95ae3aed88917efcbc085ae9a41d27706a154b51dc24e82d +AUX riseup-vpn-respect-AR.patch 1700 BLAKE2B ec94095cc7e239add206595d7861260026f00d1c42ab01f2d8093c5f33b9e66bf9923bb4f526deccf92c798a2d3b565bcf159c76192983cbe4d058fa927f6faf SHA512 88b449abff3a015f499ff69d595421aa9c58d51d21b739c6c0532f889b822a07ec506c94ef5d05cd25b0165ec2c1f0056549069c18c8fd6d997db32e1ae2dd44 DIST 0xacab.org%2Fleap%2Fshapeshifter%2F@v%2Fv0.0.0-20191029173606-85d3e8ac43e2.mod 36 BLAKE2B 18848dd9ecba98ad55023c343e68149c2a86e1fb1cec95cfc36d58f304050b29c4a8a0b108392e8daca2f201b0a7bbc30b9e5f5ea54196433c9c6a37ed4c5522 SHA512 ce08c7ff89bfcf6d9e56cec299cb0befa012493384be6f1d6d6b0ab2875d91cce640cc8df51c660ab291cca52c53cbc98bfb465bf569fcad351fc5c126ccaa87 DIST 0xacab.org%2Fleap%2Fshapeshifter%2F@v%2Fv0.0.0-20191029173606-85d3e8ac43e2.zip 2199 BLAKE2B 7b996b10c73fec0c9cb1c038245bb3bc04b297443b853df62b1ca910476162cd984d52b62b4b0c76c35bb69aab3129f880602fc726af78a75990b4444f61ead6 SHA512 3f9d68dfc635253670f55a36e2257956eaf08c186ef4aa768e7d0e445885070ad39461b97a3fcef276df8bac31867a733c690e4cb32f52f59d5ab365f0473e66 DIST github.com%2F!operator!foundation%2Fobfs4%2F@v%2Fv0.0.0-20161108041644-17f2cb99c264.mod 43 BLAKE2B a97856b301e7add28f30c43da9693c6df2e96bee193c1ee14712f6c87d6f84cfbe2072e13603e0309ef346d1fd72504f47c66242e3d62a852d6f98e5d16e0a49 SHA512 8ce3244a1456706dc0acf147c7bb1001942d34f3701b0dc02c9af9ede2925d656a1d21b8e39dbf2b288fcf1b36bd5b9aa24203019fbb2c927e4a7330598f3233 @@ -42,5 +43,5 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.zip 1916451 BLAKE2B da323af18ec6dbb2c7cfcc267ceaeddb5e452789f3ed5797345020ccbf118992e9972fc652b20d8cd5a023c96613d5a770f71e6384b6576a271bc322d02a450b SHA512 13fcebd117456775d53483f713e5a090321ab1159048b92252aee953c294dc174d7f5695e8d09f272203786143bdd6b15ff32c979aef5a30b442a56aa09d1a7d DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d DIST riseup-vpn-0.21.6.tar.gz 5404265 BLAKE2B 2dcae7aaa3659fe9e8b9910a6c085ec49389551a6d2e404fb5520622e22adff98277fe3962f1dfd3b44d23b8c687855105196e74b89d4bb9890202e97033c5d9 SHA512 074dadcd24c1ecaa21504a26406c5f8f3cdbbe8dffc3679e1c1b62d1978b51b20154edd54d8887868c7458e4c184b8f16aa6ff21e71890fe6b84c0eb2e008deb -EBUILD riseup-vpn-0.21.6.ebuild 4615 BLAKE2B 9451acfc92cc52f568e87b823df8f413b077a421dc61d421ca197c7bed05e22982c8f00c496bdbfb838c86683e1687d3b24ab8579a7663cfda0fb0761c65146c SHA512 ee1f2e86f47ae2b2fc5c1b640400b6d9808b33c4cb63ff97f707f3eb93d7e46b6af4f31a006c1a0a21840bc46ac0d785c2181aaf7e9763daea374a15d8c5305f +EBUILD riseup-vpn-0.21.6-r1.ebuild 4729 BLAKE2B 8ce437ecb9e9e09eec3410120fb570476424a73361371c06aa3ebf721bfe20d25b77d2a39360d2ecb4e563a195fb7d2181a44185c41c572983761a40ba97490c SHA512 91a0a27f33c47904fd557fc8da907060cfd1bd82df968d073d19f9de5389e96e6ceca5a99af5eb76ced43551956435d8b2c4330c2a99be2905e1d7d2e7e550a1 MISC metadata.xml 1044 BLAKE2B 28fd241b8a0a7cf97f52b56f854a1337272ddb652ed782448ccd71a3be6df07e4791cf1fcf21ee1750f6b498e1d9cd30e35c778427c04af2e4f60b709de7c8a9 SHA512 fc8e0f86bfbb7dd808f145284c81de8670341ec1ca8ce62e8dc4b9ef3aff0a8ff5c1bc72ea6946b0ec742adbd49d977e9a442dd7f075b3649ddf5304fc7fc735 diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch b/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch new file mode 100644 index 000000000000..431ab1376c65 --- /dev/null +++ b/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch @@ -0,0 +1,38 @@ +diff --git a/gui/build.sh b/gui/build.sh +index 56e3d66..9e519a6 100755 +--- a/gui/build.sh ++++ b/gui/build.sh +@@ -63,13 +63,13 @@ function buildGoLib { + if [ "$XBUILD" == "no" ] + then + echo "[+] Building Go library with standard Go compiler" +- CGO_ENABLED=1 GOOS=$GOOS CC=$CC CGO_CFLAGS=$CGO_CFLAGS CGO_LDFLAGS=$CGO_LDFLAGS go build -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB ++ CGO_ENABLED=1 GOOS=$GOOS CC=$CC CGO_CFLAGS=$CGO_CFLAGS CGO_LDFLAGS=$CGO_LDFLAGS go build -buildmode=c-archive -ldflags="-extar=$AR -extld=$LD -extldflags=$LDFLAGS" -o $TARGET_GOLIB $SOURCE_GOLIB + fi + if [ "$XBUILD" == "$WIN64" ] + then + echo "[+] Building Go library with mxe" + echo "[+] Using cc:" $CC +- CC=$CC CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB ++ CC=$CC CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -buildmode=c-archive -ldflags="-extar=$AR -extld=$LD -extldflags=$LDFLAGS" -o $TARGET_GOLIB $SOURCE_GOLIB + fi + } + +@@ -77,7 +77,7 @@ function buildQmake { + echo "[+] Now building Qml app with Qt qmake" + echo "[+] Using qmake in:" $QMAKE + mkdir -p $QTBUILD +- $QMAKE -o "$QTBUILD/Makefile" CONFIG+=release VENDOR_PATH=${VENDOR_PATH} $PROJECT ++ $QMAKE -early QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX -o "$QTBUILD/Makefile" CONFIG+=release VENDOR_PATH=${VENDOR_PATH} $PROJECT + #CONFIG=+force_debug_info CONFIG+=debug CONFIG+=debug_and_release + } + +@@ -115,7 +115,7 @@ function buildDefault { + buildQmake + + make -C $QTBUILD clean +- make -C $QTBUILD -j4 all ++ make -C $QTBUILD $MAKEFLAGS all + + renameOutput + echo "[+] Done." diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild new file mode 100644 index 000000000000..91db3c978164 --- /dev/null +++ b/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="sphinx" +DOCS_DIR="docs" +DOCS_DEPEND="dev-python/alabaster" + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit desktop python-single-r1 docs go-module virtualx toolchain-funcs xdg + +EGO_SUM=( + "0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2" + "0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2/go.mod" + "github.com/OperatorFoundation/obfs4 v0.0.0-20161108041644-17f2cb99c264" + "github.com/OperatorFoundation/obfs4 v0.0.0-20161108041644-17f2cb99c264/go.mod" + "github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e0" + "github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e0/go.mod" + "github.com/OperatorFoundation/shapeshifter-transports v0.0.0-20191101030951-7a751b0500f4" + "github.com/OperatorFoundation/shapeshifter-transports v0.0.0-20191101030951-7a751b0500f4/go.mod" + "github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a" + "github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a/go.mod" + "github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412" + "github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod" + "github.com/apparentlymart/go-openvpn-mgmt v0.0.0-20161009010951-9a305aecd7f2" + "github.com/apparentlymart/go-openvpn-mgmt v0.0.0-20161009010951-9a305aecd7f2/go.mod" + "github.com/davecgh/go-spew v1.1.0" + "github.com/davecgh/go-spew v1.1.0/go.mod" + "github.com/dchest/siphash v1.2.1" + "github.com/dchest/siphash v1.2.1/go.mod" + "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0" + "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod" + "github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19" + "github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19/go.mod" + "github.com/pmezard/go-difflib v1.0.0" + "github.com/pmezard/go-difflib v1.0.0/go.mod" + "github.com/rakyll/statik v0.1.7" + "github.com/rakyll/statik v0.1.7/go.mod" + "github.com/sevlyar/go-daemon v0.1.5" + "github.com/sevlyar/go-daemon v0.1.5/go.mod" + "github.com/stretchr/objx v0.1.0/go.mod" + "github.com/stretchr/testify v1.3.0" + "github.com/stretchr/testify v1.3.0/go.mod" + "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" + "golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59" + "golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59/go.mod" + "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" + "golang.org/x/net v0.0.0-20200226121028-0de0cce0169b" + "golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod" + "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" + "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" + "golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4" + "golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod" + "golang.org/x/text v0.3.0/go.mod" +) +go-module_set_globals + +DESCRIPTION="Anonymous encrypted VPN client powered by Bitmask" +HOMEPAGE="https://riseup.net/en/vpn https://0xacab.org/leap/bitmask-vpn https://bitmask.net" +SRC_URI="https://0xacab.org/leap/bitmask-vpn/-/archive/${PV}/bitmask-vpn-${PV}.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +IUSE="test" +PROPERTIES="test_network" +RESTRICT="test" +# The tests require internet access to connect to Riseup Networks + +# Generated with dev-go/golicense +LICENSE="GPL-3 BSD-2 CC0-1.0 MIT BSD" +KEYWORDS="~amd64" +SLOT="0" + +BDEPEND=" + virtual/pkgconfig + dev-qt/linguist-tools + test? ( dev-qt/qttest:5 ) +" + +DEPEND="${PYTHON_DEPS} + dev-qt/qtdeclarative:5[widgets] + dev-qt/qtquickcontrols:5[widgets] + dev-qt/qtquickcontrols2:5[widgets] +" + +RDEPEND="${DEPEND} + net-vpn/openvpn + sys-auth/polkit +" + +# ip command is in bin instead of sbin on Gentoo +PATCHES=( + "${FILESDIR}/${PN}-ip-location.patch" + "${FILESDIR}/${PN}-respect-AR.patch" +) + +S="${WORKDIR}/bitmask-vpn-${PV}" + +src_prepare() { + default + + # do not pre-strip + sed -i -e '/strip $RELEASE\/$TARGET/d' gui/build.sh || die + + # add autodoc to the extensions because this actually + # does require extra dependencies + sed -i -e "/^extensions = \[/a \ \ \ \ \'sphinx.ext.autodoc\'," docs/conf.py || die +} + +src_compile() { + # does not build with j>1 + tc-export AR LD CC CXX + emake -j1 build + docs_compile +} + +src_test() { + emake -j1 test + virtx emake -j1 test_ui +} + +src_install() { + einstalldocs + + dobin "build/qt/release/riseup-vpn" + + python_scriptinto /usr/sbin + python_doscript "helpers/bitmask-root" + + insinto /usr/share/polkit-1/actions + newins "helpers/se.leap.bitmask.policy" se.leap.bitmask.riseupvpn.policy + + newicon -s scalable "providers/riseup/assets/icon.svg" riseup.svg + make_desktop_entry "${PN}" RiseupVPN riseup Network +} + +pkg_postinst() { + xdg_pkg_postinst +} diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.6.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.6.ebuild deleted file mode 100644 index 3b22b5554aed..000000000000 --- a/net-vpn/riseup-vpn/riseup-vpn-0.21.6.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DOCS_BUILDER="sphinx" -DOCS_DIR="docs" -DOCS_DEPEND="dev-python/alabaster" - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit desktop python-single-r1 docs go-module virtualx xdg - -EGO_SUM=( - "0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2" - "0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2/go.mod" - "github.com/OperatorFoundation/obfs4 v0.0.0-20161108041644-17f2cb99c264" - "github.com/OperatorFoundation/obfs4 v0.0.0-20161108041644-17f2cb99c264/go.mod" - "github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e0" - "github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e0/go.mod" - "github.com/OperatorFoundation/shapeshifter-transports v0.0.0-20191101030951-7a751b0500f4" - "github.com/OperatorFoundation/shapeshifter-transports v0.0.0-20191101030951-7a751b0500f4/go.mod" - "github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a" - "github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a/go.mod" - "github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412" - "github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod" - "github.com/apparentlymart/go-openvpn-mgmt v0.0.0-20161009010951-9a305aecd7f2" - "github.com/apparentlymart/go-openvpn-mgmt v0.0.0-20161009010951-9a305aecd7f2/go.mod" - "github.com/davecgh/go-spew v1.1.0" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/dchest/siphash v1.2.1" - "github.com/dchest/siphash v1.2.1/go.mod" - "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0" - "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod" - "github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19" - "github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/rakyll/statik v0.1.7" - "github.com/rakyll/statik v0.1.7/go.mod" - "github.com/sevlyar/go-daemon v0.1.5" - "github.com/sevlyar/go-daemon v0.1.5/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/testify v1.3.0" - "github.com/stretchr/testify v1.3.0/go.mod" - "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" - "golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59" - "golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59/go.mod" - "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" - "golang.org/x/net v0.0.0-20200226121028-0de0cce0169b" - "golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod" - "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" - "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" - "golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4" - "golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod" - "golang.org/x/text v0.3.0/go.mod" -) -go-module_set_globals - -DESCRIPTION="Anonymous encrypted VPN client powered by Bitmask" -HOMEPAGE="https://riseup.net/en/vpn https://0xacab.org/leap/bitmask-vpn https://bitmask.net" -SRC_URI="https://0xacab.org/leap/bitmask-vpn/-/archive/${PV}/bitmask-vpn-${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -IUSE="test" -PROPERTIES="test_network" -RESTRICT="test" -# The tests require internet access to connect to Riseup Networks - -# Generated with dev-go/golicense -LICENSE="GPL-3 BSD-2 CC0-1.0 MIT BSD" -KEYWORDS="~amd64" -SLOT="0" - -BDEPEND=" - virtual/pkgconfig - dev-qt/linguist-tools - test? ( dev-qt/qttest:5 ) -" - -DEPEND="${PYTHON_DEPS} - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtquickcontrols2:5[widgets] -" - -RDEPEND="${DEPEND} - net-vpn/openvpn - sys-auth/polkit -" - -# ip command is in bin instead of sbin on Gentoo -PATCHES=( "${FILESDIR}/${PN}-ip-location.patch" ) - -S="${WORKDIR}/bitmask-vpn-${PV}" - -src_prepare() { - default - - # do not pre-strip - sed -i -e '/strip $RELEASE\/$TARGET/d' gui/build.sh || die - - # add autodoc to the extensions because this actually - # does require extra dependencies - sed -i -e "/^extensions = \[/a \ \ \ \ \'sphinx.ext.autodoc\'," docs/conf.py || die -} - -src_compile() { - # does not build with j>1 - emake -j1 build - docs_compile -} - -src_test() { - emake -j1 test - virtx emake -j1 test_ui -} - -src_install() { - einstalldocs - - dobin "build/qt/release/riseup-vpn" - - python_scriptinto /usr/sbin - python_doscript "helpers/bitmask-root" - - insinto /usr/share/polkit-1/actions - newins "helpers/se.leap.bitmask.policy" se.leap.bitmask.riseupvpn.policy - - newicon -s scalable "providers/riseup/assets/icon.svg" riseup.svg - make_desktop_entry "${PN}" RiseupVPN riseup Network -} - -pkg_postinst() { - xdg_pkg_postinst -} -- cgit v1.2.3