Merge remote-tracking branch 'MISP/2.4' into 2.4

INSTALL/INSTALL.sh.sfv

@@ -1,5 +1,5 @@
-; Generated by RHash v1.3.9 on 2020-05-13 at 12:47.53
+; Generated by RHash v1.3.9 on 2020-05-17 at 03:12.57
 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
 ;
-;       132625  12:47.53 2020-05-13 INSTALL.sh
-INSTALL.sh 39D54E983C460248BD68CEE97BA24736DDF9A479 016DDE3CF5F0199C66A23B72F8F6D5951972C2B9CF1B5AE5159D650695442D8A D245A7EB12AEC9BCEC2C391C9B7023F6C8AE3713324FC410DC42A9A9620C13E4BC9CA456F62A40AE17F864D021492750 BE6ACAE2DFD1BA7FD29ED7F73098EE54552DB91EBEE3B58E239D54D4AD7AFDD3FDB212689D550B990A253A17A37E2E8BA3C4C41C129ECBD78E0EACB97F0085D5
+;       132940  03:12.57 2020-05-17 INSTALL.sh
+INSTALL.sh 89D2EC44902AE611FB65EC5CF30FD8685F713ECD 4D2C48FBF6D668A0FF35B01DE88BAA656943C13A1CEB148C09DD333299E894B3 9BC9C39F584346C8EC1DBF87DBF0E1952EF1736DF22E6BE233A60968F751E2C1C5A8E36CE34BE5696D6EE61D8E1079FA 0AD43002838AF3EB559FC2493A9F9B9FFC1E9592311E0866A46ADA3FB3D0D2AF419B06EB42454184E4DDEDDFAC281C07148E4C61277F933D942ABCEA7CF976CA

INSTALL/INSTALL.sh.sha1

@@ -1 +1 @@
-39d54e983c460248bd68cee97ba24736ddf9a479  INSTALL.sh
+89d2ec44902ae611fb65ec5cf30fd8685f713ecd  INSTALL.sh

INSTALL/INSTALL.sh.sha256

@@ -1 +1 @@
-016dde3cf5f0199c66a23b72f8f6d5951972c2b9cf1b5ae5159d650695442d8a  INSTALL.sh
+4d2c48fbf6d668a0ff35b01de88baa656943c13a1ceb148c09dd333299e894b3  INSTALL.sh

INSTALL/INSTALL.sh.sha384

@@ -1 +1 @@
-d245a7eb12aec9bcec2c391c9b7023f6c8ae3713324fc410dc42a9a9620c13e4bc9ca456f62a40ae17f864d021492750  INSTALL.sh
+9bc9c39f584346c8ec1dbf87dbf0e1952ef1736df22e6be233a60968f751e2c1c5a8e36ce34be5696d6ee61d8e1079fa  INSTALL.sh

INSTALL/INSTALL.sh.sha512

@@ -1 +1 @@
-be6acae2dfd1ba7fd29ed7f73098ee54552db91ebee3b58e239d54d4ad7afdd3fdb212689d550b990a253a17a37e2e8ba3c4c41c129ecbd78e0eacb97f0085d5  INSTALL.sh
+0ad43002838af3eb559fc2493a9f9b9ffc1e9592311e0866a46ada3fb3d0d2af419b06eb42454184e4ddeddfac281c07148e4c61277f933d942abcea7cf976ca  INSTALL.sh

docs/INSTALL.kali.md

@@ -1,12 +1,14 @@
 # INSTALLATION INSTRUCTIONS
-## for Kali Linux 2019.1
+## for Kali Linux 2020.2
 # 0/ Quick MISP Instance on Kali Linux - Status
 
-This has been tested by @SteveClement on 20190221
+This has been tested by @SteveClement on 20200513
 
 # 1/ Prepare Kali with a MISP User
 
-To install MISP on Kali copy paste this in your r00t shell:
+This only works on Kali 2020.x 2019.x was year(s) ago(tm).
+
+To install MISP on Kali copy paste this in your shell:
 ```bash
 wget -O /tmp/misp-kali.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh && bash /tmp/misp-kali.sh
 ```

docs/INSTALL.ubuntu1804.md

@@ -45,7 +45,6 @@ bash /tmp/INSTALL.sh -c
 aptUpgrade () {
   debug "Upgrading system"
   checkAptLock
-  sudo apt-get update
 
   # If we run in non-interactive mode, make sure we do not stop all of a sudden
   if [[ "${PACKER}" == "1" || "${UNATTENDED}" == "1" ]]; then
@@ -110,7 +109,7 @@ installDepsPhp72 () {
   debug "Installing PHP 7.2 dependencies"
   PHP_ETC_BASE=/etc/php/7.2
   PHP_INI=${PHP_ETC_BASE}/apache2/php.ini
-  sudo apt update
+  checkAptLock
   sudo apt install -qy \
   libapache2-mod-php \
   php php-cli \

docs/INSTALL.ubuntu2004.md

@@ -45,7 +45,6 @@ bash /tmp/INSTALL.sh -c
 aptUpgrade () {
   debug "Upgrading system"
   checkAptLock
-  sudo apt-get update
 
   # If we run in non-interactive mode, make sure we do not stop all of a sudden
   if [[ "${PACKER}" == "1" || "${UNATTENDED}" == "1" ]]; then
@@ -110,7 +109,7 @@ installDepsPhp74 () {
   debug "Installing PHP 7.4 dependencies"
   PHP_ETC_BASE=/etc/php/7.4
   PHP_INI=${PHP_ETC_BASE}/apache2/php.ini
-  sudo apt update
+  checkAptLock
   sudo apt install -qy \
   libapache2-mod-php \
   php php-cli \