[Pkg-samba-maint] r3401 - in branches/ctdb/lenny-backports/debian: . patches

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2010-03-12 13:05:47 +0000 (Fri, 12 Mar 2010)
New Revision: 3401

Added:
   branches/ctdb/lenny-backports/debian/patches/71-correct-nice_service.diff
Modified:
   branches/ctdb/lenny-backports/debian/changelog
   branches/ctdb/lenny-backports/debian/ctdb-dbg.README.Debian
   branches/ctdb/lenny-backports/debian/ctdb-dbg.install
   branches/ctdb/lenny-backports/debian/patches/series
Log:
Backport 1.0.112-11-2~bpo50+1


Modified: branches/ctdb/lenny-backports/debian/changelog
===================================================================
--- branches/ctdb/lenny-backports/debian/changelog	2010-03-12 13:00:00 UTC (rev 3400)
+++ branches/ctdb/lenny-backports/debian/changelog	2010-03-12 13:05:47 UTC (rev 3401)
@@ -1,9 +1,17 @@
-ctdb (1.0.112-11-1~bpo50+1) lenny-backports; urgency=low
+ctdb (1.0.112-11-2~bpo50+1) lenny-backports; urgency=low
 
   * Rebuild for lenny-backports.
 
- -- Mathieu Parent <sathieu at debian.org>  Thu, 04 Mar 2010 17:55:32 +0100
+ -- Mathieu Parent <sathieu at debian.org>  Fri, 12 Mar 2010 14:04:29 +0100
 
+ctdb (1.0.112-11-2) unstable; urgency=low
+
+  * New 71-correct-nice_service.diff: Correct nice_service() to be compatible
+    with distributions without service
+  * Add missing "scripts" directory to tests
+
+ -- Mathieu Parent <sathieu at debian.org>  Fri, 12 Mar 2010 13:58:25 +0100
+
 ctdb (1.0.112-11-1) unstable; urgency=low
 
   * New upstream release. 1.0.112 branch was recommended by Ronnie Sahlberg on

Modified: branches/ctdb/lenny-backports/debian/ctdb-dbg.README.Debian
===================================================================
--- branches/ctdb/lenny-backports/debian/ctdb-dbg.README.Debian	2010-03-12 13:00:00 UTC (rev 3400)
+++ branches/ctdb/lenny-backports/debian/ctdb-dbg.README.Debian	2010-03-12 13:05:47 UTC (rev 3401)
@@ -1,8 +1,11 @@
 Running the testsuite
 ---------------------
 
-* Add /usr/lib/ctdb/tests/bin to the PATH.
+* Add /usr/lib/ctdb/tests/bin to the PATH, in /root/.bashrc on all nodes:
+ PATH="$PATH:/usr/lib/ctdb/tests/bin"
 
-* Change dir to /usr/share/ctdb/tests
+* On one node, change dir to /usr/share/ctdb/tests:
+ cd /usr/share/ctdb/tests
+ 
+* And follow instructions from /usr/share/ctdb/tests/README
 
-* Follow instructions from /usr/share/ctdb/tests/README

Modified: branches/ctdb/lenny-backports/debian/ctdb-dbg.install
===================================================================
--- branches/ctdb/lenny-backports/debian/ctdb-dbg.install	2010-03-12 13:00:00 UTC (rev 3400)
+++ branches/ctdb/lenny-backports/debian/ctdb-dbg.install	2010-03-12 13:05:47 UTC (rev 3401)
@@ -12,6 +12,7 @@
 tests/README					usr/share/ctdb/tests
 tests/recover.sh				usr/share/ctdb/tests
 tests/run_tests.sh				usr/share/ctdb/tests
+tests/scripts					usr/share/ctdb/tests
 tests/simple					usr/share/ctdb/tests
 tests/test_check_tcp_ports.sh	usr/share/ctdb/tests
 tests/TODO						usr/share/ctdb/tests

Copied: branches/ctdb/lenny-backports/debian/patches/71-correct-nice_service.diff (from rev 3400, trunk/ctdb/debian/patches/71-correct-nice_service.diff)
===================================================================
--- branches/ctdb/lenny-backports/debian/patches/71-correct-nice_service.diff	                        (rev 0)
+++ branches/ctdb/lenny-backports/debian/patches/71-correct-nice_service.diff	2010-03-12 13:05:47 UTC (rev 3401)
@@ -0,0 +1,45 @@
+Goal: Correct nice_service() to be compatible with distributions without service
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=7224
+
+From 868d92043d62e6cbd484d368ff938d3f0b007064 Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Mon, 8 Mar 2010 21:19:35 +0100
+Subject: [PATCH] Correct nice_service()
+
+nice takes a binary as argument and not a function or builtin command
+---
+ config/functions |   13 +++++++++++--
+ 1 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/config/functions b/config/functions
+index b70a352..6556b21 100644
+--- a/config/functions
++++ b/config/functions
+@@ -61,10 +61,19 @@ service() {
+ ######################################################
+ # simulate /sbin/service (niced) on platforms that don't have it
+ nice_service() { 
++  _service_name="$1"
++  _op="$2"
++
+   # do nothing, when no service was specified
+-  [ -z "$1" ] && return
++  [ -z "$_service_name" ] && return
+ 
+-    nice service "$@"
++  if [ -x /sbin/service ]; then
++      nice /sbin/service "$_service_name" "$_op"
++  elif [ -x /etc/init.d/$_service_name ]; then
++      nice /etc/init.d/$_service_name "$_op"
++  elif [ -x /etc/rc.d/init.d/$_service_name ]; then
++      nice /etc/rc.d/init.d/$_service_name "$_op"
++  fi
+ }
+ 
+ ######################################################
+-- 
+1.7.0
+

Modified: branches/ctdb/lenny-backports/debian/patches/series
===================================================================
--- branches/ctdb/lenny-backports/debian/patches/series	2010-03-12 13:00:00 UTC (rev 3400)
+++ branches/ctdb/lenny-backports/debian/patches/series	2010-03-12 13:05:47 UTC (rev 3401)
@@ -5,3 +5,4 @@
 60-spelling-errors.diff
 61-spelling-errors-manpages.diff
 70-nfstickle-sysconfig.diff
+71-correct-nice_service.diff