From patchwork Tue Jan 7 17:07:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reed Meyerson X-Patchwork-Id: 36714 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 2AA9E27BBE9; Tue, 7 Jan 2025 21:00:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9607F27BBE2 for ; Tue, 7 Jan 2025 21:00:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tVGg2-0008LY-HX; Tue, 07 Jan 2025 15:59:50 -0500 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 1tVDTr-0005fh-Hn for guix-patches@gnu.org; Tue, 07 Jan 2025 12:35:03 -0500 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 1tVDTr-00037U-9C for guix-patches@gnu.org; Tue, 07 Jan 2025 12:35:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:From:MIME-Version:To:In-Reply-To:References:Subject; bh=T2hiAsrVdMFC8Xr4Ydq+86RZ2TcOzkYTPyXzmMAPGko=; b=PXEqpUW3XYXqtG4ESfggP7ZJQfxwbayLmvrJO6/+xPdA/JMhGnQ/Ua70f1yPdf8eMvu61DKlB5aoVK0DJOBNchdDhH+vOXX/xxZCYku/nvkAfHoAjDOTbey2a/kKmh2m+jnmAnhqdYkDPI34WgNCKkACjYOeWnDnOpCMU9j2V932ZXl5ESqGECFK+adHXd+XctZmo0jpu6npg5taWqIAaIb58yHprl4QS50lUKMut45CovIfPQV8b8iIwkR8G9KAw03mjZP8BQpF5808XR1RjakE38amg0PB+7MamMTFsnvKhFvt1PY4wV/0ryVF7NzNAKs6jIcd99z/UcNCSbEGTg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tVDTp-0003Hi-Ok for guix-patches@gnu.org; Tue, 07 Jan 2025 12:35:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#72207] [PATCH] gnu: ganeti: Fix build. References: <5d7ae8c0db78c963581ef2fb1cca83c7c5b8466b.1721476128.git.attila@lendvai.name> In-Reply-To: <5d7ae8c0db78c963581ef2fb1cca83c7c5b8466b.1721476128.git.attila@lendvai.name> Resent-From: Reed Meyerson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Jan 2025 17:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72207 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72207@debbugs.gnu.org Received: via spool by 72207-submit@debbugs.gnu.org id=B72207.173627129012596 (code B ref 72207); Tue, 07 Jan 2025 17:35:01 +0000 Received: (at 72207) by debbugs.gnu.org; 7 Jan 2025 17:34:50 +0000 Received: from localhost ([127.0.0.1]:44465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVDTc-0003H4-Sj for submit@debbugs.gnu.org; Tue, 07 Jan 2025 12:34:50 -0500 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:47151) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tVD3Q-0001sm-Tg for 72207@debbugs.gnu.org; Tue, 07 Jan 2025 12:07:50 -0500 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-5d647d5df90so12441962a12.2 for <72207@debbugs.gnu.org>; Tue, 07 Jan 2025 09:07:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736269663; x=1736874463; darn=debbugs.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=su6dyT1POt42EvHoT/ktVTOodo5nJzWtSYOC2aJzU44=; b=G+wx114Q9VuKY4a5xea0Gqr84aRoiW5/vkiD4im+c1KzII1Q/bcJuuk8R5j2POi2BK 8nIJFv95fH4D11CFVCkYI1O9SFwg+aJI/mwrn/9cnlAvV+9bnDocmUHZOrezFC+IMaIw cnYYNCmmdtmfyIrGmod6eWtgesfjclydgKu3+RzWQV1L3YQ2/krVFPhbXrE95Z1FfJHl MVpT6LwTKKb+fa4BbefK1fCaZ6tiQR50vnKux0KVLwaDkyhywo74CaiEf/InrBI1aqr8 ejl5h9cJXPsvgmenUsBQcuzpFtahAWlAW3NCVKOQyZulg/0VE+t9chSeb4bJP00iB2/X qoxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736269663; x=1736874463; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=su6dyT1POt42EvHoT/ktVTOodo5nJzWtSYOC2aJzU44=; b=H3ltviDU0k7i/6HWdCDOtE8N9PhktRI35gs6LjXKuSLhj0Aa+nPyxycgaziKYOZ10/ QRiqVzyrFdC+f7wSje/BK6IFUu9jq/sAPe5vhfy4LKk9ds0DKX1504q9Jc21r4HS73RL 8cRplIU7kRPvfJgoDo/C/0TdsAZvDbxrSIYGr/NfewK8xcZlg5Aj6cauaZb5NcYjxqXR s1QUAHA5tywTuF+PQh9wSkGR6zaQc9cV8QMtSsXrR25+tYormivsGC+9ksb/z6SaH7L9 Db7Ud9wcVE3I33wdfwmMLKOcSZEBmAlz9mJ4FgNeIACSbT+AZW5cxWTIJFFSrcBzgNwn B+Ow== X-Gm-Message-State: AOJu0YzybDbNAX+0qLem+Dg8y/Fd/6+w+cFU0BUPONakGK7NLSWbwFBg ACewxl8dXzc992LjhQB4zLa+SafP8HLN2oTXXW9iy6svmazEnavXdmToT4B1d7TF8wnLQ5Qbfnm vfRS5d+2zbtmBjbRiPFzMb6uBl/J14Ah1 X-Gm-Gg: ASbGncs90fZ6Mbv1EKjTBqM66eaJ7rLBc8dYjvpMkJ6PDtc3hg4v/xK4gSMbbTahTHm kCPjjvLD/GqxZ7FkCdwso0JCMpDqhqzV4jd0a X-Google-Smtp-Source: AGHT+IEtk9tHIj+B93gVghiqmTl0/d2bWiA2wcVC1VcxlssteBE9wqvTZ5NZGmz/YsB09Ij4wpj+yWMSnAvMrppUEuY= X-Received: by 2002:a05:6402:278d:b0:5d3:baa3:29f with SMTP id 4fb4d7f45d1cf-5d81dd8e07emr43773170a12.9.1736269663068; Tue, 07 Jan 2025 09:07:43 -0800 (PST) MIME-Version: 1.0 From: Reed Meyerson Date: Tue, 7 Jan 2025 12:07:31 -0500 X-Gm-Features: AbW1kvZCu3slPE4gwXJy95-WvPaCP6Clyw24llI9mMtosyoJGPJwvTydD_1JzIc Message-ID: X-Mailman-Approved-At: Tue, 07 Jan 2025 12:34:47 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 07 Jan 2025 15:59:47 -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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches I was able to get this building using the patch above, and by removing a deprecated import (See upstream: https://github.com/ganeti/ganeti/commit/2844c7c0d0f1493c9fd79cb05e5445d6d1d4687d ) Best, Reed From d3feb577f2040daa6b54f0af264dea1d477e530d Mon Sep 17 00:00:00 2001 Message-ID: From: Reed Meyerson Date: Tue, 7 Jan 2025 11:27:00 -0500 Subject: [PATCH 1/1] removing deprecated sphinx.util.compat import Change-Id: I21c4dd5e7210021e8905dc6237bd5148aeed930d --- .../patches/ganeti-openssh-test-fix.patch | 46 +++++++++++++++++++ .../patches/ganeti-sphinx-import.patch | 12 +++++ gnu/packages/virtualization.scm | 12 ++++- 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/ganeti-openssh-test-fix.patch create mode 100644 gnu/packages/patches/ganeti-sphinx-import.patch diff --git a/gnu/packages/patches/ganeti-openssh-test-fix.patch b/gnu/packages/patches/ganeti-openssh-test-fix.patch new file mode 100644 index 0000000000..ed7a498fab --- /dev/null +++ b/gnu/packages/patches/ganeti-openssh-test-fix.patch @@ -0,0 +1,46 @@ +From 8a06656acf8f6e3dfa907bea77bd57a469a8d3fb Mon Sep 17 00:00:00 2001 +From: codefritzel +Date: Thu, 11 Jul 2024 23:10:41 +0200 +Subject: replace dsa with rsa in TestUpdateSshRoot + +DSA to be deactivated in OpenSSH from 2025. Since version 7.0 dsa is +marked as deprecated. + +The TestUpdateSshRoot uses DSA, which will fail in the future with newer +OpenSSH versions. + +fixes #1752 + +Signed-off-by: codefritzel + +diff --git a/test/py/ganeti.tools.prepare_node_join_unittest.py b/test/py/ganeti.tools.prepare_node_join_unittest.py +index fe7efdf8c..fe029b8f2 100755 +--- a/test/py/ganeti.tools.prepare_node_join_unittest.py ++++ b/test/py/ganeti.tools.prepare_node_join_unittest.py +@@ -229,20 +229,20 @@ class TestUpdateSshRoot(unittest.TestCase): + def testUpdate(self): + data = { + constants.SSHS_SSH_ROOT_KEY: [ +- (constants.SSHK_DSA, "privatedsa", "ssh-dss pubdsa"), ++ (constants.SSHK_RSA, "privatersa", "ssh-rsa pubrsa"), + ], +- constants.SSHS_SSH_KEY_TYPE: "dsa", +- constants.SSHS_SSH_KEY_BITS: 1024, ++ constants.SSHS_SSH_KEY_TYPE: "rsa", ++ constants.SSHS_SSH_KEY_BITS: 2048, + } + + prepare_node_join.UpdateSshRoot(data, False, + _homedir_fn=self._GetHomeDir) + self.assertEqual(os.listdir(self.tmpdir), [".ssh"]) + self.assertEqual(sorted(os.listdir(self.sshdir)), +- sorted(["authorized_keys", "id_dsa", "id_dsa.pub"])) +- self.assertTrue(utils.ReadFile(utils.PathJoin(self.sshdir, "id_dsa")) ++ sorted(["authorized_keys", "id_rsa", "id_rsa.pub"])) ++ self.assertTrue(utils.ReadFile(utils.PathJoin(self.sshdir, "id_rsa")) + is not None) +- pub_key = utils.ReadFile(utils.PathJoin(self.sshdir, "id_dsa.pub")) ++ pub_key = utils.ReadFile(utils.PathJoin(self.sshdir, "id_rsa.pub")) + self.assertTrue(pub_key is not None) + self.assertEqual(utils.ReadFile(utils.PathJoin(self.sshdir, + "authorized_keys")), diff --git a/gnu/packages/patches/ganeti-sphinx-import.patch b/gnu/packages/patches/ganeti-sphinx-import.patch new file mode 100644 index 0000000000..8c6e7b5be5 --- /dev/null +++ b/gnu/packages/patches/ganeti-sphinx-import.patch @@ -0,0 +1,12 @@ +diff --git a/lib/build/sphinx_ext.py b/lib/build/sphinx_ext.py +index ca8b8216e..017f52343 100644 +--- a/lib/build/sphinx_ext.py ++++ b/lib/build/sphinx_ext.py +@@ -45,7 +45,6 @@ import docutils.parsers.rst + from docutils.parsers.rst import Directive + + import sphinx.errors +-import sphinx.util.compat + import sphinx.roles + import sphinx.addnodes + diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9dff421341..4cc46b3939 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -776,10 +776,12 @@ (define-public ganeti "ganeti-procps-compat.patch" "ganeti-disable-version-symlinks.patch" "ganeti-lens-compat.patch" + "ganeti-openssh-test-fix.patch" "ganeti-template-haskell-2.17.patch" "ganeti-template-haskell-2.18.patch" "ganeti-reorder-arbitrary-definitions.patch" - "ganeti-relax-dependencies.patch")))) + "ganeti-relax-dependencies.patch" + "ganeti-sphinx-import.patch")))) (build-system gnu-build-system) (arguments `(#:imported-modules (,@%default-gnu-imported-modules @@ -923,13 +925,19 @@ (define-public ganeti (("test/py/ganeti\\.hypervisor\\.hv_kvm_unittest\\.py") "") (("test/py/ganeti\\.tools\\.ensure_dirs_unittest\\.py") "") (("test/py/ganeti\\.utils\\.io_unittest-runasroot\\.py") "") + ;; Tracked at: https://github.com/ganeti/ganeti/issues/1752 + (("test/py/ganeti\\.ssh_unittest\\.py") "") ;; Disable the bash_completion test, as it requires the full ;; bash instead of bash-minimal. (("test/py/bash_completion\\.bash") "") ;; This test requires networking. (("test/py/import-export_unittest\\.bash") - "")))) + "")) + (substitute* "test/hs/Test/Ganeti/OpCodes.hs" + ;; Some serdes failure, tracked at: + ;; https://github.com/ganeti/ganeti/issues/1753 + ((", 'case_py_compat_types") "")))) (add-after 'build 'build-bash-completions (lambda _ (setenv "PYTHONPATH" ".") base-commit: 84a68cffe6abf1056df2607e79ef587b63820a6e -- 2.46.0