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

Wed Feb 20 17:38:26 UTC 2008

Author: mparent-guest
Date: 2008-02-20 17:38:26 +0000 (Wed, 20 Feb 2008)
New Revision: 1729

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/patches/04_install_chmod.patch
   trunk/ctdb/debian/patches/06_services_names.diff
   trunk/ctdb/debian/patches/series
Log:
  * new upstream git snapshot
  * dropped 05_nice_service.diff, merged upstream
  * updated 04_install_chmod.patch, half has been merged upstream
  * updated 06_services_names, nfs is not patched anymore



Modified: trunk/ctdb/debian/changelog
===================================================================

--- trunk/ctdb/debian/changelog	2008-02-12 18:52:20 UTC (rev 1728)
+++ trunk/ctdb/debian/changelog	2008-02-20 17:38:26 UTC (rev 1729)
@@ -1,3 +1,12 @@
+ctdb (1.0.28+git200802191444) UNRELEASED; urgency=low
+
+  * new upstream git snapshot
+  * dropped 05_nice_service.diff, merged upstream
+  * updated 04_install_chmod.patch, half has been merged upstream
+  * updated 06_services_names, nfs is not patched anymore
+
+ -- Mathieu PARENT <math.parent at gmail.com>  Wed, 13 Feb 2008 21:43:33 +0100
+
 ctdb (1.0.28+git200802081512-1) unstable; urgency=low
 
   * Initial release (Closes: #460114)

Modified: trunk/ctdb/debian/patches/04_install_chmod.patch
===================================================================
--- trunk/ctdb/debian/patches/04_install_chmod.patch	2008-02-12 18:52:20 UTC (rev 1728)
+++ trunk/ctdb/debian/patches/04_install_chmod.patch	2008-02-20 17:38:26 UTC (rev 1729)
@@ -1,26 +1,11 @@
-Goal: correct Makefile to install proper execution permissions
+Goal: /etc/ctdb/functions should be not executable or mention the interpreter
 
-Two changes :
-* /etc/ctdb/events.d/README should not be executable
 * /etc/ctdb/functions should have #!/bin/sh
 
 Author: Mathieu Parent <math.parent at gmail.com>
 
-Upstream status: reported as bugzilla bug #5216 and bug #5217
+Upstream status: reported as bugzilla bug #5216
 
-Index: ctdb-0~20080104223653/Makefile.in
-===================================================================
---- ctdb-0~20080104223653.orig/Makefile.in	2008-01-20 22:40:03.000000000 +0100
-+++ ctdb-0~20080104223653/Makefile.in	2008-01-20 22:40:35.000000000 +0100
-@@ -173,7 +173,7 @@
- 	${INSTALLCMD} -m 644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3
- 	${INSTALLCMD} -m 755 config/functions $(DESTDIR)$(etcdir)/ctdb
- 	${INSTALLCMD} -m 755 config/statd-callout $(DESTDIR)$(etcdir)/ctdb
--	${INSTALLCMD} -m 755 config/events.d/README $(DESTDIR)$(etcdir)/ctdb/events.d
-+	${INSTALLCMD} -m 644 config/events.d/README $(DESTDIR)$(etcdir)/ctdb/events.d
- 	${INSTALLCMD} -m 755 config/events.d/00.ctdb $(DESTDIR)$(etcdir)/ctdb/events.d
- 	${INSTALLCMD} -m 755 config/events.d/10.interface $(DESTDIR)$(etcdir)/ctdb/events.d
- 	${INSTALLCMD} -m 755 config/events.d/40.vsftpd $(DESTDIR)$(etcdir)/ctdb/events.d
 Index: ctdb-0~20080104223653/config/functions
 ===================================================================
 --- ctdb-0~20080104223653.orig/config/functions	2008-01-20 22:40:48.000000000 +0100

Modified: trunk/ctdb/debian/patches/06_services_names.diff
===================================================================
--- trunk/ctdb/debian/patches/06_services_names.diff	2008-02-12 18:52:20 UTC (rev 1728)
+++ trunk/ctdb/debian/patches/06_services_names.diff	2008-02-20 17:38:26 UTC (rev 1729)
@@ -2,7 +2,6 @@
 
 Services have different names :
 * http -> apache2
-* nfs -> nfs-kernel-server
 * smb -> samba
 
 Author: Mathieu Parent <math.parent at gmail.com>
@@ -41,61 +40,6 @@
          ;;
  
       monitor)
-Index: ctdb-1.0.25+git200801291431/config/events.d/60.nfs
-===================================================================
---- ctdb-1.0.25+git200801291431.orig/config/events.d/60.nfs	2008-02-03 20:44:30.000000000 +0100
-+++ ctdb-1.0.25+git200801291431/config/events.d/60.nfs	2008-02-03 21:28:28.000000000 +0100
-@@ -2,7 +2,7 @@
- # script to manage nfs in a clustered environment
- 
- . $CTDB_BASE/functions
--loadconfig nfs
-+loadconfig nfs-kernelc
- 
- [ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0
- [ -z "$STATD_SHARED_DIRECTORY" ] && exit 0
-@@ -14,24 +14,21 @@
- 
- case $cmd in 
-      startup)
--	/bin/mkdir -p $CTDB_BASE/state/nfs
-+	/bin/mkdir -p $CTDB_BASE/state/nfs-kernel-server
- 	/bin/mkdir -p $CTDB_BASE/state/statd/ip
- 	/bin/mkdir -p $STATD_SHARED_DIRECTORY
- 
- 	/bin/rm -f $CTDB_BASE/state/statd/statd.restart >/dev/null 2>/dev/null
- 
- 	# make sure nfs is stopped before we start it, or it may get a bind error
--	service nfs stop > /dev/null 2>&1
--	service nfslock stop > /dev/null 2>&1
-+	service nfs-kernel-server stop > /dev/null 2>&1
- 
--	service nfslock start
--	service nfs start
-+	service nfs-kernel-server start
- 	;;
- 
-      shutdown)
- 	# shutting down nfs can take a while so put it in the background
--	service nfs stop &
--	service nfslock stop &
-+	service nfs-kernel-server stop &
- 	exit 0
- 	;;
- 
-Index: ctdb-1.0.25+git200801291431/config/events.d/61.nfstickle
-===================================================================
---- ctdb-1.0.25+git200801291431.orig/config/events.d/61.nfstickle	2008-02-03 20:44:30.000000000 +0100
-+++ ctdb-1.0.25+git200801291431/config/events.d/61.nfstickle	2008-02-03 21:28:28.000000000 +0100
-@@ -4,7 +4,7 @@
- PATH=/bin:/usr/bin:$PATH
- 
- . $CTDB_BASE/functions
--loadconfig nfs
-+loadconfig nfs-kernel-server
- 
- cmd="$1"
- shift
 Index: ctdb-1.0.25+git200801291431/config/events.d/50.samba
 ===================================================================
 --- ctdb-1.0.25+git200801291431.orig/config/events.d/50.samba	2008-02-03 21:28:46.000000000 +0100

Modified: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series	2008-02-12 18:52:20 UTC (rev 1728)
+++ trunk/ctdb/debian/patches/series	2008-02-20 17:38:26 UTC (rev 1729)
@@ -1,5 +1,4 @@
 02_ctdb_diagnostics.diff
 03_web.diff
 04_install_chmod.patch
-05_nice_service.diff
 06_services_names.diff


