From patchwork Thu Nov 11 15:51:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: zamfofex X-Patchwork-Id: 34398 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 0A3DB27BBE3; Thu, 11 Nov 2021 17:52:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5DE4F27BBE1 for ; Thu, 11 Nov 2021 17:52:13 +0000 (GMT) Received: from localhost ([::1]:53488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlEFA-0004JE-Hi for patchwork@mira.cbaines.net; Thu, 11 Nov 2021 12:52:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlCiA-0004vz-DE for guix-patches@gnu.org; Thu, 11 Nov 2021 11:14:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58755) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlCiA-0002dB-3u for guix-patches@gnu.org; Thu, 11 Nov 2021 11:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mlCi9-0000Tu-Se for guix-patches@gnu.org; Thu, 11 Nov 2021 11:14:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51770] [PATCH] update Hurd packages Resent-From: zamfofex Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Nov 2021 16:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51770 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51770@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.16366472041780 (code B ref -1); Thu, 11 Nov 2021 16:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Nov 2021 16:13:24 +0000 Received: from localhost ([127.0.0.1]:42068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlChV-0000SZ-6C for submit@debbugs.gnu.org; Thu, 11 Nov 2021 11:13:24 -0500 Received: from lists.gnu.org ([209.51.188.17]:44044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlCUk-0008Uw-N1 for submit@debbugs.gnu.org; Thu, 11 Nov 2021 11:00:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlCUk-0003dE-Dc for guix-patches@gnu.org; Thu, 11 Nov 2021 11:00:10 -0500 Received: from mailout-pe-b.jellyfish.systems ([63.250.43.116]:55725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlCUc-0000VV-5a for guix-patches@gnu.org; Thu, 11 Nov 2021 11:00:06 -0500 Received: from NEW-01.privateemail.com (unknown [10.35.5.64]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout-pe-b.jellyfish.systems (Postfix) with ESMTPSA id 4HqmRG425lzGpsV for ; Thu, 11 Nov 2021 15:51:22 +0000 (UTC) Received: from MTA-08.privateemail.com (unknown [10.50.14.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by NEW-01.privateemail.com (Postfix) with ESMTPS id 7B73918000CD for ; Thu, 11 Nov 2021 10:51:22 -0500 (EST) Received: from mta-08.privateemail.com (localhost [127.0.0.1]) by mta-08.privateemail.com (Postfix) with ESMTP id 4D50718000A5 for ; Thu, 11 Nov 2021 10:51:22 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=twdb.moe; s=default; t=1636645882; bh=53kCb+afonJx9G4auLBXO41Mz6M3+oZzpZJMWRqUk2w=; h=Date:From:To:Subject:From; b=WMQ6LiH60aCNJhfItOemQ2LoT3FiTXCHENVDd1cxPCsGevXmHFxrtLOq4BTohP2iv b/nYJnEy5/k5sRPh5B0vDjvmwUNjOF4D3SxwtivT4OSYAXsufmLmkEat70SsAJfQ9M W1MQtrZmFSpBXjbHaIUVKONJCTO9qYnGNzY0Y95FmTMWuZ2XJTPi6AUYQtopDxqWYW 04iohkCkryqvq5jLEIV/2OPjRnTpVUyMv787iMW8rNcen3p4nO+tQ3B4FyHbb5RQXx 8gXf5KyiJ9vbwfNwMerxG889SVcyOSJxV+xFOLZFmkcHpQkboOEDogYmGXYlgdR+P8 NOqB23Lp9/SwA== Received: from APP-11 (unknown [10.50.14.211]) by mta-08.privateemail.com (Postfix) with ESMTPA id 0E5A818000A4 for ; Thu, 11 Nov 2021 10:51:22 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=twdb.moe; s=default; t=1636645882; bh=53kCb+afonJx9G4auLBXO41Mz6M3+oZzpZJMWRqUk2w=; h=Date:From:To:Subject:From; b=WMQ6LiH60aCNJhfItOemQ2LoT3FiTXCHENVDd1cxPCsGevXmHFxrtLOq4BTohP2iv b/nYJnEy5/k5sRPh5B0vDjvmwUNjOF4D3SxwtivT4OSYAXsufmLmkEat70SsAJfQ9M W1MQtrZmFSpBXjbHaIUVKONJCTO9qYnGNzY0Y95FmTMWuZ2XJTPi6AUYQtopDxqWYW 04iohkCkryqvq5jLEIV/2OPjRnTpVUyMv787iMW8rNcen3p4nO+tQ3B4FyHbb5RQXx 8gXf5KyiJ9vbwfNwMerxG889SVcyOSJxV+xFOLZFmkcHpQkboOEDogYmGXYlgdR+P8 NOqB23Lp9/SwA== Date: Thu, 11 Nov 2021 12:51:21 -0300 (BRT) From: zamfofex Message-ID: <1850188127.399847.1636645881998@privateemail.com> MIME-Version: 1.0 X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.5-Rev26 X-Originating-Client: open-xchange-appsuite X-Virus-Scanned: ClamAV using ClamSMTP X-NCJF-Result: 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 X-NCJF-Version: 13 Received-SPF: pass client-ip=63.250.43.116; envelope-from=zamfofex@twdb.moe; helo=mailout-pe-b.jellyfish.systems X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 11 Nov 2021 11:13:20 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 11 Nov 2021 12:52:05 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches I have been working on updating the Hurd packages for quite a while now. My goal was to use netdde (which wasn’t previously working well) so that I could install Guix GNU/Hurd on my computer and use it. I was asked (in IRC) to say that my changes are necessary to be able to get netdde to a working state, since non-release updates are generally not accepted. However, I will note that all packages I updated (as far as I can tell) were already in a non-release commit. I have applied my changes over the 'core-update-frozen' branch because it seems like the newer version of glibc therein is necessary for these newer package commit versions to build successfully. I will send the patch file generated by 'git format-patch' as an attachment. If I have done anything wrong while sending this email, please let me know and apologies in advance. From 124b2e5033f60bf3ec66a082ef7a092eb5e7f432 Mon Sep 17 00:00:00 2001 From: zamfofex Date: Thu, 11 Nov 2021 12:28:49 -0300 Subject: [PATCH] gnu: update Hurd packages * gnu/packages/hurd.scm (gnumach, gnumach-headers, hurd, netdde): Update packages relating to the Hurd so that netdde is usable --- gnu/packages/hurd.scm | 36 +++++++++++------------ gnu/packages/patches/hurd-configure.patch | 4 +++ 2 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 gnu/packages/patches/hurd-configure.patch diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 1e6af1029f..620a99c25b 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Rene Saavedra +;;; Copyright © 2021 zamfofex ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,8 +68,8 @@ (define (hurd-source-url version) version ".tar.gz")) (define-public gnumach-headers - (let ((commit "097f9cf735ffa1212b828682ad92f0f6c5f1c552") - (revision "1")) + (let ((commit "7c107da5f0b7397eea37f5fb77d4afac8f6e93c7") + (revision "2")) (package (name "gnumach-headers") (version (git-version "1.8" revision commit)) @@ -81,7 +82,7 @@ (define-public gnumach-headers (file-name (git-file-name "gnumach" version)) (sha256 (base32 - "0q36z7k02bykrld90zaxbhyzxlmwlqqs4divgir6ix38zsp6icqk")))) + "1wwpa6hsp51bqzb0zdbvdfjffy252jj4kx66jj4zj0r385a37n6c")))) (build-system gnu-build-system) (arguments `(#:phases @@ -166,8 +167,8 @@ (define-public mig/32-bit (define-public hurd-headers ;; Resort to a post-0.9 snapshot that provides the 'file_utimens' and ;; 'file_exec_paths' RPCs that glibc 2.28 expects. - (let ((revision "1") - (commit "91a51672ff4cfe1f1a0712b4c542ded3081c825b")) + (let ((revision "2") + (commit "77cdd08a2faf08afd13610f11db694856a7ce44c")) (package (name "hurd-headers") (version (git-version "0.9" revision commit)) @@ -178,7 +179,8 @@ (define-public hurd-headers (commit commit))) (sha256 (base32 - "16k9wkahz9wasviijz53n6i13nmiwa9fs64ikf1jqh8rl60hw7cz")) + "0xjb40j1n0yj11gfw70lmppg1hvcl2n0yip30hlxx52s3yqdgzpw")) + (patches (search-patches "hurd-configure.patch")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs @@ -337,7 +339,7 @@ (define unifont (define dde-sources ;; This is the current tip of the dde branch - (let ((commit "ac1c7eb7a8b24b7469bed5365be38a968d59a136")) + (let ((commit "3c12bd85cbc32d96f866ef19fa5173069b42130d")) (origin (method git-fetch) (uri (git-reference @@ -345,31 +347,29 @@ (define dde-sources (commit commit))) (sha256 (base32 - "1vryinbg75xpydfrv9dbgfnds6knlh8l8bk2rxp32y9dc58z0692")) + "09wvwnldv95i5xhl3jljhbxsnzjh6lw7kip5sl8wnxdgfphl5qj7")) (file-name (git-file-name "dde" commit))))) (define-public hurd (package (name "hurd") (version (package-version hurd-headers)) - (source (origin (inherit (package-source hurd-headers)) - (patches (search-patches "hurd-cross.patch" - "hurd-xattr.patch")))) + (source (package-source hurd-headers)) (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'prepare-dde (lambda* (#:key native-inputs inputs #:allow-other-keys) (substitute* "Makefile" - (("libbpf ") - "libbpf libmachdev libmachdevdde libddekit")) + (("libmachdev ") + "libmachdev libmachdevdde libddekit ")) (for-each make-file-writable (find-files ".")) (let ((dde (or (assoc-ref inputs "dde-sources") (assoc-ref native-inputs "dde-sources")))) (for-each (lambda (dir) (copy-recursively - (string-append dde "/" dir ) dir)) - '("libmachdev" "libmachdevdde" "libddekit"))) + (string-append dde "/" dir) dir)) + '("libmachdevdde" "libddekit"))) #t)) (add-after 'unpack 'find-tirpc (lambda* (#:key inputs #:allow-other-keys) @@ -562,8 +562,8 @@ (define-public hurd (license gpl2+))) (define-public netdde - (let ((commit "4a1016f130b6f2065d3f088325e5fb0b2997ae12") - (revision "1")) + (let ((commit "e67c284ac113d939b10b4578334f27dab29d5b08") + (revision "2")) (package (name "netdde") ;; The version prefix corresponds to the version of Linux from which the @@ -576,7 +576,7 @@ (define-public netdde (commit commit))) (sha256 (base32 - "1njv9dszq4lj05yq4v9j5v247hfghpzvvz4hzy0khjjr35mw7hr8")) + "0vnkls7sr7srzib5mnw6gybzl5qa8c5a4zf3h08w6gdr7zqbndh0")) (file-name (git-file-name name commit)))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/hurd-configure.patch b/gnu/packages/patches/hurd-configure.patch new file mode 100644 index 0000000000..b06eae2ebb --- /dev/null +++ b/gnu/packages/patches/hurd-configure.patch @@ -0,0 +1,4 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -0,1 +0,0 @@ +-AC_CHECK_FUNCS(_hurd_libc_proc_init) -- 2.33.1