From 883110b29fe406f4d6ad53dbee9d93fd210a63db Mon Sep 17 00:00:00 2001 From: Roman Prilipskii Date: Mon, 1 Jul 2024 04:19:02 +0200 Subject: [PATCH] Remove the OpenSSL workaround No longer required with the EPEL-related modifications --- .../actors/clearpackageconflicts/actor.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/repos/system_upgrade/cloudlinux/actors/clearpackageconflicts/actor.py b/repos/system_upgrade/cloudlinux/actors/clearpackageconflicts/actor.py index c776d0c160..5c70a62307 100644 --- a/repos/system_upgrade/cloudlinux/actors/clearpackageconflicts/actor.py +++ b/repos/system_upgrade/cloudlinux/actors/clearpackageconflicts/actor.py @@ -77,23 +77,6 @@ def alt_python37_handle(self): if self.problem_packages_installed(problem_packages): self.clear_problem_files(problem_files, problem_dirs) - def openssl_handle(self): - """ - openssl11-libs package from the EPEL repo is conflicting with the incoming openssl-libs package for EL8. - https://access.redhat.com/solutions/6986997 - """ - problem_packages = [ - "openssl11-libs" - ] - problem_files = [ - "/usr/lib64/.libcrypto.so.1.1.1k.hmac", - "/usr/lib64/.libssl.so.1.1.1k.hmac" - ] - problem_dirs = [] - - if self.problem_packages_installed(problem_packages): - self.clear_problem_files(problem_files, problem_dirs) - def lua_cjson_handle(self): """ lua-cjson package is conflicting with the incoming lua-cjson package for EL8. @@ -116,4 +99,3 @@ def lua_cjson_handle(self): def process(self): self.rpm_lookup = {rpm for rpm in self.consume(InstalledRPM)} self.alt_python37_handle() - self.openssl_handle()