Merge ~rafaeldtinoco/ubuntu/+source/pacemaker:lp1864116-focal into ubuntu/+source/pacemaker:debian/sid

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/pacemaker/+bug/1864116
PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1864116

[Christian Ehrhardt  (paelzer)]

Changelog:
- [√] old content matches pkg/import/2.0.1-5ubuntu5
- [√] changelog entry correct version and targeted codename
- [x] changelog entries correct
  Missing:
  - d/control: Demote fence-agents to Suggests, avoiding main inclusion
  Optional:
  your style on non-active LP references differs e.g. LP: 1828228 vs LP #1862947
- [√] update-maintainer has been run

Actual changes:
- [√] no major upstream changes to consider
- [√] no further upstream version to consider
- [√] debian changes look safe

Old Delta:
- [√] dropped changes are ok to be dropped
- [√] nothing else to drop

New Delta:
- [√] no new patches added

Build/Test:
- [√] build is ok
- [√] verified PPA package installs/uninstalls

Puh plenty of changes in d/control bumping versions and packages.
I think I have read all of them and none needs a breaks/replaces - hope I didn't miss one.
libtransitioner25 had only internal dependencies, so it is ok to go away.

+1, but I've not seen autopkgtests yet, so if you can run them before doing the upload

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

(k)rafaeldtinoco@clustertests:~/.../ubuntu$ sudo dpkg -i liblrmd-dev_2.0.3-3ubuntu1_all.deb libcib-dev_2.0.3-3ubuntu1_all.deb libcrmcommon-dev_2.0.3-3ubuntu1_all.deb libstonithd-dev_2.0.3-3ubuntu1_all.deb liblrmd28_2.0.3-3ubuntu1_amd64.deb libpe-rules26_2.0.3-3ubuntu1_amd64.deb libcrmcluster-dev_2.0.3-3ubuntu1_all.deb libstonithd26_2.0.3-3ubuntu1_amd64.deb libpengine-dev_2.0.3-3ubuntu1_all.deb libcrmservice-dev_2.0.3-3ubuntu1_all.deb libcib27_2.0.3-3ubuntu1_amd64.deb pacemaker-common_2.0.3-3ubuntu1_all.deb pacemaker-dev_2.0.3-3ubuntu1_amd64.deb pacemaker-resource-agents_2.0.3-3ubuntu1_all.deb libcrmcluster29_2.0.3-3ubuntu1_amd64.deb libpe-status28_2.0.3-3ubuntu1_amd64.deb libcrmcommon34_2.0.3-3ubuntu1_amd64.deb libpacemaker1_2.0.3-3ubuntu1_amd64.deb libcrmservice28_2.0.3-3ubuntu1_amd64.deb pacemaker_2.0.3-3ubuntu1_amd64.deb pacemaker-cli-utils_2.0.3-3ubuntu1_amd64.deb pacemaker-doc_2.0.3-3ubuntu1_all.deb
....

Cluster Summary:
  * Stack: corosync
  * Current DC: node1 (version 2.0.3-4b1f869f0f) - partition with quorum
  * Last updated: Tue Feb 25 23:21:04 2020
  * Last change: Tue Feb 25 23:18:06 2020 by hacluster via crmd on node1
  * 1 node configured
  * 0 resource instances configured

Node List:
  * Online: [ node1 ]

Active Resources:
  * No active resources

pacemaker PASS
pacemaker PASS

[Rafael David Tinoco (rafaeldtinoco)]

(c)rafaeldtinoco@cluster:~/.../pacemaker$ git log -1 --pretty=oneline --tags
c4fda38e (HEAD -> lp1864116-focal, tag: upload/2.0.3-3ubuntu1, rafaeldtinoco/lp1864116-focal) update-maintainer

(c)rafaeldtinoco@cluster:~/.../ubuntu$ dput ubuntu ./pacemaker_2.0.3-3ubuntu1_source.changes
Checking signature on .changes
gpg: ./pacemaker_2.0.3-3ubuntu1_source.changes: Valid signature from A93E0E0AD83C0D0F
Checking signature on .dsc
gpg: ./pacemaker_2.0.3-3ubuntu1.dsc: Valid signature from A93E0E0AD83C0D0F
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading pacemaker_2.0.3-3ubuntu1.dsc: done.
  Uploading pacemaker_2.0.3.orig.tar.gz: done.
  Uploading pacemaker_2.0.3-3ubuntu1.debian.tar.xz: done.
  Uploading pacemaker_2.0.3-3ubuntu1_source.buildinfo: done.
  Uploading pacemaker_2.0.3-3ubuntu1_source.changes: done.
Successfully uploaded packages.

(c)rafaeldtinoco@cluster:~/.../pacemaker$ git push pkg upload/2.0.3-3ubuntu1
Enumerating objects: 41, done.
Counting objects: 100% (41/41), done.
Delta compression using up to 8 threads
Compressing objects: 100% (33/33), done.
Writing objects: 100% (33/33), 8.35 KiB | 950.00 KiB/s, done.
Total 33 (delta 20), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/pacemaker
 * [new tag] upload/2.0.3-3ubuntu1 -> upload/2.0.3-3ubuntu1

----

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]

pacemaker (2.0.3-3) unstable; urgency=medium

  * [543574f] Omit pacemaker{, -cli-utils, -remote} on Ubuntu/i386
    (Closes: #948379)
  * [327889e] Reenable dwz, it already works with the magic sections from libqb

pacemaker (2.0.3-2) unstable; urgency=medium

  * [2b80438] Special libqb symbols not present on Power architectures
  * [99905eb] New patch: Avoid clashes with glibc error codes on HPPA
  * [b3928b4] Add -dev package dependencies
  * [712627c] Suppress stderr output of autopkgtest instead of ignoring it
  * [8f47294] Generate an autopkgtest artifact
  * [1e66b70] Run Salsa CI reprotest with diffoscope
  * [4560320] Recognize the autopkgtest artifacts in Salsa CI

pacemaker (2.0.3-1) unstable; urgency=medium

  *...

diff --git a/debian/changelog b/debian/changelog
index 83ff4e1..a8710ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+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 <[e-mail]>  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
@@ -54,6 +77,54 @@ pacemaker (2.0.3-1) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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
@@ -63,6 +134,28 @@ pacemaker (2.0.1-5) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Mon, 13 May 2019 12:11:35 +0200
+
 pacemaker (2.0.1-4) unstable; urgency=high
 
   * [54ace53] Fix check for already present statoverride.
@@ -112,6 +205,24 @@ pacemaker (2.0.1-3) unstable; urgency=high
 
  -- Ferenc Wágner <[e-mail]>  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 <[e-mail]>  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.
@@ -218,6 +329,57 @@ pacemaker (1.1.19-1) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 24 Jul 2018 14:12:03 +0100
+
 pacemaker (1.1.18-2) unstable; urgency=medium
 
   * [812cda7] Fixup symbols files.
@@ -264,6 +426,40 @@ pacemaker (1.1.18-1) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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)
@@ -282,6 +478,16 @@ pacemaker (1.1.18~rc4-1) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  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 <[e-mail]>  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
@@ -303,6 +509,14 @@ pacemaker (1.1.18~rc3-1) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  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 <[e-mail]>  Wed, 09 Aug 2017 10:52:14 -0700
+
 pacemaker (1.1.17-1) unstable; urgency=medium
 
   [ Christoph Berg ]
@@ -322,6 +536,21 @@ pacemaker (1.1.17-1) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  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 <[e-mail]>  Wed, 11 Jan 2017 12:30:02 -0800
+
 pacemaker (1.1.16-1) unstable; urgency=medium
 
   * [d90daf5] Refresh our patches
@@ -397,6 +626,30 @@ pacemaker (1.1.15-2) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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
@@ -471,6 +724,17 @@ pacemaker (1.1.14-3) unstable; urgency=medium
 
  -- Adrian Vondendriesch <[e-mail]>  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 <[e-mail]>  Mon, 21 Mar 2016 15:56:54 +0000
+
 pacemaker (1.1.14-2) unstable; urgency=medium
 
   * [42577da] Promote resource-agents to Depends (Closes: #813009)
@@ -501,6 +765,22 @@ pacemaker (1.1.14-2) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  Fri, 26 Feb 2016 11:58:06 +0100
 
+pacemaker (1.1.14-1ubuntu2) xenial; urgency=medium
+
+  * No-change rebuild for gnutls transition.
+
+ -- Matthias Klose <[e-mail]>  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 <[e-mail]>  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)
@@ -518,6 +798,16 @@ pacemaker (1.1.14-1) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  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 <[e-mail]>  Fri, 15 Jan 2016 13:59:46 +0200
+
 pacemaker (1.1.14~rc4-2) unstable; urgency=medium
 
   [ Ferenc Wágner ]
@@ -542,6 +832,16 @@ pacemaker (1.1.14~rc4-1) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  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 <[e-mail]>  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 --git a/debian/control b/debian/control
index 466097c..0b8917e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: pacemaker
 Section: admin
 Priority: optional
-Maintainer: Debian HA Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian HA Maintainers <[e-mail]>
 Uploaders:
  Ferenc Wágner <[e-mail]>,
  Adrian Vondendriesch <[e-mail]>,
@@ -102,6 +103,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),
@@ -111,12 +113,12 @@ Depends:
  ${python3:Depends},
  ${shlibs:Depends},
 Recommends:
- fence-agents,
  pacemaker-cli-utils,
 Suggests:
 # the fence_legacy helper uses /usr/sbin/stonith from cluster-glue:
  cluster-glue,
- crmsh | pcs,
+ pcs,
+ fence-agents,
 Breaks:
  pacemaker-remote,
 # pulled in crm_attribute and crm_node, because they depend on the
diff --git a/debian/rules b/debian/rules
index bf68c30..24b4b35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,11 @@ export DEB_LDFLAGS_MAINT_APPEND+=-Wl,--as-needed
 # Ubuntu/i386 shrank into a compatibility layer not carrying the
 # dependencies of some of our binary packages (#948379):
 ifeq ($(shell dpkg-vendor --query vendor)/$(DEB_HOST_ARCH), Ubuntu/i386)
-    UBUNTU_EXCLUDES = -Npacemaker -Npacemaker-cli-utils -Npacemaker-remote
+    UBUNTU_EXCLUDES = \
+	-Npacemaker \
+	-Npacemaker-cli-utils \
+	-Npacemaker-remote \
+	-Npacemaker-resource-agents
 endif
 
 %:
diff --git a/debian/tests/control b/debian/tests/control
index 9bb91e2..ea80d5f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Depends: pacemaker, pacemaker-cli-utils
-Restrictions: needs-root, isolation-container
+Restrictions: needs-root, isolation-container, allow-stderr, skippable
 Tests: pacemaker
diff --git a/debian/tests/pacemaker b/debian/tests/pacemaker
index 871cd87..68e3534 100755
--- a/debian/tests/pacemaker
+++ b/debian/tests/pacemaker
@@ -4,6 +4,12 @@ set -e
 
 OUTPUT="${AUTOPKGTEST_ARTIFACTS:-.}/crm_mon.txt"
 
+ulimit -H -l unlimited 2>/dev/null || {
+    # https://bugs.launchpad.net/bugs/1828228
+    echo "test disabled for unprivileged namespaces"
+    exit 77
+}
+
 # Wait more than dc-deadtime (20s by default)
 sleep 25