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

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-08-01 20:10:43 +0000 (Fri, 01 Aug 2008)
New Revision: 2097

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/patches/06_services_names.diff
   trunk/ctdb/debian/patches/25_popt_lib.diff
   trunk/ctdb/debian/patches/30_ctdb_log.diff
Log:
* Refreshed all patches
* Corrected revision number


Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2008-08-01 20:09:42 UTC (rev 2096)
+++ trunk/ctdb/debian/changelog	2008-08-01 20:10:43 UTC (rev 2097)
@@ -1,4 +1,4 @@
-ctdb (1.0.51) UNRELEASED; urgency=low
+ctdb (1.0.51-1) UNRELEASED; urgency=low
 
   * New upstream git version
   * Maintenance enhancements:
@@ -8,8 +8,9 @@
     * removed debian/build-orig (was used by get-orig-source target)
   * Updated init script to better match upstream
   * 02_ctdb_diagnostics.diff: keep rpm queries
+  * refreshed all patches
 
- -- Mathieu Parent <math.parent at gmail.com>  Fri, 01 Aug 2008 22:07:50 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Fri, 01 Aug 2008 22:09:53 +0200
 
 ctdb (1.0.47+git200807111148-1) unstable; urgency=low
 

Modified: trunk/ctdb/debian/patches/06_services_names.diff
===================================================================
--- trunk/ctdb/debian/patches/06_services_names.diff	2008-08-01 20:09:42 UTC (rev 2096)
+++ trunk/ctdb/debian/patches/06_services_names.diff	2008-08-01 20:10:43 UTC (rev 2097)
@@ -8,10 +8,10 @@
 
 Upstream status: specific to debian
 
-Index: ctdb-1.0.25+git200801291431/config/events.d/41.httpd
+Index: ctdb-1.0.51/config/events.d/41.httpd
 ===================================================================
---- ctdb-1.0.25+git200801291431.orig/config/events.d/41.httpd	2008-02-03 20:44:30.000000000 +0100
-+++ ctdb-1.0.25+git200801291431/config/events.d/41.httpd	2008-02-03 21:28:28.000000000 +0100
+--- ctdb-1.0.51.orig/config/events.d/41.httpd	2008-08-01 22:04:17.000000000 +0200
++++ ctdb-1.0.51/config/events.d/41.httpd	2008-08-01 22:05:31.000000000 +0200
 @@ -1,9 +1,9 @@
  #!/bin/sh
 -# event strict to manage httpd in a cluster environment
@@ -40,11 +40,11 @@
          ;;
  
       monitor)
-Index: ctdb-1.0.25+git200801291431/config/events.d/50.samba
+Index: ctdb-1.0.51/config/events.d/50.samba
 ===================================================================
---- ctdb-1.0.25+git200801291431.orig/config/events.d/50.samba	2008-02-03 21:28:46.000000000 +0100
-+++ ctdb-1.0.25+git200801291431/config/events.d/50.samba	2008-02-03 21:29:32.000000000 +0100
-@@ -45,7 +45,7 @@
+--- ctdb-1.0.51.orig/config/events.d/50.samba	2008-08-01 22:04:17.000000000 +0200
++++ ctdb-1.0.51/config/events.d/50.samba	2008-08-01 22:05:31.000000000 +0200
+@@ -118,7 +118,7 @@
  	/bin/mkdir -p $CTDB_BASE/state/samba
  
  	# make sure samba is not already started
@@ -53,7 +53,7 @@
  	killall -0 -q smbd && {
  	    sleep 1
  	    # make absolutely sure samba is dead
-@@ -66,7 +66,7 @@
+@@ -140,7 +140,7 @@
  	# start Samba service. Start it reniced, as under very heavy load 
  	# the number of smbd processes will mean that it leaves few cycles for
  	# anything else
@@ -62,7 +62,7 @@
  	;;
  	
       takeip)
-@@ -84,7 +84,7 @@
+@@ -158,7 +158,7 @@
  
       shutdown)
  	# shutdown Samba when ctdb goes down
@@ -70,4 +70,4 @@
 +	service samba stop
  
  	# stop the winbind service
- 	[ "$CTDB_MANAGES_WINBIND" = "yes" ] && {
+ 	check_ctdb_manages_winbind

Modified: trunk/ctdb/debian/patches/25_popt_lib.diff
===================================================================
--- trunk/ctdb/debian/patches/25_popt_lib.diff	2008-08-01 20:09:42 UTC (rev 2096)
+++ trunk/ctdb/debian/patches/25_popt_lib.diff	2008-08-01 20:10:43 UTC (rev 2097)
@@ -4,10 +4,10 @@
 
 Upstream status: should be reported upstream
 
-Index: ctdb-1.0.28+git200802191444/utils/smnotify/smnotify.c
+Index: ctdb-1.0.51/utils/smnotify/smnotify.c
 ===================================================================
---- ctdb-1.0.28+git200802191444.orig/utils/smnotify/smnotify.c	2008-02-25 17:19:37.000000000 +0100
-+++ ctdb-1.0.28+git200802191444/utils/smnotify/smnotify.c	2008-02-25 17:19:55.000000000 +0100
+--- ctdb-1.0.51.orig/utils/smnotify/smnotify.c	2008-08-01 22:04:14.000000000 +0200
++++ ctdb-1.0.51/utils/smnotify/smnotify.c	2008-08-01 22:05:39.000000000 +0200
 @@ -24,7 +24,7 @@
  #include <netinet/in.h>
  #include <arpa/inet.h>

Modified: trunk/ctdb/debian/patches/30_ctdb_log.diff
===================================================================
--- trunk/ctdb/debian/patches/30_ctdb_log.diff	2008-08-01 20:09:42 UTC (rev 2096)
+++ trunk/ctdb/debian/patches/30_ctdb_log.diff	2008-08-01 20:10:43 UTC (rev 2097)
@@ -4,11 +4,11 @@
 
 Upstream status: should be reported upstream using a configure parameter
 
-Index: ctdb-1.0.28+git200802191444/server/ctdbd.c
+Index: ctdb-1.0.51/server/ctdbd.c
 ===================================================================
---- ctdb-1.0.28+git200802191444.orig/server/ctdbd.c	2008-02-27 16:19:54.000000000 +0100
-+++ ctdb-1.0.28+git200802191444/server/ctdbd.c	2008-02-27 16:20:14.000000000 +0100
-@@ -46,7 +46,7 @@
+--- ctdb-1.0.51.orig/server/ctdbd.c	2008-08-01 22:04:09.000000000 +0200
++++ ctdb-1.0.51/server/ctdbd.c	2008-08-01 22:05:44.000000000 +0200
+@@ -50,7 +50,7 @@
  	.nlist = ETCDIR "/ctdb/nodes",
  	.transport = "tcp",
  	.event_script_dir = ETCDIR "/ctdb/events.d",