chg: [installer] Updated to latest, considering rhel8.4/8.5

pull/8065/head
Steve Clement 2021-12-25 14:54:59 +09:00
parent 40c1a733fd
commit ee1ee01c62
No known key found for this signature in database
GPG Key ID: 69A20F509BE4AEE9
7 changed files with 4385 additions and 11 deletions

View File

@ -2289,7 +2289,8 @@ yumInstallCoreDeps8 () {
# Install the dependencies:
PHP_BASE="/etc/"
PHP_INI="/etc/php.ini"
sudo dnf install @httpd -y
# If the install group @httpd is not existent, fallback to httpd
sudo dnf install @httpd -y || sudo dnf install httpd -y
sudo dnf install gcc git zip unzip \
httpd \
mod_ssl \
@ -2442,7 +2443,8 @@ compileLiefRHEL8 () {
# The following adds a PYTHONPATH to where the pyLIEF module has been compiled
echo /var/www/MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee /var/www/MISP/venv/lib/python3.6/site-packages/lief.pth
[[ "${DISTRI}" == "fedora33" ]] && (echo /var/www/MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee /var/www/MISP/venv/lib/python3.9/site-packages/lief.pth)
([[ "${DISTRI}" == "fedora33" ]] || [[ ${DISTRI} == 'fedora34' ]]) && (echo /var/www/MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee /var/www/MISP/venv/lib/python3.9/site-packages/lief.pth)
[[ "${DISTRI}" == "fedora35" ]] && (echo /var/www/MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee /var/www/MISP/venv/lib/python3.10/site-packages/lief.pth)
$SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U python-magic plyara
}
@ -2470,7 +2472,7 @@ installCoreRHEL8 () {
$SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U pip setuptools
# If you umask is has been changed from the default, it is a good idea to reset it to 0022 before installing python modules
([[ ${DISTRI} == 'fedora33' ]] || [[ ${DISTRI} == 'fedora34' ]] || [[ ${DISTRI} == 'rhel8.3' ]]) && sudo dnf install cmake3 -y && CMAKE_BIN='cmake3'
([[ ${DISTRI} == 'fedora33' ]] || [[ ${DISTRI} == 'fedora34' ]] || [[ ${DISTRI} == 'fedora35' ]] || [[ ${DISTRI} == 'rhel8.3' ]] || [[ ${DISTRI} == 'rhel8.4' ]] || [[ ${DISTRI} == 'rhel8.5' ]]) && sudo dnf install cmake3 -y && CMAKE_BIN='cmake3'
([[ ${DISTRI} == 'centos8stream' ]] || [[ ${DISTRI} == 'centos8' ]] || [[ ${DISTRI} == 'rocky8.4' ]] || [[ ${DISTRI} == 'rocky8.5' ]]) && sudo dnf install cmake -y && CMAKE_BIN='cmake'
UMASK=$(umask)

View File

@ -1,5 +1,5 @@
; Generated by RHash v1.3.9 on 2021-12-25 at 12:36.06
; Generated by RHash v1.3.9 on 2021-12-25 at 14:54.47
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
;
; 160760 12:36.06 2021-12-25 INSTALL.sh
INSTALL.sh 544D6E91F39C5E461935089087307B0BEE1BFE23 7D6A5684431EBD0E0BCA3302D56506D7B45F00B1B11C1774A8734E998122BDF7 10654088BEF89BA11B45C072F66897E1D522287F20D564263C2A7380A576C65996FF204621ECCBB233EB36BAA16E9DCA 9F3EDA3873A7C711258DF4BD938934149F61702082B41AA4F570060820361F812A5A4C0F4C8C80DEFE84C0609A1C376DEC5BC02A691CD2662486EDBDEFB5443E
; 161158 14:54.46 2021-12-25 INSTALL.sh
INSTALL.sh A1EEC205071442B2C9B145E7B5A054FF24728EF4 DAF55446860994E3AE8589FB6F8EE33B015DBC454ADFC8D7F3E0B2F28AA8BBBD 4F6F43B200D0F9B35C53186B4AD26A1CCFEBB6FC961B19369E3D13A053C046340B6BF1673D14793B0FE7233ECA86993D D38C7FAF648C60DCEA4D9C64AB5EB4AE262B3F1625106670DC837D1AEC9AB302BCB21811CEE5B14845D841BCDCBF420FA800BDCDCA44B5F58196667022BBD94D

View File

@ -1 +1 @@
544d6e91f39c5e461935089087307b0bee1bfe23 INSTALL.sh
a1eec205071442b2c9b145e7b5a054ff24728ef4 INSTALL.sh

View File

@ -1 +1 @@
7d6a5684431ebd0e0bca3302d56506d7b45f00b1b11c1774a8734e998122bdf7 INSTALL.sh
daf55446860994e3ae8589fb6f8ee33b015dbc454adfc8d7f3e0b2f28aa8bbbd INSTALL.sh

View File

@ -1 +1 @@
10654088bef89ba11b45c072f66897e1d522287f20d564263c2a7380a576c65996ff204621eccbb233eb36baa16e9dca INSTALL.sh
4f6f43b200d0f9b35c53186b4ad26a1ccfebb6fc961b19369e3d13a053c046340b6bf1673d14793b0fe7233eca86993d INSTALL.sh

View File

@ -1 +1 @@
9f3eda3873a7c711258df4bd938934149f61702082b41aa4f570060820361f812a5a4c0f4c8c80defe84c0609a1c376dec5bc02a691cd2662486edbdefb5443e INSTALL.sh
d38c7faf648c60dcea4d9c64ab5eb4ae262b3f1625106670dc837d1aec9ab302bcb21811cee5b14845d841bcdcbf420fa800bdcdca44b5f58196667022bbd94d INSTALL.sh

File diff suppressed because it is too large Load Diff