download.lst | 4 ++--
external/openssl/configurable-z-option.patch.0 | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 915a51edc90a17176dde1bc1c63dbfb697eaef64
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Sep 3 17:01:28 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Sep 4 10:30:10 2024 +0200
openssl: upgrade to 3.0.15
Downloaded from
https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz
Change-Id: Ic1598fe8fafe610c7a3b409c5811bcc52658b130
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172830
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit e21e07f24bfdbe802e3ed8e611a135ab2ad2fe4c)
diff --git a/download.lst b/download.lst
index 9479aa799856..8d06fcc5611c 100644
--- a/download.lst
+++ b/download.lst
@@ -439,8 +439,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-OPENSSL_SHA256SUM :=
eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca
-OPENSSL_TARBALL := openssl-3.0.14.tar.gz
+OPENSSL_SHA256SUM :=
23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533
+OPENSSL_TARBALL := openssl-3.0.15.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
commit 4173b4cd3992020ad0919abc6ea869e951fa392a
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jun 5 11:40:19 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Sep 4 10:30:10 2024 +0200
openssl: upgrade to 3.0.14
Downloaded from https://www.openssl.org/source/openssl-3.0.14.tar.gz
Change-Id: Ib75738f257210532d0f01f429ec3b78a1a2410a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168456
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Tested-by: Jenkins
(cherry picked from commit b3a70a28b0becc9c872f2a92c35dfdaac4822600)
diff --git a/download.lst b/download.lst
index c9e9b71b5a4c..9479aa799856 100644
--- a/download.lst
+++ b/download.lst
@@ -439,8 +439,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-OPENSSL_SHA256SUM :=
88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313
-OPENSSL_TARBALL := openssl-3.0.13.tar.gz
+OPENSSL_SHA256SUM :=
eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca
+OPENSSL_TARBALL := openssl-3.0.14.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
commit 6219ae5b0c704357a8e122d464cc0be136e70669
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Feb 16 13:43:20 2024 +0600
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Sep 4 10:30:10 2024 +0200
OpenSSL: upgrade to 3.0.13
Change-Id: Ib03c99a2dbf0f7c932b8a6b953ac9eb9c43f978f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163475
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 4897792975453024db8369c3d8c5f2e65c956d73)
diff --git a/download.lst b/download.lst
index 10e54e5eb9cd..c9e9b71b5a4c 100644
--- a/download.lst
+++ b/download.lst
@@ -439,8 +439,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-OPENSSL_SHA256SUM :=
b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55
-OPENSSL_TARBALL := openssl-3.0.11.tar.gz
+OPENSSL_SHA256SUM :=
88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313
+OPENSSL_TARBALL := openssl-3.0.13.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
commit a021d9c7ff6f2ce6e58fc994016bdcf3a5e0172f
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Sep 30 23:54:06 2023 +0900
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Sep 4 10:30:10 2024 +0200
openssl: upgrade to release 3.0.11
Change-Id: I80c6fde3b6ae526f46b6bc346f09b287cc88b032
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157433
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit d059aebd99f717d846e7746d5ff5b99d507a3160)
diff --git a/download.lst b/download.lst
index 8279876b1664..10e54e5eb9cd 100644
--- a/download.lst
+++ b/download.lst
@@ -439,8 +439,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-OPENSSL_SHA256SUM :=
1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323
-OPENSSL_TARBALL := openssl-3.0.10.tar.gz
+OPENSSL_SHA256SUM :=
b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55
+OPENSSL_TARBALL := openssl-3.0.11.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/openssl/configurable-z-option.patch.0
b/external/openssl/configurable-z-option.patch.0
index 9a4426edd5d2..d9478b6a9701 100644
--- a/external/openssl/configurable-z-option.patch.0
+++ b/external/openssl/configurable-z-option.patch.0
@@ -1,15 +1,15 @@
---- Configurations/10-main.conf.sav 2021-08-24 13:38:47.000000000 +0000
-+++ Configurations/10-main.conf 2021-11-02 22:20:44.377653700 +0000
-@@ -13,7 +13,7 @@
+--- Configurations/10-main.conf.sav 2023-09-19 22:02:31.000000000 +0900
++++ Configurations/10-main.conf 2023-09-30 23:47:49.734377000 +0900
+@@ -14,7 +14,7 @@
} elsif ($disabled{asm}) {
# assembler is still used to compile uplink shim
$vc_win64a_info = { AS => "ml64",
- ASFLAGS => "/nologo /Zi",
+ ASFLAGS => "/nologo $$(DEBUG_FLAGS_VALUE)",
asflags => "/c /Cp /Cx",
- asoutflag => "/Fo" };
- } else {
-@@ -41,7 +41,7 @@
+ asoutflag => "/Fo",
+ perlasm_scheme => "masm" };
+@@ -44,7 +44,7 @@
} elsif ($disabled{asm}) {
# not actually used, uplink shim is inlined into C code
$vc_win32_info = { AS => "ml",
@@ -18,7 +18,7 @@
asflags => "/Cp /coff /c /Cx",
asoutflag => "/Fo",
perlasm_scheme => "win32" };
-@@ -1323,10 +1323,10 @@
+@@ -1333,10 +1333,10 @@
"UNICODE", "_UNICODE",
"_CRT_SECURE_NO_DEPRECATE",
"_WINSOCK_DEPRECATED_NO_WARNINGS"),
