From a59286f645d039bc300aaa48f707c390bd2acb49 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Wed, 19 Nov 2014 17:15:05 -0300 Subject: Use the right files for the version being built. Use the correct root.json file to get TUF working. Install pycrypto and others into the bundle so TUF can verify the data correctly. Move json version specifications to pkg/ Closes #6385, #6378, #6376. --- copy-binaries.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'copy-binaries.sh') diff --git a/copy-binaries.sh b/copy-binaries.sh index 1d8b809..3ada635 100755 --- a/copy-binaries.sh +++ b/copy-binaries.sh @@ -37,16 +37,15 @@ cp /usr/lib/libpython2.7.so.1.0 . cp /usr/lib/$ARCH/libssl.so.1.0.0 . cp /usr/lib/$ARCH/libstdc++.so.6 . -touch root.json # empty file for TUF +# NOTE: this needs to be always the same root.json file +cp $BASE/root.json mkdir openvpn.files cd openvpn.files cp $BASE/openvpn/src/openvpn/openvpn leap-openvpn -# TODO: to avoid network requests this should be copied from the cloned repositories -# after `bundler gitclone` and before `bundler pythonsetup` -wget https://raw.githubusercontent.com/leapcode/bitmask_client/develop/pkg/linux/bitmask-root -wget https://raw.githubusercontent.com/leapcode/bitmask_client/develop/pkg/linux/leap-install-helper.sh -wget https://raw.githubusercontent.com/leapcode/bitmask_client/develop/pkg/linux/polkit/se.leap.bitmask.bundle.policy +cp $BASE/bundler.output/bitmask_client/pkg/linux/bitmask-root +cp $BASE/bundler.output/bitmask_client/pkg/linux/leap-install-helper.sh +cp $BASE/bundler.output/bitmask_client/pkg/linux/polkit/se.leap.bitmask.bundle.policy chmod +x bitmask-root chmod +x leap-install-helper.sh -- cgit v1.2.3