From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 MJSRIqs3PGdDfAEAe85BDQ:P1 (envelope-from ) for ; Tue, 19 Nov 2024 07:00:59 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id MJSRIqs3PGdDfAEAe85BDQ (envelope-from ) for ; Tue, 19 Nov 2024 08:00:59 +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=d1wPSpa1; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=hPXJDoH9; 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=1731999659; 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=oE8gEu4o9bNkA82P9wdAd86uhMmJhAOKnhaXn81mud0=; b=CWNitVK9Lh0s0re2kRNxZQK/H0ADYCR+/6IkHRAjVM6x0SmMCy7KHmyyUKw3apnpWtmoFf tlLKwYjI4AvZcBUx3rRd822OmVnHq7xjB1UMoDBUWvQgAH8itPyIyCL0T5PNO4R+zFNMxV ZOBf+p6lEsVMHSzi2uG7TcIeXDvFCR62p/u/xI/RBKJm9jAoFSUhAZfVy8BGXa9u1sEcJa qUH7Q8pOfdltPsgBGzu1rGrVvtyP2LYx2Y6wVShMA+AoeUuL2dOls2lv9xmLHyFlQFEjBX sjAZ5uQvonQWzgjzWboyJ0saYER1n3WeoUP0HLr3GYt61J6vPd+b28cxlnwOiQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=d1wPSpa1; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=hPXJDoH9; 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=1731999659; a=rsa-sha256; cv=none; b=JgqQ+T4kGNuxnzRHzmhYv9AcrBMTMap/tJQWTWwA5tB69qObpz0P6VKtZuJhYtXl7BOdIh 6UpOLg6dxosEdltuCsx/KMw331KDyYWCoQE/g7V1uDOOR4x0M4LDBJxRW2MHLaP3ls4MeR sdyXnS2RSevUaJagut0mf6ZAAh3Arw0qeBL+ZnoWnpmQofqo8XmZr6yNkwaCq286wQ+WJd +yi5Dza1S+BnAjsH+c4o5Hoqcpt9/TKI5o5sXv90zhplgKcdqH9cyAF+GroP7MEu4cjX37 xclT3lIP/1cF+ksIn5y1dNHD9IG9yAmND6ax8TiLWpHJ5GotCYHVwCpR9l6myw== 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 43A7A438C0 for ; Tue, 19 Nov 2024 08:00:59 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDICf-0008Ly-9s; Tue, 19 Nov 2024 01:59:13 -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 ) id 1tDICe-0008Kd-1X for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59: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 ) id 1tDICd-0004JN-I0 for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59: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=oE8gEu4o9bNkA82P9wdAd86uhMmJhAOKnhaXn81mud0=; b=d1wPSpa1Uf0q/Y55GmaUDcoZzbSyAS6c+jDa1Mq84iouWQ85L/fDcvfQuiCuLe5K6OXNdruFxNxTEOewHk5oSTUf24BtPaq71su1/v5jT8BlrSiEIoG8pTuYhXtOmnkmo5lK+PbfEWlYBnGAI56uUT1HTndzwsR/OiBKGmNyOynfMxShQQDRtO5er4C+svSW+fcYv1cH6P9UT6ibdoMVcCsJ8LS3ddOkHh45XfExa95sDrfDm0z/vjzB0a4xQDW716k4DM7vud7rg4BE9HOaz6Ak25b9crTQ8HS3skdzSDQ/5YcB3l3GFtLkyLKTm/nUhr58/nxsoTVB5NGx0dX28Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDICd-0005GY-C7 for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 10/51] gnu: libxcrypt: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59:11 +0000 Resent-Message-ID: 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.173199950519755 (code B ref 74290); Tue, 19 Nov 2024 06:59:11 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:25 +0000 Received: from localhost ([127.0.0.1]:40465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBs-00058R-Si for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBj-00055t-A7 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:16 -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 ) id 1tDI9X-0003xU-Fv; Tue, 19 Nov 2024 01:55:59 -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=oE8gEu4o9bNkA82P9wdAd86uhMmJhAOKnhaXn81mud0=; b=hPXJDoH9dn9GBtgdFapr piKYIBkd4qTtEIBorvBD5Ry+rqAI1cy5cn+89FBn4eOSbdSw+FmX9CLt0NWKgkhQZEqx6Q1diO82K QcofbGM1A5+b5NhiL9Xt5ORjsBmrUqF6+NUNZXVzK1lvUrJGbYNyxhz+fmLz0WzJrvJrIz34JQcmK oaX3p1FMHs1VTd6EPHppiZCvmKsa/4nAjjbb1+LEnyeCBApBE8x91HG6bmo022gcLG5ZA3b83VXq+ KJOwT9o0f6uukO680S1Bud2hCA+CNwnb+xV72aEICiYDoA9j3JHU9/EL8c9WWc19W21zcqz70PegS xyMIoM/959xdiQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:40 +0100 Message-ID: <66779608ae5f1662fd6f5ee55d323aeebc9f7101.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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.72 X-Spam-Score: -3.72 X-Migadu-Queue-Id: 43A7A438C0 X-TUID: D4pZkCEbsziB * 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-hurd64-patch'. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/local.mk | 1 + gnu/packages/crypto.scm | 13 +++++++ gnu/packages/patches/libxcrypt-hurd64.patch | 38 +++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index cd9ad3aebb..9a775cc160 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1730,6 +1730,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..9ef1a53fa6 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2023 Ivan Vilata-i-Balaguer ;;; Copyright © 2023 Foundation Devices, Inc. +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -1661,6 +1662,18 @@ (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-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch "libxcrypt-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch)))))) + '())) (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: + + +From b2c1da2e1ce2d3e72f511f5bc94a6ffa68b70917 Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +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 | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + -- 2.46.0