Merge ~jgrimm/ubuntu/+source/libqb:merge-zesty-1.0.1-1ubuntu1 into ~usd-import-team/ubuntu/+source/libqb:debian/sid

[Jon Grimm]

1) I added a reference to the kernel bug that the aarch workaround patch is for.
2) I've added a libqb task to same bug, in hopes that when the kernel team verifies that the kernel side is fixed we can drop this aarch patch.
3) I reworked the ubuntu_disable_tests.patch to not disable rb or ipc test as they seem to work for me after consult with rbasak. Worst case we re-enable if turn out flaky still in the real builders.

[Nish Aravamudan (nacc)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index d727d09..357c677 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+libqb (1.0.1-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/ubuntu_disable_tests.patch: Disable failing tests that
+      cause the package to FTBFS.  Modified patch to reenable rb and ipc
+      tests as seem to work now.
+    - debian/patches/aarch64_no_coarse_clock.patch: Avoid
+      CLOCK_REALTIME_COARSE on aarch64 due to a kernel bug (LP: 1239109)
+  * Dropping unneeded refreshes on debian patches from last upload:
+    - debian/patches/hurd-support.patch
+    - debian/patches/low-fixed-Spelling-error-of-failure-in-qbhdb.h.patch
+    - debian/patches/ubuntu_disable_tests.patch
+
+ -- Jon Grimm <[e-mail]>  Thu, 16 Feb 2017 12:36:50 -0600
+
 libqb (1.0.1-1) unstable; urgency=medium
 
   [ Christoph Berg ]
@@ -15,6 +30,16 @@ libqb (1.0.1-1) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  Wed, 07 Dec 2016 14:55:06 +0100
 
+libqb (1.0-1ubuntu1) yakkety; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/ubuntu_disable_tests.patch: Disable failing tests that
+      cause the package to FTBFS.
+    - debian/patches/aarch64_no_coarse_clock.patch: Avoid
+      CLOCK_REALTIME_COARSE on aarch64 due to a kernel bug.
+
+ -- James Page <[e-mail]>  Mon, 27 Jun 2016 11:55:44 +0100
+
 libqb (1.0-1) unstable; urgency=medium
 
   [ Arturo Borrero Gonzalez ]
@@ -53,6 +78,16 @@ libqb (1.0-1) unstable; urgency=medium
 
  -- Ferenc Wágner <[e-mail]>  Wed, 22 Jun 2016 09:48:05 +0200
 
+libqb (0.17.2.real-6ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/ubuntu_disable_tests.patch: Disable failing tests that
+      cause the package to FTBFS.
+    - debian/patches/aarch64_no_coarse_clock.patch: Avoid
+      CLOCK_REALTIME_COARSE on aarch64 due to a kernel bug.
+
+ -- James Page <[e-mail]>  Wed, 02 Mar 2016 10:01:35 +0000
+
 libqb (0.17.2.real-6) unstable; urgency=medium
 
   * Update hurd support patch to fix regression in sem_timedwait detection.
@@ -67,6 +102,16 @@ libqb (0.17.2.real-5) unstable; urgency=medium
 
  -- Christoph Berg <[e-mail]>  Fri, 19 Feb 2016 11:19:26 +0100
 
+libqb (0.17.2.real-4ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/ubuntu_disable_tests.patch: Disable failing tests that
+      cause the package to FTBFS.
+    - debian/patches/aarch64_no_coarse_clock.patch: Avoid
+      CLOCK_REALTIME_COARSE on aarch64 due to a kernel bug.
+
+ -- James Page <[e-mail]>  Mon, 04 Jan 2016 11:43:59 +0000
+
 libqb (0.17.2.real-4) unstable; urgency=medium
 
   * Add debian/libqb0.symbols.ppc64 symlink.
@@ -214,6 +259,16 @@ libqb (0.17.1-1) unstable; urgency=medium
 
  -- Christoph Berg <[e-mail]>  Wed, 06 May 2015 14:28:46 +0200
 
+libqb (0.17.0-2ubuntu1) vivid; urgency=medium
+
+  * Resynchronise with Debian.  Remaining changes:
+    - debian/patches/ubuntu_disable_tests.patch: Disable failing tests that
+      cause the package to FTBFS.
+    - debian/patches/aarch64_no_coarse_clock.patch: Avoid
+      CLOCK_REALTIME_COARSE on aarch64 due to a kernel bug.
+
+ -- Colin Watson <[e-mail]>  Tue, 02 Dec 2014 16:35:37 +0000
+
 libqb (0.17.0-2) unstable; urgency=medium
 
   * debian/patches/buildfix-dvossel-1.patch: Add an additional fix by dvossel
@@ -243,6 +298,27 @@ libqb (0.16.0.real-1.1) unstable; urgency=medium
 
  -- Anibal Monsalve Salazar <[e-mail]>  Thu, 20 Feb 2014 07:21:30 +0000
 
+libqb (0.16.0.real-1ubuntu3) trusty; urgency=medium
+
+  * debian/patches/ubuntu_disable_tests.patch: Remove dependency of
+    resources.log on disabled tests.
+
+ -- Colin Watson <[e-mail]>  Tue, 17 Dec 2013 18:06:07 +0000
+
+libqb (0.16.0.real-1ubuntu2) saucy; urgency=low
+
+  * debian/patches/aarch64_no_coarse_clock.patch: Avoid
+    CLOCK_REALTIME_COARSE on aarch64 due to a kernel bug.
+
+ -- William Grant <[e-mail]>  Sat, 12 Oct 2013 19:07:55 +1100
+
+libqb (0.16.0.real-1ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/ubuntu_disable_tests.patch: Updated.
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 15 Aug 2013 11:38:09 -0400
+
 libqb (0.16.0.real-1) unstable; urgency=low
 
   * New upload, this time with the "right" upstream .orig.tar.gz
@@ -255,6 +331,14 @@ libqb (0.16.0-1) unstable; urgency=low
 
  -- Martin Loschwitz <[e-mail]>  Thu, 01 Aug 2013 10:57:28 +0000
 
+libqb (0.14.4-1ubuntu1) saucy; urgency=low
+
+  * Resync from debian experimental.
+  * debian/patches/ubuntu_disable_tests.patch: Disable failing tests that
+    cause the package to FTBFS.
+
+ -- Andres Rodriguez <[e-mail]>  Mon, 22 Jul 2013 16:47:44 -0400
+
 libqb (0.14.4-1) experimental; urgency=low
 
   * New upstream release
@@ -291,3 +375,4 @@ libqb (0.11.1-1) unstable; urgency=low
   * Initial release (Closes: #666504)  
 
  -- Martin Loschwitz <[e-mail]>  Sun, 01 Apr 2012 16:47:49 +0000
+
diff --git a/debian/control b/debian/control
index ea8ada1..4c1eb85 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: libqb
 Priority: optional
-Maintainer: Debian HA Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian HA Maintainers <[e-mail]>
 Uploaders:
            Richard B Winters <[e-mail]>,
            Ferenc Wágner <[e-mail]>,
diff --git a/debian/patches/aarch64_no_coarse_clock.patch b/debian/patches/aarch64_no_coarse_clock.patch
new file mode 100644
index 0000000..565a194
--- /dev/null
+++ b/debian/patches/aarch64_no_coarse_clock.patch
@@ -0,0 +1,27 @@
+From: William Grant <[e-mail]>
+Description: Avoid CLOCK_REALTIME_COARSE on aarch64 to avoid a kernel bug.
+ .
+ __kernel_clock_gettime in the aarch64 VDSO is buggy in the
+ CLOCK_{REALTIME,MONOTONIC}_COARSE cases, resulting in a SIGSEGV or
+ SIGBUS when it attempts to return.
+
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -153,7 +153,7 @@ qb_util_nano_from_epoch_get(void)
+ {
+ 	uint64_t nano_monotonic;
+ 	struct timespec ts;
+-#ifdef CLOCK_REALTIME_COARSE
++#if defined(CLOCK_REALTIME_COARSE) && !defined(__aarch64__)
+ 	clock_gettime(CLOCK_REALTIME_COARSE, &ts);
+ #else
+ 	clock_gettime(CLOCK_REALTIME, &ts);
+@@ -185,7 +185,7 @@ qb_util_nano_monotonic_hz(void)
+ void
+ qb_util_timespec_from_epoch_get(struct timespec *ts)
+ {
+-#ifdef CLOCK_REALTIME_COARSE
++#if defined(CLOCK_REALTIME_COARSE) && !defined(__aarch64__)
+ 	clock_gettime(CLOCK_REALTIME_COARSE, ts);
+ #else
+ 	clock_gettime(CLOCK_REALTIME, ts);
diff --git a/debian/patches/series b/debian/patches/series
index 52f6355..7ab5083 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,7 @@ Restrict-ldl-to-where-it-s-actually-needed.patch
 Restrict-pthreads-to-where-it-s-actually-needed.patch
 Restrict-socket-lib-to-where-it-s-actually-needed.patch
 Restrict-nsl-lib-to-where-it-s-actually-needed.patch
+
+# Ubuntu
+ubuntu_disable_tests.patch
+aarch64_no_coarse_clock.patch
diff --git a/debian/patches/ubuntu_disable_tests.patch b/debian/patches/ubuntu_disable_tests.patch
new file mode 100644
index 0000000..a512b1c
--- /dev/null
+++ b/debian/patches/ubuntu_disable_tests.patch
@@ -0,0 +1,18 @@
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -103,12 +103,12 @@ if HAVE_CHECK
+ EXTRA_DIST += resources.test
+ EXTRA_DIST += blackbox-segfault.sh
+ 
+-TESTS = array.test map.test rb.test log.test blackbox-segfault.sh loop.test ipc.test resources.test
++TESTS = array.test map.test rb.test blackbox-segfault.sh loop.test ipc.test resources.test
+ 
+-resources.log: rb.log log.log ipc.log
++resources.log: rb.log ipc.log
+ 
+ check_LTLIBRARIES =
+-check_PROGRAMS = array.test map.test rb.test log.test loop.test ipc.test util.test crash_test_dummy file_change_bytes
++check_PROGRAMS = array.test map.test rb.test loop.test ipc.test util.test crash_test_dummy file_change_bytes
+ dist_check_SCRIPTS = resources.test blackbox-segfault.sh
+ 
+ if HAVE_SLOW_TESTS