Merge branch '2.4' into develop

pull/8039/head
Steve Clement 2021-12-17 11:07:52 +04:00
commit f132a6b497
No known key found for this signature in database
GPG Key ID: 69A20F509BE4AEE9
7 changed files with 9 additions and 9 deletions

View File

@ -2890,7 +2890,7 @@ mispmodulesRHEL () {
# some misp-modules dependencies for RHEL<8
([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[7].* ]]) && sudo dnf install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
# some misp-modules dependencies for RHEL8
[[ "${DIST_VER}" =~ ^[8].* ]] && sudo dnf install https://packages.endpoint.com/rhel/8/main/x86_64/endpoint-repo-8-1.ep8.noarch.rpm -y && sudo dnf install zbar-devel opencv-devel -y
[[ "${DIST_VER}" =~ ^[8].* ]] && sudo dnf install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm -y && sudo dnf install zbar-devel opencv-devel -y
echo "[Unit]
Description=MISP modules

View File

@ -1,5 +1,5 @@
; Generated by RHash v1.4.2 on 2021-11-09 at 12:08.58
; Generated by RHash v1.4.2 on 2021-12-17 at 11:06.13
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
;
; 160592 12:08.58 2021-11-09 INSTALL.sh
INSTALL.sh 9645FCE5A2C4EC2130B5D08AB2676CEFB04A6D80 FD967530AD42883B1493305A873F86DFF04533D77DE021805B4CCDAE7C86392E BDE824E4A236D494AC0C834E7B23C1BF9A4DB799559245E79A481BA871B3B303D22782ACBE63AF37AECEC7541237E689 7B4D1EADFDCC4DD9B41F83869440013B0C6E1964401368F91A4AACA9D3FEA62DED7B1406B8DC520B80182D5F03D7646A4760E1A30A32EA19D1B7111BDA6EE8C3
; 160585 11:06.13 2021-12-17 INSTALL.sh
INSTALL.sh AEC401C355C029DED1D86AA99CE2C23C543D9893 B00DFDC930635FBA8A7A289C1F5BA8AB1B70A30E6A6277296CC3DD36E74BD713 3AE99154519041006BD732544445F9BA2485C1AF763D2F909B6C63F1688392B2E0F31A437A292791251D6AED684B3187 454634410F8CB5F357F096F1D0B1E068BFBA6C5663557AAE6C91015E406C9DE3FE878B07FB9FBED0A5866C0E65B4BA0892197812DDF773B33AA2EE68FDC3370A

View File

@ -1 +1 @@
9645fce5a2c4ec2130b5d08ab2676cefb04a6d80 INSTALL.sh
aec401c355c029ded1d86aa99ce2c23c543d9893 INSTALL.sh

View File

@ -1 +1 @@
fd967530ad42883b1493305a873f86dff04533d77de021805b4ccdae7c86392e INSTALL.sh
b00dfdc930635fba8a7a289c1f5ba8ab1b70a30e6a6277296cc3dd36e74bd713 INSTALL.sh

View File

@ -1 +1 @@
bde824e4a236d494ac0c834e7b23c1bf9a4db799559245e79a481ba871b3b303d22782acbe63af37aecec7541237e689 INSTALL.sh
3ae99154519041006bd732544445f9ba2485c1af763d2f909b6c63f1688392b2e0f31a437a292791251d6aed684b3187 INSTALL.sh

View File

@ -1 +1 @@
7b4d1eadfdcc4dd9b41f83869440013b0c6e1964401368f91a4aaca9d3fea62ded7b1406b8dc520b80182d5f03d7646a4760e1a30a32ea19d1b7111bda6ee8c3 INSTALL.sh
454634410f8cb5f357f096f1d0b1e068bfba6c5663557aae6c91015e406c9de3fe878b07fb9fbed0a5866c0e65b4ba0892197812ddf773b33aa2ee68fdc3370a INSTALL.sh

View File

@ -21,7 +21,7 @@ mispmodulesRHEL () {
# some misp-modules dependencies for RHEL<8
([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[7].* ]]) && sudo dnf install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
# some misp-modules dependencies for RHEL8
[[ "${DIST_VER}" =~ ^[8].* ]] && sudo dnf install https://packages.endpoint.com/rhel/8/main/x86_64/endpoint-repo-8-1.ep8.noarch.rpm -y && sudo dnf install zbar-devel opencv-devel -y
[[ "${DIST_VER}" =~ ^[8].* ]] && sudo dnf install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm -y && sudo dnf install zbar-devel opencv-devel -y
echo "[Unit]
Description=MISP modules