Merge ~rafaeldtinoco/ubuntu/+source/corosync-qdevice:lp1883771-groovy into ubuntu/+source/corosync-qdevice:debian/sid

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/corosync-qdevice/+bug/1883771
PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1883771
MERGE: https://tinyurl.com/y7utmykj

[Rafael David Tinoco (rafaeldtinoco)]

The change is already upstreamed:

https://salsa.debian.org/ha-team/corosync-qdevice/-/merge_requests/3

(as I got permission to merge things in salsa) but I won't create a new version, will let maintainer to decide what is best. For this merge, just keep it as a delta.

[Andreas Hasenack (ahasenack)]

+1, tags correct, simple delta carried over unchanged, no further Debian changes to consider.

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

$ git push pkg upload/3.0.0-5ubuntu1
Enumerating objects: 26, done.
Counting objects: 100% (26/26), done.
Delta compression using up to 8 threads
Compressing objects: 100% (19/19), done.
Writing objects: 100% (19/19), 2.36 KiB | 1.18 MiB/s, done.
Total 19 (delta 13), reused 1 (delta 0), pack-reused 0
To ssh://git.launchpad.net/ubuntu/+source/corosync-qdevice
 * [new tag] upload/3.0.0-5ubuntu1 -> upload/3.0.0-5ubuntu1

$ debdiff corosync-qdevice_3.0.0-5.dsc corosync-qdevice_3.0.0-5ubuntu1.dsc | diffstat
 changelog | 17 +++++++++++++++++
 control | 3 ++-
 tests/control | 2 +-
 tests/qdevice | 6 ++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

 dput ubuntu ./corosync-qdevice_3.0.0-5ubuntu1_source.changes
Checking signature on .changes
gpg: ./corosync-qdevice_3.0.0-5ubuntu1_source.changes: Valid signature from A93E0E0AD83C0D0F
Checking signature on .dsc
gpg: ./corosync-qdevice_3.0.0-5ubuntu1.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 corosync-qdevice_3.0.0-5ubuntu1.dsc: done.
  Uploading corosync-qdevice_3.0.0.orig.tar.gz: done.
  Uploading corosync-qdevice_3.0.0.orig.tar.gz.asc: done.
  Uploading corosync-qdevice_3.0.0-5ubuntu1.debian.tar.xz: done.
  Uploading corosync-qdevice_3.0.0-5ubuntu1_source.buildinfo: done.
  Uploading corosync-qdevice_3.0.0-5ubuntu1_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 7566a64..27ef7d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+corosync-qdevice (3.0.0-5ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1883771). Remaining changes:
+    - Skip autopkgtest for unprivileged containers: (LP: 1837090)
+      - d/t/control: mark corosync-qnetd test as skippable
+      - d/t/qdevice: skip if memlock can't be set to unlimited by root
+
+ -- Rafael David Tinoco <[e-mail]>  Tue, 07 Jul 2020 01:31:10 +0000
+
 corosync-qdevice (3.0.0-5) unstable; urgency=medium
 
   * [03f7f53] Set Default-Start runlevels for corosync-qdevice (Closes: #932346)
@@ -7,6 +16,14 @@ corosync-qdevice (3.0.0-5) unstable; urgency=medium
 
  -- Valentin Vidic <[e-mail]>  Tue, 07 Apr 2020 22:24:07 +0200
 
+corosync-qdevice (3.0.0-4ubuntu1) eoan; urgency=medium
+
+  * Skip autopkgtest for unprivileged containers: (LP: #1837090)
+    - d/t/control: mark corosync-qnetd test as skippable
+    - d/t/qdevice: skip if memlock can't be set to unlimited by root
+
+ -- Rafael David Tinoco <[e-mail]>  Thu, 08 Aug 2019 18:28:45 +0000
+
 corosync-qdevice (3.0.0-4) unstable; urgency=medium
 
   * [c680521] Revert "Require pacemaker for qdevice autopkgtest"
diff --git a/debian/control b/debian/control
index 819724e..e010c2b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: corosync-qdevice
 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]>,
  Valentin Vidic <[e-mail]>,
diff --git a/debian/tests/control b/debian/tests/control
index 4ad2d31..1b46921 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,5 +3,5 @@ Restrictions: needs-root, isolation-container
 Tests: qnetd
 
 Depends: corosync-qnetd, corosync-qdevice
-Restrictions: needs-root, isolation-container
+Restrictions: needs-root, isolation-container, skippable
 Tests: qdevice
diff --git a/debian/tests/qdevice b/debian/tests/qdevice
index 57b4e34..6c4c963 100755
--- a/debian/tests/qdevice
+++ b/debian/tests/qdevice
@@ -2,6 +2,12 @@
 
 set -e
 
+ulimit -H -l unlimited 2>/dev/null || {
+    # https://bugs.launchpad.net/bugs/1828228
+    echo "test disabled for unprivileged namespaces"
+    exit 77
+}
+
 # setup TLS certificates
 corosync-qdevice-net-certutil -i -c /etc/corosync/qnetd/nssdb/qnetd-cacert.crt 2>&1
 corosync-qdevice-net-certutil -r -n debian 2>&1