upgrade to openssl 3.0.7

Change-Id: I92eb4f6ce4c7eb38651ed94b9704ce10804e5224
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142180
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 6 insertions, 61 deletions

diff --git a/external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1 b/external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1
deleted file mode 100644
index 45ce5a9038e5..000000000000
--- a/external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1
+++ /dev/null
@@ -1,54 +0,0 @@
-From c04b8819161de007cee831dd9e58dde52268da18 Mon Sep 17 00:00:00 2001
-From: Richard Levitte <levitte@openssl.org>
-Date: Mon, 25 Jul 2022 08:07:33 +0200
-Subject: [PATCH] Configurations/10-main.conf: In the VC-common target, unquote
- $(CC)
-
-Some of the VC-common attributes have values that use `$(CC)`, wrapped with
-quotes.  However, `Configurations/windows-makefile.tmpl` already quotes the
-`CC` value, like this:
-
-    CC="{- $config{CC} -}"
-
-The interaction between that makefile variable and the attributes using
-`$(CC)` wrapped with quotes is a command line with the quotes doubled.  For
-example, the value of `$(CPP)` becomes `""cl""`.
-
-Strangely enough, this appears to be tolerated, at least on some versions of
-Windows.  However, this has been reported not to be the case.
-
-This is fixed by removing the quotes in `Configurations/10-main.conf`,
-making `Configurations/windows-makefile.tmpl` responsible for proper
-quoting.
-
-Fixes #18823
-
-Reviewed-by: Hugo Landau <hlandau@openssl.org>
-Reviewed-by: Matt Caswell <matt@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/18861)
----
- Configurations/10-main.conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
-index c824f4ed4a0..73ace78bc41 100644
---- a/Configurations/10-main.conf
-+++ b/Configurations/10-main.conf
-@@ -1309,7 +1309,7 @@ my %targets = (
-         inherit_from     => [ "BASE_Windows" ],
-         template         => 1,
-         CC               => "cl",
--        CPP              => '"$(CC)" /EP /C',
-+        CPP              => '$(CC) /EP /C',
-         CFLAGS           => "/W3 /wd4090 /nologo",
-         coutflag         => "/Fo",
-         LD               => "link",
-@@ -1318,7 +1318,7 @@ my %targets = (
-         ldpostoutflag    => "",
-         ld_resp_delim    => "\n",
-         bin_lflags       => "setargv.obj",
--        makedepcmd       => '"$(CC)" /Zs /showIncludes',
-+        makedepcmd       => '$(CC) /Zs /showIncludes',
-         makedep_scheme   => 'VC',
-         AR               => "lib",
-         ARFLAGS          => "/nologo",
diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk
index 18ed71850627..2a8f3bb3f905 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
 	external/openssl/openssl-no-multilib.patch.0 \
 	external/openssl/configurable-z-option.patch.0 \
 	external/openssl/openssl-no-ipc-cmd.patch.0 \
-	external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1 \
 	external/openssl/system-cannot-find-path-for-move.patch.0 \
 ))
 
diff --git a/external/openssl/openssl-no-ipc-cmd.patch.0 b/external/openssl/openssl-no-ipc-cmd.patch.0
index f844831a34ae..75ed669eabc9 100644
--- a/external/openssl/openssl-no-ipc-cmd.patch.0
+++ b/external/openssl/openssl-no-ipc-cmd.patch.0
@@ -1,15 +1,15 @@
 --- util/perl/OpenSSL/config.pm	2022-09-08 11:45:57.408532119 +0100
 +++ util/perl/OpenSSL/config.pm	2022-09-08 11:47:46.877590711 +0100
-@@ -15,7 +15,7 @@
- use warnings;
+@@ -16,7 +16,7 @@
  use Getopt::Std;
  use File::Basename;
+ use File::Spec;
 -use IPC::Cmd;
 +# use IPC::Cmd;
  use POSIX;
+ use Config;
  use Carp;
- 
-@@ -193,7 +193,8 @@
+@@ -205,7 +205,8 @@
  
  # Look for ISC/SCO with its unique uname program
  sub is_sco_uname {
@@ -19,7 +19,7 @@
  
      open UNAME, "uname -X 2>/dev/null|" or return '';
      my $line = "";
-@@ -291,13 +292,13 @@
+@@ -303,13 +304,13 @@
      $CCVENDOR = '';             # Dunno, don't care (unless found later)
  
      # Find a compiler if we don't already have one
@@ -40,7 +40,7 @@
  
      if ( $CC ) {
          # Find the compiler vendor and version number for certain compilers
-@@ -352,14 +353,14 @@
+@@ -364,14 +365,14 @@
              }
          }