Merge branch '2.4' of github.com:MISP/MISP into 2.4

INSTALL/INSTALL.sh

@@ -393,7 +393,7 @@ ask_o () {
 
   while true; do
     case "${ANSWER}" in "${OPT1}" | "${OPT2}") break ;; esac
-    echo -n "${1} (${OPT1}/${OPT2}) "
+    echo -e -n "${1} (${OPT1}/${OPT2}) "
     read ANSWER
     ANSWER=$(echo "${ANSWER}" |  tr '[:upper:]' '[:lower:]')
   done
@@ -967,7 +967,16 @@ aptUpgrade () {
   debug "Upgrading system"
   checkAptLock
   sudo apt-get update
-  sudo apt-get upgrade -qy
+
+  # If we run in non-interactive mode, make sure we do not stop all of a sudden
+  if [[ "${PACKER}" == "1" || "${UNATTENDED}" == "1" ]]; then
+    export DEBIAN_FRONTEND=noninteractive
+    export DEBIAN_PRIORITY=critical
+    sudo -E apt-get -qy -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" upgrade
+    sudo -E apt-get -qy autoclean
+  else
+    sudo apt-get upgrade -qy
+  fi
 }
 
 # check if sudo is installed
@@ -2141,6 +2150,9 @@ installMISPonKali () {
   # install python-magic
   $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic 2> /dev/null > /dev/null
 
+  # install plyara
+  $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara 2> /dev/null > /dev/null
+
   # install zmq needed by mispzmq
   $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install zmq 2> /dev/null > /dev/null
 

INSTALL/INSTALL.sh.sfv

@@ -1,5 +1,5 @@
-; Generated by RHash v1.3.8 on 2019-06-15 at 11:59.41
+; Generated by RHash v1.3.8 on 2019-06-20 at 14:00.36
 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
 ;
-;        94958  11:59.41 2019-06-15 INSTALL.sh
-INSTALL.sh AD8916A355616615634DD364BB78945301039BDD E12BB967B309DB78E723476B79AC6F1001F02248A0001593B5EFA5C18D0BEBB6 37BC162A792BDBC86AEC04F629E5C410D754C92CA76D796F8FA9F11272A35064D6D3371165A330F747E5C71BF69311F0 71C1FF6F5FB0C2A61A9C0AACE2D017C7EA4A7094B49F22CD22E5723702CFAC27F66D05C52368F169FD8F40166AFC493F5512E078EDF5C279939AB85110A27EBD
+;        95437  14:00.36 2019-06-20 INSTALL.sh
+INSTALL.sh 8CFDF8FC14572C9AA51673D7449C354257C6CE67 61B8976709B44B3F2C0491EDB6FA013AC15BA4833F074929810C65C93C274FCB 75D5538717565401F180E7C777BE41A167B2365473806141C9357E75220DD198BE68DC2B59452F39396B42FB50208194 460D731E91EAA0F589B96D13CC451BCB7014C683A357099B13492E7683A459ECB7C2A43AFFB237C966CE67DD06140199686E968B518A33ED73C84135948E0749

INSTALL/INSTALL.sh.sha1

@@ -1 +1 @@
-ad8916a355616615634dd364bb78945301039bdd  INSTALL.sh
+8cfdf8fc14572c9aa51673d7449c354257c6ce67  INSTALL.sh

INSTALL/INSTALL.sh.sha256

@@ -1 +1 @@
-e12bb967b309db78e723476b79ac6f1001f02248a0001593b5efa5c18d0bebb6  INSTALL.sh
+61b8976709b44b3f2c0491edb6fa013ac15ba4833f074929810c65c93c274fcb  INSTALL.sh

INSTALL/INSTALL.sh.sha384

@@ -1 +1 @@
-37bc162a792bdbc86aec04f629e5c410d754c92ca76d796f8fa9f11272a35064d6d3371165a330f747e5c71bf69311f0  INSTALL.sh
+75d5538717565401f180e7c777be41a167b2365473806141c9357e75220dd198be68dc2b59452f39396b42fb50208194  INSTALL.sh

INSTALL/INSTALL.sh.sha512

@@ -1 +1 @@
-71c1ff6f5fb0c2a61a9c0aace2d017c7ea4a7094b49f22cd22e5723702cfac27f66d05c52368f169fd8f40166afc493f5512e078edf5c279939ab85110a27ebd  INSTALL.sh
+460d731e91eaa0f589b96d13cc451bcb7014c683a357099b13492e7683a459ecb7c2a43affb237c966ce67dd06140199686e968b518a33ed73c84135948e0749  INSTALL.sh

INSTALL/INSTALL.tpl.sh

@@ -465,6 +465,9 @@ installMISPonKali () {
   # install python-magic
   $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic 2> /dev/null > /dev/null
 
+  # install plyara
+  $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara 2> /dev/null > /dev/null
+
   # install zmq needed by mispzmq
   $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install zmq 2> /dev/null > /dev/null
 

docs/INSTALL.rhel7.md

@@ -703,7 +703,7 @@ sudo systemctl enable --now misp-workers.service
 ## 9.07/ misp-modules (WIP!)
 ```bash
 # some misp-modules dependencies
-sudo yum install openjpeg-devel gcc-c++ poppler-cpp-devel -y
+sudo yum install openjpeg-devel gcc-c++ poppler-cpp-devel pkgconfig python-devel redhat-rpm-config -y
 
 sudo chmod 2777 /usr/local/src
 sudo chown root:users /usr/local/src

docs/INSTALL.ubuntu1804.md

@@ -46,7 +46,16 @@ aptUpgrade () {
   debug "Upgrading system"
   checkAptLock
   sudo apt-get update
-  sudo apt-get upgrade -qy
+
+  # If we run in non-interactive mode, make sure we do not stop all of a sudden
+  if [[ "${PACKER}" == "1" || "${UNATTENDED}" == "1" ]]; then
+    export DEBIAN_FRONTEND=noninteractive
+    export DEBIAN_PRIORITY=critical
+    sudo -E apt-get -qy -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" upgrade
+    sudo -E apt-get -qy autoclean
+  else
+    sudo apt-get upgrade -qy
+  fi
 }
 # <snippet-end 0_apt-upgrade.sh>
 ```