From unknown Thu Jun 19 14:33:52 2025 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) From: yelninei@tutamail.com Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_6468_1266614298.1747768372211" 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-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) ------=_Part_6468_1266614298.1747768372211 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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? ------=_Part_6468_1266614298.1747768372211 Content-Type: text/x-patch; charset=UTF-8; name=0001-gnu-libxcrypt-Remove-now-unnecessary-Hurd64-patch.patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-libxcrypt-Remove-now-unnecessary-Hurd64-patch.patch >From 57e36f535a691c4c9d8fdd41e7461cd711cf644a Mon Sep 17 00:00:00 2001 Message-ID: <57e36f535a691c4c9d8fdd41e7461cd711cf644a.1747767404.git.yelnin= ei@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 unnecess= ary Hurd64 patch. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crypto.scm (libxcrypt)[arguments]: Remove =E2=80=98apply-hurd64-patch=E2=80=99 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 =3D=09=09=09=09=09=09\ %D%/packages/patches/libutils-remove-damaging-includes.patch=09\ %D%/packages/patches/libvdpau-va-gl-unbundle.patch=09=09\ %D%/packages/patches/libvpx-CVE-2016-2818.patch=09=09\ - %D%/packages/patches/libxcrypt-hurd64.patch=09=09=09\ %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch=09\ %D%/packages/patches/libwpd-gcc-compat.patch=09=09=09\ %D%/packages/patches/libxslt-generated-ids.patch=09=09\ 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/pat= ches/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=3DUTF-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=09=09=09-=09=09GLIBC_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 -=20 - # GNU Hurd -+GLIBC_2.38 gnu x86_64 - GLIBC_2.2.6 gnu i[3-9]86 - ERROR gnu . -=20 ---=20 -Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.o= rg -Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcad= emy.com - --=20 2.49.0 ------=_Part_6468_1266614298.1747768372211-- From unknown Thu Jun 19 14:33:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78513] [PATCH core-packages-team 1/1] gnu: libxcrypt: Remove now unnecessary Hurd64 patch. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 May 2025 07:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: yelninei@tutamail.com Cc: 78513@debbugs.gnu.org X-Debbugs-Original-Cc: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174807109318071 (code B ref -1); Sat, 24 May 2025 07:19:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 May 2025 07:18:13 +0000 Received: from localhost ([127.0.0.1]:56107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uIj93-0004hO-Eq for submit@debbugs.gnu.org; Sat, 24 May 2025 03:18:13 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56996) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uIj8z-0004h9-Se for submit@debbugs.gnu.org; Sat, 24 May 2025 03:18:11 -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 1uIj8u-0007H7-8O for guix-patches@gnu.org; Sat, 24 May 2025 03:18:04 -0400 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 1uIj8t-00062u-Vv; Sat, 24 May 2025 03:18:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=3rQ9OH2PyodY+3ufE1IQbK5g6ajwEb0lGYLTcw5/g/Q=; b=SxGRKL+W78NAUCxLhduc dZK6MwlYGUlG3IW1ZtcuJohQi792weelclzoE086oL/kdygpsPbu6nEpCEmIrMXKypHIArj6NB2pi tkfkcz0TbZBtMPcKwDHsEIvKKLSg8FbWQ1XLT9e58cZfwBvKBnbQE2Sa3xI0PtblCyH/msVUkw44Q lycjZZGE2eoBoirCb8093HVe1BjHB9KtvFVzDV2M7aAixcO2hDR/MUdvcyCLkk6cyVK4BEh9OhkTH qkNa9wzDfgdW163KmNcOCS9PWGI+x8Nna7+f5mNQB+2zL2KO8SA7qCLCp9dTI0mXWNhg2feyi1Hw5 rlb/uwg1a/cPcA==; From: Janneke Nieuwenhuizen In-Reply-To: (yelninei@tutamail.com's message of "Tue, 20 May 2025 21:12:52 +0200 (GMT+02:00)") Organization: AvatarAcademy.nl References: X-Url: http://AvatarAcademy.nl Date: Sat, 24 May 2025 09:18:01 +0200 Message-ID: <8734cuscie.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, > With this patch the bare-hurd64.tmpl os crossbuilds and runs on > core-packages-team. Thanks! > Haven't figured out how to make a proper 64bit childhurd to get the > native packages building with the nice offloading setup. Yes, I think that's work yet to be done? > 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? Yes, indeed; pushed to core-packages-team. Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Thu Jun 19 14:33:52 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: yelninei@tutamail.com Subject: bug#78513: closed (Closing Issues) Message-ID: References: X-Gnu-PR-Message: they-closed 78513 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 78513@debbugs.gnu.org Date: Sat, 24 May 2025 15:10:05 +0000 Content-Type: multipart/mixed; boundary="----------=_1748099405-9193-1" This is a multi-part message in MIME format... ------------=_1748099405-9193-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #78513: [PATCH core-packages-team 1/1] gnu: libxcrypt: Remove now unnecessa= ry Hurd64 patch. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 78513@debbugs.gnu.org. --=20 78513: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78513 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1748099405-9193-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 78513-done) by debbugs.gnu.org; 24 May 2025 15:09:12 +0000 Received: from localhost ([127.0.0.1]:33589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uIqUp-0002Fo-OY for submit@debbugs.gnu.org; Sat, 24 May 2025 11:09:12 -0400 Received: from mail.w13.tutanota.de ([185.205.69.213]:60086) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uIqUi-0002EO-HM for 78513-done@debbugs.gnu.org; Sat, 24 May 2025 11:09:05 -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 41BCE8C6E3E3 for <78513-done@debbugs.gnu.org>; Sat, 24 May 2025 17:08:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1748099337; s=s1; d=tutamail.com; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=N8vvT09116UQhRR1Is4Q8T4nvWBXL1xFJ+LgAwK4Z1o=; b=zboUrFznVymDLumP8ZGZQAFX9foHUq1Jq59i6Bf1NxzWw/VRc6OdtUxt6XpSypi8 V3naSP7CqZrtIQajLSEt5Oe3n9vjgbJGdhf3Vew7bW9IUQ12y9ZzDX495uVU3HQM1a9 lVVKZRjQOHT8m72rVEjMQos3eihwsHQqfa5Oz9SvqKESaQHubmEWCEFQn9ZUdtKXGve vdsOWgeO3mns2vvaloGwoCnpF3Wsfm2rQ+d/fIb6s3IXIC/Ettl0MY9qybibEX2Gmyb 05nD5AfElTPAXrrSxWMsLdLWAgLJEA8o3I6Y8lMaO0qm3WaYaaGPW0Bv03Nvdwa887o lopXcOUrVw== Date: Sat, 24 May 2025 17:08:57 +0200 (GMT+02:00) From: yelninei@tutamail.com To: 78349-done@debbugs.gnu.org, 78513-done@debbugs.gnu.org, 78351-done@debbugs.gnu.org, 78471-done@debbugs.gnu.org Message-ID: Subject: Closing Issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 78513-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) All patches are applied, cleaning up the issues. ------------=_1748099405-9193-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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) From: yelninei@tutamail.com To: guix-patches@gnu.org Message-ID: Subject: [PATCH core-packages-team 1/1] gnu: libxcrypt: Remove now unnecessary Hurd64 patch. MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_6468_1266614298.1747768372211" 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-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Janneke Nieuwenhuizen X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) ------=_Part_6468_1266614298.1747768372211 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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? ------=_Part_6468_1266614298.1747768372211 Content-Type: text/x-patch; charset=UTF-8; name=0001-gnu-libxcrypt-Remove-now-unnecessary-Hurd64-patch.patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-libxcrypt-Remove-now-unnecessary-Hurd64-patch.patch >From 57e36f535a691c4c9d8fdd41e7461cd711cf644a Mon Sep 17 00:00:00 2001 Message-ID: <57e36f535a691c4c9d8fdd41e7461cd711cf644a.1747767404.git.yelnin= ei@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 unnecess= ary Hurd64 patch. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crypto.scm (libxcrypt)[arguments]: Remove =E2=80=98apply-hurd64-patch=E2=80=99 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 =3D=09=09=09=09=09=09\ %D%/packages/patches/libutils-remove-damaging-includes.patch=09\ %D%/packages/patches/libvdpau-va-gl-unbundle.patch=09=09\ %D%/packages/patches/libvpx-CVE-2016-2818.patch=09=09\ - %D%/packages/patches/libxcrypt-hurd64.patch=09=09=09\ %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch=09\ %D%/packages/patches/libwpd-gcc-compat.patch=09=09=09\ %D%/packages/patches/libxslt-generated-ids.patch=09=09\ 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/pat= ches/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=3DUTF-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=09=09=09-=09=09GLIBC_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 -=20 - # GNU Hurd -+GLIBC_2.38 gnu x86_64 - GLIBC_2.2.6 gnu i[3-9]86 - ERROR gnu . -=20 ---=20 -Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.o= rg -Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcad= emy.com - --=20 2.49.0 ------=_Part_6468_1266614298.1747768372211-- ------------=_1748099405-9193-1--