[gentoo-commits] repo/gentoo:master commit in: net-vpn/riseup-vpn/files/, net-vpn/riseup-vpn/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     d2ea86cdde2d1da50589b9c3be2e991f3d4f2186
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 09:49:53 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 09:50:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ea86cd

net-vpn/riseup-vpn: add 0.21.11_p20221113

Closes: https://bugs.gentoo.org/893328
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 net-vpn/riseup-vpn/Manifest                        |  2 +
 ...20221113-revert-data-cipher-arg-to-cipher.patch | 18 +++++
 .../riseup-vpn/riseup-vpn-0.21.11_p20221113.ebuild | 89 ++++++++++++++++++++++
 3 files changed, 109 insertions(+)

diff --git a/net-vpn/riseup-vpn/Manifest b/net-vpn/riseup-vpn/Manifest
index 51844c447cef..e204652a89e5 100644
--- a/net-vpn/riseup-vpn/Manifest
+++ b/net-vpn/riseup-vpn/Manifest
@@ -1,2 +1,4 @@
 DIST riseup-vpn-0.21.11-deps.tar.xz 180372544 BLAKE2B 3679347cb3bc83850b78d4290649b98e3a376950bb1830a092bc007d4b06c0292a8dbd3a08dd21eaefaba4a95fe4f9ffd5ef5be789a67bffe80c05c89d01bc0c SHA512 3587bf35855ef89987a370df686a4c882a2ae59c9a2893605cf8c102a639a1410a6963f0d7b8d9a316d72ed9f3c443e3aee129423c872be92257fa660d5a4c8e
 DIST riseup-vpn-0.21.11.tar.gz 7595837 BLAKE2B a1cd09741f044d03577128ab88ba6e6d9961a1a39c0e6488d79e73ec9c94b7a0fa44463a07d2e2130fe4adf986d86a693cb3114bae99e4a4bb55d23b90f2c871 SHA512 b4fa6f57f97bfba364c7aa9b2a4fc08561c7753d5471424534884a3279e5ff2bd102cc254c4e15a99f6fa47ef16abf1c691d3d174eda27bbfdac61d192f6fbb1
+DIST riseup-vpn-0.21.11_p20221113-deps.tar.xz 1628980 BLAKE2B 5af75fb2cd71da2fd949f89d1c768c001a268cc7fab0d26a621a02136eaddb8466e4cd1346954b785a5ac695bb816dd791b006b226359204670c47d4a47d25b8 SHA512 f0a8a657ac1aeefcf3d83b970157b600247ef228072c93c5aa1dfe062b8a9f81a4e13c44f51dc9c289f2b76de4eff516b045d3a145a905034b5a3ee263dbd68d
+DIST riseup-vpn-0.21.11_p20221113.tar.gz 7696220 BLAKE2B ba4c968e7b185c98e8995b300ab25ec79103473cafbd647c262d51308c173ba1a48f69b42b8dad2356791711137688a6a9a3a47e68294579be51ecd77b04bac4 SHA512 44157eebd266b99d146f29f621576c181a012d5965c4172fddb93232230f42f128958342891d8137bdedfb3236f132a1c73a9f45cad803b29d520393eb7d8cb4

diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-0.21.11_p20221113-revert-data-cipher-arg-to-cipher.patch b/net-vpn/riseup-vpn/files/riseup-vpn-0.21.11_p20221113-revert-data-cipher-arg-to-cipher.patch
new file mode 100644
index 000000000000..375250be4127
--- /dev/null
+++ b/net-vpn/riseup-vpn/files/riseup-vpn-0.21.11_p20221113-revert-data-cipher-arg-to-cipher.patch
@@ -0,0 +1,18 @@
+diff --git a/pkg/vpn/bonafide/eip_service.go b/pkg/vpn/bonafide/eip_service.go
+index 71c9b82..c6caf37 100644
+--- a/pkg/vpn/bonafide/eip_service.go
++++ b/pkg/vpn/bonafide/eip_service.go
+@@ -238,13 +238,6 @@ func (eip eipService) getOpenvpnArgs() []string {
+ 	for arg, value := range cfg {
+ 		switch v := value.(type) {
+ 		case string:
+-			// this is a transitioning hack for the transition to float deployment,
+-			// assuming we're using openvpn 2.5. We're treating the "cipher"
+-			// string that the platform sends us as the newer data-cipher
+-			// which includes colon-separated ciphers.
+-			if arg == "cipher" {
+-				arg = "data-ciphers"
+-			}
+ 			args = append(args, "--"+arg)
+ 			args = append(args, strings.Split(v, " ")...)
+ 		case bool:

diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.11_p20221113.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.11_p20221113.ebuild
new file mode 100644
index 000000000000..1b90a735e391
--- /dev/null
+++ b/net-vpn/riseup-vpn/riseup-vpn-0.21.11_p20221113.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit desktop python-single-r1 go-module qmake-utils virtualx xdg
+
+COMMIT="d7749dca00983fa9240e146ebf036c44cf67b9cd"
+
+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/${COMMIT}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~andrewammerlaan/${P}-deps.tar.xz
+"
+S="${WORKDIR}/bitmask-vpn-${COMMIT}"
+
+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="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtquickcontrols2:5[widgets]
+	dev-qt/qtsvg:5
+"
+
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	net-vpn/openvpn
+	sys-auth/polkit
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-revert-data-cipher-arg-to-cipher.patch"
+)
+
+src_prepare() {
+	default
+
+	# do not pre-strip
+	sed -i -e '/strip $RELEASE\/$TARGET/d' gui/build.sh || die
+
+	# We need qmake and lrelease from  qt5 bin dir
+	export PATH="${PATH}:$(qt5_get_bindir)" || die
+}
+
+src_compile() {
+	emake build
+}
+
+src_test() {
+	emake test
+	virtx emake test_ui
+}
+
+src_install() {
+	einstalldocs
+
+	dobin "build/qt/release/riseup-vpn"
+
+	python_scriptinto /usr/sbin
+	python_doscript "pkg/pickle/helpers/bitmask-root"
+
+	insinto /usr/share/polkit-1/actions
+	newins "pkg/pickle/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
+
+	dodoc -r docs/*
+}