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:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id oGxcN2SNMGda9AAA62LTzQ:P1 (envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>) for <larch@yhetil.org>; Sun, 10 Nov 2024 10:39:33 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id oGxcN2SNMGda9AAA62LTzQ (envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>) for <larch@yhetil.org>; Sun, 10 Nov 2024 11:39:32 +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="daI5/8Qp"; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=MW7j9MJz; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731235172; a=rsa-sha256; cv=none; b=Dm3LIJFz3azI3qpmBznyxpbAloVk/kC3O9CbFE29KxqI6DqCAMpmdbG3nFspSxfIeLcBaa OMjCsZmfhYeKPQPXnT61Hwb+YvTK+JT3ZR6UnxUIxsmOoanE34VFRjefxypTQeGhyrNTmC 3kFLtsoDits6t+FKTqOikx4fRr6TJn2JPMpU43iTaAyEbz++cLk8fpaokZXxa71zFKm1p7 ApLC1oVq3Fl9BEXbL0A2KV2Smp8Z41KFU5EhRTY1VBgaa3Qz4x6JzBuD9cbqFAwX3eAot/ PHjEWncrSRhBJUybFNp/ca5F/G/5l1i1SUkzNQ7OTt8k7+DS1kmBB465yvO4Lw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="daI5/8Qp"; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=MW7j9MJz; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1731235172; 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=1FDCkthV/PlW3VLUz/brPBgC4PiYjOo43MRl9Sk9oSs=; b=EKC7IpELJ0BMwHYi8NG3dXw786AoKkKLvxxlP7/78eUWGFUCxZXGU0IHRwz8SOZ9J+zouy QqLSsTmLrUhnyl4YUIdxtusOpHqMcM9sc9IYRmI6J5SX/ot2i1WqI6BbDRVYSD52AWiY9G H8PAVGzXV+95pEpJ0jBZ5Cva1cWJL9u+UdNx9IdONDE/4FU+l5CsS4vjt1YrdEK34AdNfE diDXeUb2ZvLbis8kqcGfjeDFFx2MNshTsjkoKOk0ArTFxFYP5VNqOiHd6rxanZ5+htsXkV KL/L9Cdm8BLvPJO+zMPd7MZABva38eWRBFzkpiXA69SxxOrQYt0JCqeJJhwK4w== 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 6B119689C for <larch@yhetil.org>; Sun, 10 Nov 2024 11:39:32 +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 1tA5Le-0000BQ-KZ; Sun, 10 Nov 2024 05:39:14 -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 1tA5Lb-00009V-Lv for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:12 -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 1tA5Lb-0007u6-8C for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:11 -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=1FDCkthV/PlW3VLUz/brPBgC4PiYjOo43MRl9Sk9oSs=; b=daI5/8QpApDIlICItVDTLLDc85FqQzlLlfXDfvjT0zE8oYElEFlvpDgVIdTMwDMqeX/ftM8cb4W+1x3QhxnwfJU9Oerlk2qBIT7lQFlCcTGFNzeGg0HnVYb4AxFNr0Hk6zMTwATb/Q++1nnGPd4+75tlDJVIDE1YvpFjrrpsl0dqBmUgR6yuzTuWLenMDGaNoE9L0TTJHTfWbYtGJR3Esz1HT0fCTirAewhMdGJRpkM12Lq+tWSoXv4lglN4qHG5t94/CMxXO2oe1LD9nvJdGV0Js1RaCHJMRSsbJWFYBJ7U3FEwzHA7XXwpBMtGVKJ2CKwK9DLdpruc9b4CZkBbdA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tA5Lb-0002cO-2A for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 11/31] gnu: libxcrypt: 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, 10 Nov 2024 10:39:11 +0000 Resent-Message-ID: <handler.74290.B74290.173123514810016@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.173123514810016 (code B ref 74290); Sun, 10 Nov 2024 10:39:11 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:08 +0000 Received: from localhost ([127.0.0.1]:55723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1tA5LX-0002bC-Fj for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@gnu.org>) id 1tA5LO-0002Xl-0m for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:58 -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 1tA5LI-0007oZ-Qs; Sun, 10 Nov 2024 05:38:52 -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=1FDCkthV/PlW3VLUz/brPBgC4PiYjOo43MRl9Sk9oSs=; b=MW7j9MJzPcqFMAohiuCj a/T3fTCJg5hxMHATkFLIuEaBA5W7R+tUCVqnkQmp01oI6qaq6LTLGdnso1ZgxvN6DsWqmuPqJfmeV jvmj7svOYkwJXPZJgmCDnucZXe2OQvry9i9nvgQz8x4Sa+LVGhyWmbVDOv+xP9MJyU1PEBNdclKtH VDm4Pab1l+3GPQDizAvzhFPJMTf8NM8ahbTOoYrCtmxnJA2xbWgirqpnecBT9DxZeDworPiNyhcoF /0uHC3NLF1N++C661RXInetkqpE6qDm1Qo2fA6j6bufLDQxx0m3pni1Ha6lGY75kobc2wMLcqX5Kr FSb6UoHkPyIJKA==; From: Janneke Nieuwenhuizen <janneke@gnu.org> Date: Sun, 10 Nov 2024 11:38:07 +0100 Message-ID: <ed2b361b5ed1e1dc7864f89a7276ac210f99a537.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <cover.1731232753.git.janneke@gnu.org> References: <cover.1731232753.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 1.38 X-Spam-Score: 1.38 X-Migadu-Queue-Id: 6B119689C X-Migadu-Scanner: mx12.migadu.com X-TUID: MuaGAjOwooBt * gnu/packages/patches/libxcrypt-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/crypto.scm (libxcrypt)[arguments]: When building for the 64bit Hurd, use it in new phase `apply-patch'. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/local.mk | 1 + gnu/packages/crypto.scm | 15 ++++++++ gnu/packages/patches/libxcrypt-hurd64.patch | 38 +++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4d3ee9ea35..4b9fa95658 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1725,6 +1725,7 @@ dist_patch_DATA = \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libvpx-CVE-2023-5217.patch \ %D%/packages/patches/libvpx-CVE-2023-44488.patch \ + %D%/packages/patches/libxcrypt-hurd64.patch \ %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch \ %D%/packages/patches/libwpd-gcc-compat.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 2a298c4caf..94a98bb0ad 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> +;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1661,6 +1662,20 @@ (define-public libxcrypt (build-system gnu-build-system) (native-inputs (list perl)) + (arguments + (if (target-hurd64?) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch + "libxcrypt-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" + patch-file)))))) + '())) (synopsis "Extended crypt library for descrypt, md5crypt, bcrypt, and others") (description diff --git a/gnu/packages/patches/libxcrypt-hurd64.patch b/gnu/packages/patches/libxcrypt-hurd64.patch new file mode 100644 index 0000000000..9fc3018539 --- /dev/null +++ b/gnu/packages/patches/libxcrypt-hurd64.patch @@ -0,0 +1,38 @@ +Upstream-status: Taken from upstream: + <https://github.com/besser82/libxcrypt/commit/b2c1da2e1ce2d3e72f511f5bc94a6ffa68b70917> + +From b2c1da2e1ce2d3e72f511f5bc94a6ffa68b70917 Mon Sep 17 00:00:00 2001 +From: Samuel Thibault <samuel.thibault@ens-lyon.org> +Date: Sun, 14 Jul 2024 13:13:07 +0200 +Subject: [PATCH] Add binary compatibility for x86_64 GNU/Hurd +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + + +diff --git a/lib/libcrypt.map.in b/lib/libcrypt.map.in +index 88ea911..a56b7bf 100644 +--- a/lib/libcrypt.map.in ++++ b/lib/libcrypt.map.in +@@ -43,5 +43,5 @@ fcrypt - GLIBC_2.0 + %chain GLIBC_2.0 GLIBC_2.2 GLIBC_2.2.1 GLIBC_2.2.2 GLIBC_2.2.5 GLIBC_2.2.6 + %chain GLIBC_2.3 GLIBC_2.4 GLIBC_2.12 GLIBC_2.16 GLIBC_2.17 GLIBC_2.18 + %chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 GLIBC_2.35 +-%chain GLIBC_2.36 ++%chain GLIBC_2.36 GLIBC_2.38 + %chain OW_CRYPT_1.0 XCRYPT_2.0 XCRYPT_4.3 XCRYPT_4.4 +diff --git a/lib/libcrypt.minver b/lib/libcrypt.minver +index 8478077..c5a5bf2 100644 +--- a/lib/libcrypt.minver ++++ b/lib/libcrypt.minver +@@ -51,6 +51,7 @@ + #VERSION SYSTEM CPU_FAMILY PREPROCESSOR_CHECK + + # GNU Hurd ++GLIBC_2.38 gnu x86_64 + GLIBC_2.2.6 gnu i[3-9]86 + ERROR gnu . + +-- +Janneke Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + -- Janneke Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com