wip: centos-7 devtoolset-11 install/setup and openssl-4.0.0 build

Author: craigcomstock

ci/centos-7-setup-devtoolset-11.sh

@@ -0,0 +1,7 @@
+sudo yum install -y centos-release-scl
+rm /etc/yum.repos.d/CentOS-SCLo-scl.repo
+sed -i 's,^#baseurl.*$,baseurl=https://vault.centos.org/7.9.2009/sclo/x86_64/rh/' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
+sed -i ',mirrorlist,d' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo
+sudo yum update
+sudo yum install -y devtoolset-11
+# add source /opt/rh/devtoolset-11/enable to /usr/lib/rpm/find-debuginfo.sh at the top of the file just after the shebang

deps-packaging/openssl/cfbuild-openssl.spec

@@ -7,7 +7,6 @@ Release: 1
 Source0: openssl-%{openssl_version}.tar.gz
 Patch0: 0006-Add-latomic-on-AIX-7.patch
 Patch1: 0008-Define-_XOPEN_SOURCE_EXTENDED-as-1.patch
-Patch2: 0010-Provide-timespec-for-centos-7.patch
 License: MIT
 Group: Other
 Url: https://cfengine.com
@@ -24,12 +23,6 @@ mkdir -p %{_builddir}
 %patch0 -p1
 %patch1 -p1
 
-# for some reason linux/time.h is not included and timespec struct is not defined which causes an error in crypto/thread/arch/thread_posix.c
-if [ "$OS_VERSION_MAJOR" = "7" ]
-then
-%patch2 -p1
-fi
-
 %build
 
 if [ -z "$MAKE" ]
@@ -68,11 +61,8 @@ then
     fi
     if [ "$OS_VERSION_MAJOR" = "7" ]
     then
-        # https://github.com/openssl/openssl/commit/232f17f065e089cab931d2babbed548e5958e6b2 introduced a skip of new b64 encoder which uses avx2, centos-7 gcc 4.8.2 lacks full support for the avx2 related code so we leverage _M_ARM64EC macro
-        # also, gcc 4.8.2 does not support some c99 constructs like in loop variable initialization so explicitly choose c99.
-        # as described in crypto/sleep.c if nanosleep is unavailable, define OPENSSL_USE_USLEEP
-        # in crypto/thread/arch/thread_posix.c deadline_ts is unused so skip that warning as error
-        HACK_FLAGS="-D_M_ARM64EC -std=c99 -DOPENSSL_USE_USLEEP -Wno-unused-variable"
+        # apparently our build doesn't quite work with devtoolset on centos so give it a hint where to find libraries with -L/opt/rh/devtoolset-11/root/usr/lib64
+        HACK_FLAGS="-L/opt/rh/devtoolset-11/root/usr/lib64"
     fi
 fi
 
@@ -178,8 +168,8 @@ CFEngine Build Automation -- openssl -- development files
 %{prefix}/bin/openssl
 
 %dir %{prefix}/lib
-%{prefix}/lib/libssl.so.3
-%{prefix}/lib/libcrypto.so.3
+%{prefix}/lib/libssl.so.4
+%{prefix}/lib/libcrypto.so.4
 %{prefix}/ssl/openssl.cnf
 %{prefix}/ssl/ct_log_list.cnf
 %{prefix}/ssl/ct_log_list.cnf.dist