andreas pushed a commit to branch core-packages-team
in repository guix.
commit 30c602620cb3ddcd65082a15d114390a51330bff
Author: Zheng Junjie <z572@z572.online>
AuthorDate: Fri Feb 7 19:03:47 2025 +0800
gnu: openssl-3.0: Update to 3.4.0.
* gnu/packages/tls.scm (openssl-3.0): Update to 3.4.0.
[arguments]: Remove apply-hurd-patch phase.
* gnu/packages/patches/openssl-hurd64.patch: Remove it.
* gnu/local.mk (dist_patch_DATA): Unregister it.
Change-Id: I95e6f1abafc094245c0579406ce68b03af30a233
---
gnu/local.mk | 1 -
gnu/packages/patches/openssl-hurd64.patch | 99 -------------------------------
gnu/packages/tls.scm | 13 +---
3 files changed, 2 insertions(+), 111 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 69b46f4477..4a7de3774c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1980,7 +1980,6 @@ dist_patch_DATA =
\
%D%/packages/patches/opensles-add-license-file.patch \
%D%/packages/patches/openssl-1.1-c-rehash-in.patch \
%D%/packages/patches/openssl-3.0-c-rehash-in.patch \
- %D%/packages/patches/openssl-hurd64.patch \
%D%/packages/patches/opentaxsolver-file-browser-fix.patch \
%D%/packages/patches/open-zwave-hidapi.patch \
%D%/packages/patches/orangeduck-mpc-fix-pkg-config.patch \
diff --git a/gnu/packages/patches/openssl-hurd64.patch
b/gnu/packages/patches/openssl-hurd64.patch
deleted file mode 100644
index 372fda834a..0000000000
--- a/gnu/packages/patches/openssl-hurd64.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Upstream-status: Taken from upstream:
-
-<https://github.com/openssl/openssl/commit/7c729851d169f30d9e0c0ad6e7c1cf6cefb37935>.
-
-From 795699363be8f717e36802c3ac503011b74ad752 Mon Sep 17 00:00:00 2001
-From: Janneke Nieuwenhuizen <jann...@gnu.org>
-Date: Thu, 7 Nov 2024 14:08:05 +0100
-Subject: [PATCH] Add support for the 64bit Hurd.
-Content-Transfer-Encoding: 8bit
-Content-Type: text/plain; charset=UTF-8
-
-Taken from <https://salsa.debian.org/debian/openssl>.
----
- Configurations/10-main.conf | 45 ++++++++++++++++++++++++++++++++-----
- util/perl/OpenSSL/config.pm | 3 ++-
- 2 files changed, 41 insertions(+), 7 deletions(-)
-
-diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
-index b578a3c2a8..740460ebd3 100644
---- a/Configurations/10-main.conf
-+++ b/Configurations/10-main.conf
-@@ -1685,20 +1685,53 @@ my %targets = (
- },
-
- ##### GNU Hurd
-- "hurd-x86" => {
-+ "hurd-generic32" => {
- inherit_from => [ "BASE_unix" ],
- CC => "gcc",
-- CFLAGS => "-O3 -fomit-frame-pointer -Wall",
-+ CXX => "g++",
-+ CFLAGS => picker(default => "-Wall",
-+ debug => "-O0 -g",
-+ release => "-O3"),
-+ CXXFLAGS => picker(default => "-Wall",
-+ debug => "-O0 -g",
-+ release => "-O3"),
- cflags => threads("-pthread"),
-- lib_cppflags => "-DL_ENDIAN",
-+ cxxflags => combine("-std=c++11", threads("-pthread")),
- ex_libs => add("-ldl", threads("-pthread")),
-- bn_ops => "BN_LLONG",
-- asm_arch => 'x86',
-- perlasm_scheme => 'elf',
-+ bn_ops => "BN_LLONG RC4_CHAR",
- thread_scheme => "pthreads",
- dso_scheme => "dlfcn",
- shared_target => "linux-shared",
- shared_cflag => "-fPIC",
-+ shared_ldflag => sub { $disabled{pinshared} ? () :
"-Wl,-znodelete" },
-+ },
-+
-+ "hurd-generic64" => {
-+ inherit_from => [ "hurd-generic32" ],
-+ bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
-+ },
-+
-+ #### X86 / X86_64 targets
-+ "hurd-x86" => {
-+ inherit_from => [ "hurd-generic32" ],
-+ CFLAGS => add(picker(release => "-fomit-frame-pointer")),
-+ cflags => add("-m32"),
-+ cxxflags => add("-m32"),
-+ lib_cppflags => add("-DL_ENDIAN"),
-+ bn_ops => "BN_LLONG",
-+ asm_arch => 'x86',
-+ perlasm_scheme => 'elf',
-+ },
-+
-+ "hurd-x86_64" => {
-+ inherit_from => [ "hurd-generic64" ],
-+ cflags => add("-m64"),
-+ cxxflags => add("-m64"),
-+ lib_cppflags => add("-DL_ENDIAN"),
-+ bn_ops => "SIXTY_FOUR_BIT_LONG",
-+ asm_arch => 'x86_64',
-+ perlasm_scheme => 'elf',
-+ multilib => "64",
- },
-
- ##### VxWorks for various targets
-diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm
-index 2f1edcafb6..707db71537 100755
---- a/util/perl/OpenSSL/config.pm
-+++ b/util/perl/OpenSSL/config.pm
-@@ -92,7 +92,8 @@ my $guess_patterns = [
- [ 'IRIX64:.*', 'mips4-sgi-irix64' ],
- [ 'Linux:[2-9]\..*', '${MACHINE}-whatever-linux2' ],
- [ 'Linux:1\..*', '${MACHINE}-whatever-linux1' ],
-- [ 'GNU.*', 'hurd-x86' ],
-+ [ 'GNU:.*86-AT386', 'hurd-x86' ],
-+ [ 'GNU:.*86_64-AT386', 'hurd-x86_64' ],
- [ 'LynxOS:.*', '${MACHINE}-lynx-lynxos' ],
- # BSD/OS always says 386
- [ 'BSD\/OS:4\..*', 'i486-whatever-bsdi4' ],
---
-Janneke Nieuwenhuizen <jann...@gnu.org> | GNU LilyPond https://LilyPond.org
-Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com
-
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index e12c1856ea..51cbc7bec6 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -573,7 +573,7 @@ OpenSSL for TARGET."
(define-public openssl-3.0
(package
(inherit openssl-1.1)
- (version "3.0.8")
+ (version "3.4.0")
(source (origin
(method url-fetch)
(uri (list (string-append
"https://www.openssl.org/source/openssl-";
@@ -586,7 +586,7 @@ OpenSSL for TARGET."
(patches (search-patches "openssl-3.0-c-rehash-in.patch"))
(sha256
(base32
- "0gjb7qjl2jnzs1liz3rrccrddxbk6q3lg8z27jn1xwzx72zx44vc"))))
+ "1gwlfadp09wa9rng96azqw9m67d09ins68dcqafi7s1gzs1dlpg1"))))
(arguments
(substitute-keyword-arguments (package-arguments openssl-1.1)
((#:phases phases '%standard-phases)
@@ -598,15 +598,6 @@ OpenSSL for TARGET."
"/bin/perl"))))
#$@(if (target-hurd?)
#~((delete 'patch-configure))
- #~())
- #$@(if (target-hurd64?)
- #~((add-after 'unpack 'apply-hurd-patch
- (lambda _
- (let ((patch-file
- #$(local-file
- (search-patch "openssl-hurd64.patch"))))
- (invoke "patch" "--force" "-p1" "-i"
- patch-file)))))
#~())))
((#:configure-flags flags #~'())
(if (system-hurd?) ;must not be used when
