From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id qHf2B3ykm2aTlwAAqHPOHw:P1 (envelope-from ) for ; Sat, 20 Jul 2024 11:50:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id qHf2B3ykm2aTlwAAqHPOHw (envelope-from ) for ; Sat, 20 Jul 2024 13:50:20 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=kuIrjfEA; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1721476220; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=ipW35p866jn9vrpTE2Plb35nWi3MabhAGsUYnd6kdos=; b=Agq5vraxBikku/dJScHjQMPYegnaI12VZQReJqbvP7Sjoh6qnjUVY7tjgldcctTSg6P7DY 51B7xPcwror/CqwVnvpz4SuyFDrVVkQvrHQKbOZRHaMI4d0VzdHhDMuvHAiiVk6vFTxc+F Usf3HJDk918RCf7wO2vkF78F9O0gJKGVRgBa51bYa/gBvyH65zRomZzKTBQ7s2x5YAg/q+ 0qHluMs2M5EvLZsFX1JtK6VAtl+AMurl1ltdP5gvN5JHobkyF1O9Sqid214AjrHpoe8IlH uZ6Ow3bJ81UQoiqaw9gI21x3fVT82nrF6PfjV6NWujPFOmjx9cOMd94oOp4EHA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=kuIrjfEA; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1721476220; a=rsa-sha256; cv=none; b=ry6Ms07+q/EwVcSQwqbUR/Ixp+qBDLMQ+QrB5ld9fF/uJpiKpTHuO/grsGakHKctrZ00fL 8Gg20IGHgAOsIa+nMAHs74CmhbMk9v1NjyfnHc2i3BeSUD1pexne8exsVVXYgg3V/aMXom 9+u8PgdT3k6g2LlDegZVcNHzO5e4IrrXmfOSnA6fGhILbx8slVVl+V55pp11Y4WHUk6wzw PujkkV+z3duJG5qpHwa48fxe1uXnssYaaSJnDeqig7zq6qhJTZk+i842qZwlkdUy1zEHSp vXOUBtLObBR48UyMoU6wAUTiT7Ox8F8OhdM62vf/AgXCJKU/CIpmNd9ZUZZFmQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C8732B2F7 for ; Sat, 20 Jul 2024 13:50:18 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sV8bF-0007OX-MF; Sat, 20 Jul 2024 07:50: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 1sV8bC-0007Nq-BD for guix-patches@gnu.org; Sat, 20 Jul 2024 07:50:02 -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 1sV8bB-0000v6-VF for guix-patches@gnu.org; Sat, 20 Jul 2024 07:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sV8bB-0000Op-OR for guix-patches@gnu.org; Sat, 20 Jul 2024 07:50:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72207] [PATCH] gnu: ganeti: Fix build. Resent-From: attila.lendvai@gmail.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Jul 2024 11:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72207 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72207@debbugs.gnu.org Cc: Attila Lendvai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17214761781488 (code B ref -1); Sat, 20 Jul 2024 11:50:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jul 2024 11:49:38 +0000 Received: from localhost ([127.0.0.1]:51892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sV8ao-0000Nv-5z for submit@debbugs.gnu.org; Sat, 20 Jul 2024 07:49:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:33770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sV8al-0000Nl-BY for submit@debbugs.gnu.org; Sat, 20 Jul 2024 07:49:36 -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 1sV8ak-0007H2-R6 for guix-patches@gnu.org; Sat, 20 Jul 2024 07:49:34 -0400 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sV8ai-0000io-W8 for guix-patches@gnu.org; Sat, 20 Jul 2024 07:49:34 -0400 Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2eede876fccso34104921fa.1 for ; Sat, 20 Jul 2024 04:49:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721476171; x=1722080971; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ipW35p866jn9vrpTE2Plb35nWi3MabhAGsUYnd6kdos=; b=kuIrjfEAzJoPsMZFkBaDogqiazDlogH0V5nZu+dkRGj7EWNU9DWg5GWaUuUOpoMEBb j7lga34ttH+RT6o9I0ZdMbQikY/Q80cfxJxMTLdtgehmC9cK/0OQv2JZv021GYXCtCKU +G+kvNGsLhCAPbb7co+nHshUPTrnSx/JCWUJgo0O/oVlvZfNasEXkFPybV739q0XxBRX dpxoNBpazqD7xFv0y5eKrhJDudkTFtIF5uViy849BN5gTNNEDr7YNmZAH1sSckUcxntc 3hj1czZhvaQuASKCBQs8EGETChsQcVj4Fgir+pUjnWxFNMRkDSEBCOdkacYLScZ7WR08 BOXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721476171; x=1722080971; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ipW35p866jn9vrpTE2Plb35nWi3MabhAGsUYnd6kdos=; b=xS4BD0dg3rXq246qGCvB4ctU1ZCbE4EZHJSWpP9v47I6d8l04YL07rOap7a3GVi2up 1ab8MNd7FKTyrkF9h12ZcFUhzud0XQ/twmesLLSF+OEOvJKJLF4B40XCqgRRDYxCPTZM NC85GRlfNqQQMjCPCaCCNhWgMw2yM9hFpll9dz76P/hwDwSB4kp0hHemu3lBugOHdZrl 8g1kfeP5kJ6K/quNnyuLS/kfPOtsg2+62JeCSQ5YtyP1icUqFv9tL5YdL0ZHrhkKg9G2 W5lMJumI61V/AYzoH66RTNwM4PyUUNgkm6CQv6BQpKP0SY9O4r67zsjnTc6l4ku0Pui9 UOcA== X-Gm-Message-State: AOJu0YzyDP7x/f3DK1ehmrCbRTkSle0x7fm8LLs1Bj+dbUxDYdxe9wNN YjdVRdqfsVxT9fTYpeZ/9UgxkAm2z03lXIV2VBEx5CSe1HSxhCKywuaFzA== X-Google-Smtp-Source: AGHT+IGLavHFg8vaQbFjR88+R8gEkNvusQkk7VBk+hXaabwQh3B+bKByES7PmFmRfuCmYGLqAFt42A== X-Received: by 2002:a05:6512:33c5:b0:52e:be2c:4b05 with SMTP id 2adb3069b0e04-52ef8d960admr1285581e87.21.1721476170186; Sat, 20 Jul 2024 04:49:30 -0700 (PDT) Received: from lelap.lan (2a00-1f40-b161-30b0--477.pool6.panelnet.hu. [2a00:1f40:b161:30b0::477]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7a3c8c1e2asm151725766b.129.2024.07.20.04.49.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jul 2024 04:49:29 -0700 (PDT) From: attila.lendvai@gmail.com X-Google-Original-From: attila@lendvai.name Date: Sat, 20 Jul 2024 13:48:49 +0200 Message-ID: <5d7ae8c0db78c963581ef2fb1cca83c7c5b8466b.1721476128.git.attila@lendvai.name> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::236; envelope-from=attila.lendvai@gmail.com; helo=mail-lj1-x236.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: 2.89 X-Migadu-Queue-Id: C8732B2F7 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: 2.89 X-TUID: Taj1rGd+fHy6 From: Attila Lendvai * gnu/packages/virtualization.scm (ganeti): Add backported patch `ganeti-openssh-test-fix.patch`. Disable test `py_compat_types` in `test/hs/Test/Ganeti/OpCodes.hs`. Disable test `test/py/ganeti.ssh_unittest.py`. Change-Id: Id317c3f159374c2568a762c42c821ec2ee879bc6 --- .../patches/ganeti-openssh-test-fix.patch | 46 +++++++++++++++++++ gnu/packages/virtualization.scm | 9 +++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ganeti-openssh-test-fix.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 00000000000..ed7a498fab2 --- /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/virtualization.scm b/gnu/packages/virtualization.scm index dfd0e19e4b2..100957d4106 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -749,6 +749,7 @@ (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" @@ -896,13 +897,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: 9df5289c6687cd5688c275d16417389fbab6d384 -- 2.45.1