From b546d64221f5c10d7ec076fd278b7e60c3fb6f31 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 9 Mar 2016 16:27:12 -0400
Subject: [feat] add bitmaskd to multipackage spec

---
 pkg/pyinst/bitmaskd      |  1 +
 pkg/pyinst/bitmaskd.spec | 33 +++++++++++++++++++++++++++++++++
 pkg/pyinst/multi.spec    | 25 +++++++++++++++++++++++--
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 120000 pkg/pyinst/bitmaskd
 create mode 100644 pkg/pyinst/bitmaskd.spec

(limited to 'pkg')

diff --git a/pkg/pyinst/bitmaskd b/pkg/pyinst/bitmaskd
new file mode 120000
index 00000000..c5b08597
--- /dev/null
+++ b/pkg/pyinst/bitmaskd
@@ -0,0 +1 @@
+../../src/leap/bitmask/core/launcher.py
\ No newline at end of file
diff --git a/pkg/pyinst/bitmaskd.spec b/pkg/pyinst/bitmaskd.spec
new file mode 100644
index 00000000..4e2e2d6a
--- /dev/null
+++ b/pkg/pyinst/bitmaskd.spec
@@ -0,0 +1,33 @@
+# -*- mode: python -*-
+
+block_cipher = None
+
+
+a = Analysis(['bitmaskd'],
+             pathex=['/home/kali/leap/bitmask_client/pkg/pyinst'],
+             binaries=None,
+             datas=None,
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          name='bitmaskd',
+          debug=False,
+          strip=False,
+          upx=True,
+          console=True )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               name='bitmaskd')
diff --git a/pkg/pyinst/multi.spec b/pkg/pyinst/multi.spec
index 2bb9d248..aa5c83c0 100644
--- a/pkg/pyinst/multi.spec
+++ b/pkg/pyinst/multi.spec
@@ -13,7 +13,6 @@ gui_a = Analysis(['bitmask.py'],
              excludes=None,
              cipher=block_cipher)
 cli_a = Analysis(['bitmask_cli'],
-             pathex=['/home/kali/leap/bitmask_client/pkg/pyinst'],
              binaries=None,
              datas=None,
              hiddenimports=[
@@ -24,9 +23,21 @@ cli_a = Analysis(['bitmask_cli'],
              win_no_prefer_redirects=False,
              win_private_assemblies=False,
              cipher=block_cipher)
+daemon_a = Analysis(['bitmaskd'],
+             binaries=None,
+             datas=None,
+             hiddenimports=[
+	     	'leap.bitmask.core.service'],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
 
 MERGE( (gui_a, 'bitmask', 'bitmask'),
-       (cli_a, 'bitmask_cli', 'bitmask'))
+       (cli_a, 'bitmask_cli', 'bitmask'),
+       (daemon_a, 'bitmaskd', 'bitmaskd'))
 
 gui_pyz = PYZ(gui_a.pure, gui_a.zipped_data, cipher=block_cipher)
 gui_exe = EXE(gui_pyz,
@@ -41,6 +52,11 @@ cli_exe = EXE(cli_pyz,
           exclude_binaries=True,
           name='bitmask_cli', debug=False, strip=False,
           upx=True, console=True)
+daemon_pyz = PYZ(daemon_a.pure, daemon_a.zipped_data, cipher=block_cipher)
+daemon_exe = EXE(daemon_pyz,
+          daemon_a.scripts,
+          exclude_binaries=True,
+          name='bitmaskd', debug=False, strip=False, upx=True, console=True )
 
 gui_coll = COLLECT(gui_exe,
                gui_a.binaries,
@@ -52,3 +68,8 @@ cli_coll = COLLECT(cli_exe,
                cli_a.zipfiles,
                cli_a.datas,
                strip=False, upx=True, name='bitmask_cli')
+daemon_coll = COLLECT(daemon_exe,
+               daemon_a.binaries,
+               daemon_a.zipfiles,
+               daemon_a.datas,
+               strip=False, upx=True, name='bitmaskd')
-- 
cgit v1.2.3