summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bundler/actions.py4
-rwxr-xr-xcopy-binaries.sh2
-rwxr-xr-xcreatebundle.sh16
3 files changed, 14 insertions, 8 deletions
diff --git a/bundler/actions.py b/bundler/actions.py
index c579236..c1d984c 100644
--- a/bundler/actions.py
+++ b/bundler/actions.py
@@ -555,7 +555,7 @@ class CopyMisc(Action):
cp(_convert_path_for_win(
os.path.join(self._basedir,
- "bitmask_client", "relnotes.txt")),
+ "bitmask_client", "release-notes.rst")),
_convert_path_for_win(os.path.join(self._basedir, "Bitmask")))
launcher_path = os.path.join(self._basedir, "Bitmask", "launcher.conf")
@@ -604,7 +604,7 @@ class DmgIt(Action):
template_dir = os.path.join(self._basedir, "Bitmask")
mkdir("-p", dmg_dir)
cp("-R", os.path.join(template_dir, "Applications"), dmg_dir)
- cp("-R", os.path.join(template_dir, "relnotes.txt"), dmg_dir)
+ cp("-R", os.path.join(template_dir, "release-notes.rst"), dmg_dir)
cp("-R", os.path.join(template_dir, "Bitmask.app"), dmg_dir)
cp(os.path.join(self._basedir,
"leap_assets",
diff --git a/copy-binaries.sh b/copy-binaries.sh
index 2097803..ba60078 100755
--- a/copy-binaries.sh
+++ b/copy-binaries.sh
@@ -3,7 +3,7 @@
set -e # Exit immediately if a command exits with a non-zero status.
BASE='/home/leap/bitmask.bundle'
-BOOST_MINOR="57"
+BOOST_MINOR="59"
BOOST="$BASE/boost_1_${BOOST_MINOR}_0"
# Note: we could use:
diff --git a/createbundle.sh b/createbundle.sh
index adf498a..41bf5fc 100755
--- a/createbundle.sh
+++ b/createbundle.sh
@@ -47,9 +47,9 @@ BINARY_COPIER="$SCRIPT_DIR/copy-binaries.sh"
ROOT_JSON="$SCRIPT_DIR/root.json"
# picked from https://github.com/OpenVPN/openvpn/releases
-OPENVPN_VERSION="v2.3.6"
+OPENVPN_VERSION="v2.3.8"
-BOOST_MINOR="57" # Minor version
+BOOST_MINOR="59" # Minor version
BOOST_NAME="boost_1_${BOOST_MINOR}_0"
mkdir -p $BASE
@@ -74,11 +74,12 @@ build_boost() {
cd $BASE
wget -c http://ufpr.dl.sourceforge.net/project/boost/boost/1.${BOOST_MINOR}.0/${BOOST_NAME}.tar.bz2
- tar xjf ${BOOST_NAME}.tar.bz2
- # NOTE: this md5 is the only thing that they provide to verification.
+ # NOTE: md5 is the only thing that they provide to verification.
# for more information see: https://leap.se/code/issues/6296
- echo "1be49befbdd9a5ce9def2983ba3e7b76 boost_1_57_0.tar.bz2" | md5sum -c -
+ echo "727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca boost_1_59_0.tar.bz2" | sha256sum -c
+
+ tar xjf ${BOOST_NAME}.tar.bz2
cd $BOOST_NAME/tools/build/
./bootstrap.sh --with-toolset=gcc
@@ -206,6 +207,11 @@ run_bundler() {
# uncomment the following line if you want to do a pause before the python setup in order to do some tweaks on the cloned repos.
# read -p "Waiting to 'pythonsetup' ... press <Enter> to continue, <Ctrl>+C to exit. "
+
+ # pin pyzmq version, 14.7.0 doesn't work
+ sed 's/pyzmq>=14.4.1/pyzmq==14.6.0/' -i bundler.output/leap_pycommon/pkg/requirements.pip
+ sed 's/^pyzmq$/pyzmq==14.6.0/' -i bundler.output/bitmask_client/pkg/requirements.pip
+
$bundler --do pythonsetup
# hack to solve gnupg version problem