diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/openssl/0001-Inthe-VC-common-target-unquote-CC.patch.1 | 54 | ||||
| -rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk | 1 | ||||
| -rw-r--r-- | external/openssl/openssl-no-ipc-cmd.patch.0 | 12 |
4 files changed, 8 insertions, 63 deletions
diff --git a/download.lst b/download.lst index b3d439d3cbd1..be17cba2e9a5 100644 --- a/download.lst +++ b/download.lst @@ -194,8 +194,8 @@ export OFFICEOTRON_SHA256SUM := f2443f27561af52324eee03a1892d9f569adc8db9e7bca55 export OFFICEOTRON_JAR := 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := aa7d8d9bef71ad6525c55ba11e5f4397889ce49c2c9349dcea6d3e4f0b024a7a -export OPENSSL_TARBALL := openssl-3.0.5.tar.gz +export OPENSSL_SHA256SUM := 83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e +export OPENSSL_TARBALL := openssl-3.0.7.tar.gz export ORCUS_SHA256SUM := 2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143 export ORCUS_TARBALL := liborcus-0.17.2.tar.bz2 export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d 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 @@ } } |