From 456941648223a14fe144264c27a5dce4e4e702e5 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Thu, 23 Apr 2015 12:41:08 -0300
Subject: [bug] change the ip command location to /sbin/

Change the 'ip' command location to support Fedora/RHEL distros.
/bin/ip is pressent on Debian/Ubuntu but not on Fedora.
/sbin/ip is a symlink to /bin/ip on Debian/Ubuntu and a binary on Fedora.

- Resolves: #6894
---
 pkg/linux/bitmask-root | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkg/linux')

diff --git a/pkg/linux/bitmask-root b/pkg/linux/bitmask-root
index 6fb1f0b3..80ac12e8 100755
--- a/pkg/linux/bitmask-root
+++ b/pkg/linux/bitmask-root
@@ -73,7 +73,7 @@ def get_no_group_name():
             return None
 
 
-VERSION = "5"
+VERSION = "6"
 SCRIPT = "bitmask-root"
 NAMESERVER = "10.42.0.1"
 BITMASK_CHAIN = "bitmask"
@@ -85,7 +85,7 @@ LOCAL_INTERFACE = "lo"
 IMAP_PORT = "1984"
 SMTP_PORT = "2013"
 
-IP = "/bin/ip"
+IP = "/sbin/ip"
 IPTABLES = "/sbin/iptables"
 IP6TABLES = "/sbin/ip6tables"
 
-- 
cgit v1.2.3


From 7fef8b6258e203ac364d0e566fe9d1490e83a5ef Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 23 Jul 2015 15:48:06 -0400
Subject: [pkg] add notes about needed hacks with pyinstaller

there are a couple of manual steps needed
---
 pkg/linux/pyinst-notes.txt | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 pkg/linux/pyinst-notes.txt

(limited to 'pkg/linux')

diff --git a/pkg/linux/pyinst-notes.txt b/pkg/linux/pyinst-notes.txt
new file mode 100644
index 00000000..e4310e6d
--- /dev/null
+++ b/pkg/linux/pyinst-notes.txt
@@ -0,0 +1,20 @@
+hacks
+-----
+**because nobody's perfect, at least the first time**
+
+missing osrandom_engine header
+===============================
+
+1. extract osrandom_engine.* from original cryptography tarball:
+
+cp /src/cryptography/hazmat/bindings/openssl/src/osrandom_engine.h /tmp
+cp /src/cryptography/hazmat/bindings/openssl/src/osrandom_engine.c /tmp
+
+cd dist/bitmask
+mkdir -p cryptography/hazmat/bindings/openssl/src
+cp /tmp/osrandom_engine.* cryptography/hazmat/bindings/openssl/src
+
+missing dbschema.sql
+====================
+mkdir -p u1db/backends
+cp ~VIRTUAL_ENV/lib/python2.7/site-packages/u1db/backends/dbschema.sql u1db/backends
-- 
cgit v1.2.3


From be08bd222ef498dad6f4fa5902f45fc6845b86ac Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 24 Jul 2015 01:31:17 -0400
Subject: [pkg] add small shell launcher for linux bundle

to workaround the incompatibility problem with Qt libs found in ubuntu
---
 pkg/linux/bitmask-launcher | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100755 pkg/linux/bitmask-launcher

(limited to 'pkg/linux')

diff --git a/pkg/linux/bitmask-launcher b/pkg/linux/bitmask-launcher
new file mode 100755
index 00000000..550dd134
--- /dev/null
+++ b/pkg/linux/bitmask-launcher
@@ -0,0 +1,9 @@
+#!/bin/sh
+# The Bitmask Launcher
+# (c) 2015 - The LEAP Encryption Access Project
+
+[ -f libQtCore.so.4 ] || ln -s libQtCore.so.4.orig libQtCore.so.4
+[ -f libQtGui.so.4 ] || ln -s libQtGui.so.4.orig libQtGui.so.4
+cat /etc/os-release | grep ID | grep -i ubuntu && unlink libQtCore.so.4 && unlink libQtGui.so.4
+
+./bitmask-app "$@"
-- 
cgit v1.2.3