From c201029c3070da1bd9c2a7d65ac426e49f3cc241 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 14 Apr 2016 15:40:05 -0400 Subject: [pkg] ship statically built binaries - mention the versions in the next relnotes - add the leap_thirdparty_build to gitignore. the build scripts are supposed to place the binaries here. --- .gitignore | 1 + Makefile | 1 + pkg/pyinst/pyinst-build.mk | 9 +++------ release-notes.rst | 19 +++++++++---------- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 62b21fd1..35c5d4a9 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ data/bitmask.pro bitmask-resources.png docker/data +leap_thirdparty_build diff --git a/Makefile b/Makefile index 8e275e93..7d26a7ae 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,7 @@ DIST = dist/bitmask/ NEXT_VERSION = $(shell cat pkg/next-version) DIST_VERSION = dist/bitmask-$(NEXT_VERSION)/ GIT_COMMIT = $(shell git rev-parse HEAD) +LEAP_BUILD_DIR = leap_thirdparty_build/ ################################# diff --git a/pkg/pyinst/pyinst-build.mk b/pkg/pyinst/pyinst-build.mk index b6a7a6f3..9120e7a1 100644 --- a/pkg/pyinst/pyinst-build.mk +++ b/pkg/pyinst/pyinst-build.mk @@ -4,8 +4,7 @@ freeze-ver: sed -i 's/^full_revisionid\(.*\)/full_revisionid = "$(GIT_COMMIT)"/' src/leap/bitmask/_version.py hash-binaries: - # TODO get from a build dir - OPENVPN_BIN=/usr/sbin/openvpn BITMASK_ROOT=pkg/linux/bitmask-root python setup.py hash_binaries + OPENVPN_BIN=$(LEAP_BUILD_DIR)openvpn BITMASK_ROOT=pkg/linux/bitmask-root python setup.py hash_binaries pyinst: freeze-ver hash-binaries pyinstaller -y pkg/pyinst/bitmask.spec @@ -47,14 +46,12 @@ pyinst-distribution-data: pyinst-linux-helpers: mkdir -p $(DIST_VERSION)apps/eip/files - # TODO compile static - cp /usr/sbin/openvpn $(DIST_VERSION)apps/eip/files/leap-openvpn + cp $(LEAP_BUILD_DIR)openvpn $(DIST_VERSION)apps/eip/files/leap-openvpn cp pkg/linux/bitmask-root $(DIST_VERSION)apps/eip/files/ cp pkg/linux/leap-install-helper.sh $(DIST_VERSION)apps/eip/files/ cp pkg/linux/polkit/se.leap.bitmask.bundle.policy $(DIST_VERSION)apps/eip/files/ mkdir -p $(DIST_VERSION)apps/mail - # TODO compile static - cp /usr/bin/gpg $(DIST_VERSION)apps/mail + cp $(LEAP_BUILD_DIR)gpg $(DIST_VERSION)apps/mail pyinst-tar: cd dist/ && tar cvzf Bitmask.$(NEXT_VERSION).tar.gz bitmask-$(NEXT_VERSION) diff --git a/release-notes.rst b/release-notes.rst index 7a63901e..a9c0ff47 100644 --- a/release-notes.rst +++ b/release-notes.rst @@ -1,25 +1,24 @@ -0.9.1 November 03 - "the day of the calaca" +0.9.2 April XY - "Panis et Circenses" +++++++++++++++++++++++++++++++++++++++++++ -We were very pleased to announce Bitmask stable 0.9.1 :tada:. +We were very pleased to announce Bitmask stable 0.9.2 This is a minor release and you can see changes on `the changelog`_. -The complete list of things that have changed since 0.8.x series can be seen on -`0.9.0 release notes`_ -Don't miss the big pile of changes we brought you on 0.9.0 :) - Using the latest Bitmask, Linux users will be able to use our encrypted email -service, now in beta state! A Mac release is imminent and a windows release is -underway. +service, now in beta state! An alpha version for OSX is also available. Currently we have a test provider for mail @ https://mail.bitmask.net This provider is already bundled with Bitmask for easy access on the wizard. Please help us test this and file bug reports here: https://leap.se/code/projects/report-issues +[Pixelated integration news] + +The standalone bundles for 0.9.2 include statically compiled binaries for +OpenVPN 2.3.10 (compiled against PolarSSL 1.3.9) and GnuPG 1.4.20. + NOTE: beta means that we expect things not to break but we don't promise you won't get any headaches or lose some email, so please be careful. -.. _`the changelog`: https://github.com/leapcode/bitmask_client/blob/0.9.1/CHANGELOG.rst -.. _`0.9.0 release notes`: https://github.com/leapcode/bitmask_client/blob/0.9.0/release-notes.rst +.. _`the changelog`: https://github.com/leapcode/bitmask_client/blob/0.9.2/CHANGELOG.rst -- cgit v1.2.3