From patchwork Tue May 20 19:12:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: yelninei--- via Guix-patches via X-Patchwork-Id: 42783 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1897127BC4B; Tue, 20 May 2025 20:14:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D1E0A27BC49 for ; Tue, 20 May 2025 20:14:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHSPd-0004Lx-AV; Tue, 20 May 2025 15:14:05 -0400 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 1uHSPb-0004Li-7Z for guix-patches@gnu.org; Tue, 20 May 2025 15:14:03 -0400 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 1uHSPa-0000nP-TZ for guix-patches@gnu.org; Tue, 20 May 2025 15:14:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:Subject; bh=/HytNHYJuhmxJll08+tc4s2ooVLoKYfCQ1sonVZylwc=; b=EXEF1kTrt9MLOh80ZFWLHl25ZSJfHWvQZ9XD+jZXmReC300Nr9D1n5JLoYky/3Kmg40YmN+FUocQRa1/H5rq+oXQxMpeetzn6clA/7yD0nNynYHRuMY1KPzTaJJbb5uyGLrTsLKw0v6ePbPJ9sx+eIVqEwAiWy9DYs2pFKTWJyR6/wbLntOebNwXYMvyHDDe2L+NVWlA/RrMsBn14YpufAugMNn0sWrnRdVEnlcJueB2T7XtseJXBq5R6rLqOzR7OncOh12iuPDvXwkg8Jg97jXjrbsWXSWtptWE2kEdI7uX+2Ei2Cfnio21RxFo+JTk9kZ30Zkoij/f5bmOR6unmg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHSPa-0006kH-Hg for guix-patches@gnu.org; Tue, 20 May 2025 15:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78513] [PATCH core-packages-team 1/1] gnu: libxcrypt: Remove now unnecessary Hurd64 patch. Resent-From: yelninei@tutamail.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 May 2025 19:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78513@debbugs.gnu.org Cc: Janneke Nieuwenhuizen X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174776843225866 (code B ref -1); Tue, 20 May 2025 19:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 May 2025 19:13:52 +0000 Received: from localhost ([127.0.0.1]:35830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHSPK-0006iX-B7 for submit@debbugs.gnu.org; Tue, 20 May 2025 15:13:52 -0400 Received: from lists.gnu.org ([2001:470:142::17]:44994) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHSPG-0006hO-Kc for submit@debbugs.gnu.org; Tue, 20 May 2025 15:13:43 -0400 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 1uHSP5-0004Jx-Pg for guix-patches@gnu.org; Tue, 20 May 2025 15:13:33 -0400 Received: from mail.w13.tutanota.de ([185.205.69.213]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uHSP1-0000id-QK for guix-patches@gnu.org; Tue, 20 May 2025 15:13:31 -0400 Received: from tutadb.w10.tutanota.de (w10.api.tuta.com [IPv6:fd:ac::d:10]) by mail.w13.tutanota.de (Postfix) with ESMTP id 351558A967BF for ; Tue, 20 May 2025 21:12:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1747768372; s=s1; d=tutamail.com; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=/HytNHYJuhmxJll08+tc4s2ooVLoKYfCQ1sonVZylwc=; b=OSOuBgzUPJJ+Mtv9js7E9qfrML1FhHoLacc95ffWTELbn+RPEc32Fio4a+q0HVgV 8y8yAztul3ZIQ2sEqREywtPrAJ6OTwCVXG14j0shN2yF4JwCPt9I57cCjnaTE5Rl2uj vGH9AC6VU0/RHFzAiC2iC0/Kzc6MEuKNKi+AmNDu0WPV6OMqBPSqRgJJ36IvSc2txzH Ecp0q4Z8+dTjhXsENM9u08jl7399B9z4mMckHj0v+WGOmxPMJp2UjzE53byHjafd5CB ps8laV5hxhwGZcDBh7X70qvZo5Mx0GY3vIO3zJhFq7t6ZYMJ9a6kypp5ebpg7R5QFj2 5J/mAzOveQ== Date: Tue, 20 May 2025 21:12:52 +0200 (GMT+02:00) Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.205.69.213; envelope-from=yelninei@tutamail.com; helo=mail.w13.tutanota.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: yelninei@tutamail.com X-ACL-Warn: , yelninei--- via Guix-patches X-Patchwork-Original-From: yelninei--- via Guix-patches via From: yelninei--- via Guix-patches via Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello, With this patch the bare-hurd64.tmpl os crossbuilds and runs on core-packages-team. Haven't figured out how to make a proper 64bit childhurd to get the native packages building with the nice offloading setup. I also managed to get the updated rumpkernel to build (the updated build.sh unsets C_INCLUDE_PATH, it also it depends on the new hurd lib libirqhelp which introduces a circular depency, for now i have created a separate package for it similar to hurd-minimal) . However idk if this is something for core-packages-team? I guess it should be hurd-team but that has moved into core-packages-team? From 57e36f535a691c4c9d8fdd41e7461cd711cf644a Mon Sep 17 00:00:00 2001 Message-ID: <57e36f535a691c4c9d8fdd41e7461cd711cf644a.1747767404.git.yelninei@tutamail.com> In-Reply-To: References: From: Yelninei Date: Sun, 18 May 2025 11:41:44 +0100 Subject: [PATCH core-packages-team 1/1] gnu: libxcrypt: Remove now unnecessary Hurd64 patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crypto.scm (libxcrypt)[arguments]: Remove ‘apply-hurd64-patch’ phase. * gnu/packages/patches/libxcrypt-hurd64.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove it. Change-Id: Id98b268426ef22219e2bfc5041e7d7965c5f9275 --- gnu/local.mk | 1 - gnu/packages/crypto.scm | 10 ------ gnu/packages/patches/libxcrypt-hurd64.patch | 38 --------------------- 3 files changed, 49 deletions(-) delete mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7bd44a9776..bd17d816de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1785,7 +1785,6 @@ 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 \ diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 1828769b03..81f857a1b6 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1641,16 +1641,6 @@ (define-public libxcrypt (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. (else '()))) 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: - - -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.49.0