Pedro Monreal Gonzalez
be2dc0eb62
- Added openssl-3-use-include-directive.patch so that the default /etc/ssl/openssl.cnf file will include any configuration files that other packages might place into /etc/ssl/engines3.d/ and /etc/ssl/engdef3.d/. Also create symbolic links /etc/ssl/engines.d/ and /etc/ssl/engdef.d/ to above versioned directories. - Updated spec file to create the two new necessary directores for the above patch and two symbolic links to above directories. [bsc#1194187, bsc#1207472, bsc#1218933] - Replace our reverted commit with an upstream version * rename openssl-Revert-Makefile-Call-mknum.pl-on-make-ordinals-only-if.patch to openssl-Remove-the-source-directory-.num-targets.patch OBS-URL: https://build.opensuse.org/request/show/1141236 OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-3?expand=0&rev=88
55 lines
2.2 KiB
Diff
55 lines
2.2 KiB
Diff
From 9e8d114bd69619f245b103b70d051cd6e5e6468e Mon Sep 17 00:00:00 2001
|
|
From: Richard Levitte <levitte@openssl.org>
|
|
Date: Thu, 30 Nov 2023 16:38:43 +0100
|
|
Subject: [PATCH] Remove the source directory .num targets
|
|
|
|
$(SRCDIR)/util/libcrypto.num and $(SRCDIR)/util/libssl.num were made their
|
|
own targets to have 'make ordinals' reproduce them (run mknum.pl) only if
|
|
needed.
|
|
|
|
Unfortunately, because the shared library linker scripts depend on these
|
|
.num files, we suddenly have mknum.pl run at random times when building.
|
|
Furthermore, this created a diamond dependency, which disturbs parallell
|
|
building because multiple mknum.pl on the same file could run at the same
|
|
time.
|
|
|
|
This reverts commit 0e55c3ab8d702ffc897c9beb51d19b14b7896182.
|
|
|
|
Fixes #21999
|
|
Partially fixes #22841
|
|
|
|
Reviewed-by: Tomas Mraz <tomas@openssl.org>
|
|
Reviewed-by: Matt Caswell <matt@openssl.org>
|
|
(Merged from https://github.com/openssl/openssl/pull/22890)
|
|
|
|
(cherry picked from commit c08b21a2c95c2925e9c7ab11eb667d95e7b1fe3a)
|
|
---
|
|
Configurations/unix-Makefile.tmpl | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
|
|
index 8ddb1282af7b6..6714699178dd9 100644
|
|
--- a/Configurations/unix-Makefile.tmpl
|
|
+++ b/Configurations/unix-Makefile.tmpl
|
|
@@ -1363,18 +1363,16 @@ renumber: build_generated
|
|
--renumber \
|
|
$(SSLHEADERS)
|
|
|
|
-$(SRCDIR)/util/libcrypto.num: $(CRYPTOHEADERS) $(SRCDIR)/include/openssl/symhacks.h
|
|
+.PHONY: ordinals
|
|
+ordinals: build_generated
|
|
$(PERL) $(SRCDIR)/util/mknum.pl --version $(VERSION_NUMBER) --no-warnings \
|
|
--ordinals $(SRCDIR)/util/libcrypto.num \
|
|
--symhacks $(SRCDIR)/include/openssl/symhacks.h \
|
|
$(CRYPTOHEADERS)
|
|
-$(SRCDIR)/util/libssl.num: $(SSLHEADERS) $(SRCDIR)/include/openssl/symhacks.h
|
|
$(PERL) $(SRCDIR)/util/mknum.pl --version $(VERSION_NUMBER) --no-warnings \
|
|
--ordinals $(SRCDIR)/util/libssl.num \
|
|
--symhacks $(SRCDIR)/include/openssl/symhacks.h \
|
|
$(SSLHEADERS)
|
|
-.PHONY: ordinals
|
|
-ordinals: build_generated $(SRCDIR)/util/libcrypto.num $(SRCDIR)/util/libssl.num
|
|
|
|
test_ordinals:
|
|
$(MAKE) run_tests TESTS=test_ordinals
|