[gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/files/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     461af5da2a85cb794b2f4fe217f43e94201f4c59
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Dec 18 16:18:20 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 19:50:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=461af5da

dev-libs/openssl: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/openssl-3.3.1-cmake-generator.patch      |  55 ----
 .../files/openssl-3.3.1-pkg-config-deux.patch      | 303 ---------------------
 .../openssl/files/openssl-3.3.1-pkg-config.patch   |  31 ---
 dev-libs/openssl/files/openssl-3.3.1-riscv.patch   |  96 -------
 4 files changed, 485 deletions(-)

diff --git a/dev-libs/openssl/files/openssl-3.3.1-cmake-generator.patch b/dev-libs/openssl/files/openssl-3.3.1-cmake-generator.patch
deleted file mode 100644
index bb8fdbe3f241..000000000000
--- a/dev-libs/openssl/files/openssl-3.3.1-cmake-generator.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.gentoo.org/937457
-https://github.com/openssl/openssl/commit/419fb4ea4be4c0b28c63b494ff30fa3510aba06e
-
-From 419fb4ea4be4c0b28c63b494ff30fa3510aba06e Mon Sep 17 00:00:00 2001
-From: Neil Horman <nhorman@openssl.org>
-Date: Sun, 14 Jul 2024 08:57:25 -0400
-Subject: [PATCH] Fix cmake generator
-
-PR #24678 modified some environment variables and locations that the
-cmake exporter depended on, resulting in empty directory resolution.
-Adjust build build.info and input variable names to match up again
-
-Fixes #24874
-
-Reviewed-by: Richard Levitte <levitte@openssl.org>
-Reviewed-by: Tomas Mraz <tomas@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/24877)
-
-(cherry picked from commit c1a27bdeb9a4f915aa92ed0e74ed48a1f9b94176)
---- a/build.info
-+++ b/build.info
-@@ -102,6 +102,11 @@ IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-|BC-)/ -}]
- ENDIF
- 
- # This file sets the build directory up for CMake inclusion
-+# Note: This generation of OpenSSLConfig[Version].cmake is used
-+# for building openssl locally, and so the build variables are 
-+# taken from builddata.pm rather than installdata.pm.  For exportable
-+# versions of these generated files, you'll find them in the exporters
-+# directory
- GENERATE[OpenSSLConfig.cmake]=exporters/cmake/OpenSSLConfig.cmake.in
- DEPEND[OpenSSLConfig.cmake]=builddata.pm
- GENERATE[OpenSSLConfigVersion.cmake]=exporters/cmake/OpenSSLConfigVersion.cmake.in
---- a/exporters/cmake/OpenSSLConfig.cmake.in
-+++ b/exporters/cmake/OpenSSLConfig.cmake.in
-@@ -127,13 +127,13 @@ set(OPENSSL_VERSION_FIX "${OpenSSL_VERSION_PATCH}")
- set(OPENSSL_FOUND YES)
- 
- # Directories and names
--set(OPENSSL_INCLUDE_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::INCLUDEDIR_REL, 1); -}")
--set(OPENSSL_LIBRARY_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::LIBDIR_REL, 1); -}")
--set(OPENSSL_ENGINES_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::ENGINESDIR_REL, 1); -}")
--set(OPENSSL_MODULES_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::MODULESDIR_REL, 1); -}")
--set(OPENSSL_RUNTIME_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::BINDIR_REL, 1); -}")
-+set(OPENSSL_LIBRARY_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::LIBDIR_REL_PREFIX, 1); -}")
-+set(OPENSSL_INCLUDE_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX, 1); -}")
-+set(OPENSSL_ENGINES_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::LIBDIR_REL_PREFIX, 1); -}/{- unixify($OpenSSL::safe::installdata::ENGINESDIR_REL_LIBDIR, 1); -}")
-+set(OPENSSL_MODULES_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::LIBDIR_REL_PREFIX, 1); -}/{- unixify($OpenSSL::safe::installdata::MODULESDIR_REL_LIBDIR, 1); -}")
-+set(OPENSSL_RUNTIME_DIR "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::BINDIR_REL_PREFIX, 1); -}")
- {- output_off() if $disabled{uplink}; "" -}
--set(OPENSSL_APPLINK_SOURCE "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::APPLINKDIR_REL, 1); -}/applink.c")
-+set(OPENSSL_APPLINK_SOURCE "${_ossl_prefix}/{- unixify($OpenSSL::safe::installdata::APPLINKDIR_REL_PREFIX, 1); -}/applink.c")
- {- output_on() if $disabled{uplink}; "" -}
- set(OPENSSL_PROGRAM "${OPENSSL_RUNTIME_DIR}/{- platform->bin('openssl') -}")
- 

diff --git a/dev-libs/openssl/files/openssl-3.3.1-pkg-config-deux.patch b/dev-libs/openssl/files/openssl-3.3.1-pkg-config-deux.patch
deleted file mode 100644
index a5ad9987eb57..000000000000
--- a/dev-libs/openssl/files/openssl-3.3.1-pkg-config-deux.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-https://github.com/openssl/openssl/pull/24687
-https://bugs.gentoo.org/936576
-
-https://github.com/openssl/openssl/commit/aa099dba7c80c723cf4babf5adc0c801f1c28363
-https://github.com/openssl/openssl/commit/1c437b5704c9ee5f667bc2b11e5fdf176dfb714f
-
-From aa099dba7c80c723cf4babf5adc0c801f1c28363 Mon Sep 17 00:00:00 2001
-From: Richard Levitte <levitte@openssl.org>
-Date: Thu, 20 Jun 2024 14:30:16 +0200
-Subject: [PATCH] Give util/mkinstallvars.pl more fine grained control over var
- dependencies
-
-Essentially, we try to do what GNU does.  'prefix' is used to define the
-defaults for 'exec_prefix' and 'libdir', and these are then used to define
-further directory values.  util/mkinstallvars.pl is changed to reflect that
-to the best of our ability.
-
-Reviewed-by: Neil Horman <nhorman@openssl.org>
-Reviewed-by: Tomas Mraz <tomas@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/24687)
-
-(cherry picked from commit 6e0fd246e7a6e51f92b2ef3520bfc4414b7773c0)
----
- exporters/build.info  |   2 +-
- util/mkinstallvars.pl | 133 ++++++++++++++++++++++++++----------------
- 2 files changed, 85 insertions(+), 50 deletions(-)
-
-diff --git a/exporters/build.info b/exporters/build.info
-index 86acf2df9467c..9241dc9b0a658 100644
---- a/exporters/build.info
-+++ b/exporters/build.info
-@@ -19,7 +19,7 @@ DEPEND[openssl.pc]=libcrypto.pc libssl.pc
- DEPEND[""]=openssl.pc
- 
- GENERATE[../installdata.pm]=../util/mkinstallvars.pl \
--    "PREFIX=$(INSTALLTOP)" BINDIR=bin "LIBDIR=$(LIBDIR)" \
-+    "PREFIX=$(INSTALLTOP)" BINDIR=bin "LIBDIR=$(LIBDIR)" "libdir=$(libdir)" \
-     INCLUDEDIR=include APPLINKDIR=include/openssl \
-     "ENGINESDIR=$(ENGINESDIR)" "MODULESDIR=$(MODULESDIR)" \
-     "PKGCONFIGDIR=$(PKGCONFIGDIR)" "CMAKECONFIGDIR=$(CMAKECONFIGDIR)" \
-diff --git a/util/mkinstallvars.pl b/util/mkinstallvars.pl
-index 59a432d28c601..5fadb708e1b77 100644
---- a/util/mkinstallvars.pl
-+++ b/util/mkinstallvars.pl
-@@ -11,13 +11,25 @@
- # The result is a Perl module creating the package OpenSSL::safe::installdata.
- 
- use File::Spec;
-+use List::Util qw(pairs);
- 
- # These are expected to be set up as absolute directories
--my @absolutes = qw(PREFIX);
-+my @absolutes = qw(PREFIX libdir);
- # These may be absolute directories, and if not, they are expected to be set up
--# as subdirectories to PREFIX
--my @subdirs = qw(BINDIR LIBDIR INCLUDEDIR APPLINKDIR ENGINESDIR MODULESDIR
--                 PKGCONFIGDIR CMAKECONFIGDIR);
-+# as subdirectories to PREFIX or LIBDIR.  The order of the pairs is important,
-+# since the LIBDIR subdirectories depend on the calculation of LIBDIR from
-+# PREFIX.
-+my @subdirs = pairs (PREFIX => [ qw(BINDIR LIBDIR INCLUDEDIR APPLINKDIR) ],
-+                     LIBDIR => [ qw(ENGINESDIR MODULESDIR PKGCONFIGDIR
-+                                    CMAKECONFIGDIR) ]);
-+# For completeness, other expected variables
-+my @others = qw(VERSION LDLIBS);
-+
-+my %all = ( );
-+foreach (@absolutes) { $all{$_} = 1 }
-+foreach (@subdirs) { foreach (@{$_->[1]}) { $all{$_} = 1 } }
-+foreach (@others) { $all{$_} = 1 }
-+print STDERR "DEBUG: all keys: ", join(", ", sort keys %all), "\n";
- 
- my %keys = ();
- foreach (@ARGV) {
-@@ -26,29 +38,47 @@
-     $ENV{$k} = $v;
- }
- 
--foreach my $k (sort keys %keys) {
--    my $v = $ENV{$k};
--    $v = File::Spec->rel2abs($v) if $v && grep { $k eq $_ } @absolutes;
--    $ENV{$k} = $v;
-+# warn if there are missing values, and also if there are unexpected values
-+foreach my $k (sort keys %all) {
-+    warn "No value given for $k\n" unless $keys{$k};
- }
- foreach my $k (sort keys %keys) {
-+    warn "Unknown variable $k\n" unless $all{$k};
-+}
-+
-+# This shouldn't be needed, but just in case we get relative paths that
-+# should be absolute, make sure they actually are.
-+foreach my $k (@absolutes) {
-     my $v = $ENV{$k} || '.';
-+    print STDERR "DEBUG: $k = $v => ";
-+    $v = File::Spec->rel2abs($v) if $v;
-+    $ENV{$k} = $v;
-+    print STDERR "$k = $ENV{$k}\n";
-+}
- 
--    # Absolute paths for the subdir variables are computed.  This provides
--    # the usual form of values for names that have become norm, known as GNU
--    # installation paths.
--    # For the benefit of those that need it, the subdirectories are preserved
--    # as they are, using the same variable names, suffixed with '_REL', if they
--    # are indeed subdirectories.
--    if (grep { $k eq $_ } @subdirs) {
-+# Absolute paths for the subdir variables are computed.  This provides
-+# the usual form of values for names that have become norm, known as GNU
-+# installation paths.
-+# For the benefit of those that need it, the subdirectories are preserved
-+# as they are, using the same variable names, suffixed with '_REL_{var}',
-+# if they are indeed subdirectories.  The '{var}' part of the name tells
-+# which other variable value they are relative to.
-+foreach my $pair (@subdirs) {
-+    my ($var, $subdir_vars) = @$pair;
-+    foreach my $k (@$subdir_vars) {
-+        my $v = $ENV{$k} || '.';
-+        print STDERR "DEBUG: $k = $v => ";
-         if (File::Spec->file_name_is_absolute($v)) {
--            $ENV{"${k}_REL"} = File::Spec->abs2rel($v, $ENV{PREFIX});
-+            my $kr = "${k}_REL_${var}";
-+            $ENV{$kr} = File::Spec->abs2rel($v, $ENV{$var});
-+            print STDERR "$kr = $ENV{$kr}\n";
-         } else {
--            $ENV{"${k}_REL"} = $v;
--            $v = File::Spec->rel2abs($v, $ENV{PREFIX});
-+            my $kr = "${k}_REL_${var}";
-+            $ENV{$kr} = $v;
-+            $ENV{$k} = File::Spec->rel2abs($v, $ENV{$var});
-+            print STDERR "$k = $ENV{$k} ,  $kr = $v\n";
-         }
-     }
--    $ENV{$k} = $v;
- }
- 
- print <<_____;
-@@ -58,36 +88,41 @@ package OpenSSL::safe::installdata;
- use warnings;
- use Exporter;
- our \@ISA = qw(Exporter);
--our \@EXPORT = qw(\$PREFIX
--                  \$BINDIR \$BINDIR_REL
--                  \$LIBDIR \$LIBDIR_REL
--                  \$INCLUDEDIR \$INCLUDEDIR_REL
--                  \$APPLINKDIR \$APPLINKDIR_REL
--                  \$ENGINESDIR \$ENGINESDIR_REL
--                  \$MODULESDIR \$MODULESDIR_REL
--                  \$PKGCONFIGDIR \$PKGCONFIGDIR_REL
--                  \$CMAKECONFIGDIR \$CMAKECONFIGDIR_REL
--                  \$VERSION \@LDLIBS);
--
--our \$PREFIX             = '$ENV{PREFIX}';
--our \$BINDIR             = '$ENV{BINDIR}';
--our \$BINDIR_REL         = '$ENV{BINDIR_REL}';
--our \$LIBDIR             = '$ENV{LIBDIR}';
--our \$LIBDIR_REL         = '$ENV{LIBDIR_REL}';
--our \$INCLUDEDIR         = '$ENV{INCLUDEDIR}';
--our \$INCLUDEDIR_REL     = '$ENV{INCLUDEDIR_REL}';
--our \$APPLINKDIR         = '$ENV{APPLINKDIR}';
--our \$APPLINKDIR_REL     = '$ENV{APPLINKDIR_REL}';
--our \$ENGINESDIR         = '$ENV{ENGINESDIR}';
--our \$ENGINESDIR_REL     = '$ENV{ENGINESDIR_REL}';
--our \$MODULESDIR         = '$ENV{MODULESDIR}';
--our \$MODULESDIR_REL     = '$ENV{MODULESDIR_REL}';
--our \$PKGCONFIGDIR       = '$ENV{PKGCONFIGDIR}';
--our \$PKGCONFIGDIR_REL   = '$ENV{PKGCONFIGDIR_REL}';
--our \$CMAKECONFIGDIR     = '$ENV{CMAKECONFIGDIR}';
--our \$CMAKECONFIGDIR_REL = '$ENV{CMAKECONFIGDIR_REL}';
--our \$VERSION            = '$ENV{VERSION}';
--our \@LDLIBS             =
-+our \@EXPORT = qw(
-+_____
-+
-+foreach my $k (@absolutes) {
-+    print "    \$$k\n";
-+}
-+foreach my $pair (@subdirs) {
-+    my ($var, $subdir_vars) = @$pair;
-+    foreach my $k (@$subdir_vars) {
-+        my $k2 = "${k}_REL_${var}";
-+        print "    \$$k \$$k2\n";
-+    }
-+}
-+
-+print <<_____;
-+    \$VERSION \@LDLIBS
-+);
-+
-+_____
-+
-+foreach my $k (@absolutes) {
-+    print "our \$$k" . ' ' x (27 - length($k)) . "= '$ENV{$k}';\n";
-+}
-+foreach my $pair (@subdirs) {
-+    my ($var, $subdir_vars) = @$pair;
-+    foreach my $k (@$subdir_vars) {
-+        my $k2 = "${k}_REL_${var}";
-+        print "our \$$k" . ' ' x (27 - length($k)) . "= '$ENV{$k}';\n";
-+        print "our \$$k2" . ' ' x (27 - length($k2)) . "= '$ENV{$k2}';\n";
-+    }
-+}
-+
-+print <<_____;
-+our \$VERSION                    = '$ENV{VERSION}';
-+our \@LDLIBS                     =
-     # Unix and Windows use space separation, VMS uses comma separation
-     split(/ +| *, */, '$ENV{LDLIBS}');
- 
-
-From 1c437b5704c9ee5f667bc2b11e5fdf176dfb714f Mon Sep 17 00:00:00 2001
-From: Richard Levitte <levitte@openssl.org>
-Date: Thu, 20 Jun 2024 14:33:15 +0200
-Subject: [PATCH] Adapt all the exporter files to the new vars from
- util/mkinstallvars.pl
-
-With this, the pkg-config files take better advantage of relative directory
-values.
-
-Fixes #24298
-
-Reviewed-by: Neil Horman <nhorman@openssl.org>
-Reviewed-by: Tomas Mraz <tomas@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/24687)
-
-(cherry picked from commit 30dc37d798a0428fd477d3763086e7e97b3d596f)
----
- exporters/cmake/OpenSSLConfig.cmake.in |  7 ++++---
- exporters/pkg-config/libcrypto.pc.in   | 12 ++++++++----
- exporters/pkg-config/libssl.pc.in      |  8 ++++++--
- exporters/pkg-config/openssl.pc.in     |  8 ++++++--
- 4 files changed, 24 insertions(+), 11 deletions(-)
-
-diff --git a/exporters/cmake/OpenSSLConfig.cmake.in b/exporters/cmake/OpenSSLConfig.cmake.in
-index 2d2321931de1d..06f796158b2fa 100644
---- a/exporters/cmake/OpenSSLConfig.cmake.in
-+++ b/exporters/cmake/OpenSSLConfig.cmake.in
-@@ -89,9 +89,10 @@ unset(_ossl_undefined_targets)
- # Set up the import path, so all other import paths are made relative this file
- get_filename_component(_ossl_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH)
- {-
--  # For each component in $OpenSSL::safe::installdata::CMAKECONFIGDIR_REL, have CMake
--  # out the parent directory.
--  my $d = unixify($OpenSSL::safe::installdata::CMAKECONFIGDIR_REL);
-+  # For each component in $OpenSSL::safe::installdata::CMAKECONFIGDIR relative to
-+  # $OpenSSL::safe::installdata::PREFIX, have CMake figure out the parent directory.
-+  my $d = join('/', unixify($OpenSSL::safe::installdata::LIBDIR_REL_PREFIX),
-+                    unixify($OpenSSL::safe::installdata::CMAKECONFIGDIR_REL_LIBDIR));
-   $OUT = '';
-   $OUT .= 'get_filename_component(_ossl_prefix "${_ossl_prefix}" PATH)' . "\n"
-       foreach (split '/', $d);
-diff --git a/exporters/pkg-config/libcrypto.pc.in b/exporters/pkg-config/libcrypto.pc.in
-index 14ed339f3c3a0..fbc8ea4c79b06 100644
---- a/exporters/pkg-config/libcrypto.pc.in
-+++ b/exporters/pkg-config/libcrypto.pc.in
-@@ -1,7 +1,11 @@
--libdir={- $OpenSSL::safe::installdata::LIBDIR -}
--includedir={- $OpenSSL::safe::installdata::INCLUDEDIR -}
--enginesdir={- $OpenSSL::safe::installdata::ENGINESDIR -}
--modulesdir={- $OpenSSL::safe::installdata::MODULESDIR -}
-+prefix={- $OpenSSL::safe::installdata::PREFIX -}
-+exec_prefix=${prefix}
-+libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX
-+          ? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX
-+          : $OpenSSL::safe::installdata::libdir -}
-+includedir=${prefix}/{- $OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX -}
-+enginesdir=${libdir}/{- $OpenSSL::safe::installdata::ENGINESDIR_REL_LIBDIR -}
-+modulesdir=${libdir}/{- $OpenSSL::safe::installdata::MODULESDIR_REL_LIBDIR -}
- 
- Name: OpenSSL-libcrypto
- Description: OpenSSL cryptography library
-diff --git a/exporters/pkg-config/libssl.pc.in b/exporters/pkg-config/libssl.pc.in
-index a7828b3cc6a49..963538807bb2b 100644
---- a/exporters/pkg-config/libssl.pc.in
-+++ b/exporters/pkg-config/libssl.pc.in
-@@ -1,5 +1,9 @@
--libdir={- $OpenSSL::safe::installdata::LIBDIR -}
--includedir={- $OpenSSL::safe::installdata::INCLUDEDIR -}
-+prefix={- $OpenSSL::safe::installdata::PREFIX -}
-+exec_prefix=${prefix}
-+libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX
-+          ? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX
-+          : $OpenSSL::safe::installdata::libdir -}
-+includedir=${prefix}/{- $OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX -}
- 
- Name: OpenSSL-libssl
- Description: Secure Sockets Layer and cryptography libraries
-diff --git a/exporters/pkg-config/openssl.pc.in b/exporters/pkg-config/openssl.pc.in
-index dbb77aa39add2..225bef9e2384d 100644
---- a/exporters/pkg-config/openssl.pc.in
-+++ b/exporters/pkg-config/openssl.pc.in
-@@ -1,5 +1,9 @@
--libdir={- $OpenSSL::safe::installdata::LIBDIR -}
--includedir={- $OpenSSL::safe::installdata::INCLUDEDIR -}
-+prefix={- $OpenSSL::safe::installdata::PREFIX -}
-+exec_prefix=${prefix}
-+libdir={- $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX
-+          ? '${exec_prefix}/' . $OpenSSL::safe::installdata::LIBDIR_REL_PREFIX
-+          : $OpenSSL::safe::installdata::libdir -}
-+includedir=${prefix}/{- $OpenSSL::safe::installdata::INCLUDEDIR_REL_PREFIX -}
- 
- Name: OpenSSL
- Description: Secure Sockets Layer and cryptography libraries and tools

diff --git a/dev-libs/openssl/files/openssl-3.3.1-pkg-config.patch b/dev-libs/openssl/files/openssl-3.3.1-pkg-config.patch
deleted file mode 100644
index b915b963509a..000000000000
--- a/dev-libs/openssl/files/openssl-3.3.1-pkg-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/openssl/openssl/pull/25018
-https://bugs.gentoo.org/936793
-
-From b7bd618fb12728b4a85b9159af95ca40a817674d Mon Sep 17 00:00:00 2001
-From: Richard Levitte <levitte@openssl.org>
-Date: Sun, 28 Jul 2024 10:47:08 +0200
-Subject: [PATCH] fix: util/mkinstallvars.pl mistreated LDLIBS on Unix (and
- Windows)
-
-Don't do comma separation on those platforms.
-
-Fixes #24986
----
- util/mkinstallvars.pl | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/util/mkinstallvars.pl b/util/mkinstallvars.pl
-index 5fadb708e1b77..e2b7d9d08321f 100644
---- a/util/mkinstallvars.pl
-+++ b/util/mkinstallvars.pl
-@@ -124,7 +124,9 @@ package OpenSSL::safe::installdata;
- our \$VERSION                    = '$ENV{VERSION}';
- our \@LDLIBS                     =
-     # Unix and Windows use space separation, VMS uses comma separation
--    split(/ +| *, */, '$ENV{LDLIBS}');
-+    \$^O eq 'VMS'
-+    ? split(/ *, */, '$ENV{LDLIBS}')
-+    : split(/ +/, '$ENV{LDLIBS}');
- 
- 1;
- _____

diff --git a/dev-libs/openssl/files/openssl-3.3.1-riscv.patch b/dev-libs/openssl/files/openssl-3.3.1-riscv.patch
deleted file mode 100644
index 90cad6d92a00..000000000000
--- a/dev-libs/openssl/files/openssl-3.3.1-riscv.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-# https://bugs.gentoo.org/936311
-# Taken from https://github.com/openssl/openssl/pull/24486
-
-From b1dd4a8005cf172053d986c0dd85fd104f005307 Mon Sep 17 00:00:00 2001
-From: Hongren Zheng <i@zenithal.me>
-Date: Fri, 24 May 2024 14:12:47 +0800
-Subject: [PATCH] riscv: Fix cpuid_obj asm checks for sm4/sm3
-
-Similar to #22881 / #23752
----
- crypto/sm3/sm3_local.h                                | 2 +-
- include/crypto/sm4_platform.h                         | 2 +-
- providers/implementations/ciphers/cipher_sm4_ccm_hw.c | 2 +-
- providers/implementations/ciphers/cipher_sm4_gcm_hw.c | 2 +-
- providers/implementations/ciphers/cipher_sm4_hw.c     | 2 +-
- providers/implementations/ciphers/cipher_sm4_xts_hw.c | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/crypto/sm3/sm3_local.h b/crypto/sm3/sm3_local.h
-index d2845f9678967..a467cc98eb13e 100644
---- a/crypto/sm3/sm3_local.h
-+++ b/crypto/sm3/sm3_local.h
-@@ -39,7 +39,7 @@
- #  define HWSM3_CAPABLE (OPENSSL_armcap_P & ARMV8_SM3)
- void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
- # endif
--# if defined(__riscv) && __riscv_xlen == 64
-+# if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
- #  include "crypto/riscv_arch.h"
- #  define HWSM3_CAPABLE 1
- void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
-diff --git a/include/crypto/sm4_platform.h b/include/crypto/sm4_platform.h
-index 928dc17ff0838..4d70d291450a1 100644
---- a/include/crypto/sm4_platform.h
-+++ b/include/crypto/sm4_platform.h
-@@ -38,7 +38,7 @@ static inline int vpsm4_ex_capable(void)
- #   define HWSM4_cbc_encrypt sm4_v8_cbc_encrypt
- #   define HWSM4_ecb_encrypt sm4_v8_ecb_encrypt
- #   define HWSM4_ctr32_encrypt_blocks sm4_v8_ctr32_encrypt_blocks
--#  elif defined(__riscv) && __riscv_xlen == 64
-+#  elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
- /* RV64 support */
- #   include "riscv_arch.h"
- /* Zvksed extension (vector crypto SM4). */
-diff --git a/providers/implementations/ciphers/cipher_sm4_ccm_hw.c b/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
-index 34f0e751e007d..293bb69d64272 100644
---- a/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
-+++ b/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
-@@ -59,7 +59,7 @@ static const PROV_CCM_HW ccm_sm4 = {
-     ossl_ccm_generic_gettag
- };
- 
--#if defined(__riscv) && __riscv_xlen == 64
-+#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
- # include "cipher_sm4_ccm_hw_rv64i.inc"
- #else
- const PROV_CCM_HW *ossl_prov_sm4_hw_ccm(size_t keybits)
-diff --git a/providers/implementations/ciphers/cipher_sm4_gcm_hw.c b/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
-index 06ca450782ff2..e3b4e9f588807 100644
---- a/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
-+++ b/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
-@@ -89,7 +89,7 @@ static const PROV_GCM_HW sm4_gcm = {
-     ossl_gcm_one_shot
- };
- 
--#if defined(__riscv) && __riscv_xlen == 64
-+#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
- # include "cipher_sm4_gcm_hw_rv64i.inc"
- #else
- const PROV_GCM_HW *ossl_prov_sm4_hw_gcm(size_t keybits)
-diff --git a/providers/implementations/ciphers/cipher_sm4_hw.c b/providers/implementations/ciphers/cipher_sm4_hw.c
-index c4f2f97cccd8d..70dc66ffae233 100644
---- a/providers/implementations/ciphers/cipher_sm4_hw.c
-+++ b/providers/implementations/ciphers/cipher_sm4_hw.c
-@@ -134,7 +134,7 @@ const PROV_CIPHER_HW *ossl_prov_cipher_hw_sm4_##mode(size_t keybits)           \
-     return &sm4_##mode;                                                        \
- }
- 
--#if defined(__riscv) && __riscv_xlen == 64
-+#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
- # include "cipher_sm4_hw_rv64i.inc"
- #else
- /* The generic case */
-diff --git a/providers/implementations/ciphers/cipher_sm4_xts_hw.c b/providers/implementations/ciphers/cipher_sm4_xts_hw.c
-index 6cf58e851f5d4..423598317d217 100644
---- a/providers/implementations/ciphers/cipher_sm4_xts_hw.c
-+++ b/providers/implementations/ciphers/cipher_sm4_xts_hw.c
-@@ -89,7 +89,7 @@ static const PROV_CIPHER_HW sm4_generic_xts = {
-     cipher_hw_sm4_xts_copyctx
- };
- 
--#if defined(__riscv) && __riscv_xlen == 64
-+#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
- # include "cipher_sm4_xts_hw_rv64i.inc"
- #else
- const PROV_CIPHER_HW *ossl_prov_cipher_hw_sm4_xts(size_t keybits)