[Pkg-samba-maint] r3147 - in trunk/ctdb/debian: . patches

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2009-12-11 20:15:21 +0000 (Fri, 11 Dec 2009)
New Revision: 3147

Added:
   trunk/ctdb/debian/README.hurd
Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/patches/05-hurd.diff
Log:
- 05-hurd.diff updated: to make it build on Hurd again
- Added README.hurd to list limitations

Added: trunk/ctdb/debian/README.hurd
===================================================================
--- trunk/ctdb/debian/README.hurd	                        (rev 0)
+++ trunk/ctdb/debian/README.hurd	2009-12-11 20:15:21 UTC (rev 3147)
@@ -0,0 +1,8 @@
+CTDB has the following limitations on GNU Hurd:
+
+The pid of a peer is not get from the socket [1]. As a consequence, the peer
+process is not killed when releasing IP [2].
+
+[1]: ctdb_accept_client() in server/ctdb_daemon.c: there is no SO_PEERCRED
+     option to getsockopt on Hurd.
+[2]: release_kill_clients() in server/ctdb_takeover.c

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2009-12-11 20:07:38 UTC (rev 3146)
+++ trunk/ctdb/debian/changelog	2009-12-11 20:15:21 UTC (rev 3147)
@@ -1,3 +1,9 @@
+ctdb (1.0.108-3) UNRELEASED; urgency=low
+
+  * 05-hurd.diff updated: to make it build on Hurd again. See README.hurd.
+
+ -- Mathieu Parent <sathieu at debian.org>  Fri, 11 Dec 2009 20:16:18 +0100
+
 ctdb (1.0.108-2) unstable; urgency=low
 
   * Fix "auto init style detection fails with Debian's init script"

Modified: trunk/ctdb/debian/patches/05-hurd.diff
===================================================================
--- trunk/ctdb/debian/patches/05-hurd.diff	2009-12-11 20:07:38 UTC (rev 3146)
+++ trunk/ctdb/debian/patches/05-hurd.diff	2009-12-11 20:15:21 UTC (rev 3147)
@@ -1,5 +1,7 @@
 Goal: GNU Hurd port
 
+See README.hurd for limitations.
+
 Author: Marc Dequènes (Duck) <duck at duckcorp.org>
 
 Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=6424
@@ -64,7 +66,7 @@
  #ifdef _AIX
  	if (getsockopt(fd, SOL_SOCKET, SO_PEERID, &cr, &crl) == 0) {
  #else
-@@ -584,6 +587,7 @@
+@@ -584,11 +587,14 @@
  #endif
  		DEBUG(DEBUG_INFO,("Connected client with pid:%u\n", (unsigned)cr.pid));
  	}
@@ -72,6 +74,13 @@
  
  	client->ctdb = ctdb;
  	client->fd = fd;
+ 	client->client_id = ctdb_reqid_new(ctdb, client);
++#if ! defined(__GNU__)
+ 	client->pid = cr.pid;
++#endif
+
+ 	client_pid = talloc(client, struct ctdb_client_pid_list);
+ 	if (client_pid == NULL) {
 Index: b/common/system_gnu.c
 ===================================================================
 --- /dev/null