3 files changed, 0 insertions, 105 deletions
diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-ip-location.patch b/net-vpn/riseup-vpn/files/riseup-vpn-ip-location.patch
deleted file mode 100644
index 99c7d5255962..000000000000
--- a/net-vpn/riseup-vpn/files/riseup-vpn-ip-location.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/helpers/bitmask-root b/helpers/bitmask-root
-index 13ba407..7c08b21 100644
---- a/helpers/bitmask-root
-+++ b/helpers/bitmask-root
-@@ -106,7 +106,7 @@ def swhich(binary):
- 
-     :rtype: str
-     """
--    for folder in ["/sbin", "/usr/sbin", "/usr/local/sbin"]:
-+    for folder in ["/bin", "/sbin", "/usr/sbin", "/usr/local/sbin"]:
-         path = os.path.join(folder, binary)
-         if os.path.isfile(path):
-             return path
diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-parallel-make.patch b/net-vpn/riseup-vpn/files/riseup-vpn-parallel-make.patch
deleted file mode 100644
index 2b0f188e4a57..000000000000
--- a/net-vpn/riseup-vpn/files/riseup-vpn-parallel-make.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b9ddda5..500adb7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -108,7 +108,7 @@ PKGFILES = $(shell find pkg -type f -name '*.go')
- endif
- 
- lib/%.a: $(PKGFILES)
--	@XBUILD=no ./gui/build.sh --just-golib
-+	@XBUILD=no MAKE=${MAKE} ./gui/build.sh --just-golib
- 
- relink_vendor:
- 	@echo "============RELINK VENDOR============="
-@@ -136,14 +136,14 @@ endif
- 
- build_golib: lib/libgoshim.a
- 
--build_gui: relink_vendor
-+build_gui: build_golib relink_vendor
- 	@echo "==============BUILD GUI==============="
- 	@echo "TARGET: ${TARGET}"
- 	@echo "VENDOR_PATH: ${VENDOR_PATH}"
--	@XBUILD=no QMAKE=${QMAKE} LRELEASE=${LRELEASE} TARGET=${TARGET} VENDOR_PATH=${VENDOR_PATH} gui/build.sh --skip-golib
-+	@XBUILD=no MAKE=${MAKE} QMAKE=${QMAKE} LRELEASE=${LRELEASE} TARGET=${TARGET} VENDOR_PATH=${VENDOR_PATH} gui/build.sh --skip-golib
- 	@echo "============BUILD GUI================="
- 
--build: build_golib build_helper build_gui
-+build: build_helper build_gui
- 
- build_helper:
- ifeq ($(PLATFORM), linux)
-diff --git a/gui/build.sh b/gui/build.sh
-index 9e519a6..8aa0356 100755
---- a/gui/build.sh
-+++ b/gui/build.sh
-@@ -17,6 +17,7 @@ PROJECT=bitmask.pro
- TARGET_GOLIB=lib/libgoshim.a
- SOURCE_GOLIB=gui/backend.go
- 
-+MAKE=${MAKE:=make}
- QTBUILD=build/qt
- RELEASE=$QTBUILD/release
- DEBUGP=$QTBUILD/debug
-@@ -114,8 +115,8 @@ function buildDefault {
-     fi
-     buildQmake
- 
--    make -C $QTBUILD clean
--    make -C $QTBUILD $MAKEFLAGS all
-+    $MAKE -C $QTBUILD clean
-+    $MAKE -C $QTBUILD $MAKEFLAGS all
- 
-     renameOutput
-     echo "[+] Done."
diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch b/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch
deleted file mode 100644
index 431ab1376c65..000000000000
--- a/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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."