[Debian-ha-commits] [libqb] 01/01: Update hurd support patch to fix regression in sem_timedwait detection.

[Christoph Berg]

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

myon pushed a commit to branch master
in repository libqb.

commit 0474a2696815dd319e38b3c6ea5624598c482748
Author: Christoph Berg <myon at debian.org>
Date:   Mon Feb 22 20:56:05 2016 +0100

    Update hurd support patch to fix regression in sem_timedwait detection.
---
 debian/changelog                  |  6 +++++
 debian/control                    |  2 +-
 debian/libqb0.symbols             |  7 ------
 debian/patches/hurd-support.patch | 48 ++++++++++++++++-----------------------
 4 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b408b5..d53fe55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libqb (0.17.2.real-6) unstable; urgency=medium
+
+  * Update hurd support patch to fix regression in sem_timedwait detection.
+
+ -- Christoph Berg <myon at debian.org>  Mon, 22 Feb 2016 20:51:37 +0100
+
 libqb (0.17.2.real-5) unstable; urgency=medium
 
   * Support hurd-i386, patch by Svante Signell, thanks!
diff --git a/debian/control b/debian/control
index 1c91814..b554779 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
  doxygen,
  graphviz,
  libglib2.0-dev,
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Section: libs
 Homepage: http://github.com/clusterlabs/libqb/wiki
 Vcs-Git: https://alioth.debian.org/anonscm/git/debian-ha/libqb.git
diff --git a/debian/libqb0.symbols b/debian/libqb0.symbols
index c69862f..3471b4e 100644
--- a/debian/libqb0.symbols
+++ b/debian/libqb0.symbols
@@ -232,12 +232,5 @@ libqb.so.0 libqb0 #MINVER#
  qb_util_timespec_from_epoch_get at Base 0.11.1
  qb_vsnprintf_deserialize at Base 0.11.1
  qb_vsnprintf_serialize at Base 0.14.2
- rpl_sem_destroy at Base 0.17.2
- rpl_sem_getvalue at Base 0.17.2
- rpl_sem_init at Base 0.17.2
- rpl_sem_post at Base 0.17.2
- rpl_sem_timedwait at Base 0.17.2
- rpl_sem_trywait at Base 0.17.2
- rpl_sem_wait at Base 0.17.2
  strlcat at Base 0.11.1
  strlcpy at Base 0.11.1
diff --git a/debian/patches/hurd-support.patch b/debian/patches/hurd-support.patch
index ee6c31f..7132722 100644
--- a/debian/patches/hurd-support.patch
+++ b/debian/patches/hurd-support.patch
@@ -1,34 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -202,10 +202,26 @@ AC_CHECK_FUNCS([alarm clock_gettime ftru
- 		pthread_spin_lock pthread_setschedparam \
-                 pthread_mutexattr_setpshared \
-                 pthread_condattr_setpshared \
--		sem_timedwait semtimedop \
-+		semtimedop \
- 		sched_get_priority_max sched_setscheduler \
- 		getpeerucred getpeereid])
- 
-+		AC_MSG_CHECKING(for a working sem_timedwait)
-+		LDFLAGS=-lpthread
-+		AC_RUN_IFELSE([AC_LANG_PROGRAM(
-+[[#include <semaphore.h>]],
-+[[sem_t sem;
-+struct timespec ts;
-+if (sem_init(&sem, 0, 0) == -1) return -1;
-+if(sem_timedwait(&sem, &ts)==-1) return -1;]])],
-+			  [
-+			    AC_MSG_RESULT([yes])
-+			    AC_DEFINE_UNQUOTED([HAVE_SEM_TIMEDWAIT], [1], [Define to 1 if sem_timedwait works])
-+			  ],
-+			  [
-+			    AC_MSG_RESULT([no])
-+			  ])
-+
- AM_CONDITIONAL(HAVE_SEM_TIMEDWAIT,
- 	       [test "x$ac_cv_func_sem_timedwait" = xyes])
- AM_CONDITIONAL(HAVE_EPOLL,
-@@ -341,6 +357,11 @@ case "$host_os" in
+@@ -341,6 +341,11 @@ case "$host_os" in
  		CP=rsync
  		AC_MSG_RESULT([Solaris])
  	;;
@@ -56,6 +28,15 @@
  		}
 --- a/lib/ipc_socket.c
 +++ b/lib/ipc_socket.c
+@@ -50,7 +50,7 @@ set_sock_addr(struct sockaddr_un *addres
+ 	address->sun_len = QB_SUN_LEN(address);
+ #endif
+ 
+-#if defined(QB_LINUX) || defined(QB_CYGWIN)
++#if defined(QB_LINUX) || defined(QB_CYGWIN) || defined(QB_GNU)
+ 	snprintf(address->sun_path + 1, UNIX_PATH_MAX - 1, "%s", socket_name);
+ #else
+ 	snprintf(address->sun_path, sizeof(address->sun_path), "%s/%s", SOCKETDIR,
 @@ -79,7 +79,7 @@ qb_ipc_dgram_sock_setup(const char *base
  	}
  	snprintf(sock_path, PATH_MAX, "%s-%s", base_name, service_name);
@@ -123,6 +104,15 @@
  		snprintf(path, PATH_MAX, LOCALSTATEDIR "/run/%s", file);
 --- a/lib/ipc_setup.c
 +++ b/lib/ipc_setup.c
+@@ -282,7 +282,7 @@ qb_ipcc_stream_sock_connect(const char *
+ 	address.sun_len = QB_SUN_LEN(&address);
+ #endif
+ 
+-#if defined(QB_LINUX) || defined(QB_CYGWIN)
++#if defined(QB_LINUX) || defined(QB_CYGWIN) || defined(QB_GNU)
+ 	snprintf(address.sun_path + 1, UNIX_PATH_MAX - 1, "%s", socket_name);
+ #else
+ 	snprintf(address.sun_path, sizeof(address.sun_path), "%s/%s", SOCKETDIR,
 @@ -394,7 +394,7 @@ qb_ipcs_us_publish(struct qb_ipcs_servic
  #endif
  

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