From cec99a26f50339a14d7c7314507632b7dcc4c32b Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Sat, 29 Sep 2018 23:14:41 +0200 Subject: [pkg] remove snap from bitmask-dev --- snap/README.rst | 95 ------------------------------------- snap/TODO | 1 - snap/gui/riseup-vpn.desktop | 15 ------ snap/gui/riseupvpn.svg | 80 ------------------------------- snap/hooks/install | 14 ------ snap/hooks/remove | 6 --- snap/snapcraft.yaml | 113 -------------------------------------------- 7 files changed, 324 deletions(-) delete mode 100644 snap/README.rst delete mode 100644 snap/TODO delete mode 100644 snap/gui/riseup-vpn.desktop delete mode 100644 snap/gui/riseupvpn.svg delete mode 100755 snap/hooks/install delete mode 100755 snap/hooks/remove delete mode 100644 snap/snapcraft.yaml diff --git a/snap/README.rst b/snap/README.rst deleted file mode 100644 index bf0351df..00000000 --- a/snap/README.rst +++ /dev/null @@ -1,95 +0,0 @@ -RiseupVPN ---------- - -This is the Snap package for RiseupVPN. RiseupVPN is a specialized build of -bitmask, that lacks client authentication and is preconfigured to use a single -provider (riseup.net). - -In the future, this snap very likely will be maintained in its own repo, and -here we will maintain a snap package for the generic Bitmask client. - -At the moment, RiseupVPN has two main components: - -- A headless build of bitmask-vpn. This lives in the bitmask-dev repo, it's written - in twisted + python, and it uses an entrypoint called "anonvpn". This - entrypoint launches the bitmaskd backend, and tries to launch the - bitmask-systray too. - -- A minimalistic systray, written in golang. This lives in the bitmask-systray repo. - - -Building ---------- - -First of all, make sure that the version in the snapcraft.yaml file matches what we're building. -We're following the convention of adding +git to any build that comes after a tag. - -Launchpad does up 4 daily builds if code is modified in bitmask-dev repo. We're -building for amd64, i386 and arm8. -If you need to force a build, trigger it by editing the version string in the -snapcraft.yaml file. - -For local builds, you can use 'make snap_in_docker'. This builds in a docker -container (provided by snapcraft/snapcore). At this moment, this image is based -in xenial - therefore, a special tag is needed for the gtk3 libs in go. - - -Releasing ---------- - -From the snap dashboard, you can see the revisions that are built. -By default, we have riseupvpn-builds configured to upload builds to beta and -edge channels. If you are going to be pushing to edge manually regularly, -please configure the automated builds to push just to beta for some time and -push your builds to edge channel. - -To publish a snap, click on "release" from the dashboard, and assign a channel to them. - -By convention, if you release to a channel, please release the revision to all -the lower channels too. (For example, if you release a particular revision to -"candidate", release it also to "beta" and "edge"). - -Do note that the automated builds for different architectures do have different revision -numbers, so when releasing you have to repeat the steps for each platform that -we're building for. - -From the command line: - - snapcraft login - snapcraft status riseup-vpn - - # if we've built a release manually, we have to push it first. it gives us a - # revision number that we use in the next step. - - snapcraft push riseup-vpn_0.10.6+git_amd64.snap - Preparing to push '/home/kali/leap/bitmask-dev/riseup-vpn_0.10.6+git_amd64.snap' to the store. - Found cached source snap /home/kali/.cache/snapcraft/projects/riseup-vpn/snap_hashes/amd64/b5e9d106c823e3c83fce1ef81ad95d68c33fcada859eeb98233fc766863d39205c192fe5ee53def71c43886e40d3ab5b. - Generating xdelta3 delta for riseup-vpn_0.10.6+git_amd64.snap. - Pushing delta /home/kali/leap/bitmask-dev/riseup-vpn_0.10.6+git_amd64.snap.xdelta3. - Pushing riseup-vpn_0.10.6+git_amd64.snap.xdelta3 [=================================================] 100% - Processing...| - Ready to release! - Revision 20 of 'riseup-vpn' created. - - # otherwise I assume that you're just trying to release something - # that was already built and automatically uploaded. - - # let's publish amd64 to candidate channel and the channels below - snapcraft release riseupv-vpn 20 candidate - snapcraft release riseupv-vpn 20 beta - snapcraft release riseupv-vpn 20 edge - - # and now the i386 build - snapcraft release riseupv-vpn 19 candidate - snapcraft release riseupv-vpn 19 beta - snapcraft release riseupv-vpn 19 edge - - -Testing -------- - -To install a snap published on a specific channel, indicate the channel from the commandline: - - snap install riseup-vpn --classic --edge - snap install riseup-vpn --classic --beta - snap install riseup-vpn --classic --candidate diff --git a/snap/TODO b/snap/TODO deleted file mode 100644 index 04568467..00000000 --- a/snap/TODO +++ /dev/null @@ -1 +0,0 @@ -[ ] Allow apt-cacher to save some bandwith: https://www.brainvault.xyz/2016/07/20/apt-cacher-ng-with-docker-builds/ diff --git a/snap/gui/riseup-vpn.desktop b/snap/gui/riseup-vpn.desktop deleted file mode 100644 index e325b204..00000000 --- a/snap/gui/riseup-vpn.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=RiseupVPN -Comment=Anonymous VPN -Comment[es]=VPN Anonima -Comment[de]=Anonymous VPN -Path=/snap/bin -Exec=riseup-vpn.launcher -Terminal=false -Icon=/snap/riseup-vpn/current/snap/gui/riseupvpn.svg -Categories=Network;Application; -StartupNotify=true -Keywords=VPN;riseup;leap - diff --git a/snap/gui/riseupvpn.svg b/snap/gui/riseupvpn.svg deleted file mode 100644 index a19c6c61..00000000 --- a/snap/gui/riseupvpn.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/snap/hooks/install b/snap/hooks/install deleted file mode 100755 index c435f006..00000000 --- a/snap/hooks/install +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python3 -# DO NOT MODIFY MANUALLY -# This helper installs the polkit policy file -# for the RiseupVPN snap. -# It is generated automatically -# by the script at "pkg/riseupvpn/pack_installers" -from base64 import decodestring as decode - -POLKIT = b'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPCFET0NUWVBFIHBvbGljeWNv\nbmZpZyBQVUJMSUMKICItLy9mcmVlZGVza3RvcC8vRFREIFBvbGljeUtpdCBQb2xpY3kgQ29uZmln\ndXJhdGlvbiAxLjAvL0VOIgogImh0dHA6Ly93d3cuZnJlZWRlc2t0b3Aub3JnL3N0YW5kYXJkcy9Q\nb2xpY3lLaXQvMS9wb2xpY3ljb25maWcuZHRkIj4KPHBvbGljeWNvbmZpZz4KCiAgPHZlbmRvcj5M\nRUFQIFByb2plY3Q8L3ZlbmRvcj4KICA8dmVuZG9yX3VybD5odHRwOi8vbGVhcC5zZS88L3ZlbmRv\ncl91cmw+CgogIDxhY3Rpb24gaWQ9InNlLmxlYXAuYml0bWFzay5yaXNldXB2cG4ucG9saWN5Ij4K\nICAgIDxkZXNjcmlwdGlvbj5SdW5zIGJpdG1hc2sgaGVscGVyIHRvIGxhdW5jaCBmaXJld2FsbCBh\nbmQgb3BlbnZwbiAoUmlzZXVwVlBOKTwvZGVzY3JpcHRpb24+CiAgICA8ZGVzY3JpcHRpb24geG1s\nOmxhbmc9ImVzIj5FamVjdXRhIGVsIGFzaXN0ZW50ZSBkZSBiaXRtYXNrIHBhcmEgbGFuemFyIGVs\nIGZpcmV3YWxsIHkgb3BlbnZwbiAoUmlzZXVwVlBOKTwvZGVzY3JpcHRpb24+CiAgICA8bWVzc2Fn\nZT5SaXNldXBWUE4gbmVlZHMgdGhhdCB5b3UgYXV0aGVudGljYXRlIHRvIHN0YXJ0PC9tZXNzYWdl\nPgogICAgPG1lc3NhZ2UgeG1sOmxhbmc9ImVzIj5SaXNldXBWUE4gbmVjZXNpdGEgYXV0b3JpemFj\naW9uIHBhcmEgY29tZW56YXI8L21lc3NhZ2U+CiAgICA8aWNvbl9uYW1lPnBhY2thZ2UteC1nZW5l\ncmljPC9pY29uX25hbWU+IAogICAgPGRlZmF1bHRzPgogICAgICA8YWxsb3dfYW55PnllczwvYWxs\nb3dfYW55PgogICAgICA8YWxsb3dfaW5hY3RpdmU+eWVzPC9hbGxvd19pbmFjdGl2ZT4KICAgICAg\nPGFsbG93X2FjdGl2ZT55ZXM8L2FsbG93X2FjdGl2ZT4KICAgIDwvZGVmYXVsdHM+CiAgICA8YW5u\nb3RhdGUga2V5PSJvcmcuZnJlZWRlc2t0b3AucG9saWN5a2l0LmV4ZWMucGF0aCI+L3NuYXAvYmlu\nL3Jpc2V1cC12cG4uYml0bWFzay1yb290PC9hbm5vdGF0ZT4KICA8L2FjdGlvbj4KPC9wb2xpY3lj\nb25maWc+Cg==\n' - -with open('/usr/share/polkit-1/actions/se.leap.bitmask.riseupvpn.policy', 'w') as polkit: - lines = decode(POLKIT).split(b"\n") - for line in lines: - polkit.write(line.decode() + "\n") diff --git a/snap/hooks/remove b/snap/hooks/remove deleted file mode 100755 index 029a9549..00000000 --- a/snap/hooks/remove +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -e - -echo "Executing remove hook for RiseupVPN" -rm "/usr/share/polkit-1/actions/se.leap.bitmask.riseupvpn.policy" -echo "done" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml deleted file mode 100644 index 53464853..00000000 --- a/snap/snapcraft.yaml +++ /dev/null @@ -1,113 +0,0 @@ -name: riseup-vpn -version: '0.10.6+git' -summary: RiseupVPN, secure VPN. Powered by Bitmask. -description: | - RiseupVPN is an easy, fast, and secure VPN service from riseup.net. - RiseupVPN does not require a user account, keep logs, or track you in - any way. The service is paid for entirely by donations from users like - you. - -grade: stable -confinement: classic -icon: snap/gui/riseupvpn.svg - -parts: - desktop-gtk3: - stage-packages: - - libc6 - prime: - - '*' - - -usr/include - - -usr/lib/locale - - -usr/share/X11/locale - - -usr/share/doc - - -usr/share/locale - - -usr/share/man - - bitmask: - after: [desktop-gtk3] - plugin: python - python-version: python2 - source-branch: master - source: . - requirements: pkg/requirements-vpn.pip - stage-packages: - # this seems to trigger https://bugs.launchpad.net/snapcraft/+bug/1676684 - - libc6 - - python2.7-dev - - libsqlcipher-dev - - libffi-dev - - libsqlite3-dev - - libzmq3-dev - prime: - - -usr/include - - -usr/lib/locale - - -usr/share/X11/locale - - -usr/share/doc - - -usr/share/locale - - -usr/share/man - - openvpn: - plugin: nil - stage-packages: - - openvpn - - libc6 - prime: - - -usr/share/doc - - -usr/share/man - bitmask-systray: - after: [desktop-gtk3] - plugin: go - #PRAGMA:XENIAL go-buildtags: [gtk_3_18] - source: https://0xacab.org/leap/bitmask-systray.git - # prepare: XXX run systray tests here - build-packages: - - pkg-config - - patchelf - - libpcre3-dev - - libappindicator3-dev - - libgtk-3-dev - #- libzmq5 - #- libzmq3-dev - #- libsodium-dev - stage-packages: - - libc6 - - libpcre3 - - libappindicator3-1 - - zlib1g - #- libzmq5 - #- libsodium23 # for bionic, previously it was libsodium18 - # prime: - # prime:-etc/fonts - # prime:-usr/include - # prime:-usr/bin - # prime:-usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/ - # prime:-usr/lib/x86_64-linux-gnu/glib-2.0/ - # prime:-usr/lib/x86_64-linux-gnu/gtk-3.0/3.0.0/immodules/ - # prime:-usr/lib/x86_64-linux-gnu/gtk-3.0/3.0.0/printbackends/ - # prime:-usr/lib/x86_64-linux-gnu/libgtk-3-0/gtk-query-immodules-3.0 - # prime:-usr/lib/x86_64-linux-gnu/libwayland-* - # prime:-usr/sbin/update-icon-caches - # prime:-usr/share/doc - # prime:-usr/share/glib-2.0/schemas - # prime:-usr/share/icons - # prime:-usr/share/lintian - # prime:-usr/share/pkgconfig - # prime:-usr/share/theme - # prime:-usr/share/mime - # prime:-usr/lib/locale - # prime:-usr/share/locale - -apps: - launcher: - command: ./bin/bitmask_anonvpn - openvpn: - command: ./usr/sbin/openvpn - bitmaskd: - command: ./bin/bitmaskd - bitmask-systray: - command: ./bin/bitmask-systray.git - environment: - LD_LIBRARY_PATH: "$SNAP/usr/lib/$(gcc -print-multiarch):$SNAP/lib/$(gcc -print-multiarch):$LD_LIBRARY_PATH" - bitmask-root: - command: ./lib/python2.7/site-packages/leap/bitmask/vpn/helpers/linux/bitmask-root -- cgit v1.2.3