amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libxcrypt: Support the 64bit Hurd.

Browse source 
* 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
This commit is contained in:
Janneke Nieuwenhuizen 2024-11-04 18:29:39 +01:00
parent d53f374a8a
commit 5f0a02a190
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 52 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1728,6 +1728,7 @@ dist_patch_DATA = \
%D%/packages/patches/libutils-remove-damaging-includes.patch \
%D%/packages/patches/libvdpau-va-gl-unbundle.patch \
%D%/packages/patches/libvpx-CVE-2016-2818.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 \

13
gnu/packages/crypto.scm
View file

@ -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,18 @@ checksum tool based on the BLAKE3 cryptographic hash function.")
(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

38
gnu/packages/patches/libxcrypt-hurd64.patch Normal file
View file

@ -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