From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org> Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id cD7cOA7gQmeaXwAA62LTzQ:P1 (envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>) for <larch@yhetil.org>; Sun, 24 Nov 2024 08:13:03 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id cD7cOA7gQmeaXwAA62LTzQ (envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>) for <larch@yhetil.org>; Sun, 24 Nov 2024 09:13:03 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=j1R8rcw2; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=YP9chkuK; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732435982; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=oe2B747ttuSurmcjFSNch9CnaI/kPuvPp9LdxFzcWGM=; b=PVkYB0r21pHUjT5zkJN9ft6e3bZaoZkQvVLqo4lYe+KpeU8h7QKAgRhmqUG4f+s7671y26 wUzKU8gFwQv+X7mTqay6TJJdqoqwToW5DseUuPICyEvLyzrCMHt9E6ofXdIdfznejXC/UF WFJYXUb/cd+LgOh9ieC2NEq0n0hsxqtMgwGa6vMnvimXmqEZ+Q9PoG2eSyVh9tTaZI45LR AKsB9aeUh3Pa42+Upj83EegoL6pCW4/7L55nQkCkSMacEMQY2xhu6DSUI7VCOXi78NIMST vcBjkRxf9mFlp8xfLsr71MioMI6VH3lf9FAbmBu7ljRhtSUl+jFeo5rlO4mjtQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=j1R8rcw2; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=YP9chkuK; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732435982; a=rsa-sha256; cv=none; b=OFJKv3UaZfJV1v98TnkOPs5Hd5ont4evQImJsOhdhzWNgoT047KxFm1O/a/+MUT+Nbl14f 4WWmyLoNfYLG38ZcJQAoM4FNXfL7U8fy9l3CQ5nZOiRK5JOwyfz5Z5uRAy9FScBdhogiQS zlBW96xEuA8hIURijUwpeSmtivSfMA5d97WXQuyJ084eE4jpKA9IALBMLHEDvlKgWgHe23 R1qcyGWPUGmJhXM3A4bt89LzO13ADOskRZq3gOqOGM4y1jFN6VW3Z0ndFvzxCnHYUkiTZJ JmjFayeR3tJNNJT0SpENYLh16HkUSHYEvZ2mZefYmwJWggy7dMqFcfplVzaUng== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 679717BB1E for <larch@yhetil.org>; Sun, 24 Nov 2024 09:13:01 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1tF7Ug-0000Np-FK; Sun, 24 Nov 2024 02:57:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tF7Uf-0000MM-5j for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:21 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tF7Ue-0002OI-SU for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=oe2B747ttuSurmcjFSNch9CnaI/kPuvPp9LdxFzcWGM=; b=j1R8rcw2RVkuh/BLbS8fmVkqGXq3bTfkIY9ifbkiLJqmNZj0yXZDA1/K9D9CoQonnNjasKXBiGKtTNRdZfpYN6T0rwkK69MT0Mou1koxH14mrH+ZlgU0Pgzv3WjVgmNHVVj55pBcJnWv01+PIjRuttCGbK6OlXOjkn5Ek8AhvOUj/wQwAKbVytIogpFjMlcOhmhnNZw9ZY6ZhXv4sDHztYCyPaZiu0t6ff++WjMAQs/YG8Yh/JBSG92mwxRiOw+Rfat3bMMfl5RPOhuCbvA6uPWCgeoi0+9ZiAFOCoPi5Qs11IOexmMdy2o5/0CYqdmLyX3llzydNkjvfD5Tmukegw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tF7Ue-0004kq-NT for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:20 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 31/58] gnu: openssl-3.0: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:20 +0000 Resent-Message-ID: <handler.74290.B74290.173243502918036@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243502918036 (code B ref 74290); Sun, 24 Nov 2024 07:57:20 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:09 +0000 Received: from localhost ([127.0.0.1]:60822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1tF7US-0004gc-KK for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@gnu.org>) id 1tF7To-0004ZN-PH for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:29 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@gnu.org>) id 1tF7Tj-0002Ca-HB; Sun, 24 Nov 2024 02:56:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=oe2B747ttuSurmcjFSNch9CnaI/kPuvPp9LdxFzcWGM=; b=YP9chkuKg21N965vMPFo U0KuLp+ZR1+p1CDldd5gKfk1KC+CIpylXgzemjxUBjpcT4V4VfZ40Ez5eFV49cTRcTJoUEg2SI7cd IiAJCmWfPSVNVfLClR/3XOBpdHfUgOobOWfEprlLzXiDigpHm43Mvq44E/R/4oAWLNx4Sd3XX54ZG ZNkXCsTA5N3X/pkA/xWOSjGenvFQssSuaLFHciWjE6a7xfK5Dqu93ZEne4LE+S1dw8llWrAih4yjk FI+e3emi4kSD5cbVmw7CNiF1NIQhA3CjQgoMzkRshM4Fl+peRWNo2DrAw0I0GdrS7QS3GY5JELmxc RNGxb4aQaBRtJQ==; From: Janneke Nieuwenhuizen <janneke@gnu.org> Date: Sun, 24 Nov 2024 08:54:54 +0100 Message-ID: <663e3d1a6a8465ad8aa4a78c79b532a77f558abf.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <cover.1732434270.git.janneke@gnu.org> References: <cover.1732434270.git.janneke@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -3.53 X-Spam-Score: -3.53 X-Migadu-Queue-Id: 679717BB1E X-TUID: FPJvzyyjV33E * gnu/packages/patches/openssl-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/tls.scm (openssl-3.0)[arguments]: When building for the 64bit Hurd, use it in new "apply-hurd-patch" phase. Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05 --- gnu/local.mk | 1 + gnu/packages/patches/openssl-hurd64.patch | 99 +++++++++++++++++++++++ gnu/packages/tls.scm | 9 +++ 3 files changed, 109 insertions(+) create mode 100644 gnu/packages/patches/openssl-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 52239fb0e0..c1eca1f940 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1899,6 +1899,7 @@ 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 new file mode 100644 index 0000000000..372fda834a --- /dev/null +++ b/gnu/packages/patches/openssl-hurd64.patch @@ -0,0 +1,99 @@ +Upstream-status: Taken from upstream: + +<https://github.com/openssl/openssl/commit/7c729851d169f30d9e0c0ad6e7c1cf6cefb37935>. + +From 795699363be8f717e36802c3ac503011b74ad752 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen <janneke@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 <janneke@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 43806e24da..fab88518ce 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -589,6 +589,15 @@ (define-public openssl-3.0 "/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?) -- 2.46.0