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

Sun Oct 5 11:36:38 UTC 2008

Author: mparent-guest
Date: 2008-10-05 11:36:38 +0000 (Sun, 05 Oct 2008)
New Revision: 2182

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/patches/30_ctdb_log.diff
   trunk/ctdb/debian/rules
Log:
30_ctdb_log.diff: updated to prepare upstream inclusion


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

--- trunk/ctdb/debian/changelog	2008-10-04 15:07:52 UTC (rev 2181)
+++ trunk/ctdb/debian/changelog	2008-10-05 11:36:38 UTC (rev 2182)
@@ -9,8 +9,9 @@
   * Updated init script to better match upstream
   * 02_ctdb_diagnostics.diff: keep rpm queries
   * refreshed all patches
+  * 30_ctdb_log.diff: updated to prepare upstream inclusion
 
- -- Mathieu Parent <math.parent at gmail.com>  Thu, 28 Aug 2008 00:41:46 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Sun, 05 Oct 2008 13:12:35 +0200
 
 ctdb (1.0.47+git200807111148-1) unstable; urgency=low
 

Modified: trunk/ctdb/debian/patches/30_ctdb_log.diff
===================================================================
--- trunk/ctdb/debian/patches/30_ctdb_log.diff	2008-10-04 15:07:52 UTC (rev 2181)
+++ trunk/ctdb/debian/patches/30_ctdb_log.diff	2008-10-05 11:36:38 UTC (rev 2182)
@@ -2,18 +2,111 @@
 
 Author: Mathieu Parent <math.parent at gmail.com>
 
-Upstream status: should be reported upstream using a configure parameter
+Upstream status: Submited http://lists.samba.org/archive/samba-technical/2008-October/061534.html
 
-Index: ctdb-1.0.51/server/ctdbd.c
+Index: ctdb-1.0.58/server/ctdbd.c
 ===================================================================
---- 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
+--- ctdb-1.0.58.orig/server/ctdbd.c	2008-08-28 00:41:25.000000000 +0200
++++ ctdb-1.0.58/server/ctdbd.c	2008-10-05 12:40:14.000000000 +0200
 @@ -50,7 +50,7 @@
  	.nlist = ETCDIR "/ctdb/nodes",
  	.transport = "tcp",
  	.event_script_dir = ETCDIR "/ctdb/events.d",
 -	.logfile = VARDIR "/log/log.ctdb",
-+	.logfile = "/var/log/log.ctdb",
++	.logfile = LOGDIR "/log.ctdb",
  	.db_dir = VARDIR "/ctdb",
  	.db_dir_persistent = VARDIR "/ctdb/persistent",
  };
+Index: ctdb-1.0.58/Makefile.in
+===================================================================
+--- ctdb-1.0.58.orig/Makefile.in	2008-08-28 00:41:25.000000000 +0200
++++ ctdb-1.0.58/Makefile.in	2008-10-05 12:40:14.000000000 +0200
+@@ -12,6 +12,7 @@
+ sbindir = @sbindir@
+ mandir = @mandir@
+ localstatedir = @localstatedir@
++logdir = @logdir@
+ VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
+ srcdir = @srcdir@
+ etcdir = @sysconfdir@
+@@ -29,8 +30,8 @@
+ 
+ CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
+        -I at tallocdir@ -I at tdbdir@/include -I at libreplacedir@ \
+-	-DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
+-	-DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
++	-DVARDIR=\"$(localstatedir)\" -DLOGDIR=\"$(logdir)\" \
++	-DETCDIR=\"$(etcdir)\" -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
+ 
+ LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@ @CTDB_PCAP_LDFLAGS@
+ 
+Index: ctdb-1.0.58/configure
+===================================================================
+--- ctdb-1.0.58.orig/configure	2008-08-28 00:41:31.000000000 +0200
++++ ctdb-1.0.58/configure	2008-10-05 13:09:35.000000000 +0200
+@@ -632,6 +632,7 @@
+ sysconfdir
+ sharedstatedir
+ localstatedir
++logdir
+ includedir
+ oldincludedir
+ docdir
+@@ -750,6 +751,7 @@
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++logdir='${prefix}/var/log'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE}'
+@@ -911,6 +913,11 @@
+   | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+     localstatedir=$ac_optarg ;;
+ 
++  -logdir | --logdir)
++    ac_prev=logdir ;;
++  -logdir=* | --logdir=*)
++    logdir=$ac_optarg ;;
++
+   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+     ac_prev=mandir ;;
+   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+@@ -1101,9 +1108,9 @@
+ 
+ # Be sure to have absolute directory names.
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+-		datadir sysconfdir sharedstatedir localstatedir includedir \
+-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir
++		datadir sysconfdir sharedstatedir localstatedir logdir \
++		includedir oldincludedir docdir infodir htmldir dvidir pdfdir \
++		psdir libdir localedir mandir
+ do
+   eval ac_val=\$$ac_var
+   case $ac_val in
+@@ -1256,6 +1263,7 @@
+   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
++  --logdir=DIR           logfiles [PREFIX/var/log]
+   --libdir=DIR           object code libraries [EPREFIX/lib]
+   --includedir=DIR       C header files [PREFIX/include]
+   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+@@ -24201,6 +24209,7 @@
+ sysconfdir!$sysconfdir$ac_delim
+ sharedstatedir!$sharedstatedir$ac_delim
+ localstatedir!$localstatedir$ac_delim
++logdir!$logdir$ac_delim
+ includedir!$includedir$ac_delim
+ oldincludedir!$oldincludedir$ac_delim
+ docdir!$docdir$ac_delim
+@@ -24275,7 +24284,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: trunk/ctdb/debian/rules
===================================================================
--- trunk/ctdb/debian/rules	2008-10-04 15:07:52 UTC (rev 2181)
+++ trunk/ctdb/debian/rules	2008-10-05 11:36:38 UTC (rev 2182)
@@ -32,7 +32,9 @@
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var/lib
+		--localstatedir=/var/lib \
+		--logdir=/var/log
+
 configure: patch configure-stamp
 configure-stamp:
 	dh_testdir


