[Pkg-samba-maint] r3174 - trunk/ctdb/debian/patches

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2009-12-18 10:52:42 +0000 (Fri, 18 Dec 2009)
New Revision: 3174

Modified:
   trunk/ctdb/debian/patches/05-hurd.diff
   trunk/ctdb/debian/patches/10_no-lib64.diff
   trunk/ctdb/debian/patches/60-spelling-errors.diff
Log:
Refreshed patches


Modified: trunk/ctdb/debian/patches/05-hurd.diff
===================================================================
--- trunk/ctdb/debian/patches/05-hurd.diff	2009-12-18 10:48:07 UTC (rev 3173)
+++ trunk/ctdb/debian/patches/05-hurd.diff	2009-12-18 10:52:42 UTC (rev 3174)
@@ -10,7 +10,7 @@
 ===================================================================
 --- a/configure
 +++ b/configure
-@@ -2468,6 +2468,11 @@
+@@ -2469,6 +2469,11 @@
      CTDB_SCSI_IO=
      CTDB_PCAP_LDFLAGS=-lpcap
      ;;
@@ -42,7 +42,7 @@
 ===================================================================
 --- a/server/ctdb_daemon.c
 +++ b/server/ctdb_daemon.c
-@@ -556,6 +556,7 @@
+@@ -566,6 +566,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);
-@@ -563,6 +564,7 @@
+@@ -573,6 +574,7 @@
  	struct ucred cr;
  	socklen_t crl = sizeof(struct ucred);
  #endif
@@ -58,7 +58,7 @@
  
  	memset(&addr, 0, sizeof(addr));
  	len = sizeof(addr);
-@@ -577,6 +579,7 @@
+@@ -587,6 +589,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
-@@ -584,11 +587,14 @@
+@@ -594,11 +597,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) {
-@@ -598,7 +604,9 @@
+@@ -608,7 +614,9 @@
  		return;
  	}		
  	client_pid->ctdb   = ctdb;

Modified: trunk/ctdb/debian/patches/10_no-lib64.diff
===================================================================
--- trunk/ctdb/debian/patches/10_no-lib64.diff	2009-12-18 10:48:07 UTC (rev 3173)
+++ trunk/ctdb/debian/patches/10_no-lib64.diff	2009-12-18 10:52:42 UTC (rev 3174)
@@ -10,7 +10,7 @@
 ===================================================================
 --- a/configure
 +++ b/configure
-@@ -2448,7 +2448,7 @@
+@@ -2449,7 +2449,7 @@
  
  if test "${libdir}" = '${exec_prefix}/lib'; then
    case `uname -m` in

Modified: trunk/ctdb/debian/patches/60-spelling-errors.diff
===================================================================
--- trunk/ctdb/debian/patches/60-spelling-errors.diff	2009-12-18 10:48:07 UTC (rev 3173)
+++ trunk/ctdb/debian/patches/60-spelling-errors.diff	2009-12-18 10:52:42 UTC (rev 3174)
@@ -16,11 +16,11 @@
  server/ctdbd.c        |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/lib/replace/getpass.c b/lib/replace/getpass.c
-index d91d029..787cd1d 100644
+Index: b/lib/replace/getpass.c
+===================================================================
 --- a/lib/replace/getpass.c
 +++ b/lib/replace/getpass.c
-@@ -211,7 +211,7 @@ char *rep_getpass(const char *prompt)
+@@ -211,7 +211,7 @@
  	catch_signal(SIGINT, SIGNAL_CAST SIG_DFL);
  
  	if (gotintr) {
@@ -29,19 +29,16 @@
  		fflush(stdout);
  		exit(1);
  	}
-diff --git a/server/ctdbd.c b/server/ctdbd.c
-index 8647aad..a8f13a9 100644
+Index: b/server/ctdbd.c
+===================================================================
 --- a/server/ctdbd.c
 +++ b/server/ctdbd.c
-@@ -135,7 +135,7 @@ int main(int argc, const char *argv[])
+@@ -139,7 +139,7 @@
  		{ "no-recmaster", 0, POPT_ARG_NONE, &options.no_recmaster, 0, "disable recmaster role on this node", NULL },
  		{ "lvs", 0, POPT_ARG_NONE, &options.lvs, 0, "lvs is enabled on this node", NULL },
  		{ "script-log-level", 0, POPT_ARG_INT, &options.script_log_level, DEBUG_ERR, "log level of event script output", NULL },
 -		{ "nopublicipcheck", 0, POPT_ARG_NONE, &options.no_publicipcheck, 0, "dont check we have/dont have the correct public ip addresses", NULL },
 +		{ "nopublicipcheck", 0, POPT_ARG_NONE, &options.no_publicipcheck, 0, "don't check we have/don't have the correct public ip addresses", NULL },
- 		POPT_TABLEEND
- 	};
- 	int opt, ret;
--- 
-1.6.5
-
+ 		{ "max-persistent-check-errors", 0, POPT_ARG_INT,
+ 		  &options.max_persistent_check_errors, 0,
+ 		  "max allowed persistent check errors (default 0)", NULL },