summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2018-02-14 02:22:23 +0100
committerKali Kaneko <kali@leap.se>2018-02-15 16:36:55 +0100
commitbfda65b93510d8f1e0e8c8e9a95a245ac4524f4c (patch)
treea0552d231ba4e368dda244e6e8091b1135ad835d
parentd39adbba2883697fd5b7ec69b46cafd535efe021 (diff)
[pkg] fixes for bundle script
-rw-r--r--Makefile2
-rw-r--r--pkg/bundles/build.mk24
-rw-r--r--pkg/docker_bundleapt/Dockerfile4
3 files changed, 22 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 0ba49edd..ef0d9c10 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
DIST=dist/bitmask
HEADLESS_DIST=dist/bitmask-nox
+ANONVPN_DIST=dist/riseupvpn
NEXT_VERSION = $(shell cat pkg/next-version)
DIST_VERSION = dist/bitmask-$(NEXT_VERSION)/
HEADLESS_DIST_VERSION = dist/bitmask-nox-$(NEXT_VERSION)/
+ANONVPN_DIST_VERSION = dist/riseupvpn-$(NEXT_VERSION)/
BITMASK_ROOT = src/leap/bitmask/vpn/helpers/linux/bitmask-root
POLKIT_POLICY = src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy
diff --git a/pkg/bundles/build.mk b/pkg/bundles/build.mk
index 90eeb946..837b3389 100644
--- a/pkg/bundles/build.mk
+++ b/pkg/bundles/build.mk
@@ -138,11 +138,19 @@ bundle_headless:
bundle_anonvpn:
pyinstaller -y pkg/pyinst/anonvpn.spec
- cp src/leap/bitmask/core/bitmaskd.tac $(DIST)
- cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(DIST)/
- echo `git describe` > $(HEADLESS_DIST)/version
- mv $(DIST) _bundlelib && mkdir $(DIST_VERSION) && mv _bundlelib $(DIST_VERSION)lib/
- mkdir -p $(DIST_VERSION)/apps/providers
- cp -r src/leap/bitmask/bonafide/providers/* $(DIST_VERSION)/apps/providers/
-
-bundle_anonvpn_linux: bundle_anonvpn bundle_linux_vpn bundle_linux_helpers
+ cp src/leap/bitmask/core/bitmaskd.tac $(ANONVPN_DIST)
+ cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(ANONVPN_DIST)/
+ cho `git describe` > $(ANONVPN_DIST)/version
+ mv $(ANONVPN_DIST) _bundlelib && mkdir $(ANONVPN_DIST_VERSION) && mv _bundlelib $(ANONVPN_DIST_VERSION)lib/
+ mkdir -p $(ANONVPN_DIST_VERSION)/apps/providers
+ cp -r src/leap/bitmask/bonafide/providers/* $(ANONVPN_DIST_VERSION)/apps/providers/
+
+ # openvpn
+ mkdir -p $(ANONVPN_DIST_VERSION)/apps/vpn
+ wget https://downloads.leap.se/thirdparty/linux/openvpn/openvpn-x64 -O $(ANONVPN_DIST_VERSION)/apps/vpn/openvpn.leap
+ # helpers
+ mkdir -p $(ANONVPN_DIST_VERSION)/apps/helpers
+ cp src/leap/bitmask/vpn/helpers/linux/bitmask-root $(ANONVPN_DIST_VERSION)/apps/helpers/
+ cp src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.bundle.policy $(ANONVPN_DIST_VERSION)/apps/helpers/
+
+bundle_anonvpn_linux: bundle_anonvpn
diff --git a/pkg/docker_bundleapt/Dockerfile b/pkg/docker_bundleapt/Dockerfile
index 76a43657..ee07a1c2 100644
--- a/pkg/docker_bundleapt/Dockerfile
+++ b/pkg/docker_bundleapt/Dockerfile
@@ -72,4 +72,8 @@ RUN ln -s /usr/lib/python2.7/dist-packages/sipconfig.py /usr/local/lib/python2.7
RUN ln -s /usr/lib/python2.7/dist-packages/sipconfig_nd.py /usr/local/lib/python2.7/site-packages/
RUN ln -s /usr/lib/python2.7/dist-packages/sip.pyi /usr/local/lib/python2.7/site-packages/
+# get dependencies for bitmask-systray so that builds are quick
+RUN export GOPATH=/srv/go && go get 0xacab.org/leap/bitmask-systray
+
+# get ourselves a shell
RUN apt-get install bash