From 47d6341da42f7c8536c5d93880a6bdcfd3aaadb4 Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Fri, 13 Aug 2021 14:03:27 +0300 Subject: [PATCH] [qa#261] install OpenSSL 1.1.1g on CentOS 7 --- hammer.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/hammer.py b/hammer.py index 80cb88b244..864d8e71cf 100755 --- a/hammer.py +++ b/hammer.py @@ -1397,9 +1397,16 @@ def prepare_system_local(features, check_times): elif system == 'centos': install_pkgs('epel-release', env=env, check_times=check_times) - packages = ['make', 'autoconf', 'automake', 'libtool', 'gcc-c++', 'openssl-devel', + packages = ['make', 'autoconf', 'automake', 'libtool', 'gcc-c++', 'log4cplus-devel', 'boost-devel', 'mariadb-devel', 'postgresql-devel'] + if revision == '7': + # openssl-devel is version 1.0.2k which is out of support. + # Install 1.1.1g instead. + packages.append('openssl11-devel') + else: + packages.append('openssl-devel') + if 'native-pkg' in features: packages.extend(['rpm-build', 'python3-devel']) @@ -1453,9 +1460,15 @@ def prepare_system_local(features, check_times): # prepare rhel elif system == 'rhel': - packages = ['make', 'autoconf', 'automake', 'libtool', 'gcc-c++', 'openssl-devel', 'boost-devel', - 'mariadb-devel', 'postgresql-devel'] - packages.extend(['rpm-build']) + packages = ['make', 'autoconf', 'automake', 'libtool', 'gcc-c++', 'boost-devel', + 'mariadb-devel', 'postgresql-devel', 'rpm-build'] + + if revision == '7': + # openssl-devel is version 1.0.2k which is out of support. + # Install 1.1.1g instead. + packages.append('openssl11-devel') + else: + packages.append('openssl-devel') if 'docs' in features and not revision == '8': packages.extend(['libxslt', 'elinks', 'docbook-style-xsl'])