From 373ccad047ac9ef29ae24806c11a525452e70b3d Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 21 Feb 2018 18:27:01 +0100 Subject: [pkg] initial snappification --- pkg/riseupvpn/Makefile | 8 +++++ pkg/riseupvpn/TODO | 4 +++ pkg/riseupvpn/snap/.snapcraft/state | 3 ++ pkg/riseupvpn/snap/snapcraft.yaml | 60 +++++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 pkg/riseupvpn/Makefile create mode 100644 pkg/riseupvpn/TODO create mode 100644 pkg/riseupvpn/snap/.snapcraft/state create mode 100644 pkg/riseupvpn/snap/snapcraft.yaml diff --git a/pkg/riseupvpn/Makefile b/pkg/riseupvpn/Makefile new file mode 100644 index 00000000..47985e28 --- /dev/null +++ b/pkg/riseupvpn/Makefile @@ -0,0 +1,8 @@ +build: + sudo snapcraft cleanbuild +install: + sudo snap install riseup-vpn_*.snap --dangerous --classic +uninstall: + sudo snap remove riseup-vpn +init-lxd: + sudo lxd init diff --git a/pkg/riseupvpn/TODO b/pkg/riseupvpn/TODO new file mode 100644 index 00000000..2288e7e4 --- /dev/null +++ b/pkg/riseupvpn/TODO @@ -0,0 +1,4 @@ +[ ] copy libzmq.so.5 library to the binary path (HACK, ask in forums). +[ ] install polkit helpers +[ ] install bitmask root in its place (can classic confinement install something in the global path? does this produce conflicts with proper debs?) +[ ] add a desktop file entry diff --git a/pkg/riseupvpn/snap/.snapcraft/state b/pkg/riseupvpn/snap/.snapcraft/state new file mode 100644 index 00000000..34977889 --- /dev/null +++ b/pkg/riseupvpn/snap/.snapcraft/state @@ -0,0 +1,3 @@ +!GlobalState +assets: + build-packages: [] diff --git a/pkg/riseupvpn/snap/snapcraft.yaml b/pkg/riseupvpn/snap/snapcraft.yaml new file mode 100644 index 00000000..024bdf3b --- /dev/null +++ b/pkg/riseupvpn/snap/snapcraft.yaml @@ -0,0 +1,60 @@ +name: riseup-vpn +version: '0.10.3+git' +epoch: 0 +summary: RiseupVPN, anonymous VPN. Powered by Bitmask. +description: | + RiseupVPN is an anonymous VPN. It's controlled by a minimal systray + that communicates with the bitmask daemon. + Just click on it. And don't forget to donate. + +grade: devel # must be 'stable' to release into candidate/stable channels +#confinement: devmode #classic # use 'strict' once you have the right plugs and slots +confinement: classic + +parts: + + bitmask: + plugin: python + python-version: python2 + source-branch: snap + # XXX change to leap/master + source: https://0xacab.org/kali/bitmask-dev.git + requirements: pkg/requirements-vpn.pip + stage-packages: + # this seems to trigger https://bugs.launchpad.net/snapcraft/+bug/1676684 + - python2.7-dev + - libsqlcipher-dev + - libffi-dev + - libsqlite3-dev + - libzmq3-dev + openvpn: + plugin: nil + stage-packages: + - openvpn + bitmask-systray: + plugin: go + source: https://0xacab.org/leap/bitmask-systray.git + build-packages: + - pkg-config + - libzmq5 + - libzmq3-dev + - libsodium-dev + - libappindicator3-dev + - libgtk-3-dev + stage-packages: + - libzmq5 + - libsodium18 + - libappindicator3-1 + desktop-gtk3: + prime: ['*'] + +apps: + bitmask-systray: + command: ./bin/bitmask-systray.git + plugs: [x11, network] + launcher: + command: ./bin/bitmask_anonvpn + plugs: [x11, network] + bitmaskd: + command: ./bin/bitmaskd + plugs: [network] -- cgit v1.2.3