diff -pruN 5.0.0-2/debian/changelog 5.0.0-2ubuntu1/debian/changelog --- 5.0.0-2/debian/changelog 2025-10-27 20:08:05.000000000 +0000 +++ 5.0.0-2ubuntu1/debian/changelog 2025-11-17 05:12:25.000000000 +0000 @@ -1,3 +1,12 @@ +crmsh (5.0.0-2ubuntu1) resolute; urgency=medium + + * Merge with Debian unstable (LP: #2125991). Remaining changes: + - d/t/control: add resource-agents-extra as a dependency of some tests. + - d/t/testsuite.sh: unset SUDO_USER to proper replicate this test run across + different environments. + + -- Renan Rodrigo Mon, 17 Nov 2025 02:12:25 -0300 + crmsh (5.0.0-2) unstable; urgency=medium * d/control: add util-linux-extra to Suggests (Closes: #1116291) @@ -32,6 +41,15 @@ crmsh (5.0.0~rc1-1) unstable; urgency=me -- Valentin Vidic Thu, 19 Jun 2025 21:08:58 +0200 +crmsh (4.6.1-2ubuntu1) questing; urgency=medium + + * Merge with Debian unstable (LP: #2110432). Remaining changes: + - d/t/control: add resource-agents-extra as a dependency of some tests. + - d/t/testsuite.sh: unset SUDO_USER to proper replicate this test run across + different environments. + + -- Renan Rodrigo Thu, 29 May 2025 15:17:08 -0300 + crmsh (4.6.1-2) unstable; urgency=medium * d/patches: fix update_err handling (Closes: #1102663) @@ -49,12 +67,34 @@ crmsh (4.6.1-1) unstable; urgency=medium -- Valentin Vidic Wed, 02 Apr 2025 22:46:02 +0200 +crmsh (4.6.0-4ubuntu1) plucky; urgency=medium + + * Merge from Debian Unstable. Remaining changes: + - d/t/control: add resource-agents-extra as a dependency of some tests. + - d/t/testsuite.sh: unset SUDO_USER to proper replicate this test run across + different environments. + + -- Simon Quigley Wed, 19 Feb 2025 18:30:10 -0600 + crmsh (4.6.0-4) unstable; urgency=medium * d/patches: add fix for failing timestamp test -- Valentin Vidic Sun, 09 Feb 2025 16:59:10 +0100 +crmsh (4.6.0-3ubuntu1) plucky; urgency=medium + + * Merge with Debian unstable (LP: #2085226). Remaining changes: + - d/t/control: add resource-agents-extra as a dependency of some tests. + - d/t/testsuite.sh: unset SUDO_USER to proper replicate this test run across + different environments. + * Dropped changes: + - d/p/fix-findln-by-timestamp-test.patch: fix failing unit test. + (Closes: #1068562) (LP #2060536) + [ Fixed in 4.6.0-2 ] + + -- Athos Ribeiro Tue, 17 Dec 2024 16:50:11 -0300 + crmsh (4.6.0-3) unstable; urgency=medium * d/patches: fix python syntax warnings (Closes: #1082829) @@ -71,6 +111,22 @@ crmsh (4.6.0-2) unstable; urgency=medium -- Valentin Vidic Sun, 14 Apr 2024 13:11:19 +0200 +crmsh (4.6.0-1ubuntu2) noble; urgency=medium + + - d/p/fix-findln-by-timestamp-test.patch: fix failing unit test. + (Closes: #1068562) (LP: #2060536) + + -- Athos Ribeiro Wed, 10 Apr 2024 16:14:45 -0300 + +crmsh (4.6.0-1ubuntu1) noble; urgency=medium + + * Merge with Debian; remaining changes: + - d/t/control: add resource-agents-extra as a dependency of some tests. + - d/t/testsuite.sh: unset SUDO_USER to proper replicate this test run across + different environments. + + -- Matthias Klose Sun, 18 Feb 2024 23:46:13 +0100 + crmsh (4.6.0-1) unstable; urgency=medium * New upstream version 4.6.0 @@ -83,6 +139,26 @@ crmsh (4.6.0-1) unstable; urgency=medium -- Valentin Vidic Sat, 17 Feb 2024 13:58:22 +0100 +crmsh (4.5.0-1ubuntu3) noble; urgency=medium + + * Use packaging.version instead of distutils.version. + + -- Matthias Klose Wed, 07 Feb 2024 03:45:17 +0100 + +crmsh (4.5.0-1ubuntu2) noble; urgency=medium + + * d/t/testsuite.sh: unset SUDO_USER to proper replicate this test run across + different environments. + + -- Athos Ribeiro Tue, 05 Dec 2023 11:44:42 -0300 + +crmsh (4.5.0-1ubuntu1) noble; urgency=medium + + * Merge with Debian unstable (LP: #2040377). Remaining changes: + - d/t/control: add resource-agents-extra as a dependency of some tests. + + -- Athos Ribeiro Wed, 01 Nov 2023 15:13:15 -0300 + crmsh (4.5.0-1) unstable; urgency=medium * New upstream version 4.5.0 @@ -94,6 +170,18 @@ crmsh (4.5.0-1) unstable; urgency=medium -- Valentin Vidic Tue, 10 Oct 2023 22:57:14 +0200 +crmsh (4.4.1-1ubuntu1) mantic; urgency=medium + + * Merge with Debian unstable (LP: #2018067). Remaining changes: + - d/t/control: add resource-agents-extra as a dependency of some tests. + * Drop changes: + - d/t/control: add fence-virt as dependency of utils.sh. + [ Fixed in Debian in 4.4.0-5 ] + - d/t/utils.sh: use fence-virt package instead of vim. + [ Fixed in Debian in 4.4.0-5 ] + + -- Athos Ribeiro Tue, 04 Jul 2023 10:22:31 -0300 + crmsh (4.4.1-1) unstable; urgency=medium [ Bas Couwenberg ] @@ -117,6 +205,17 @@ crmsh (4.4.0-5) unstable; urgency=medium -- Valentin Vidic Sat, 14 Jan 2023 01:45:45 +0100 +crmsh (4.4.0-4ubuntu1) lunar; urgency=medium + + * Merge with Debian unstable (LP: #2002811). Remaining changes: + - d/t/control: add resource-agents-extra as a dependency of some tests. + - d/t/control: add fence-virt as dependency of utils.sh + - d/t/utils.sh: use fence-virt package instead of vim + The test tries to remove the chosen package and vim is a + dependency of ubuntu-server and cannot be removed. + + -- Simon Chopin Fri, 13 Jan 2023 14:08:25 +0100 + crmsh (4.4.0-4) unstable; urgency=medium * Team upload. @@ -126,6 +225,23 @@ crmsh (4.4.0-4) unstable; urgency=medium -- Bas Couwenberg Thu, 12 Jan 2023 09:54:32 +0100 +crmsh (4.4.0-3ubuntu1) lunar; urgency=medium + + * Merge with Debian unstable (LP: #1993394). Remaining changes: + - d/t/control: add resource-agents-extra as a dependency of some tests. + * Dropped: + - d/t/pacemaker-node-status.sh: Get the node name with "crm_node -n" + instead of using "corosync-cmapctl". Ubuntu's corosync default + configuration file does not set the node name. + [ applied in Debian version 4.4.0-2 ] + * Added: + - d/t/control: add fence-virt as dependency of utils.sh. + - d/t/utils.sh: use fence-virt package instead of vim. + The test tries to remove the chosen package and vim is a + dependency of ubuntu-server and cannot be removed. + + -- Lucas Kanashiro Wed, 04 Jan 2023 16:37:04 -0300 + crmsh (4.4.0-3) unstable; urgency=medium * d/patches: fix crmadmin parsing (Closes: #1023824) @@ -142,6 +258,22 @@ crmsh (4.4.0-2) unstable; urgency=medium -- Valentin Vidic Sat, 15 Oct 2022 14:49:18 +0200 +crmsh (4.4.0-1ubuntu1) kinetic; urgency=medium + + * Merge with Debian unstable (LP: #1971271, #1972730). Remaining changes: + - d/t/pacemaker-node-status.sh: Get the node name with "crm_node -n" + instead of using "corosync-cmapctl". Ubuntu's corosync default + configuration file does not set the node name. + - d/t/control: add resource-agents-extra as a dependency of some tests. + * Dropped changes: + - d/p/0020-Use-crmsh-hb_report.patch: use the crmsh shipped hb_report script + when available (LP #1958247). + [ The hb_report script is no longer present since 4.4.0. ] + - d/p/0021-Support-python-310.patch: support Python 3.10 (LP #1958393). + [ Included in 4.4.0. ] + + -- Athos Ribeiro Tue, 31 May 2022 18:04:36 -0300 + crmsh (4.4.0-1) unstable; urgency=medium * New upstream version 4.4.0 @@ -174,6 +306,38 @@ crmsh (4.3.1-2) unstable; urgency=medium -- Valentin Vidic Sun, 10 Apr 2022 07:11:23 +0200 +crmsh (4.3.1-1ubuntu2) jammy; urgency=medium + + * d/t/control: add resource-agents-extra as a dependency of + pacemaker-basic-resource.sh and testsuite.sh tests (LP: #1968222). + + -- Lucas Kanashiro Thu, 07 Apr 2022 17:13:50 -0300 + +crmsh (4.3.1-1ubuntu1) jammy; urgency=medium + + * Merge with Debian unstable (LP: #1958978). Remaining changes: + - d/t/pacemaker-node-status.sh: Use the output of "uname -n" instead + of "node1" as the pacemaker node name. + - d/p/0020-Use-crmsh-hb_report.patch: use the crmsh shipped hb_report script + when available (LP #1958247). + [ Adjusted for 4.3.1 upstream release. ] + * Dropped changes: + - d/p/0017-Fix-health-scripts-python-38-support.patch: remove deprecated + function usage (LP #1947022). + [ Included in Debian in 4.3.1-1. ] + - d/p/0018-Replace-crmd.patch: replace crmd calls with pacemaker-controld + (LP #1958241). + [ Included in Debian in 4.3.1-1. ] + - d/t/testsuite.sh: set timezone for time conversion tests (LP #1958243). + [ Included in Debian in 4.3.1-1. ] + - d/p/0019-Add-hb_report-dpkg-support.patch: Add dpkg support to hb_report + (LP #1958246). + [ Included in Debian in 4.3.1-1. ] + * Added changes: + - d/p/0021-Support-python-310.patch: support Python 3.10 (LP: #1958393). + + -- Athos Ribeiro Wed, 26 Jan 2022 09:27:26 -0300 + crmsh (4.3.1-1) unstable; urgency=medium [ Valentin Vidic ] @@ -194,6 +358,29 @@ crmsh (4.3.1-1) unstable; urgency=medium -- Valentin Vidic Wed, 19 Jan 2022 21:13:36 +0100 +crmsh (4.2.1-3ubuntu2) jammy; urgency=medium + + * New changes: + - d/p/0017-Fix-health-scripts-python-38-support.patch: remove deprecated + function usage (LP: #1947022). + - d/p/0018-Replace-crmd.patch: replace crmd calls with pacemaker-controld + (LP: #1958241). + - d/t/testsuite.sh: set timezone for time conversion tests (LP: #1958243). + - d/p/0019-Add-hb_report-dpkg-support.patch: add dpkg support to hb_report + (LP: #1958246). + - d/p/0020-Use-crmsh-hb_report.patch: use the crmsh shipped hb_report script + when available (LP: #1958247). + + -- Athos Ribeiro Fri, 07 Jan 2022 10:14:32 -0300 + +crmsh (4.2.1-3ubuntu1) jammy; urgency=medium + + * Merge with Debian unstable (LP: #1946853). Remaining changes: + - d/t/pacemaker-node-status.sh: Use the output of "uname -n" instead + of "node1" as the pacemaker node name. + + -- Utkarsh Gupta Mon, 06 Dec 2021 17:46:48 +0530 + crmsh (4.2.1-3) unstable; urgency=medium * Team upload @@ -203,6 +390,24 @@ crmsh (4.2.1-3) unstable; urgency=medium -- Ferenc Wágner Sat, 30 Oct 2021 15:37:37 +0200 +crmsh (4.2.1-2ubuntu1) impish; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/t/pacemaker-node-status.sh: Use the output of "uname -n" instead + of "node1" as the pacemaker node name. + * Dropped: + - Upstream patches with post release fixes + + [997f62d6] Fix: hb_report: disable dump all tasks stack into dmesg + + [cce28254] Fix: crmsh.spec: using mktemp to create tmp file + + [e098387e] Fix: bootstrap: use csync2 '-f' option correctly + + [669f13b5] Fix: bootstrap: Change condition to add stonith-sbd resource + + [ca1f0a7f] Fix: ui_resource: refresh should complete resource + first + + [78ce77e4] Low: hb_report: Fix collecting of binary data + [Applied by upstream in version 4.2.1] + + -- Lucas Kanashiro Fri, 23 Jul 2021 09:38:52 -0300 + crmsh (4.2.1-2) unstable; urgency=medium * d/patches: include fix for CVE-2020-35459 (Closes: #985376) @@ -220,6 +425,25 @@ crmsh (4.2.1-1) unstable; urgency=medium -- Valentin Vidic Wed, 03 Feb 2021 22:05:33 +0100 +crmsh (4.2.0-4ubuntu2) impish; urgency=medium + + * d/t/pacemaker-node-status.sh: Use the output of "uname -n" instead + of "node1" as the pacemaker node name. + + -- Sergio Durigan Junior Wed, 07 Jul 2021 16:44:57 -0400 + +crmsh (4.2.0-4ubuntu1) hirsute; urgency=medium + + * Merge with Debian; remaining changes: + - [997f62d6] Fix: hb_report: disable dump all tasks stack into dmesg + - [cce28254] Fix: crmsh.spec: using mktemp to create tmp file + - [e098387e] Fix: bootstrap: use csync2 '-f' option correctly + - [669f13b5] Fix: bootstrap: Change condition to add stonith-sbd resource + - [ca1f0a7f] Fix: ui_resource: refresh should complete resource first + - [78ce77e4] Low: hb_report: Fix collecting of binary data + + -- Matthias Klose Sun, 29 Nov 2020 13:55:19 +0100 + crmsh (4.2.0-4) unstable; urgency=medium * d/patches: fix flaky autopkgtest (Closes: #972619) @@ -228,6 +452,18 @@ crmsh (4.2.0-4) unstable; urgency=medium -- Valentin Vidic Wed, 21 Oct 2020 20:42:26 +0200 +crmsh (4.2.0-3ubuntu1) groovy; urgency=medium + + * Fixes before release: (LP: #1895728) + - [997f62d6] Fix: hb_report: disable dump all tasks stack into dmesg + - [cce28254] Fix: crmsh.spec: using mktemp to create tmp file + - [e098387e] Fix: bootstrap: use csync2 '-f' option correctly + - [669f13b5] Fix: bootstrap: Change condition to add stonith-sbd resource + - [ca1f0a7f] Fix: ui_resource: refresh should complete resource first + - [78ce77e4] Low: hb_report: Fix collecting of binary data + + -- Rafael David Tinoco Wed, 16 Sep 2020 03:41:38 +0000 + crmsh (4.2.0-3) unstable; urgency=medium [ Debian Janitor ] @@ -635,3 +871,4 @@ crmsh (1.2.0+hg20121009-1) unstable; urg * Initial release (Closes: #690055) -- Martin Loschwitz Tue, 09 Oct 2012 14:36:09 +0000 + diff -pruN 5.0.0-2/debian/control 5.0.0-2ubuntu1/debian/control --- 5.0.0-2/debian/control 2025-10-27 19:54:47.000000000 +0000 +++ 5.0.0-2ubuntu1/debian/control 2025-11-17 05:12:25.000000000 +0000 @@ -1,7 +1,8 @@ Source: crmsh Section: admin Priority: optional -Maintainer: Debian HA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian HA Maintainers Uploaders: Richard B Winters , Adrian Vondendriesch , diff -pruN 5.0.0-2/debian/tests/control 5.0.0-2ubuntu1/debian/tests/control --- 5.0.0-2/debian/tests/control 2025-03-11 21:31:59.000000000 +0000 +++ 5.0.0-2ubuntu1/debian/tests/control 2025-11-17 05:12:25.000000000 +0000 @@ -15,11 +15,11 @@ Depends: crmsh, fence-virt Restrictions: needs-root, allow-stderr Tests: testsuite.sh -Depends: crmsh, openssh-server, python3-pytest +Depends: crmsh, openssh-server, python3-pytest, resource-agents-extra Restrictions: needs-root Tests: pacemaker-basic-resource.sh -Depends: crmsh +Depends: crmsh, resource-agents-extra Restrictions: needs-root, allow-stderr, isolation-container, skippable Tests: pacemaker-node-status.sh diff -pruN 5.0.0-2/debian/tests/testsuite.sh 5.0.0-2ubuntu1/debian/tests/testsuite.sh --- 5.0.0-2/debian/tests/testsuite.sh 2025-02-09 15:31:19.000000000 +0000 +++ 5.0.0-2ubuntu1/debian/tests/testsuite.sh 2025-11-17 05:12:25.000000000 +0000 @@ -8,6 +8,11 @@ export PYTHONPATH=/usr/share/crmsh # test/unittests/test_report.py::test_ts_to_dt assumes UTC export TZ=UTC +# unset sudo user. We assume root, and Ubuntu's autopkgtest infra gets root +# through "sudo su", which leads upstream tests to behave differently in Ubuntu +# autopkgtest infrastructure +unset SUDO_USER + mkdir /usr/share/crmsh/doc # some tests fail if the cluster is running