fix: bump openssl to latest point release

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

Author: GordonSmith

dockerfiles/centos-7.dockerfile

@@ -14,6 +14,7 @@ RUN yum clean all && yum update -y && yum install -y \
     kernel-devel \
     libtool \
     perl-IPC-Cmd \
+    perl-Time-Piece \
     python3 \
     tar \
     unzip \

dockerfiles/rockylinux-8.dockerfile

@@ -14,6 +14,7 @@ RUN dnf install -y 'dnf-command(config-manager)' && \
     libtool \
     libtirpc-devel \
     perl-IPC-Cmd \
+    perl-Time-Piece \
     python3 \
     rpm-build \
     tar \

overlays/openssl/cmake-config.patch

@@ -0,0 +1,62 @@
+diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
+index 09303c4..487ff68 100644
+--- a/Configurations/unix-Makefile.tmpl
++++ b/Configurations/unix-Makefile.tmpl
+@@ -338,7 +338,7 @@ bindir={- file_name_is_absolute($bindir)
+           ? $bindir : '$(INSTALLTOP)/$(BINDIR)' -}
+ 
+ PKGCONFIGDIR=$(libdir)/pkgconfig
+-CMAKECONFIGDIR=$(libdir)/cmake/OpenSSL
++CMAKECONFIGDIR=$(INSTALLTOP)/share/openssl
+ 
+ MANDIR=$(INSTALLTOP)/share/man
+ DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
+diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
+index 894834c..d6d3c41 100644
+--- a/Configurations/windows-makefile.tmpl
++++ b/Configurations/windows-makefile.tmpl
+@@ -254,7 +254,7 @@ MODULESDIR=$(MODULESDIR_dev)$(MODULESDIR_dir)
+ libdir={- file_name_is_absolute($libdir)
+           ? $libdir : '$(INSTALLTOP)\$(LIBDIR)' -}
+ 
+-CMAKECONFIGDIR=$(libdir)\cmake\OpenSSL
++CMAKECONFIGDIR=$(INSTALLTOP)\share\openssl
+ 
+ ##### User defined commands and flags ################################
+ 
+diff --git a/exporters/cmake/OpenSSLConfig.cmake.in b/exporters/cmake/OpenSSLConfig.cmake.in
+index 766aebe..026680a 100644
+--- a/exporters/cmake/OpenSSLConfig.cmake.in
++++ b/exporters/cmake/OpenSSLConfig.cmake.in
+@@ -91,8 +91,7 @@ get_filename_component(_ossl_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH)
+ {-
+   # For each component in $OpenSSL::safe::installdata::CMAKECONFIGDIR[0] relative to
+   # $OpenSSL::safe::installdata::PREFIX[0], have CMake figure out the parent directory.
+-  my $d = join('/', unixify(catdir($OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0],
+-                                   $OpenSSL::safe::installdata::CMAKECONFIGDIR_REL_LIBDIR[0]), 1));
++  my $d = 'share/openssl';
+   $OUT = '';
+   if ($d ne '.') {
+       $OUT .= 'get_filename_component(_ossl_prefix "${_ossl_prefix}" PATH)' . "\n"
+@@ -141,6 +140,14 @@ set(OPENSSL_APPLINK_SOURCE "${_ossl_prefix}/{- unixify($OpenSSL::safe::installda
+ {- output_on() if $disabled{uplink}; "" -}
+ set(OPENSSL_PROGRAM "${OPENSSL_RUNTIME_DIR}/{- platform->bin('openssl') -}")
+ 
++if(NOT Z_VCPKG_OPENSSL_USE_SINGLE_CONFIG)
++  # Prevent loop
++  set(Z_VCPKG_OPENSSL_USE_SINGLE_CONFIG "prevent-loop")
++  # Chainload vcpkg's module-based multi-config target setup
++  find_package(OpenSSL MODULE)
++  set(Z_VCPKG_OPENSSL_USE_SINGLE_CONFIG 0)
++else()
++  # Use official single-config target setup
+ # Set up the imported targets
+ if(_ossl_use_static_libs)
+ {- output_off() unless $no_static; "" -}
+@@ -240,5 +247,6 @@ set_property(TARGET OpenSSL::applink PROPERTY
+   INTERFACE_SOURCES "${OPENSSL_APPLINK_SOURCE}")
+ {- output_on() if $disabled{uplink}; "" -}
+ 
++endif()
+ unset(_ossl_prefix)
+ unset(_ossl_use_static_libs)

overlays/openssl/command-line-length.patch

@@ -0,0 +1,13 @@
+diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
+index 8ddb128..52b9ad6 100644
+--- a/Configurations/unix-Makefile.tmpl
++++ b/Configurations/unix-Makefile.tmpl
+@@ -1961,7 +1961,7 @@ EOF
+       my @objs = map { platform->obj($_) } @{$args{objs}};
+       my $deps = join(" \\\n" . ' ' x (length($lib) + 2),
+                       fill_lines(' ', $COLUMNS - length($lib) - 2, @objs));
+-      my $max_per_call = 500;
++      my $max_per_call = ($^O eq 'msys') ? 80 : 500;
+       my @objs_grouped;
+       push @objs_grouped, join(" ", splice @objs, 0, $max_per_call) while @objs;
+       my $fill_lib =

overlays/openssl/install-pc-files.cmake

@@ -0,0 +1,32 @@
+function(install_pc_file name pc_data)
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY)
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY)
+    endif()
+endfunction()
+
+install_pc_file(openssl [[
+Name: OpenSSL
+Description: Secure Sockets Layer and cryptography libraries and tools
+Requires: libssl libcrypto
+]])
+
+install_pc_file(libssl [[
+Name: OpenSSL-libssl
+Description: Secure Sockets Layer and cryptography libraries
+Libs: -L"${libdir}" -llibssl
+Requires: libcrypto
+Cflags: -I"${includedir}"
+]])
+
+install_pc_file(libcrypto [[
+Name: OpenSSL-libcrypto
+Description: OpenSSL cryptography library
+Libs: -L"${libdir}" -llibcrypto
+Libs.private: -lcrypt32 -lws2_32 -ladvapi32 -luser32
+Cflags: -I"${includedir}"
+]])
+
+vcpkg_fixup_pkgconfig()

overlays/openssl/openssl.pc.in

@@ -0,0 +1,6 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+Version: @VERSION@
+@pc_data@

overlays/openssl/portfile.cmake

@@ -0,0 +1,92 @@
+if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libressl/copyright"
+    OR EXISTS "${CURRENT_INSTALLED_DIR}/share/boringssl/copyright")
+    message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.")
+endif()
+
+if(VCPKG_TARGET_IS_EMSCRIPTEN)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO openssl/openssl
+    REF "openssl-${VERSION}"
+    SHA512 d95cf4efa524b8c251e45e1516b943d070bd0afd42b6fa174106085e1d92a703ee565a281502723390c22921bfdfae2b6121e5dc3699747e79692767cf6cad7a
+    PATCHES
+        cmake-config.patch
+        command-line-length.patch
+        script-prefix.patch
+        windows/install-layout.patch
+        windows/install-pdbs.patch
+        unix/android-cc.patch
+        unix/move-openssldir.patch
+        unix/no-empty-dirs.patch
+        unix/no-static-libs-for-shared.patch
+)
+
+vcpkg_list(SET CONFIGURE_OPTIONS
+    enable-static-engine
+    enable-capieng
+    no-tests
+    no-docs
+)
+
+# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-ec_nistp_64_gcc_128
+vcpkg_cmake_get_vars(cmake_vars_file)
+include("${cmake_vars_file}")
+if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$"
+   AND VCPKG_TARGET_ARCHITECTURE MATCHES "^(x64|arm64|riscv64|ppc64le)$")
+    vcpkg_list(APPEND CONFIGURE_OPTIONS enable-ec_nistp_64_gcc_128)
+endif()
+
+set(INSTALL_FIPS "")
+if("fips" IN_LIST FEATURES)
+    vcpkg_list(APPEND INSTALL_FIPS install_fips)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS enable-fips)
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_list(APPEND CONFIGURE_OPTIONS shared)
+else()
+    vcpkg_list(APPEND CONFIGURE_OPTIONS no-shared no-module)
+endif()
+
+if(NOT "tools" IN_LIST FEATURES)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS no-apps)
+endif()
+
+if("weak-ssl-ciphers" IN_LIST FEATURES)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS enable-weak-ssl-ciphers)
+endif()
+
+if("ssl3" IN_LIST FEATURES)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS enable-ssl3)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS enable-ssl3-method)
+endif()
+
+if(DEFINED OPENSSL_USE_NOPINSHARED)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS no-pinshared)
+endif()
+
+if(OPENSSL_NO_AUTOLOAD_CONFIG)
+    vcpkg_list(APPEND CONFIGURE_OPTIONS no-autoload-config)
+endif()
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    include("${CMAKE_CURRENT_LIST_DIR}/windows/portfile.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake")
+else()
+    include("${CMAKE_CURRENT_LIST_DIR}/unix/portfile.cmake")
+endif()
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+if (NOT "${VERSION}" MATCHES [[^([0-9]+)\.([0-9]+)\.([0-9]+)$]])
+    message(FATAL_ERROR "Version regex did not match.")
+endif()
+set(OPENSSL_VERSION_MAJOR "${CMAKE_MATCH_1}")
+set(OPENSSL_VERSION_MINOR "${CMAKE_MATCH_2}")
+set(OPENSSL_VERSION_FIX "${CMAKE_MATCH_3}")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")

overlays/openssl/script-prefix.patch

@@ -0,0 +1,22 @@
+diff --git a/tools/c_rehash.in b/tools/c_rehash.in
+index 343cdc1..e48038e 100644
+--- a/tools/c_rehash.in
++++ b/tools/c_rehash.in
+@@ -12,7 +12,7 @@
+ # and add symbolic links to their hash values.
+ 
+ my $dir = {- quotify1($config{openssldir}) -};
+-my $prefix = {- quotify1($config{prefix}) -};
++use FindBin;
+ 
+ my $errorcount = 0;
+ my $openssl = $ENV{OPENSSL} || "openssl";
+@@ -61,7 +61,7 @@ if (defined(&Cwd::getcwd)) {
+ 
+ # DOS/Win32 or Unix delimiter?  Prefix our installdir, then search.
+ my $path_delim = ($pwd =~ /^[a-z]\:/i) ? ';' : ':';
+-$ENV{PATH} = "$prefix/bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : "");
++$ENV{PATH} = "$FindBin::Bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : "");
+ 
+ if (!(-f $openssl && -x $openssl)) {
+     my $found = 0;

overlays/openssl/unix/android-cc.patch

@@ -0,0 +1,20 @@
+diff --git a/Configurations/15-android.conf b/Configurations/15-android.conf
+index 41ad922..d15e34c 100644
+--- a/Configurations/15-android.conf
++++ b/Configurations/15-android.conf
+@@ -102,6 +102,7 @@
+             my $cflags;
+             my $cppflags;
+ 
++if (0) {
+             # see if there is NDK clang on $PATH, "universal" or "standalone"
+             if (which("clang") =~ m|^$ndk/.*/prebuilt/([^/]+)/|) {
+                 my $host=$1;
+@@ -158,6 +159,7 @@
+                 $sysroot =~ s|^$ndk/||;
+                 $sysroot = " --sysroot=\$($ndk_var)/$sysroot";
+             }
++}
+             $android_ndk = {
+                 cflags   => $cflags . $sysroot,
+                 cppflags => $cppflags,

overlays/openssl/unix/configure

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+set -e
+
+declare -a OUT_OPTIONS
+
+INTERPRETER=perl
+
+LAST_SEEN=
+COPY_OPTIONS=no
+for OPTION; do
+    case "${OPTION},${COPY_OPTIONS}" in
+    */Configure,no)
+        OUT_OPTIONS+=("${OPTION}")
+        INTERPRETER="${LAST_SEEN}"
+        COPY_OPTIONS=yes
+        ;;
+    --prefix=*|--openssldir=*|--libdir=*|--cross-compile-prefix=*|--debug,*)
+        OUT_OPTIONS+=("${OPTION}")
+        ;;
+    -*|*=*)
+        ;;
+    *,yes)
+        OUT_OPTIONS+=("${OPTION}")
+        ;;
+    esac
+    LAST_SEEN="${OPTION}"
+done
+
+set -x
+"${INTERPRETER}" ${OUT_OPTIONS[@]}