[Debian-ha-commits] [libqb] 01/01: Add two more patches from upstream to fix ipc test.

[myon at debian.org]

This is an automated email from the git hooks/post-receive script.

myon pushed a commit to branch master
in repository libqb.

commit 0437411a5ed6514d9d70fd865aaabb6350d621a0
Author: Christoph Berg <christoph.berg at credativ.de>
Date:   Fri Sep 25 15:13:39 2015 +0200

    Add two more patches from upstream to fix ipc test.
---
 debian/changelog                                   |  6 +++++
 .../1908e6c15b6e3acbf083189117b314c0791f016d.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 debian/patches/testsuite-fix-timeout               | 22 ++++++++++++++++++
 4 files changed, 56 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1550870..7928333 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libqb (0.17.2.real-3) unstable; urgency=medium
+
+  * Add two more patches from upstream to fix ipc test.
+
+ -- Christoph Berg <christoph.berg at credativ.de>  Fri, 25 Sep 2015 15:13:06 +0200
+
 libqb (0.17.2.real-2) unstable; urgency=medium
 
   * Use dh --with autotools_dev again.
diff --git a/debian/patches/1908e6c15b6e3acbf083189117b314c0791f016d.patch b/debian/patches/1908e6c15b6e3acbf083189117b314c0791f016d.patch
new file mode 100644
index 0000000..787b32d
--- /dev/null
+++ b/debian/patches/1908e6c15b6e3acbf083189117b314c0791f016d.patch
@@ -0,0 +1,26 @@
+From 1908e6c15b6e3acbf083189117b314c0791f016d Mon Sep 17 00:00:00 2001
+From: Christine Caulfield <ccaulfie at redhat.com>
+Date: Tue, 22 Sep 2015 09:58:23 +0100
+Subject: [PATCH] Fix deletion of sockets on *BSD platforms
+
+The code removed the last 8 characters of a socket name
+to get the 'base name', but 9 are needed.
+
+Signed-off-by: Christine Caulfield <ccaulfie at redhat.com>
+---
+ lib/ipc_socket.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/ipc_socket.c b/lib/ipc_socket.c
+index ef97041..c02dd4c 100644
+--- a/lib/ipc_socket.c
++++ b/lib/ipc_socket.c
+@@ -301,7 +301,7 @@ qb_ipcc_us_disconnect(struct qb_ipcc_connection *c)
+ #if !(defined(QB_LINUX) || defined(QB_CYGWIN))
+     if (getsockname(c->response.u.us.sock, (struct sockaddr *)&un_addr, &un_addr_len) == 0) {
+       length = strlen(un_addr.sun_path);
+-      base_name = strndup(un_addr.sun_path,length-8);
++      base_name = strndup(un_addr.sun_path,length-9);
+       qb_util_log(LOG_DEBUG, "unlinking socket bound files with base_name=%s length=%d",base_name,length);
+       snprintf(sock_name,PATH_MAX,"%s-%s",base_name,"request");
+       qb_util_log(LOG_DEBUG, "unlink sock_name=%s",sock_name);
diff --git a/debian/patches/series b/debian/patches/series
index c904b40..0dafc9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-Fix-check_ipc-tests-so-they-exit-correctly.patch
+1908e6c15b6e3acbf083189117b314c0791f016d.patch
+testsuite-fix-timeout
diff --git a/debian/patches/testsuite-fix-timeout b/debian/patches/testsuite-fix-timeout
new file mode 100644
index 0000000..6ceddf0
--- /dev/null
+++ b/debian/patches/testsuite-fix-timeout
@@ -0,0 +1,22 @@
+https://github.com/ClusterLabs/libqb/issues/165
+
+--- a/tests/check_ipc.c
++++ b/tests/check_ipc.c
+@@ -1539,7 +1539,7 @@ make_shm_suite(void)
+ 
+ 	tc = tcase_create("ipc_stress_connections_shm");
+ 	tcase_add_test(tc, test_ipc_stress_connections_shm);
+-	tcase_set_timeout(tc, 200);
++	tcase_set_timeout(tc, 20000);
+ 	suite_add_tcase(s, tc);
+ 
+ 	return s;
+@@ -1618,7 +1618,7 @@ make_soc_suite(void)
+ 
+ 	tc = tcase_create("ipc_stress_connections_us");
+ 	tcase_add_test(tc, test_ipc_stress_connections_us);
+-	tcase_set_timeout(tc, 200);
++	tcase_set_timeout(tc, 20000);
+ 	suite_add_tcase(s, tc);
+ 
+ 	return s;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/libqb.git