From 7dab0537a0c414a5282f1918550f06a2dbfcdd2b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 27 Sep 2026 13:42:02 +0200 Subject: [PATCH] package/libopenssl: remove patch 0002 Patch was committed upstream in a slightly different version https://github.com/openssl/openssl/commit/098404128383ded87ba390dd74ecd9e2ffa6f530 and was first released in version 3.0 which was added to buildroot with commit 3c66f65a6a549930870f2c0d98abb5ca9321d2a5. Added Upstream: tag to patch 0001. Renumbered patch 0003 and updated Upstream: tag. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 - ...ible-build-do-not-leak-compiler-path.patch | 2 + ...Fv2-ABI-on-some-ppc64-big-endian-sys.patch | 37 ------------------- ...ch => 0002-Revert-Fix-static-builds.patch} | 3 +- 4 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch rename package/libopenssl/{0003-Revert-Fix-static-builds.patch => 0002-Revert-Fix-static-builds.patch} (97%) diff --git a/.checkpackageignore b/.checkpackageignore index 6d2a024e07..bd3766988d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -502,8 +502,6 @@ package/libnfc/0001-autotools-make-example-build-optional.patch lib_patch.Upstre package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch lib_patch.Upstream package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch lib_patch.Upstream package/libodb-mysql/0002-mariadb-FTBFS-fix.patch lib_patch.Upstream -package/libopenssl/0001-Reproducible-build-do-not-leak-compiler-path.patch lib_patch.Upstream -package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch lib_patch.Upstream package/liboping/0001-fix-utf8-support.patch lib_patch.Upstream package/liboping/0002-Open-raw-sockets-when-adding-hosts-not-when-doing-th.patch lib_patch.Upstream package/liboping/0003-Fix-compile-break-with-GCC-7-buffer-overflow-with-snprintf.patch lib_patch.Upstream diff --git a/package/libopenssl/0001-Reproducible-build-do-not-leak-compiler-path.patch b/package/libopenssl/0001-Reproducible-build-do-not-leak-compiler-path.patch index 9353c1ae90..f4baf916e3 100644 --- a/package/libopenssl/0001-Reproducible-build-do-not-leak-compiler-path.patch +++ b/package/libopenssl/0001-Reproducible-build-do-not-leak-compiler-path.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Reproducible build: do not leak compiler path Signed-off-by: Peter Seiderer +Upstream: https://github.com/openssl/openssl/pull/5218 (rejected) + [Rebased on openssl-1.1.1.a] Signed-off-by: Peter Seiderer --- diff --git a/package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch b/package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch deleted file mode 100644 index f74576beae..0000000000 --- a/package/libopenssl/0002-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b57cc2e4ee21babacbffc243626de72c248068ea Mon Sep 17 00:00:00 2001 -From: Andy Polyakov -Date: Sun, 5 May 2019 18:30:55 +0200 -Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems - -If _CALL_ELF is defined to be 2, it's an ELFv2 system. -Conditionally switch to the v2 perlasm scheme. - -Reviewed-by: Paul Dale -Reviewed-by: Richard Levitte -(Merged from https://github.com/openssl/openssl/pull/8883) -[vfazio: fixup for 1.1.1d] -Signed-off-by: Vincent Fazio -[rebased on openssl-1.1.1i] -Signed-off-by: Bernd Kuhls ---- - Configure | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Configure b/Configure -index 15054f9..ac3206e 100755 ---- a/Configure -+++ b/Configure -@@ -1686,6 +1686,10 @@ unless ($disabled{asm}) { - } - } - -+if ($target eq "linux-ppc64" && !$disabled{asm}) { -+ $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2); -+} -+ - # Check for makedepend capabilities. - if (!$disabled{makedepend}) { - # If the attribute makedep_scheme is defined, then we assume that the --- -2.25.0 - diff --git a/package/libopenssl/0003-Revert-Fix-static-builds.patch b/package/libopenssl/0002-Revert-Fix-static-builds.patch similarity index 97% rename from package/libopenssl/0003-Revert-Fix-static-builds.patch rename to package/libopenssl/0002-Revert-Fix-static-builds.patch index 10ca97a240..daeece2a0f 100644 --- a/package/libopenssl/0003-Revert-Fix-static-builds.patch +++ b/package/libopenssl/0002-Revert-Fix-static-builds.patch @@ -5,7 +5,8 @@ Subject: [PATCH] Revert "Fix -static builds" This reverts commit cfd7225fbb9507b2e443a494459bdaab5236d29d. -Upstream: https://github.com/openssl/openssl/issues/14574#issuecomment-817209126 +Upstream: https://github.com/openssl/openssl/issues/14574#issuecomment-3791009156 +(rejected) Signed-off-by: Bernd Kuhls [Dario: make the patch to be applied with fuzz factor 0]