diff -pruN 2.1.4-2/debian/changelog 2.1.4-2ubuntu1/debian/changelog
--- 2.1.4-2/debian/changelog	2022-07-21 21:20:11.000000000 +0000
+++ 2.1.4-2ubuntu1/debian/changelog	2022-08-03 18:53:10.000000000 +0000
@@ -1,3 +1,22 @@
+pacemaker (2.1.4-2ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1971307). Remaining changes:
+    - Make crmsh the default management tool for now (LP #1862947)
+    - d/control: make pacemaker binary recommend fence-agents-base
+    - d/control: make pacemaker-resource-agents depend on resource-agents-base.
+      And also suggest resource-agents-extra with non-curated agents.
+    - d/t/pacemaker: corosync uses uname -n to define the default node name.
+      Previously the default node name was hardcoded in the config file as
+      node1.
+    - d/rules: Fix FTBFS in ppc64el compiling with gcc10: Don't treat
+      format-overflow warnings as errors
+    - d/control: make pacemaker-cli-utils depend on resource-agents-base.
+      resource-agents is now a transitional package and it should not be in
+      main (it also pulls in resource-agents-extra which should be in
+      universe).
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Wed, 03 Aug 2022 15:53:10 -0300
+
 pacemaker (2.1.4-2) unstable; urgency=medium
 
   * [e95d387] New patch: strings.c: don't rely on strcmp() returning one-byte
@@ -37,6 +56,40 @@ pacemaker (2.1.4-1) unstable; urgency=me
 
  -- Ferenc Wágner <wferi@debian.org>  Sun, 03 Jul 2022 16:03:21 +0200
 
+pacemaker (2.1.2-1ubuntu3) jammy; urgency=medium
+
+  * d/control: make pacemaker-cli-utils depend on resource-agents-base.
+    resource-agents is now a transitional package and it should not be in
+    main (it also pulls in resource-agents-extra which should be in
+    universe).
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Wed, 30 Mar 2022 11:32:14 -0300
+
+pacemaker (2.1.2-1ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild to update maintainer scripts, see LP: 1959054
+
+ -- Dave Jones <dave.jones@canonical.com>  Wed, 16 Feb 2022 17:16:58 +0000
+
+pacemaker (2.1.2-1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946885). Remaining changes:
+    - Make crmsh the default management tool for now (LP #1862947)
+    - d/control: make pacemaker binary recommend fence-agents-base
+    - d/control: make pacemaker-resource-agents depend on resource-agents-base.
+      And also suggest resource-agents-extra with non-curated agents.
+    - d/t/pacemaker: corosync uses uname -n to define the default node name.
+      Previously the default node name was hardcoded in the config file as
+      node1.
+    - d/rules: Fix FTBFS in ppc64el compiling with gcc10: Don't treat
+      format-overflow warnings as errors
+  * Dropped:
+    - d/rules: Forcibly switch from ftime to clock_gettime, since building
+      with ftime now results in deprecation errors
+      [in 2.1.2 by upstream]
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Thu, 02 Dec 2021 15:41:12 -0300
+
 pacemaker (2.1.2-1) unstable; urgency=medium
 
   * [eeac038] New upstream release (2.1.2)
@@ -78,6 +131,88 @@ pacemaker (2.1.1-1) unstable; urgency=me
 
  -- Ferenc Wágner <wferi@debian.org>  Mon, 25 Oct 2021 12:29:49 +0200
 
+pacemaker (2.0.5-2ubuntu3) impish; urgency=medium
+
+  * d/t/pacemaker: corosync uses uname -n to define the default node name.
+    Previously the default node name was hardcoded in the config file as
+    node1.
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Wed, 23 Jun 2021 09:17:38 -0300
+
+pacemaker (2.0.5-2ubuntu2) impish; urgency=medium
+
+  * Adjust dependency relations with the {fence,resource}-agents packages. The
+    following changes were applied in debian/control:
+    - Make pacemaker binary recommend fence-agents-base.
+    - Make pacemaker-resource-agents depend on resource-agents-base.
+      Also suggest resource-agents-extra with non-curated agents.
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Wed, 05 May 2021 17:04:36 -0300
+
+pacemaker (2.0.5-2ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: Demote fence-agents to Suggests, avoiding main inclusion.
+    - Make crmsh the default management tool for now (LP #1862947)
+    - d/rules: Forcibly switch from ftime to clock_gettime, since building
+      with ftime now results in deprecation errors
+    - d/rules: Fix FTBFS in ppc64el compiling with gcc10: Don't treat
+      format-overflow warnings as errors
+  * Dropped:
+    - Skip autopkgtest for unprivileged containers: (LP #1828228)
+      + d/t/control: mark pacemaker test as skippable
+      + d/t/pacemaker: skip if memlock can't be set to unlimited by root
+      [fixed in Debian]
+    - Post 2.0.04 release fixes backported to Ubuntu (LP #1895883)
+      debian/patches/ubuntu/lp1895883-*:
+      + [055d7e4e] Low: libcib: Fix building if the gnutls library is not
+      + [67174c53] Build: configure: Conditionalize check for $PYTHON.
+      + [47c3e06b] Fix: libpacemaker: Don't allow a potential NULL in a format
+      + [ea7469cb] Low: resources: don't check host-specific conditions in
+      + [7056ae08] Fix: libcrmcommon: Set out->priv to NULL in free_priv.
+      + [37791529] Fix: libcrmcommon: Make reset and finish work more similarly.
+      + [b655c039] Fix: tools: Add the http-equiv header to crm_mon at the right
+      + [0f8e4ca5] Fix: tools, libcrmcommon: Reopen the output dest on reset.
+      + [24dd01c3] Fix: cts: Use a different grep in building the cts-cli
+      + [36cf9284] Fix: cts: Use --node instead of --host as crm_resource
+      + [5c111adf] Fix: libpe_status: Destroy hash table after use
+      + [dc341923] cluster: Close corosync handles when they disconnect
+      + [3a88b2b6] Refactor: tools: rename function in cibsecret to be more
+      [applied by upstream]
+    - Post 2.0.4 features: on-fail=demote & no-quorum-policy=demote
+      (LP #1896223). Added debian/patches/ubuntu/lp1896223-*:
+      + [c4429d86e] Log: scheduler: downgrade "active on" messages to trace
+      + [01c5ec67e] Low: scheduler: match initial no-quorum-policy struct value
+      + [015b5c012] Doc: Pacemaker Explained: document no-quorum-policy=demote
+      + [5d809e136] Test: scheduler: add regression test
+      + [b1ae35938] Feature: scheduler: support "demote" choice
+      + [0b6834453] Refactor: scheduler: functionize checking quorum policy
+      + [d4b9117e7] Doc: Pacemaker Explained: correct on-fail default
+      + [204961e95] Doc: Pacemaker Explained: document new on-fail="demote"
+      + [d29433ea5] Test: scheduler: add regression tests for on-fail="demote"
+      + [874f75e0f] Feature: scheduler: new on-fail="demote" recovery policy
+      + [2f1e2df1f] Feature: xml: add on-fail="demote" option to resources
+      + [fd55a6660] Doc: libpacemaker: improve comments for resource state
+      + [98c3b649f] Log: libpacemaker: check for re-promotes specifically
+      + [ff6aebecf] Doc: libpacemaker: improve comments when logging actions
+      + [f2d244bc4] Test: scheduler: test forcing a restart instead of reload
+      + [a4d6a20a9] Low: libpacemaker: don't force stop when skipping reload
+      + [8dceba792] Refactor: scheduler: use more appropriate types in a couple
+      + [ef246ff05] Fix: scheduler: disallow on-fail=stop for stop operations
+      + [f1f71b3f3] Refactor: scheduler: functionize comparing on-fail values
+      [applied by upstream]
+    - SECURITY UPDATE: ACL restrictions bypass
+      + debian/patches/CVE-2020-25654-*.patch: restrict IPC connections.
+      + CVE-2020-25654
+      [applied by upstream]
+    - d/{libcib27,libcrmcluster29,libcrmcommon34,libcrmservice28,
+      liblrmd28,libpacemaker1,libpe-rules26,libpe-status28,libstonithd26}.symbols:
+      libqb 2 dropped the linker magic injecting start/stop symbols.
+      Thanks to Ferenc Wágner <wferi@debian.org>.
+      [fixed in Debian]
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Tue, 19 Jan 2021 17:15:50 -0300
+
 pacemaker (2.0.5-2) unstable; urgency=medium
 
   [ Helmut Grohne ]
@@ -138,6 +273,106 @@ pacemaker (2.0.5~rc2-1) unstable; urgenc
 
  -- Ferenc Wágner <wferi@debian.org>  Tue, 10 Nov 2020 23:02:55 +0100
 
+pacemaker (2.0.4-2ubuntu5) hirsute; urgency=medium
+
+  * d/{libcib27,libcrmcluster29,libcrmcommon34,libcrmservice28,
+    liblrmd28,libpacemaker1,libpe-rules26,libpe-status28,libstonithd26}.symbols:
+    libqb 2 dropped the linker magic injecting start/stop symbols.
+    Thanks to Ferenc Wágner <wferi@debian.org>.
+
+ -- Sergio Durigan Junior <sergio.durigan@canonical.com>  Wed, 13 Jan 2021 13:39:35 -0500
+
+pacemaker (2.0.4-2ubuntu4) hirsute; urgency=medium
+
+  * No-change rebuild for libqb soname change. 
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 01 Jan 2021 14:36:48 +0100
+
+pacemaker (2.0.4-2ubuntu3.1) groovy-security; urgency=medium
+
+  * SECURITY UPDATE: ACL restrictions bypass
+    - debian/patches/CVE-2020-25654-*.patch: restrict IPC connections.
+    - CVE-2020-25654
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 29 Oct 2020 08:48:48 -0400
+
+pacemaker (2.0.4-2ubuntu3) groovy; urgency=medium
+
+  * Post 2.0.4 features: on-fail=demote & no-quorum-policy=demote
+    (LP: #1896223). Added debian/patches/ubuntu/lp1896223-*:
+    - [c4429d86e] Log: scheduler: downgrade "active on" messages to trace
+    - [01c5ec67e] Low: scheduler: match initial no-quorum-policy struct value
+    - [015b5c012] Doc: Pacemaker Explained: document no-quorum-policy=demote
+    - [5d809e136] Test: scheduler: add regression test
+    - [b1ae35938] Feature: scheduler: support "demote" choice
+    - [0b6834453] Refactor: scheduler: functionize checking quorum policy
+    - [d4b9117e7] Doc: Pacemaker Explained: correct on-fail default
+    - [204961e95] Doc: Pacemaker Explained: document new on-fail="demote"
+    - [d29433ea5] Test: scheduler: add regression tests for on-fail="demote"
+    - [874f75e0f] Feature: scheduler: new on-fail="demote" recovery policy
+    - [2f1e2df1f] Feature: xml: add on-fail="demote" option to resources
+    - [fd55a6660] Doc: libpacemaker: improve comments for resource state
+    - [98c3b649f] Log: libpacemaker: check for re-promotes specifically
+    - [ff6aebecf] Doc: libpacemaker: improve comments when logging actions
+    - [f2d244bc4] Test: scheduler: test forcing a restart instead of reload
+    - [a4d6a20a9] Low: libpacemaker: don't force stop when skipping reload
+    - [8dceba792] Refactor: scheduler: use more appropriate types in a couple
+    - [ef246ff05] Fix: scheduler: disallow on-fail=stop for stop operations
+    - [f1f71b3f3] Refactor: scheduler: functionize comparing on-fail values
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Tue, 22 Sep 2020 17:51:03 +0000
+
+pacemaker (2.0.4-2ubuntu2) groovy; urgency=medium
+
+  * debian/rules: Fix FTBFS in ppc64el: gcc10 related warnings as errors
+  * Post 2.0.04 release fixes backported to Ubuntu (LP: #1895883)
+    debian/patches/ubuntu/lp1895883-*:
+    - [055d7e4e] Low: libcib: Fix building if the gnutls library is not
+    - [67174c53] Build: configure: Conditionalize check for $PYTHON.
+    - [47c3e06b] Fix: libpacemaker: Don't allow a potential NULL in a format
+    - [ea7469cb] Low: resources: don't check host-specific conditions in
+    - [7056ae08] Fix: libcrmcommon: Set out->priv to NULL in free_priv.
+    - [37791529] Fix: libcrmcommon: Make reset and finish work more similarly.
+    - [b655c039] Fix: tools: Add the http-equiv header to crm_mon at the right
+    - [0f8e4ca5] Fix: tools, libcrmcommon: Reopen the output dest on reset.
+    - [24dd01c3] Fix: cts: Use a different grep in building the cts-cli
+    - [36cf9284] Fix: cts: Use --node instead of --host as crm_resource
+    - [5c111adf] Fix: libpe_status: Destroy hash table after use
+    - [dc341923] cluster: Close corosync handles when they disconnect
+    - [3a88b2b6] Refactor: tools: rename function in cibsecret to be more
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Thu, 17 Sep 2020 21:19:52 +0000
+
+pacemaker (2.0.4-2ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1886546). Remaining changes:
+    - Dropped: debian/patches/pacemaker_is_partof_corosync.patch:
+      Disagreement among Debian and Ubuntu about service dependencies.
+    - d/control: Demote fence-agents to Suggests, avoiding main inclusion.
+    - Skip autopkgtest for unprivileged containers: (LP #1828228)
+      + d/t/control: mark pacemaker test as skippable
+      + d/t/pacemaker: skip if memlock can't be set to unlimited by root
+    - Make crmsh the default management tool for now (LP #1862947)
+    - d/rules: Forcibly switch from ftime to clock_gettime, since building
+      with ftime now results in deprecation errors
+  * Dropped (from Ubuntu):
+    - Post 2.0.3 release fixes backported to Ubuntu (LP #1870235)
+      debian/patches/ubuntu-2.0.3-fixes/:
+      - lp1870235-0a8e789f9-Fix-libpengine-Options-should-be-uint.patch
+      - lp1870235-186042bcb-Ref-libcrmservice-SIGCHLD-handling.patch
+      - lp1870235-28bfd00e9-Low-libcrmservice-handle-child-wait-errors.patch
+      - lp1870235-426f06cc0-Fix-tools-Fix-curses_indented_printf.patch
+      - lp1870235-4f5207a28-Fix-tools-Correct-crm_mon-man-page.patch
+      - lp1870235-5afe84e45-Fix-libstonithd-validate-arg-non-const.patch
+      - lp1870235-c98987824-Fix-iso8601-Fix-crm_time_parse_offset.patch
+      - lp1870235-dec326391-Log-libcrmcommon-correct-log-line-length.patch
+      - lp1870235-e35908c79-Log-libcrmservice-impr-msgs-wait-child.patch
+      - lp1870235-eaaa20949-Fix-libstonithd-tools-Fix-arg-stonith-event.patch
+      - lp1870235-f0fe45806-Fix-scheduler-cluster-maint-mode-true.patch
+      [in Debian Pacemaker-2.0.4]
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Mon, 06 Jul 2020 19:04:45 +0000
+
 pacemaker (2.0.4-2) unstable; urgency=medium
 
   * [a0fdbb5] The special libqb symbols aren't present on PowerPC architectures
@@ -170,6 +405,54 @@ pacemaker (2.0.4-1) unstable; urgency=me
 
  -- Ferenc Wágner <wferi@debian.org>  Sun, 21 Jun 2020 20:32:05 +0200
 
+pacemaker (2.0.3-3ubuntu3) focal; urgency=medium
+
+  * Post 2.0.3 release fixes backported to Ubuntu (LP: #1870235)
+    debian/patches/ubuntu-2.0.3-fixes/:
+    - lp1870235-0a8e789f9-Fix-libpengine-Options-should-be-uint.patch
+    - lp1870235-186042bcb-Ref-libcrmservice-SIGCHLD-handling.patch
+    - lp1870235-28bfd00e9-Low-libcrmservice-handle-child-wait-errors.patch
+    - lp1870235-426f06cc0-Fix-tools-Fix-curses_indented_printf.patch
+    - lp1870235-4f5207a28-Fix-tools-Correct-crm_mon-man-page.patch
+    - lp1870235-5afe84e45-Fix-libstonithd-validate-arg-non-const.patch
+    - lp1870235-c98987824-Fix-iso8601-Fix-crm_time_parse_offset.patch
+    - lp1870235-dec326391-Log-libcrmcommon-correct-log-line-length.patch
+    - lp1870235-e35908c79-Log-libcrmservice-impr-msgs-wait-child.patch
+    - lp1870235-eaaa20949-Fix-libstonithd-tools-Fix-arg-stonith-event.patch
+    - lp1870235-f0fe45806-Fix-scheduler-cluster-maint-mode-true.patch
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Mon, 06 Apr 2020 10:48:48 -0300
+
+pacemaker (2.0.3-3ubuntu2) focal; urgency=medium
+
+  * Forcibly switch from ftime to clock_gettime, since building with ftime now
+    results in deprecation errors
+
+ -- William Grant <wgrant@ubuntu.com>  Sat, 04 Apr 2020 19:15:34 +1100
+
+pacemaker (2.0.3-3ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable (LP: #1864116). Remaining changes:
+    - Skip autopkgtest for unprivileged containers: (LP: 1828228)
+      - d/t/control: mark pacemaker test as skippable
+      - d/t/pacemaker: skip if memlock can't be set to unlimited by root
+    - Make crmsh the default management tool for now (LP #1862947)
+    - Fix: Last attempt i386 binary packages removal was wrong (-Nlibkate)
+    - Ubuntu i386 binary compatibility only effort: (LP #1863437)
+      - i386 binary package removal:
+        - pacemaker
+        - pacemaker-cli-utils
+        - pacemaker-remote
+        - pacemaker-resource-agents
+  * Dropped (from Debian):
+    - debian/patches/pacemaker_is_partof_corosync.patch
+      [fixed in corosync debian/2.4.2-3+deb9u1_bpo8+1]
+    - Omit pacemaker, pacemaker-cli-utils, pacemaker-remote binary
+      packages on i386.
+      [merged in debian/2.0.3-3]
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Fri, 21 Feb 2020 01:18:12 +0000
+
 pacemaker (2.0.3-3) unstable; urgency=medium
 
   * [543574f] Omit pacemaker{, -cli-utils, -remote} on Ubuntu/i386
@@ -226,6 +509,54 @@ pacemaker (2.0.3-1) unstable; urgency=me
 
  -- Ferenc Wágner <wferi@debian.org>  Sun, 22 Dec 2019 21:08:01 +0100
 
+pacemaker (2.0.1-5ubuntu5) focal; urgency=medium
+
+  * Fix: Last attempt i386 binary packages removal was wrong (-Nlibkate)
+  * Ubuntu i386 binary compatibility only effort: (LP: #1863437)
+    - i386 binary package removal:
+      - pacemaker
+      - pacemaker-cli-utils
+      - pacemaker-remote
+      - pacemaker-resource-agents
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Sat, 15 Feb 2020 18:52:20 +0000
+
+pacemaker (2.0.1-5ubuntu4) focal; urgency=medium
+
+  * d/control: Make crmsh the default management tool for now (LP: #1862947)
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Wed, 12 Feb 2020 14:36:27 +0000
+
+pacemaker (2.0.1-5ubuntu3) focal; urgency=medium
+
+  * No-change rebuild with fixed binutils on arm64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 10 Feb 2020 08:15:04 +0100
+
+pacemaker (2.0.1-5ubuntu2) focal; urgency=medium
+
+  * Omit pacemaker, pacemaker-cli-utils, pacemaker-remote binary packages on
+    i386.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 07 Jan 2020 15:41:07 -0800
+
+pacemaker (2.0.1-5ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/patches/pacemaker_is_partof_corosync.patch: Default systemd
+      unit hard-requires corosync.
+      + Debian disagrees in Debian bug 887563 message 36. We could revert back
+        to Debian's behaviour, but keeping the patch in this merge maintains
+        existing behaviour for Ubuntu users pending any separate future
+        decision.
+    - d/control: Demote fence-agents to Suggests, avoiding main
+      inclusion.
+    - Skip autopkgtest for unprivileged containers: (LP #1828228)
+      + d/t/control: mark pacemaker  test as skippable
+      + d/t/pacemaker: skip if memlock can't be set to unlimited by root
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Mon, 04 Nov 2019 17:31:07 -0300
+
 pacemaker (2.0.1-5) unstable; urgency=medium
 
   * [17ae230] Backport three more patches from upstream fixing memory safety
@@ -235,6 +566,28 @@ pacemaker (2.0.1-5) unstable; urgency=me
 
  -- Ferenc Wágner <wferi@debian.org>  Sun, 02 Jun 2019 14:01:06 +0200
 
+pacemaker (2.0.1-4ubuntu2) eoan; urgency=medium
+
+   * Skip autopkgtest for unprivileged containers: (LP: #1828228)
+     - d/t/control: mark pacemaker test as skippable
+     - d/t/pacemaker: skip if memlock can't be set to unlimited by root
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Thu, 25 Jul 2019 16:50:01 +0000
+
+pacemaker (2.0.1-4ubuntu1) eoan; urgency=medium
+
+   * Merge from Debian unstable.  Remaining changes:
+    - d/control: Demote fence-agents to Suggests, avoiding main
+      inclusion.
+    - debian/patches/pacemaker_is_partof_corosync.patch: Default systemd
+      unit hard-requires corosync.
+      + Debian disagrees in Debian bug 887563 message 36. We could revert back
+        to Debian's behaviour, but keeping the patch in this merge maintains
+        existing behaviour for Ubuntu users pending any separate future
+        decision.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 13 May 2019 12:11:35 +0200
+
 pacemaker (2.0.1-4) unstable; urgency=high
 
   * [54ace53] Fix check for already present statoverride.
@@ -284,6 +637,24 @@ pacemaker (2.0.1-3) unstable; urgency=hi
 
  -- Ferenc Wágner <wferi@debian.org>  Tue, 07 May 2019 17:19:08 +0200
 
+pacemaker (2.0.1-2ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - upstream CVE fixes
+      - CVE-2018-16877
+      - CVE-2018-16878
+      - CVE-2019-3885
+    - d/control: Demote fence-agents to Suggests, avoiding main
+      inclusion.
+    - debian/patches/pacemaker_is_partof_corosync.patch: Default systemd
+      unit hard-requires corosync.
+      + Debian disagrees in Debian bug 887563 message 36. We could revert back
+        to Debian's behaviour, but keeping the patch in this merge maintains
+        existing behaviour for Ubuntu users pending any separate future
+        decision.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 05 May 2019 08:28:53 +0200
+
 pacemaker (2.0.1-2) unstable; urgency=medium
 
   * [d8939cc] Avoid file conflicts with leftover packages from wheezy.
@@ -390,6 +761,57 @@ pacemaker (1.1.19-1) unstable; urgency=m
 
  -- Ferenc Wágner <wferi@debian.org>  Tue, 25 Dec 2018 20:17:46 +0100
 
+pacemaker (1.1.18-2ubuntu1.19.04.1) disco-security; urgency=medium
+
+  * SECURITY UPDATE: DoS and local privilege escalation in client-server
+    authentication
+    - debian/patches/CVE-2018-1687x-1.patch: make crm_pid_active more
+      precise as to when detections fail in include/crm_internal.h,
+      lib/common/utils.c.
+    - debian/patches/CVE-2018-1687x-2.patch: add new helpers to allow IPC
+      client side to authenticate the server in configure.ac,
+      include/crm/common/Makefile.am, include/crm/common/ipc.h,
+      include/crm/common/ipc_internal.h, lib/common/ipc.c.
+    - debian/patches/CVE-2018-1687x-3.patch: pacemakerd to trust
+      pre-existing processes via new checks instead in mcp/pacemaker.c.
+    - debian/patches/CVE-2018-1687x-4.patch: other daemons to authenticate
+      IPC servers of fellow processes in lib/cluster/corosync.c,
+      lib/cluster/cpg.c, lib/common/ipc.c, mcp/corosync.c.
+    - debian/patches/CVE-2018-1687x-5.patch: CPG users to be careful about
+      now-more-probable rival processes in attrd/main.c, cib/main.c,
+      crmd/main.c, fencing/main.c, lib/cluster/cpg.c.
+    - debian/patches/CVE-2018-1687x-6.patch: fix possible NULL pointer
+      dereference in crmd/control.c.
+    - debian/libcrmcommon3.symbols: added new symbols.
+    - CVE-2018-16877
+    - CVE-2018-16878
+  * SECURITY UPDATE: information disclosure via use-after-free
+    - debian/patches/CVE-2019-3885.patch: fix alert handling in
+      lib/services/services.c, lib/services/services_linux.c.
+    - CVE-2019-3885
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 18 Apr 2019 07:32:00 -0400
+
+pacemaker (1.1.18-2ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian. Remaining changes:
+    - d/control: Demote fence-agents to Suggests, avoiding main
+      inclusion.
+    - debian/patches/pacemaker_is_partof_corosync.patch: Default systemd
+      unit hard-requires corosync.
+      + Debian disagrees in Debian bug 887563 message 36. We could revert back
+        to Debian's behaviour, but keeping the patch in this merge maintains
+        existing behaviour for Ubuntu users pending any separate future
+        decision.
+  * Drop changes:
+    - Drop upstreamed patches (dropped in Debian now instead).
+    - Refresh d/p/portability-define-EKEYREJECTED-if-necessary.patch: no longer
+      needed; dropped in Debian.
+    - d/pacemaker.{pre,post}inst flag for corosync: upgrade path no longer
+      needed post-Bionic.
+
+ -- Robie Basak <robie.basak@ubuntu.com>  Tue, 24 Jul 2018 14:12:03 +0100
+
 pacemaker (1.1.18-2) unstable; urgency=medium
 
   * [812cda7] Fixup symbols files.
@@ -436,6 +858,40 @@ pacemaker (1.1.18-1) unstable; urgency=m
 
  -- Ferenc Wágner <wferi@debian.org>  Wed, 02 May 2018 12:18:36 +0200
 
+pacemaker (1.1.18-0ubuntu2) cosmic; urgency=medium
+
+  * No-change rebuild for ncurses soname changes.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 03 May 2018 14:17:47 +0000
+
+pacemaker (1.1.18-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release (1.1.18)
+    - Drop upstreamed patches and refresh others.
+    - LP: #1763085
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 11 Apr 2018 09:23:27 -0700
+
+pacemaker (1.1.18~rc4-1ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1743059). Remaining changes:
+    - d/control: Demote fence-agents to Suggests, avoiding main
+      inclusion.
+  * Drop:
+    - d/control: Promote crmsh | pcs to Recommends for upgraders from
+      14.04.
+      [ Not needed since 16.10 ]
+  * Properly restart corosync and pacemaker together (LP: #1740892)
+    - d/pacemaker.preinst: flag corosync to restart pacemaker on
+      upgrade.
+    - d/pacemaker.postinst: clear flag unconditionally in case of errors
+      + The preinst and postinst changes can be dropped after bionic
+        releases as long as the other changes are maintained.
+    - debian/patches/pacemaker_is_partof_corosync.patch: Default systemd
+      unit hard-requires corosync.  LP #1740892.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Tue, 30 Jan 2018 16:38:09 -0800
+
 pacemaker (1.1.18~rc4-1) unstable; urgency=medium
 
   * [50dcb19] New upstream pre-release (1.1.18~rc4)
@@ -454,6 +910,16 @@ pacemaker (1.1.18~rc4-1) unstable; urgen
 
  -- Ferenc Wágner <wferi@debian.org>  Mon, 06 Nov 2017 15:02:08 +0100
 
+pacemaker (1.1.18~rc3-1ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: Demote fence-agents to Suggests, avoiding main
+      inclusion.
+    - d/control: Promote crmsh | pcs to Recommends for upgraders from
+      14.04.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Fri, 03 Nov 2017 08:11:06 -0700
+
 pacemaker (1.1.18~rc3-1) unstable; urgency=medium
 
   * [311badb] Add forgotten Closes to already uploaded changelog
@@ -475,6 +941,14 @@ pacemaker (1.1.18~rc3-1) unstable; urgen
 
  -- Ferenc Wágner <wferi@debian.org>  Mon, 30 Oct 2017 13:36:03 +0100
 
+pacemaker (1.1.17-1ubuntu1) artful; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: Demote fence-agents to Suggests, avoiding main inclusion.
+    - d/control: Promote crmsh | pcs to Recommends for upgraders from 14.04.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 09 Aug 2017 10:52:14 -0700
+
 pacemaker (1.1.17-1) unstable; urgency=medium
 
   [ Christoph Berg ]
@@ -494,6 +968,21 @@ pacemaker (1.1.17-1) unstable; urgency=m
 
  -- Ferenc Wágner <wferi@debian.org>  Sat, 08 Jul 2017 23:00:09 +0200
 
+pacemaker (1.1.16-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable (LP: #1655753). Remaining changes:
+    - d/control: Demote fence-agents to Suggests, avoiding main inclusion.
+    - d/control: Promote crmsh | pcs to Recommends for upgraders from 14.04.
+  * Drop:
+    - d/rules: update CTS python files' path for python3 and possibly
+      site-packages. If the code is updated to use setuptools, cts should
+      continue to not be shipped. Fixes FTBFS for arch-only builds
+      (LP #1627125).
+    [ Debian resolved this by disabling the testing infrastructure in
+      1.1.15-2 ]
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 11 Jan 2017 12:30:02 -0800
+
 pacemaker (1.1.16-1) unstable; urgency=medium
 
   * [d90daf5] Refresh our patches
@@ -569,6 +1058,30 @@ pacemaker (1.1.15-2) unstable; urgency=m
 
  -- Ferenc Wágner <wferi@debian.org>  Sat, 01 Oct 2016 22:01:27 +0200
 
+pacemaker (1.1.15-1ubuntu2) yakkety; urgency=medium
+
+  * d/rules: update CTS python files' path for python3 and possibly
+    site-packages. If the code is updated to use setuptools, cts should
+    continue to not be shipped. Fixes FTBFS for arch-only builds
+    (LP: #1627125).
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Fri, 23 Sep 2016 13:51:00 -0700
+
+pacemaker (1.1.15-1ubuntu1) yakkety; urgency=medium
+
+  * Merge from Debian unstable (LP: #1604694). Remaining changes:
+    - d/control: Demote fence-agents to Suggests, avoiding main inclusion.
+    - d/control: Promote crmsh | pcs to Recommends for upgraders from 14.04.
+  * Dropped changes:
+    - d/control: bump depend on corosync to >= 2.3.0
+      (unimportant since this version was provided in Debian stable &
+      Ubuntu 14.04 LTS)
+    - d/control: Drop publican from BD's, skip some doc generation.
+    - d/pacemaker-doc.*: Drop docs generated using publican from install.
+      (universe build-depends are ok now)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Wed, 20 Jul 2016 02:39:01 -0400
+
 pacemaker (1.1.15-1) unstable; urgency=medium
 
   * [bda3c8c] Use the clusterlabs Publican brand for the documentation
@@ -643,6 +1156,17 @@ pacemaker (1.1.14-3) unstable; urgency=m
 
  -- Adrian Vondendriesch <adrian.vondendriesch@credativ.de>  Thu, 24 Mar 2016 13:58:54 +0100
 
+pacemaker (1.1.14-2ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - d/control: Drop publican from BD's, skip some doc generation.
+    - d/control: depend on corosync ( >= 2.3.0 )
+    - d/control: Demote fence-agents to Suggests, avoiding main inclusion.
+    - d/control: Promote crmsh | pcs to Recommends for upgraders from 14.04.
+    - d/pacemaker-doc.*: Drop docs generated using publican from install.
+
+ -- Pierre-André MOREY <pierre-andre.morey@canonical.com>  Mon, 21 Mar 2016 15:56:54 +0000
+
 pacemaker (1.1.14-2) unstable; urgency=medium
 
   * [42577da] Promote resource-agents to Depends (Closes: #813009)
@@ -673,6 +1197,22 @@ pacemaker (1.1.14-2) unstable; urgency=m
 
  -- Ferenc Wágner <wferi@niif.hu>  Fri, 26 Feb 2016 11:58:06 +0100
 
+pacemaker (1.1.14-1ubuntu2) xenial; urgency=medium
+
+  * No-change rebuild for gnutls transition.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 17 Feb 2016 22:27:08 +0000
+
+pacemaker (1.1.14-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - d/control: Drop publican from BD's, skip some doc generation.
+    - d/pacemaker-doc.*: Drop docs generated using publican from install.
+    - d/control: Demote fence-agents to Suggests, avoiding main inclusion.
+    - d/control: Promote crmsh | pcs to Recommends for upgraders from 14.04.
+
+ -- James Page <james.page@ubuntu.com>  Thu, 04 Feb 2016 16:32:03 +0000
+
 pacemaker (1.1.14-1) unstable; urgency=medium
 
   * [4cae0b4] New upstream release candidate (1.1.14~rc4)
@@ -690,6 +1230,16 @@ pacemaker (1.1.14-1) unstable; urgency=m
 
  -- Ferenc Wágner <wferi@niif.hu>  Sat, 23 Jan 2016 21:42:03 +0100
 
+pacemaker (1.1.14~rc4-2ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - d/control: Drop publican from BD's, skip some doc generation.
+    - d/pacemaker-doc.*: Drop docs generated using publican from install.
+    - d/control: Demote fence-agents to Suggests, avoiding main inclusion.
+    - d/control: Promote crmsh | pcs to Recommends for upgraders from 14.04.
+
+ -- James Page <james.page@ubuntu.com>  Fri, 15 Jan 2016 13:59:46 +0200
+
 pacemaker (1.1.14~rc4-2) unstable; urgency=medium
 
   [ Ferenc Wágner ]
@@ -714,6 +1264,16 @@ pacemaker (1.1.14~rc4-1) unstable; urgen
 
  -- Ferenc Wágner <wferi@niif.hu>  Wed, 06 Jan 2016 10:23:46 +0100
 
+pacemaker (1.1.13-2ubuntu1) xenial; urgency=medium
+
+  * Resync with Debian unstable.
+  * d/control: Drop publican from BD's, skip some doc generation.
+  * d/pacemaker-doc.*: Drop docs generated using publican from install.
+  * d/control: Demote fence-agents to Suggests, avoiding main inclusion.
+  * d/control: Promote crmsh | pcs to Recommends for upgraders from 14.04.
+
+ -- James Page <james.page@ubuntu.com>  Thu, 14 Jan 2016 13:57:55 +0200
+
 pacemaker (1.1.13-2) unstable; urgency=medium
 
   * Declare some symbols optional that do not show up on ppc(64el).
diff -pruN 2.1.4-2/debian/control 2.1.4-2ubuntu1/debian/control
--- 2.1.4-2/debian/control	2022-07-21 21:20:11.000000000 +0000
+++ 2.1.4-2ubuntu1/debian/control	2022-08-03 18:53:10.000000000 +0000
@@ -1,7 +1,8 @@
 Source: pacemaker
 Section: admin
 Priority: optional
-Maintainer: Debian HA Maintainers <debian-ha-maintainers@alioth-lists.debian.net>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian HA Maintainers <debian-ha-maintainers@alioth-lists.debian.net>
 Uploaders:
  Ferenc Wágner <wferi@debian.org>,
  Adrian Vondendriesch <adrian.vondendriesch@credativ.de>,
@@ -73,11 +74,13 @@ Architecture: all
 Depends:
 # some agents use top:
  procps,
- resource-agents,
+ resource-agents-base,
  ${misc:Depends},
 Recommends:
 # the ClusterMon and Stateful agents use crm_* utilities:
  pacemaker-cli-utils,
+Suggests:
+ resource-agents-extra
 Description: cluster resource manager general resource agents
  ${S:X-Common-Description}
  .
@@ -90,6 +93,7 @@ Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
  corosync (>= 1.99),
+ crmsh,
  dbus,
 # the init script sources /lib/lsb/init-functions:
  lsb-base (>= 3.0-6),
@@ -99,12 +103,13 @@ Depends:
  ${python3:Depends},
  ${shlibs:Depends},
 Recommends:
- fence-agents,
+ fence-agents-base,
  pacemaker-cli-utils,
 Suggests:
 # the fence_legacy helper uses /usr/sbin/stonith from cluster-glue:
  cluster-glue,
- crmsh | pcs,
+ pcs,
+ fence-agents-extra,
 Conflicts:
  pacemaker-remote,
 Description: cluster resource manager
@@ -118,7 +123,7 @@ Architecture: any
 Depends:
  pacemaker | pacemaker-remote,
 # cibsecret sources ocf-shellfuncs:
- resource-agents,
+ resource-agents-base,
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:
diff -pruN 2.1.4-2/debian/rules 2.1.4-2ubuntu1/debian/rules
--- 2.1.4-2/debian/rules	2022-07-21 21:20:11.000000000 +0000
+++ 2.1.4-2ubuntu1/debian/rules	2022-08-03 18:53:10.000000000 +0000
@@ -16,6 +16,10 @@ ifeq ($(shell dpkg-vendor --query vendor
 	-Npacemaker-resource-agents
 endif
 
+# Fix gcc10 warnings as errors while upstream doesn't catch up
+export DEB_CFLAGS_PREPEND=-Wno-error=format-overflow=
+export DEB_CXXFLAGS_PREPEND=${DEB_CFLAGS_PREPEND}
+
 %:
 	dh $@ $(UBUNTU_EXCLUDES)
 
diff -pruN 2.1.4-2/debian/tests/pacemaker 2.1.4-2ubuntu1/debian/tests/pacemaker
--- 2.1.4-2/debian/tests/pacemaker	2022-07-21 21:20:11.000000000 +0000
+++ 2.1.4-2ubuntu1/debian/tests/pacemaker	2022-08-03 18:46:22.000000000 +0000
@@ -16,4 +16,4 @@ sleep 25
 
 crm_mon -1 >"$OUTPUT"
 cat "$OUTPUT"
-fgrep -q "Online: [ node1 ]" "$OUTPUT"
+fgrep -q "Online: [ $(uname -n) ]" "$OUTPUT"
