From cf4db24ddcd8b821b3ee10b03e88e0ddde2f1f8a Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Thu, 13 Nov 2014 16:41:54 -0300 Subject: Use newer Boost version and verify hash. Use a specific OpenVPN version (2.3.5) so the build is normalized. This closes #6296 and #6297. --- copy-binaries.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'copy-binaries.sh') diff --git a/copy-binaries.sh b/copy-binaries.sh index 5b1e00d..2097803 100755 --- a/copy-binaries.sh +++ b/copy-binaries.sh @@ -3,7 +3,8 @@ set -e # Exit immediately if a command exits with a non-zero status. BASE='/home/leap/bitmask.bundle' -BOOST="$BASE/boost_1_56_0" +BOOST_MINOR="57" +BOOST="$BASE/boost_1_${BOOST_MINOR}_0" # Note: we could use: # ARCH=`uname -i` @@ -15,13 +16,14 @@ else fi cd $BASE +rm -fr binaries mkdir binaries && cd binaries cp /usr/bin/gpg . cp $BASE/bitmask_launcher/build/src/launcher bitmask -cp $BOOST/stage/lib/libboost_filesystem.so.1.56.0 . -cp $BOOST/stage/lib/libboost_python.so.1.56.0 . -cp $BOOST/stage/lib/libboost_system.so.1.56.0 . +cp $BOOST/stage/lib/libboost_filesystem.so.1.${BOOST_MINOR}.0 . +cp $BOOST/stage/lib/libboost_python.so.1.${BOOST_MINOR}.0 . +cp $BOOST/stage/lib/libboost_system.so.1.${BOOST_MINOR}.0 . cp $BASE/pyside-setup.git/pyside_package/PySide/libpyside-python2.7.so.1.2 . cp $BASE/pyside-setup.git/pyside_package/PySide/libshiboken-python2.7.so.1.2 . @@ -40,8 +42,7 @@ cp /usr/lib/$ARCH/libstdc++.so.6 . # NOTE: this needs to be always the same root.json file cp $BASE/root.json . -mkdir openvpn.files -cd openvpn.files +mkdir openvpn.files && cd openvpn.files cp $BASE/openvpn/src/openvpn/openvpn leap-openvpn cp $BASE/bundler.output/bitmask_client/pkg/linux/bitmask-root . -- cgit v1.2.3