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

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-11-06 20:39:00 +0000 (Sun, 06 Nov 2011)
New Revision: 3970

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/patches/05-hurd.diff
Log:
05-hurd.diff: updated to prevent FTBFS:

- include tevent.h instead of events.h
- add ctdb_sys_check_iface_exists() function



Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2011-11-06 17:33:58 UTC (rev 3969)
+++ trunk/ctdb/debian/changelog	2011-11-06 20:39:00 UTC (rev 3970)
@@ -9,6 +9,9 @@
   * removed obsolete d/README.source
   * removed empty d/ctdb.links
   * d/copyright: converted to dep5
+  * 05-hurd.diff: updated to prevent FTBFS:
+    - include tevent.h instead of events.h
+    - add ctdb_sys_check_iface_exists() function
 
  -- Mathieu Parent <sathieu at debian.org>  Sun, 06 Nov 2011 18:32:33 +0100
 

Modified: trunk/ctdb/debian/patches/05-hurd.diff
===================================================================
--- trunk/ctdb/debian/patches/05-hurd.diff	2011-11-06 17:33:58 UTC (rev 3969)
+++ trunk/ctdb/debian/patches/05-hurd.diff	2011-11-06 20:39:00 UTC (rev 3970)
@@ -6,11 +6,11 @@
 
 Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=6424
 
-Index: b/configure
+Index: ctdb-1.11+git20111102/configure
 ===================================================================
---- a/configure
-+++ b/configure
-@@ -1759,6 +1759,11 @@
+--- ctdb-1.11+git20111102.orig/configure	2011-11-06 18:30:26.000000000 +0100
++++ ctdb-1.11+git20111102/configure	2011-11-06 19:55:01.000000000 +0100
+@@ -2489,6 +2489,11 @@
      CTDB_SCSI_IO=
      CTDB_PCAP_LDFLAGS=-lpcap
      ;;
@@ -22,11 +22,11 @@
    *)
      echo unknown system  cant configure
      exit
-Index: b/configure.ac
+Index: ctdb-1.11+git20111102/configure.ac
 ===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,6 +36,11 @@
+--- ctdb-1.11+git20111102.orig/configure.ac	2011-11-06 18:30:26.000000000 +0100
++++ ctdb-1.11+git20111102/configure.ac	2011-11-06 19:55:01.000000000 +0100
+@@ -28,6 +28,11 @@
      CTDB_SCSI_IO=
      CTDB_PCAP_LDFLAGS=-lpcap
      ;;
@@ -38,11 +38,11 @@
    *)
      echo unknown system  cant configure
      exit
-Index: b/server/ctdb_daemon.c
+Index: ctdb-1.11+git20111102/server/ctdb_daemon.c
 ===================================================================
---- a/server/ctdb_daemon.c
-+++ b/server/ctdb_daemon.c
-@@ -571,6 +571,7 @@
+--- ctdb-1.11+git20111102.orig/server/ctdb_daemon.c	2011-11-06 18:30:26.000000000 +0100
++++ ctdb-1.11+git20111102/server/ctdb_daemon.c	2011-11-06 19:55:01.000000000 +0100
+@@ -651,6 +651,7 @@
  	struct ctdb_context *ctdb = talloc_get_type(private_data, struct ctdb_context);
  	struct ctdb_client *client;
  	struct ctdb_client_pid_list *client_pid;
@@ -50,7 +50,7 @@
  #ifdef _AIX
  	struct peercred_struct cr;
  	socklen_t crl = sizeof(struct peercred_struct);
-@@ -578,6 +579,7 @@
+@@ -658,6 +659,7 @@
  	struct ucred cr;
  	socklen_t crl = sizeof(struct ucred);
  #endif
@@ -58,7 +58,7 @@
  
  	memset(&addr, 0, sizeof(addr));
  	len = sizeof(addr);
-@@ -592,6 +594,7 @@
+@@ -672,6 +674,7 @@
  	DEBUG(DEBUG_DEBUG,(__location__ " Created SOCKET FD:%d to connected child\n", fd));
  
  	client = talloc_zero(ctdb, struct ctdb_client);
@@ -66,7 +66,7 @@
  #ifdef _AIX
  	if (getsockopt(fd, SOL_SOCKET, SO_PEERID, &cr, &crl) == 0) {
  #else
-@@ -599,11 +602,14 @@
+@@ -679,11 +682,14 @@
  #endif
  		DEBUG(DEBUG_INFO,("Connected client with pid:%u\n", (unsigned)cr.pid));
  	}
@@ -81,7 +81,7 @@
  
  	client_pid = talloc(client, struct ctdb_client_pid_list);
  	if (client_pid == NULL) {
-@@ -613,7 +619,9 @@
+@@ -693,7 +699,9 @@
  		return;
  	}		
  	client_pid->ctdb   = ctdb;
@@ -91,11 +91,11 @@
  	client_pid->client = client;
  
  	DLIST_ADD(ctdb->client_pids, client_pid);
-Index: b/common/system_gnu.c
+Index: ctdb-1.11+git20111102/common/system_gnu.c
 ===================================================================
---- /dev/null
-+++ b/common/system_gnu.c
-@@ -0,0 +1,355 @@
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ctdb-1.11+git20111102/common/system_gnu.c	2011-11-06 20:13:45.000000000 +0100
+@@ -0,0 +1,358 @@
 +/* 
 +   ctdb system specific code to manage raw sockets on linux
 +
@@ -126,7 +126,7 @@
 +#include "system/filesys.h"
 +#include "system/wait.h"
 +#include "../include/ctdb_private.h"
-+#include "lib/events/events.h"
++#include "lib/tevent/tevent.h"
 +#include <net/ethernet.h>
 +#include <netinet/ip6.h>
 +#include <net/if_arp.h>
@@ -450,4 +450,7 @@
 +	return -1;
 +}
 +
-+
++bool ctdb_sys_check_iface_exists(const char *iface)
++{
++	return true;
++}