From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id SGzTGB/sfWeRyQAA62LTzQ:P1 (envelope-from ) for ; Wed, 08 Jan 2025 03:08:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id SGzTGB/sfWeRyQAA62LTzQ (envelope-from ) for ; Wed, 08 Jan 2025 04:08:15 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=NS0csh5Z; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="Xl8rI9/A"; 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), DKIM 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=1736305662; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=+HXADl5uygqZzULkqpR7xXPCMxs0WIBQmirhS1oiPl8=; b=tOPLVdjIU2l1RdDbUIKeVofALPQs2zisagOxW8TuM9fVzYtuCtjG+8AV5zAsfRRUniecpM 2yb395aMqKdPbHvJWpNXhm+jkxR1v+FwsGlIPykIsnD5kqM9FRTj7NYSUchiyd9fwDxwlk Sq5m/4ffA/C5TsmLFOa4eUXRsucTglFnUMPNWvHEClAZq4Qm1N06V4srMsUPoinOSEEB+y MeLg1/F8bLiXQR/lr9bYL27SMtVKjtOlzHJOlYPhy52423NKqi9awbwnbbqubWLOwXclrF g12UaBG4cAlqBSQosXGkSyyd/U6fN5mS67eg6Y8E4nogqaOE6niJeFB/kwjLQw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=NS0csh5Z; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="Xl8rI9/A"; 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), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1736305662; a=rsa-sha256; cv=none; b=OCdjxQUR6JCJ0V0tia+JthyuNBg32Nw2riPe/8CtESdBP7EromAjYnPgPcY1Gat0FXRuBa n2VUwrHsE9gNT3YXAFVRX8ALAAIn4fN/CvgFcFyRMYKxJyTgIzf60xG++CkNe7yTqeEAKE +VdGwsyMsOz3FkN1vZ6+SIquXIYAGnJSb8wdq9rDQ6cwU+pykqag+uJJNgReGG5HN0nr7N xArmt4W//l0gR74gsSMAx/LYtEVaSltkF4IXTE7X3gKfOldYTQuLXNnT4LhO6OEYvhB/4B B4SbEq/yTXHX+J4ch72BIh9tepvJatAtZKLcSbeRq//h6iqabwJWpawjB9u8JQ== 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 F0D282B8E for ; Wed, 08 Jan 2025 04:07:41 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tVMPR-0003Hq-Fw; Tue, 07 Jan 2025 22:07:05 -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 1tVMPP-0003HS-9D for guix-patches@gnu.org; Tue, 07 Jan 2025 22:07: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 1tVMPO-0003Ox-WA for guix-patches@gnu.org; Tue, 07 Jan 2025 22:07: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=+HXADl5uygqZzULkqpR7xXPCMxs0WIBQmirhS1oiPl8=; b=NS0csh5ZS9J3uuRZE2BK1Yl7IDomaq8BLwScw6PdOzxNi4h8GmcWdkq1hNKaFsOZAbIVNNc02kp+eChbSv3iKAgwVIV/YahN+HettfanYmJuFA2qQkqUOw40ipCE3DDNIiCko1/uBjG1Ir89pDcRJv2o3tOENjYT4pngZlVFfj7EAyqLtXLhoWnaVIAhKjFzq/iXpohAIERCUV91pF9+YR9NoJlQagyIml5QpSHqa30iZbtfEjQ8G0dDOKI/qf7jVVGXJ88FEG3ImGTI4YTFvpbm2uWTpJHc/ulJagPbsceUt/t5dJPtHDEoyvPp0gHQr+R/BZJhe02AhI02ZGpiTQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tVMPO-00082Q-RO for guix-patches@gnu.org; Tue, 07 Jan 2025 22:07:02 -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: Wed, 08 Jan 2025 03:07:02 +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.173630561630854 (code B ref 72207); Wed, 08 Jan 2025 03:07:02 +0000 Received: (at 72207) by debbugs.gnu.org; 8 Jan 2025 03:06:56 +0000 Received: from localhost ([127.0.0.1]:45430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVMPG-00081Y-Qi for submit@debbugs.gnu.org; Tue, 07 Jan 2025 22:06:55 -0500 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:49418) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tVEsm-0008NN-EQ for 72207@debbugs.gnu.org; Tue, 07 Jan 2025 14:04:53 -0500 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5d8c1950da7so16108464a12.3 for <72207@debbugs.gnu.org>; Tue, 07 Jan 2025 11:04:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736276686; x=1736881486; darn=debbugs.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=+HXADl5uygqZzULkqpR7xXPCMxs0WIBQmirhS1oiPl8=; b=Xl8rI9/AZpHQtrNmBjwvbNn/7gDHBxxLJuONx5fZb8vnZ2OX/a1vmqpxmh5WLyJYOm G/ZIZl9Zki0+iQ2UUOriamzgRwfkA+0x/yeyLwjR7dzEXfp+NbC1orlbaZNaYr+tiJOn 1u6XrCoyNruunuW7imloxetxw7ASyJZKkPt4V4Zccrp9+3b/B203ThCjAXoEt+n/wVz1 B/P36NpzfxaOIS1PRou09Ozh91SINr56GCitjWN6l5OyrCoEOr0JXWLcfr6bJoZW9zFX ZAomugjlsBLMP+2FRV/C9jwM/QHQBSJsTMpEMrU9dSe0IVMRm+U4ZDPMb1pAfsBI2979 2Hwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736276686; x=1736881486; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+HXADl5uygqZzULkqpR7xXPCMxs0WIBQmirhS1oiPl8=; b=Nvo9a3i9rIif3L2C8MfM/sAKKowimMv+XB9KYs9fXYquxDC1ImvGTw4dqde76o65Mz +6S+MpqBEs6XGgu70sZcnjEJTCKV/Vku+4VWfzheVSuFh2d7DbAryfj/KqyS/rmri7oS ZZfwMKvP5L/DgCBrMoAS538cdgWSv6CdL/MOPb/boUya9zVHBE8CdvtR0MAvC4K8d8sJ /istdzEvRAgZzH/CdzCQ55ECeLnAS3ssQvuspkrHgS34wxXAMwaTH4kDPy7jzPbgF/fL 4MzkjLgy8C8way8FLFGLKNDSz3TOWl7I7Y1NIxi6UXKSLTZIzG+dwHeelwhEiEPMD2Gc x8eA== X-Gm-Message-State: AOJu0Yybmm47s3dEtkktdDax3RpkqoGDTTWGxK1ZTLm9ora9l7uCRqCc Bhsoem5Q401rft76hew3rRsgiS/VG4BY08nhz661f6IxRRSyZePzIwXxS9WJFZNgUOcmXIXjl4m /Fr0THzOWJT10cuM41Hxc1wMQGejN7J7m X-Gm-Gg: ASbGncuqE1anqxgzyQ7jUepzG7oHMgCYq+ZSomosR14SL3VjGOmP/TKBA/jnZKfb1pN 9NHRxmNafpaOtvKgq+I+hPAwzuLbNhaSQlGQJ X-Google-Smtp-Source: AGHT+IFXi/BqYwFx36GEn+UInvCyYxTVDzG14oqPEmH7V5PjvYIfcOj0u3orVQm8EGIgJJ7Y9FlwGtYVKfZPUSF+cz4= X-Received: by 2002:a05:6402:40c1:b0:5d0:b2c8:8d04 with SMTP id 4fb4d7f45d1cf-5d81dde872fmr57797209a12.18.1736276685667; Tue, 07 Jan 2025 11:04:45 -0800 (PST) MIME-Version: 1.0 From: Reed Meyerson Date: Tue, 7 Jan 2025 14:04:32 -0500 X-Gm-Features: AbW1kva7MhuK874NpXsVM_Yr5NHOlVz8UatI4QII1-lFduUOhRxIeGDIc8NbNBU Message-ID: Content-Type: multipart/alternative; boundary="00000000000014c3d9062b226ba0" X-Mailman-Approved-At: Tue, 07 Jan 2025 22:06:54 -0500 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 2.48 X-Spam-Score: 2.48 X-Migadu-Queue-Id: F0D282B8E X-TUID: +8g7SWDieZNS --00000000000014c3d9062b226ba0 Content-Type: text/plain; charset="UTF-8" Sorry, I think I attached the patch incorrectly. Here are the contents: >From d3feb577f2040daa6b54f0af264dea1d477e530d Mon Sep 17 00:00:00 2001 Message-ID: < d3feb577f2040daa6b54f0af264dea1d477e530d.1736269185.git.reed.meyerson@gmail.com> 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 --00000000000014c3d9062b226ba0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: base64 PGRpdiBkaXI9Imx0ciI+PGRpdj5Tb3JyeSwgSSB0aGluayBJIGF0dGFjaGVkIHRoZSBwYXRjaCBp bmNvcnJlY3RseS4gSGVyZSBhcmUgdGhlIGNvbnRlbnRzOjwvZGl2PjxkaXY+PGJyPjwvZGl2Pjxk aXY+PHNwYW4gc3R5bGU9ImZvbnQtZmFtaWx5Om1vbm9zcGFjZSI+PHNwYW4gc3R5bGU9ImNvbG9y OnJnYigwLDAsMCk7YmFja2dyb3VuZC1jb2xvcjpyZ2IoMjU1LDI1NSwyNTUpIj5Gcm9tIGQzZmVi NTc3ZjIwNDBkYWE2YjU0ZjBhZjI2NGRlYTFkNDc3ZTUzMGQgTW9uIFNlcCAxNyAwMDowMDowMCAy MDAxDQo8L3NwYW4+PGJyPk1lc3NhZ2UtSUQ6ICZsdDs8YSBocmVmPSJtYWlsdG86ZDNmZWI1Nzdm MjA0MGRhYTZiNTRmMGFmMjY0ZGVhMWQ0NzdlNTMwZC4xNzM2MjY5MTg1LmdpdC5yZWVkLm1leWVy c29uQGdtYWlsLmNvbSI+ZDNmZWI1NzdmMjA0MGRhYTZiNTRmMGFmMjY0ZGVhMWQ0NzdlNTMwZC4x NzM2MjY5MTg1LmdpdC5yZWVkLm1leWVyc29uQGdtYWlsLmNvbTwvYT4mZ3Q7DQo8YnI+RnJvbTog UmVlZCBNZXllcnNvbiAmbHQ7PGEgaHJlZj0ibWFpbHRvOnJlZWQubWV5ZXJzb25AZ21haWwuY29t Ij5yZWVkLm1leWVyc29uQGdtYWlsLmNvbTwvYT4mZ3Q7DQo8YnI+RGF0ZTogVHVlLCA3IEphbiAy MDI1IDExOjI3OjAwIC0wNTAwDQo8YnI+U3ViamVjdDogW1BBVENIIDEvMV0gcmVtb3ZpbmcgZGVw cmVjYXRlZCBzcGhpbngudXRpbC5jb21wYXQgaW1wb3J0DQo8YnI+DQo8YnI+Q2hhbmdlLUlkOiBJ MjFjNGRkNWU3MjEwMDIxZTg5MDVkYzYyMzdiZDUxNDhhZWVkOTMwZA0KPGJyPi0tLQ0KPGJyPiAu Li4vcGF0Y2hlcy9nYW5ldGktb3BlbnNzaC10ZXN0LWZpeC5wYXRjaCDCoMKgwqDCoHwgNDYgKysr KysrKysrKysrKysrKysrKw0KPGJyPiAuLi4vcGF0Y2hlcy9nYW5ldGktc3BoaW54LWltcG9ydC5w YXRjaCDCoMKgwqDCoMKgwqDCoHwgMTIgKysrKysNCjxicj4gZ251L3BhY2thZ2VzL3ZpcnR1YWxp emF0aW9uLnNjbSDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgfCAxMiArKysrLQ0KPGJyPiAz IGZpbGVzIGNoYW5nZWQsIDY4IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pDQo8YnI+IGNy ZWF0ZSBtb2RlIDEwMDY0NCBnbnUvcGFja2FnZXMvcGF0Y2hlcy9nYW5ldGktb3BlbnNzaC10ZXN0 LWZpeC5wYXRjaA0KPGJyPiBjcmVhdGUgbW9kZSAxMDA2NDQgZ251L3BhY2thZ2VzL3BhdGNoZXMv Z2FuZXRpLXNwaGlueC1pbXBvcnQucGF0Y2gNCjxicj4NCjxicj5kaWZmIC0tZ2l0IGEvZ251L3Bh Y2thZ2VzL3BhdGNoZXMvZ2FuZXRpLW9wZW5zc2gtdGVzdC1maXgucGF0Y2ggYi9nbnUvcGFja2Fn ZXMvcGF0Y2hlcy9nYW5ldGktb3BlbnNzaC10ZXN0LWZpeC5wYXRjaA0KPGJyPm5ldyBmaWxlIG1v ZGUgMTAwNjQ0DQo8YnI+aW5kZXggMDAwMDAwMDAwMC4uZWQ3YTQ5OGZhYg0KPGJyPi0tLSAvZGV2 L251bGwNCjxicj4rKysgYi9nbnUvcGFja2FnZXMvcGF0Y2hlcy9nYW5ldGktb3BlbnNzaC10ZXN0 LWZpeC5wYXRjaA0KPGJyPkBAIC0wLDAgKzEsNDYgQEANCjxicj4rRnJvbSA4YTA2NjU2YWNmOGY2 ZTNkZmE5MDdiZWE3N2JkNTdhNDY5YThkM2ZiIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KPGJy PitGcm9tOiBjb2RlZnJpdHplbCAmbHQ7PGEgaHJlZj0ibWFpbHRvOnBhc2NhbC1wZkBob3RtYWls LmRlIj5wYXNjYWwtcGZAaG90bWFpbC5kZTwvYT4mZ3Q7DQo8YnI+K0RhdGU6IFRodSwgMTEgSnVs IDIwMjQgMjM6MTA6NDEgKzAyMDANCjxicj4rU3ViamVjdDogcmVwbGFjZSBkc2Egd2l0aCByc2Eg aW4gVGVzdFVwZGF0ZVNzaFJvb3QNCjxicj4rDQo8YnI+K0RTQSB0byBiZSBkZWFjdGl2YXRlZCBp biBPcGVuU1NIIGZyb20gMjAyNS4gU2luY2UgdmVyc2lvbiA3LjAgZHNhIGlzDQo8YnI+K21hcmtl ZCBhcyBkZXByZWNhdGVkLg0KPGJyPisNCjxicj4rVGhlIFRlc3RVcGRhdGVTc2hSb290IHVzZXMg RFNBLCB3aGljaCB3aWxsIGZhaWwgaW4gdGhlIGZ1dHVyZSB3aXRoIG5ld2VyDQo8YnI+K09wZW5T U0ggdmVyc2lvbnMuDQo8YnI+Kw0KPGJyPitmaXhlcyAjMTc1Mg0KPGJyPisNCjxicj4rU2lnbmVk LW9mZi1ieTogY29kZWZyaXR6ZWwgJmx0OzxhIGhyZWY9Im1haWx0bzpwYXNjYWwtcGZAaG90bWFp bC5kZSI+cGFzY2FsLXBmQGhvdG1haWwuZGU8L2E+Jmd0Ow0KPGJyPisNCjxicj4rZGlmZiAtLWdp dCBhL3Rlc3QvcHkvPGEgaHJlZj0iaHR0cDovL2dhbmV0aS50b29scy5wcmVwYXJlX25vZGVfam9p bl91bml0dGVzdC5weSI+Z2FuZXRpLnRvb2xzLnByZXBhcmVfbm9kZV9qb2luX3VuaXR0ZXN0LnB5 PC9hPiBiL3Rlc3QvcHkvPGEgaHJlZj0iaHR0cDovL2dhbmV0aS50b29scy5wcmVwYXJlX25vZGVf am9pbl91bml0dGVzdC5weSI+Z2FuZXRpLnRvb2xzLnByZXBhcmVfbm9kZV9qb2luX3VuaXR0ZXN0 LnB5PC9hPg0KPGJyPitpbmRleCBmZTdlZmRmOGMuLmZlMDI5YjhmMiAxMDA3NTUNCjxicj4rLS0t IGEvdGVzdC9weS88YSBocmVmPSJodHRwOi8vZ2FuZXRpLnRvb2xzLnByZXBhcmVfbm9kZV9qb2lu X3VuaXR0ZXN0LnB5Ij5nYW5ldGkudG9vbHMucHJlcGFyZV9ub2RlX2pvaW5fdW5pdHRlc3QucHk8 L2E+DQo8YnI+KysrKyBiL3Rlc3QvcHkvPGEgaHJlZj0iaHR0cDovL2dhbmV0aS50b29scy5wcmVw YXJlX25vZGVfam9pbl91bml0dGVzdC5weSI+Z2FuZXRpLnRvb2xzLnByZXBhcmVfbm9kZV9qb2lu X3VuaXR0ZXN0LnB5PC9hPg0KPGJyPitAQCAtMjI5LDIwICsyMjksMjAgQEAgY2xhc3MgVGVzdFVw ZGF0ZVNzaFJvb3QodW5pdHRlc3QuVGVzdENhc2UpOg0KPGJyPisgwqDCoGRlZiB0ZXN0VXBkYXRl KHNlbGYpOg0KPGJyPisgwqDCoMKgwqBkYXRhID0gew0KPGJyPisgwqDCoMKgwqDCoMKgY29uc3Rh bnRzLlNTSFNfU1NIX1JPT1RfS0VZOiBbDQo8YnI+Ky0gwqDCoMKgwqDCoMKgwqAoY29uc3RhbnRz LlNTSEtfRFNBLCAmcXVvdDtwcml2YXRlZHNhJnF1b3Q7LCAmcXVvdDtzc2gtZHNzIHB1YmRzYSZx dW90OyksDQo8YnI+KysgwqDCoMKgwqDCoMKgwqAoY29uc3RhbnRzLlNTSEtfUlNBLCAmcXVvdDtw cml2YXRlcnNhJnF1b3Q7LCAmcXVvdDtzc2gtcnNhIHB1YnJzYSZxdW90OyksDQo8YnI+KyDCoMKg wqDCoMKgwqDCoMKgXSwNCjxicj4rLSDCoMKgwqDCoMKgY29uc3RhbnRzLlNTSFNfU1NIX0tFWV9U WVBFOiAmcXVvdDtkc2EmcXVvdDssDQo8YnI+Ky0gwqDCoMKgwqDCoGNvbnN0YW50cy5TU0hTX1NT SF9LRVlfQklUUzogMTAyNCwNCjxicj4rKyDCoMKgwqDCoMKgY29uc3RhbnRzLlNTSFNfU1NIX0tF WV9UWVBFOiAmcXVvdDtyc2EmcXVvdDssDQo8YnI+KysgwqDCoMKgwqDCoGNvbnN0YW50cy5TU0hT X1NTSF9LRVlfQklUUzogMjA0OCwNCjxicj4rIMKgwqDCoMKgwqDCoH0NCjxicj4rIMKgPGJyPisg wqDCoMKgwqBwcmVwYXJlX25vZGVfam9pbi5VcGRhdGVTc2hSb290KGRhdGEsIEZhbHNlLA0KPGJy PisgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgX2hvbWVkaXJfZm49c2VsZi5fR2V0SG9tZURpcikNCjxicj4rIMKg wqDCoMKgc2VsZi5hc3NlcnRFcXVhbChvcy5saXN0ZGlyKHNlbGYudG1wZGlyKSwgWyZxdW90Oy5z c2gmcXVvdDtdKQ0KPGJyPisgwqDCoMKgwqBzZWxmLmFzc2VydEVxdWFsKHNvcnRlZChvcy5saXN0 ZGlyKHNlbGYuc3NoZGlyKSksDQo8YnI+Ky0gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoHNvcnRlZChbJnF1b3Q7YXV0aG9yaXplZF9rZXlzJnF1b3Q7LCAmcXVvdDtpZF9k c2EmcXVvdDssICZxdW90O2lkX2RzYS5wdWImcXVvdDtdKSkNCjxicj4rLSDCoMKgwqBzZWxmLmFz c2VydFRydWUodXRpbHMuUmVhZEZpbGUodXRpbHMuUGF0aEpvaW4oc2VsZi5zc2hkaXIsICZxdW90 O2lkX2RzYSZxdW90OykpDQo8YnI+KysgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoHNvcnRlZChbJnF1b3Q7YXV0aG9yaXplZF9rZXlzJnF1b3Q7LCAmcXVvdDtpZF9yc2Em cXVvdDssICZxdW90O2lkX3JzYS5wdWImcXVvdDtdKSkNCjxicj4rKyDCoMKgwqBzZWxmLmFzc2Vy dFRydWUodXRpbHMuUmVhZEZpbGUodXRpbHMuUGF0aEpvaW4oc2VsZi5zc2hkaXIsICZxdW90O2lk X3JzYSZxdW90OykpDQo8YnI+KyDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgaXMgbm90IE5vbmUpDQo8YnI+Ky0gwqDCoMKgcHViX2tleSA9IHV0aWxzLlJlYWRGaWxlKHV0 aWxzLlBhdGhKb2luKHNlbGYuc3NoZGlyLCAmcXVvdDtpZF9kc2EucHViJnF1b3Q7KSkNCjxicj4r KyDCoMKgwqBwdWJfa2V5ID0gdXRpbHMuUmVhZEZpbGUodXRpbHMuUGF0aEpvaW4oc2VsZi5zc2hk aXIsICZxdW90O2lkX3JzYS5wdWImcXVvdDspKQ0KPGJyPisgwqDCoMKgwqBzZWxmLmFzc2VydFRy dWUocHViX2tleSBpcyBub3QgTm9uZSkNCjxicj4rIMKgwqDCoMKgc2VsZi5hc3NlcnRFcXVhbCh1 dGlscy5SZWFkRmlsZSh1dGlscy5QYXRoSm9pbihzZWxmLnNzaGRpciwNCjxicj4rIMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgJnF1b3Q7YXV0aG9yaXplZF9r ZXlzJnF1b3Q7KSksDQo8YnI+ZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9wYXRjaGVzL2dhbmV0 aS1zcGhpbngtaW1wb3J0LnBhdGNoIGIvZ251L3BhY2thZ2VzL3BhdGNoZXMvZ2FuZXRpLXNwaGlu eC1pbXBvcnQucGF0Y2gNCjxicj5uZXcgZmlsZSBtb2RlIDEwMDY0NA0KPGJyPmluZGV4IDAwMDAw MDAwMDAuLjhjNmU3YjViZTUNCjxicj4tLS0gL2Rldi9udWxsDQo8YnI+KysrIGIvZ251L3BhY2th Z2VzL3BhdGNoZXMvZ2FuZXRpLXNwaGlueC1pbXBvcnQucGF0Y2gNCjxicj5AQCAtMCwwICsxLDEy IEBADQo8YnI+K2RpZmYgLS1naXQgYS9saWIvYnVpbGQvc3BoaW54X2V4dC5weSBiL2xpYi9idWls ZC9zcGhpbnhfZXh0LnB5DQo8YnI+K2luZGV4IGNhOGI4MjE2ZS4uMDE3ZjUyMzQzIDEwMDY0NA0K PGJyPistLS0gYS9saWIvYnVpbGQvc3BoaW54X2V4dC5weQ0KPGJyPisrKysgYi9saWIvYnVpbGQv c3BoaW54X2V4dC5weQ0KPGJyPitAQCAtNDUsNyArNDUsNiBAQCBpbXBvcnQgZG9jdXRpbHMucGFy c2Vycy5yc3QNCjxicj4rIGZyb20gZG9jdXRpbHMucGFyc2Vycy5yc3QgaW1wb3J0IERpcmVjdGl2 ZQ0KPGJyPisgwqA8YnI+KyBpbXBvcnQgc3BoaW54LmVycm9ycw0KPGJyPistaW1wb3J0IHNwaGlu eC51dGlsLmNvbXBhdA0KPGJyPisgaW1wb3J0IHNwaGlueC5yb2xlcw0KPGJyPisgaW1wb3J0IHNw aGlueC5hZGRub2Rlcw0KPGJyPisgwqA8YnI+ZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy92aXJ0 dWFsaXphdGlvbi5zY20gYi9nbnUvcGFja2FnZXMvdmlydHVhbGl6YXRpb24uc2NtDQo8YnI+aW5k ZXggOWRmZjQyMTM0MS4uNGNjNDZiMzkzOSAxMDA2NDQNCjxicj4tLS0gYS9nbnUvcGFja2FnZXMv dmlydHVhbGl6YXRpb24uc2NtDQo8YnI+KysrIGIvZ251L3BhY2thZ2VzL3ZpcnR1YWxpemF0aW9u LnNjbQ0KPGJyPkBAIC03NzYsMTAgKzc3NiwxMiBAQCAoZGVmaW5lLXB1YmxpYyBnYW5ldGkNCjxi cj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgJnF1b3Q7Z2FuZXRpLXByb2Nwcy1jb21wYXQucGF0Y2gm cXVvdDsNCjxicj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgJnF1b3Q7Z2FuZXRpLWRpc2FibGUtdmVy c2lvbi1zeW1saW5rcy5wYXRjaCZxdW90Ow0KPGJyPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAmcXVv dDtnYW5ldGktbGVucy1jb21wYXQucGF0Y2gmcXVvdDsNCjxicj4rIMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAmcXVvdDtnYW5ldGktb3BlbnNzaC10ZXN0LWZpeC5wYXRjaCZxdW90Ow0KPGJyPiDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAmcXVvdDtnYW5ldGktdGVtcGxhdGUtaGFza2VsbC0yLjE3LnBhdGNoJnF1 b3Q7DQo8YnI+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCZxdW90O2dhbmV0aS10ZW1wbGF0ZS1oYXNr ZWxsLTIuMTgucGF0Y2gmcXVvdDsNCjxicj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgJnF1b3Q7Z2Fu ZXRpLXJlb3JkZXItYXJiaXRyYXJ5LWRlZmluaXRpb25zLnBhdGNoJnF1b3Q7DQo8YnI+LSDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgJnF1b3Q7Z2FuZXRpLXJlbGF4LWRlcGVuZGVuY2llcy5wYXRjaCZxdW90 OykpKSkNCjxicj4rIMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAmcXVvdDtnYW5ldGktcmVsYXgtZGVwZW5k ZW5jaWVzLnBhdGNoJnF1b3Q7DQo8YnI+KyDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgJnF1b3Q7Z2FuZXRp LXNwaGlueC1pbXBvcnQucGF0Y2gmcXVvdDspKSkpDQo8YnI+IMKgwqDCoMKgKGJ1aWxkLXN5c3Rl bSBnbnUtYnVpbGQtc3lzdGVtKQ0KPGJyPiDCoMKgwqDCoChhcmd1bWVudHMNCjxicj4gwqDCoMKg wqDCoGAoIzppbXBvcnRlZC1tb2R1bGVzICgsQCVkZWZhdWx0LWdudS1pbXBvcnRlZC1tb2R1bGVz DQo8YnI+QEAgLTkyMywxMyArOTI1LDE5IEBAIChkZWZpbmUtcHVibGljIGdhbmV0aQ0KPGJyPiDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAoKCZxdW90O3Rlc3QvcHkvZ2FuZXRpXFwuaHlw ZXJ2aXNvclxcLmh2X2t2bV91bml0dGVzdFxcLnB5JnF1b3Q7KSAmcXVvdDsmcXVvdDspDQo8YnI+ IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCgoJnF1b3Q7dGVzdC9weS9nYW5ldGlcXC50 b29sc1xcLmVuc3VyZV9kaXJzX3VuaXR0ZXN0XFwucHkmcXVvdDspICZxdW90OyZxdW90OykNCjxi cj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgKCgmcXVvdDt0ZXN0L3B5L2dhbmV0aVxc LnV0aWxzXFwuaW9fdW5pdHRlc3QtcnVuYXNyb290XFwucHkmcXVvdDspICZxdW90OyZxdW90OykN Cjxicj4rIMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqA7OyBUcmFja2VkIGF0OiA8YSBocmVm PSJodHRwczovL2dpdGh1Yi5jb20vZ2FuZXRpL2dhbmV0aS9pc3N1ZXMvMTc1MiI+aHR0cHM6Ly9n aXRodWIuY29tL2dhbmV0aS9nYW5ldGkvaXNzdWVzLzE3NTI8L2E+DQo8YnI+KyDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgKCgmcXVvdDt0ZXN0L3B5L2dhbmV0aVxcLnNzaF91bml0dGVzdFxc LnB5JnF1b3Q7KSAmcXVvdDsmcXVvdDspDQo8YnI+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoDs7IERpc2FibGUgdGhlIGJhc2hfY29tcGxldGlvbiB0ZXN0LCBhcyBpdCByZXF1aXJlcyB0 aGUgZnVsbA0KPGJyPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqA7OyBiYXNoIGluc3Rl YWQgb2YgYmFzaC1taW5pbWFsLg0KPGJyPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAo KCZxdW90O3Rlc3QvcHkvYmFzaF9jb21wbGV0aW9uXFwuYmFzaCZxdW90OykNCjxicj4gwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAmcXVvdDsmcXVvdDspDQo8YnI+IMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoDs7IFRoaXMgdGVzdCByZXF1aXJlcyBuZXR3b3JraW5nLg0KPGJy PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAoKCZxdW90O3Rlc3QvcHkvaW1wb3J0LWV4 cG9ydF91bml0dGVzdFxcLmJhc2gmcXVvdDspDQo8YnI+LSDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAmcXVvdDsmcXVvdDspKSkpDQo8YnI+KyDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAmcXVvdDsmcXVvdDspKQ0KPGJyPisgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgKHN1YnN0 aXR1dGUqICZxdW90O3Rlc3QvaHMvVGVzdC9HYW5ldGkvT3BDb2Rlcy5ocyZxdW90Ow0KPGJyPisg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoDs7IFNvbWUgc2VyZGVzIGZhaWx1cmUsIHRyYWNr ZWQgYXQ6DQo8YnI+KyDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgOzsgPGEgaHJlZj0iaHR0 cHM6Ly9naXRodWIuY29tL2dhbmV0aS9nYW5ldGkvaXNzdWVzLzE3NTMiPmh0dHBzOi8vZ2l0aHVi LmNvbS9nYW5ldGkvZ2FuZXRpL2lzc3Vlcy8xNzUzPC9hPg0KPGJyPisgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCgoJnF1b3Q7LCAmIzM5O2Nhc2VfcHlfY29tcGF0X3R5cGVzJnF1b3Q7KSAm cXVvdDsmcXVvdDspKSkpDQo8YnI+IMKgwqDCoMKgwqDCoMKgwqDCoChhZGQtYWZ0ZXIgJiMzOTti dWlsZCAmIzM5O2J1aWxkLWJhc2gtY29tcGxldGlvbnMNCjxicj4gwqDCoMKgwqDCoMKgwqDCoMKg wqDCoChsYW1iZGEgXw0KPGJyPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoChzZXRlbnYgJnF1 b3Q7UFlUSE9OUEFUSCZxdW90OyAmcXVvdDsuJnF1b3Q7KQ0KPGJyPg0KPGJyPmJhc2UtY29tbWl0 OiA4NGE2OGNmZmU2YWJmMTA1NmRmMjYwN2U3OWVmNTg3YjYzODIwYTZlDQo8YnI+LS0gwqA8YnI+ Mi40Ni4wDQo8YnI+PC9zcGFuPjwvZGl2PjwvZGl2Pg0K --00000000000014c3d9062b226ba0--