Merge remote-tracking branch 'kali/debian-0.3.2' into debian

2 files changed, 110 insertions, 3 deletions

diff --git a/pkg/linux/build_bundle.sh b/pkg/linux/build_bundle.sh
new file mode 100755
index 00000000..e6a1043f
--- /dev/null
+++ b/pkg/linux/build_bundle.sh
@@ -0,0 +1,107 @@
+REPOS_ROOT=$1
+VERSION=$2
+TEMPLATE_BUNDLE=$3
+JOINT_CHANGELOG=$4
+DEST=$5
+
+# clean template
+
+rm $TEMPLATE_BUNDLE/CHANGELOG
+rm $TEMPLATE_BUNDLE/relnotes.txt
+rm -rf $TEMPLATE_BUNDLE/apps/leap
+rm -rf $TEMPLATE_BUNDLE/lib/leap/{common,keymanager,soledad,mail}
+
+# checkout VERSION in all repos
+
+for i in {leap_client,leap_pycommon,soledad,keymanager,leap_mail}
+  do
+    cd $REPOS_ROOT/$i
+    git fetch
+    git checkout $VERSION
+  done
+
+# make ui in client
+
+cd $REPOS_ROOT/leap_client
+make
+
+# cp client
+
+cp -r $REPOS_ROOT/leap_client/src/leap $TEMPLATE_BUNDLE/apps/leap
+
+# setup sdist client
+
+cd $REPOS_ROOT/leap_client
+python setup.py sdist
+
+# extract $VERSION and copy _version.py to TEMPLATE_BUNDLE/Bitmask.app/Contents/MacOS/apps/leap/bitmask/_version.py
+
+cd dist
+rm -rf leap.bitmask-$VERSION
+tar xzf leap.bitmask-$VERSION.tar.gz
+cp leap.bitmask-$VERSION/src/leap/bitmask/_version.py $TEMPLATE_BUNDLE/apps/leap/bitmask/_version.py
+cp leap.bitmask-$VERSION/src/leap/bitmask/util/reqs.txt $TEMPLATE_BUNDLE/apps/leap/bitmask/util/reqs.txt
+
+# cp common, soledad(client and common), mail and keymanager in TEMPLATE_BUNDLE/Bitmask.app/Contents/MacOS/lib/leap/
+
+LEAP_LIB=$TEMPLATE_BUNDLE/lib/leap/
+
+cp -r $REPOS_ROOT/leap_pycommon/src/leap/common $LEAP_LIB
+cp -r $REPOS_ROOT/soledad/common/src/leap/soledad $LEAP_LIB
+cp -r $REPOS_ROOT/soledad/client/src/leap/soledad/client $LEAP_LIB/soledad
+cp -r $REPOS_ROOT/leap_mail/src/leap/mail $LEAP_LIB
+cp -r $REPOS_ROOT/keymanager/src/leap/keymanager $LEAP_LIB
+
+# cp leap_client launcher to TEMPLATE_BUNDLE/Bitmask.app/Contents/MacOS/Bitmask
+
+BITMASK_BIN=$TEMPLATE_BUNDLE/bitmask
+
+cd $REPOS_ROOT/leap_client_launcher/build/
+make
+cp src/launcher $BITMASK_BIN
+
+# cp launcher.py to TEMPLATE_BUNDLE/Bitmask.app/Contents/MacOS/apps/
+
+cd $REPOS_ROOT/leap_client_launcher/src/
+cp launcher.py $TEMPLATE_BUNDLE/apps/
+
+# cp relnotes to TEMPLATE_BUNDLE
+
+cp $REPOS_ROOT/leap_client/relnotes.txt $TEMPLATE_BUNDLE
+
+# cp joint_chglog to TEMPLATE_BUNDLE
+
+cp $JOINT_CHANGELOG $TEMPLATE_BUNDLE/CHANGELOG
+
+# cp LICENSE to TEMPLATE_BUNDLE
+
+cp $REPOS_ROOT/leap_client/LICENSE $TEMPLATE_BUNDLE/LICENSE
+
+# clean pyc$
+
+cd $TEMPLATE_BUNDLE
+for i in $(find . | grep pyc$);
+  do
+    rm $i
+  done
+
+# create tarball
+
+ARCH=$(uname -m | sed 's/x86_//;s/i[3-6]86/32/')
+BUNDLE_NAME=Bitmask-linux$ARCH-$VERSION
+TMP=/tmp/$BUNDLE_NAME
+
+rm -rf $TMP
+mkdir -p $TMP
+cp -R $TEMPLATE_BUNDLE/* $TMP
+cd /tmp
+tar cjf $DEST/$BUNDLE_NAME.tar.bz2 $BUNDLE_NAME
+cd
+rm -rf $TMP
+
+# go back to develop in all repos
+for i in {leap_client,leap_pycommon,soledad,keymanager,leap_mail}
+  do
+    cd $REPOS_ROOT/$i
+    git checkout develop
+  done
diff --git a/pkg/linux/resolv-update b/pkg/linux/resolv-update
index a54802e3..601d3bd2 100755
--- a/pkg/linux/resolv-update
+++ b/pkg/linux/resolv-update
@@ -20,13 +20,13 @@ function up() {
   comment=$(
 cat <<SETVAR
 #
-# This is a temporary resolv.conf set by the LEAP Client in order to
+# This is a temporary resolv.conf set by the Bitmask in order to
 # strictly enforce that DNS lookups are secured by the VPN.
 #
-# When the LEAP Client quits or the VPN connection it manages is dropped,
+# When Bitmask quits or the VPN connection it manages is dropped,
 # this file will be replace with the regularly scheduled /etc/resolv.conf
 #
-# If you want custom entries to appear in this file while LEAP is running,
+# If you want custom entries to appear in this file while Bitmask is running,
 # put them in /etc/leap/resolv-head or /etc/leap/resolv-tail. These files
 # should only be writable by root.
 #