From 690f2adf07f9148b13815bd61c4082d3e0612663 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Fri, 1 May 2020 12:25:30 +0900
Subject: [PATCH] chg: [installer] Bump version

---
 INSTALL/INSTALL.sh        | 23 ++++++++++++++++++++---
 INSTALL/INSTALL.sh.sfv    |  6 +++---
 INSTALL/INSTALL.sh.sha1   |  2 +-
 INSTALL/INSTALL.sh.sha256 |  2 +-
 INSTALL/INSTALL.sh.sha384 |  2 +-
 INSTALL/INSTALL.sh.sha512 |  2 +-
 6 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh
index 42ae0240b..b8babfb40 100755
--- a/INSTALL/INSTALL.sh
+++ b/INSTALL/INSTALL.sh
@@ -1659,10 +1659,27 @@ WantedBy=multi-user.target" | sudo tee /etc/systemd/system/misp-workers.service
 # Main MISP Modules install function
 mispmodules () {
   cd /usr/local/src/
+  sudo apt-get install cmake libcaca-dev liblua5.3-dev -y
   ## TODO: checkUsrLocalSrc in main doc
   debug "Cloning misp-modules"
   $SUDO_CMD git clone https://github.com/MISP/misp-modules.git
-  cd misp-modules
+  $SUDO_CMD git clone git://github.com/stricaud/gtcaca.git
+  $SUDO_CMD git clone git://github.com/stricaud/faup.git
+  sudo chown -R ${MISP_USER}:${MISP_USER} faup gtcaca
+  # Install gtcaca
+  cd gtcaca
+  $SUDO_CMD mkdir -p build
+  cd build
+  $SUDO_CMD cmake .. && $SUDO_CMD make
+  sudo make install
+  cd ../../faup
+  # Install faup
+  $SUDO_CMD mkdir -p build
+  cd build
+  $SUDO_CMD cmake .. && $SUDO_CMD make
+  sudo make install
+  sudo ldconfig
+  cd ../../misp-modules
   # some misp-modules dependencies
   sudo apt install libpq5 libjpeg-dev tesseract-ocr libpoppler-cpp-dev imagemagick libopencv-dev zbar-tools libzbar0 libzbar-dev libfuzzy-dev -y
   # If you build an egg, the user you build it as need write permissions in the CWD
@@ -1817,8 +1834,8 @@ mail2misp () {
   cd /usr/local/src/
   sudo apt-get install cmake libcaca-dev liblua5.3-dev -y
   $SUDO_CMD git clone https://github.com/MISP/mail_to_misp.git
-  $SUDO_CMD git clone git://github.com/stricaud/faup.git faup
-  $SUDO_CMD git clone git://github.com/stricaud/gtcaca.git gtcaca
+  [[ ! -d "faup" ]] && $SUDO_CMD git clone git://github.com/stricaud/faup.git faup
+  [[ ! -d "gtcaca" ]] && $SUDO_CMD git clone git://github.com/stricaud/gtcaca.git gtcaca
   sudo chown -R ${MISP_USER}:${MISP_USER} faup mail_to_misp gtcaca
   cd gtcaca
   $SUDO_CMD mkdir -p build
diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv
index 795383d84..4b2d48618 100644
--- a/INSTALL/INSTALL.sh.sfv
+++ b/INSTALL/INSTALL.sh.sfv
@@ -1,5 +1,5 @@
-; Generated by RHash v1.3.8 on 2020-04-30 at 19:46.06
+; Generated by RHash v1.3.8 on 2020-05-01 at 12:24.54
 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
 ;
-;       131047  19:46.06 2020-04-30 INSTALL.sh
-INSTALL.sh EB4930E5F943CCEB2D8B058DEB29D0205FBCBE04 8B77E8C17ECF325D89BDC3F48F3B38A8AEB4FD397EB33FF8F28856251A7FC128 26E91AEBD71BFD649D0BE4E2F7881B10AF294F1DD5DFA09B23C49E1CD66E2BDA7895B5E50EAE628055D07E964BDDFB36 FAB07C7E4C827244CCCF467DFEC27F09E67B19D541345DC4A28FC34E1BDC4FC6F480DC142FCA654EDB1C1DEEF8645B5B39C8B1D9DEF7F633FA9DE32D33F40C8A
+;       131599  12:24.54 2020-05-01 INSTALL.sh
+INSTALL.sh 459A7BDAD0014A5BC5BDC4FBB2AEA8A18958D170 EE218F9A83C4E22A6DA65780FB5EB6624104C71A9B3D1743EDB4511AB790B57B B7D0734C17AC66C6B714DCF24CA6053DB31EC635E4AFD2F741601DF2413B1798A9FC9295A8DDE443F315C226DEB9E5A5 D28781C84601334CC88F1C57A869487FAB2CFD199CE83AE658798F3A75777741A49B561C72E85BB9537556E5D3785153339FBD9EEB396088BD0A2DEFE5199319
diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1
index 27df3fcb2..1ba154827 100644
--- a/INSTALL/INSTALL.sh.sha1
+++ b/INSTALL/INSTALL.sh.sha1
@@ -1 +1 @@
-eb4930e5f943cceb2d8b058deb29d0205fbcbe04  INSTALL.sh
+459a7bdad0014a5bc5bdc4fbb2aea8a18958d170  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256
index a8295801d..5ccdc440c 100644
--- a/INSTALL/INSTALL.sh.sha256
+++ b/INSTALL/INSTALL.sh.sha256
@@ -1 +1 @@
-8b77e8c17ecf325d89bdc3f48f3b38a8aeb4fd397eb33ff8f28856251a7fc128  INSTALL.sh
+ee218f9a83c4e22a6da65780fb5eb6624104c71a9b3d1743edb4511ab790b57b  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384
index beb4ed0f7..7ea5a459b 100644
--- a/INSTALL/INSTALL.sh.sha384
+++ b/INSTALL/INSTALL.sh.sha384
@@ -1 +1 @@
-26e91aebd71bfd649d0be4e2f7881b10af294f1dd5dfa09b23c49e1cd66e2bda7895b5e50eae628055d07e964bddfb36  INSTALL.sh
+b7d0734c17ac66c6b714dcf24ca6053db31ec635e4afd2f741601df2413b1798a9fc9295a8dde443f315c226deb9e5a5  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512
index da621b98d..3252fe8d3 100644
--- a/INSTALL/INSTALL.sh.sha512
+++ b/INSTALL/INSTALL.sh.sha512
@@ -1 +1 @@
-fab07c7e4c827244cccf467dfec27f09e67b19d541345dc4a28fc34e1bdc4fc6f480dc142fca654edb1c1deef8645b5b39c8b1d9def7f633fa9de32d33f40c8a  INSTALL.sh
+d28781c84601334cc88f1c57a869487fab2cfd199ce83ae658798f3a75777741a49b561c72e85bb9537556e5d3785153339fbd9eeb396088bd0a2defe5199319  INSTALL.sh