From e568e811c6422513bfa5b570626615946e9851c3 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Fri, 2 Apr 2021 19:00:38 +0900
Subject: [PATCH] chg: [installer] Update to latest installer.

---
 INSTALL/INSTALL.sh        | 9 ++++++++-
 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, 15 insertions(+), 8 deletions(-)

diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh
index 276ba03ed..a59cbc18c 100755
--- a/INSTALL/INSTALL.sh
+++ b/INSTALL/INSTALL.sh
@@ -2187,6 +2187,8 @@ enableOptionalRHEL8 () {
   # Software Collections is available for Red Hat Enterprise Linux 7 and previous supported releases. Starting with Red Hat Enterprise Linux 8, the content traditionally consumed via Software Collections is now part of Application Streams. Please see the Application Streams Life Cycle documentation for that release. Source: https://access.redhat.com/support/policy/updates/rhscl
 }
 
+## 0_RHEL7_SCL.sh ##
+## 0_RHEL7_EPEL.sh ##
 centosEPEL () {
   # We need some packages from the Extra Packages for Enterprise Linux repository
   sudo yum install epel-release -y
@@ -2199,7 +2201,6 @@ centosEPEL () {
   sudo yum-config-manager --enable remi-php74
 }
 
-
 yumInstallCoreDeps () {
   # Install the dependencies:
   PHP_BASE="/etc/"
@@ -2954,6 +2955,10 @@ installSupported () {
   [[ -n $MODULES ]]   || [[ -n $ALL ]] && mispmodules
   progress 4
 
+  # Install misp-modules - functionLocation('generic/misp-modules-cake.md')
+  [[ -n $MODULES ]]   || [[ -n $ALL ]] && modulesCAKE
+  progress 4
+
   # Install Viper - functionLocation('generic/viper-debian.md')
   ## FIXME: The current state of Viper is broken, disabling any use.
   ##[[ -n $VIPER ]]     || [[ -n $ALL ]] && viper
@@ -3218,6 +3223,7 @@ installMISPonKali () {
 
   debug "Installing misp-modules"
   mispmodules
+  modulesCAKE
 
   ## FIXME: The current state of Viper is broken, disabling any use.
   ##debug "Installing Viper"
@@ -3311,6 +3317,7 @@ installMISPRHEL () {
     space
 
     mispmodulesRHEL
+    modulesCAKE
 
     echo "MISP modules installation finished."
   fi
diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv
index 64ee900c5..b0741c013 100644
--- a/INSTALL/INSTALL.sh.sfv
+++ b/INSTALL/INSTALL.sh.sfv
@@ -1,5 +1,5 @@
-; Generated by RHash v1.3.9 on 2021-04-02 at 18:03.08
+; Generated by RHash v1.3.9 on 2021-04-02 at 19:00.10
 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
 ;
-;       148462  18:03.08 2021-04-02 INSTALL.sh
-INSTALL.sh 19EE0150F3DA12E930B9E6E82028545E461E0ABB 35F00E16E6E31757CA7773C3A860AB6FE1A191EE482144350F31D548A24C0505 D2F48ACC0B9681D4726E0C8C2581C8575EA4605684630248F9051E241A21409A4D60F9B498AA044A5647B3AB67A9E208 1C8F4EFD5257032BA535149904D709E5090F81451824AEB5A1A2B52FC585DBF8D0E623B6A6206F2535322773A675DF34EA553A1A198E11460405C286DCCE1581
+;       148678  19:00.10 2021-04-02 INSTALL.sh
+INSTALL.sh 64BA3BE8A7A57C393B5507218C0331E007713FBF 8DED9ED577D909FC4FBA4B70D1AB66F192CB97054BC0CF933952AC88F3F76BAD E6FE2C2FCB191D72799B93AEA1304AEB90CEDA4FA4FAF499A7EFBC01BA6EDEDD02158CE026BA9DAF4ACD28D0D4DDEED8 206E165A891331CB420126C1AEDA58EF73FA0F1245CFF8B887A1FE8DE9FA47D5A102C3250ED5F1C264113FB6E28382EAC6225099D63693B273FC9122C30C9B63
diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1
index 258603a4d..a57940a12 100644
--- a/INSTALL/INSTALL.sh.sha1
+++ b/INSTALL/INSTALL.sh.sha1
@@ -1 +1 @@
-19ee0150f3da12e930b9e6e82028545e461e0abb  INSTALL.sh
+64ba3be8a7a57c393b5507218c0331e007713fbf  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256
index 78d81247c..4ad7fc226 100644
--- a/INSTALL/INSTALL.sh.sha256
+++ b/INSTALL/INSTALL.sh.sha256
@@ -1 +1 @@
-35f00e16e6e31757ca7773c3a860ab6fe1a191ee482144350f31d548a24c0505  INSTALL.sh
+8ded9ed577d909fc4fba4b70d1ab66f192cb97054bc0cf933952ac88f3f76bad  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384
index c2a4f5def..b027c9128 100644
--- a/INSTALL/INSTALL.sh.sha384
+++ b/INSTALL/INSTALL.sh.sha384
@@ -1 +1 @@
-d2f48acc0b9681d4726e0c8c2581c8575ea4605684630248f9051e241a21409a4d60f9b498aa044a5647b3ab67a9e208  INSTALL.sh
+e6fe2c2fcb191d72799b93aea1304aeb90ceda4fa4faf499a7efbc01ba6ededd02158ce026ba9daf4acd28d0d4ddeed8  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512
index a339adb14..7d0e5b688 100644
--- a/INSTALL/INSTALL.sh.sha512
+++ b/INSTALL/INSTALL.sh.sha512
@@ -1 +1 @@
-1c8f4efd5257032ba535149904d709e5090f81451824aeb5a1a2b52fc585dbf8d0e623b6a6206f2535322773a675df34ea553a1a198e11460405c286dcce1581  INSTALL.sh
+206e165a891331cb420126c1aeda58ef73fa0f1245cff8b887a1fe8de9fa47d5a102c3250ed5f1c264113fb6e28382eac6225099d63693b273fc9122c30c9b63  INSTALL.sh