diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/crypto.scm | 10 | ||||
| -rw-r--r-- | gnu/packages/hurd.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/libxcrypt-hurd64.patch | 38 |
4 files changed, 1 insertions, 51 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 997e5c2703..14832d7b1f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1797,7 +1797,6 @@ dist_patch_DATA = \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libvpx-CVE-2025-5262.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 03cfcd7c3f..04017e0027 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1651,16 +1651,6 @@ checksum tool based on the BLAKE3 cryptographic hash function.") (list perl)) (arguments (cond - ((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))))))) ((target-ppc32?) (list #:tests? #f)) ; TODO: Investigate test failures. ((target-mingw?) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index b5457c4d44..54a424bd73 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -319,8 +319,7 @@ Hurd-minimal package which are needed for both glibc and GCC.") (patches (search-patches "hurd-refcounts-assert.patch" "hurd-rumpdisk-no-hd.patch" "hurd-startup.patch" - "hurd-socket-activation.patch" - "hurd-64bit.patch")))) + "hurd-socket-activation.patch")))) (version (package-version hurd-headers)) (arguments `(#:tests? #f ;no "check" target diff --git a/gnu/packages/patches/libxcrypt-hurd64.patch b/gnu/packages/patches/libxcrypt-hurd64.patch deleted file mode 100644 index 9fc3018539..0000000000 --- a/gnu/packages/patches/libxcrypt-hurd64.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 - |