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

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2009-12-10 14:58:43 +0000 (Thu, 10 Dec 2009)
New Revision: 3135

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/patches/05-hurd.diff
   trunk/ctdb/debian/patches/10_no-lib64.diff
Log:
refreshed patches

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2009-12-10 14:33:37 UTC (rev 3134)
+++ trunk/ctdb/debian/changelog	2009-12-10 14:58:43 UTC (rev 3135)
@@ -4,6 +4,7 @@
     - removed 50-fix-bashism.diff: patch integrated 
     - Updated ctdb.init (Commit 058e21d96c3c02759833fd5ddfe7b43e6a5f5740
       "From Rusty")
+    - refreshed patches
   * debian/uupdate-wrapper can now pull master branch with:
     ./debian/uupdate-wrapper --version master
 

Modified: trunk/ctdb/debian/patches/05-hurd.diff
===================================================================
--- trunk/ctdb/debian/patches/05-hurd.diff	2009-12-10 14:33:37 UTC (rev 3134)
+++ trunk/ctdb/debian/patches/05-hurd.diff	2009-12-10 14:58:43 UTC (rev 3135)
@@ -4,11 +4,11 @@
 
 Upstream status: TODO
 
-Index: ctdb-1.0.82/configure
+Index: b/configure
 ===================================================================
---- ctdb-1.0.82.orig/configure	2009-05-24 17:51:12.000000000 +0200
-+++ ctdb-1.0.82/configure	2009-05-24 18:19:57.000000000 +0200
-@@ -1865,6 +1865,11 @@
+--- a/configure
++++ b/configure
+@@ -2468,6 +2468,11 @@
      CTDB_SCSI_IO=
      CTDB_PCAP_LDFLAGS=-lpcap
      ;;
@@ -20,10 +20,10 @@
    *)
      echo unknown system  cant configure
      exit
-Index: ctdb-1.0.82/configure.ac
+Index: b/configure.ac
 ===================================================================
---- ctdb-1.0.82.orig/configure.ac	2009-05-24 17:50:47.000000000 +0200
-+++ ctdb-1.0.82/configure.ac	2009-05-24 18:19:50.000000000 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -36,6 +36,11 @@
      CTDB_SCSI_IO=
      CTDB_PCAP_LDFLAGS=-lpcap
@@ -36,19 +36,19 @@
    *)
      echo unknown system  cant configure
      exit
-Index: ctdb-1.0.82/server/ctdb_daemon.c
+Index: b/server/ctdb_daemon.c
 ===================================================================
---- ctdb-1.0.82.orig/server/ctdb_daemon.c	2009-05-24 17:50:48.000000000 +0200
-+++ ctdb-1.0.82/server/ctdb_daemon.c	2009-05-24 17:51:12.000000000 +0200
-@@ -532,6 +532,7 @@
- 	int fd;
+--- a/server/ctdb_daemon.c
++++ b/server/ctdb_daemon.c
+@@ -556,6 +556,7 @@
  	struct ctdb_context *ctdb = talloc_get_type(private_data, struct ctdb_context);
  	struct ctdb_client *client;
+ 	struct ctdb_client_pid_list *client_pid;
 +#if ! defined(__GNU__)
  #ifdef _AIX
  	struct peercred_struct cr;
  	socklen_t crl = sizeof(struct peercred_struct);
-@@ -539,6 +540,7 @@
+@@ -563,6 +564,7 @@
  	struct ucred cr;
  	socklen_t crl = sizeof(struct ucred);
  #endif
@@ -56,26 +56,26 @@
  
  	memset(&addr, 0, sizeof(addr));
  	len = sizeof(addr);
-@@ -551,6 +553,7 @@
- 	set_close_on_exec(fd);
+@@ -577,6 +579,7 @@
+ 	DEBUG(DEBUG_DEBUG,(__location__ " Created SOCKET FD:%d to connected child\n", fd));
  
  	client = talloc_zero(ctdb, struct ctdb_client);
 +#if ! defined(__GNU__)
  #ifdef _AIX
  	if (getsockopt(fd, SOL_SOCKET, SO_PEERID, &cr, &crl) == 0) {
  #else
-@@ -558,6 +561,7 @@
+@@ -584,6 +587,7 @@
  #endif
- 		talloc_asprintf(client, "struct ctdb_client: pid:%u", (unsigned)cr.pid);
+ 		DEBUG(DEBUG_INFO,("Connected client with pid:%u\n", (unsigned)cr.pid));
  	}
 +#endif
  
  	client->ctdb = ctdb;
  	client->fd = fd;
-Index: ctdb-1.0.82/common/system_gnu.c
+Index: b/common/system_gnu.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ctdb-1.0.82/common/system_gnu.c	2009-05-24 18:18:47.000000000 +0200
+--- /dev/null
++++ b/common/system_gnu.c
 @@ -0,0 +1,355 @@
 +/* 
 +   ctdb system specific code to manage raw sockets on linux

Modified: trunk/ctdb/debian/patches/10_no-lib64.diff
===================================================================
--- trunk/ctdb/debian/patches/10_no-lib64.diff	2009-12-10 14:33:37 UTC (rev 3134)
+++ trunk/ctdb/debian/patches/10_no-lib64.diff	2009-12-10 14:58:43 UTC (rev 3135)
@@ -10,7 +10,7 @@
 ===================================================================
 --- a/configure
 +++ b/configure
-@@ -1845,7 +1845,7 @@
+@@ -2448,7 +2448,7 @@
  
  if test "${libdir}" = '${exec_prefix}/lib'; then
    case `uname -m` in