[Pkg-samba-maint] r2640 - in trunk/ctdb/debian: . patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Fri Mar 6 20:01:15 UTC 2009
Author: mparent-guest
Date: 2009-03-06 20:01:15 +0000 (Fri, 06 Mar 2009)
New Revision: 2640
Removed:
trunk/ctdb/debian/patches/06_services_names.diff
trunk/ctdb/debian/patches/25_popt_lib.diff
trunk/ctdb/debian/patches/30_ctdb_log.diff
trunk/ctdb/debian/patches/50_ctdbd_manpage_warning.diff
Modified:
trunk/ctdb/debian/changelog
Log:
new upstream release, most patches integrated.
Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog 2009-03-06 20:00:50 UTC (rev 2639)
+++ trunk/ctdb/debian/changelog 2009-03-06 20:01:15 UTC (rev 2640)
@@ -1,3 +1,15 @@
+ctdb (1.0.73-1) UNRELEASED; urgency=low
+
+ * new upstream release
+ - most patches integrated. Thanks to Michael Adam.
+ - 06_services_names.diff: removed, distribution specific service names are
+ now known by scripts (samba, apache2)
+ - 25_popt_lib.diff: removed, integrated
+ - 30_ctdb_log.diff: removed, integrated (with some changes)
+ - 50_ctdbd_manpage_warning.diff: removed, integrated
+
+ -- Mathieu Parent <math.parent at gmail.com> Fri, 06 Mar 2009 20:56:11 +0100
+
ctdb (1.0.71-2) unstable; urgency=low
* upload to unstable
Deleted: trunk/ctdb/debian/patches/06_services_names.diff
===================================================================
--- trunk/ctdb/debian/patches/06_services_names.diff 2009-03-06 20:00:50 UTC (rev 2639)
+++ trunk/ctdb/debian/patches/06_services_names.diff 2009-03-06 20:01:15 UTC (rev 2640)
@@ -1,41 +0,0 @@
-Goal: correct various paths in events scripts
-
-Services have different names :
-* http -> apache2
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: to adapt and submit
-
-Index: ctdb-1.0.51/config/events.d/41.httpd
-===================================================================
---- 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 sript to manage httpd in a cluster environment
-+# event script to manage apache2 in a cluster environment
-
- . $CTDB_BASE/functions
- loadconfig ctdb
--loadconfig http
-+loadconfig apache2
-
- [ "$CTDB_MANAGES_HTTPD" = "yes" ] || exit 0
-
-@@ -12,12 +12,12 @@
-
- case $cmd in
- startup)
-- service httpd stop > /dev/null 2>&1
-- service httpd start
-+ service apache2 stop > /dev/null 2>&1
-+ service apache2 start
- ;;
-
- shutdown)
-- service httpd stop
-+ service apache2 stop
- ;;
-
- monitor)
Deleted: trunk/ctdb/debian/patches/25_popt_lib.diff
===================================================================
--- trunk/ctdb/debian/patches/25_popt_lib.diff 2009-03-06 20:00:50 UTC (rev 2639)
+++ trunk/ctdb/debian/patches/25_popt_lib.diff 2009-03-06 20:01:15 UTC (rev 2640)
@@ -1,19 +0,0 @@
-Goal: fix popt.h include to allow use of system lib
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: should be reported upstream
-
-Index: ctdb-1.0.51/utils/smnotify/smnotify.c
-===================================================================
---- 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>
- #include "smnotify.h"
--#include "../../lib/popt/popt.h"
-+#include "popt.h"
-
- static char *client = NULL;
- static const char *ip = NULL;
Deleted: trunk/ctdb/debian/patches/30_ctdb_log.diff
===================================================================
--- trunk/ctdb/debian/patches/30_ctdb_log.diff 2009-03-06 20:00:50 UTC (rev 2639)
+++ trunk/ctdb/debian/patches/30_ctdb_log.diff 2009-03-06 20:01:15 UTC (rev 2640)
@@ -1,112 +0,0 @@
-Goal: fix log file to be /var/log/log.ctdb
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: Submited https://bugzilla.samba.org/show_bug.cgi?id=6084
-
-Index: ctdb-1.0.58/server/ctdbd.c
-===================================================================
---- 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 = 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
Deleted: trunk/ctdb/debian/patches/50_ctdbd_manpage_warning.diff
===================================================================
--- trunk/ctdb/debian/patches/50_ctdbd_manpage_warning.diff 2009-03-06 20:00:50 UTC (rev 2639)
+++ trunk/ctdb/debian/patches/50_ctdbd_manpage_warning.diff 2009-03-06 20:01:15 UTC (rev 2640)
@@ -1,28 +0,0 @@
-Goal: correct ctdbd(1) manpage warning
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: to be submitted
-
-Index: b/doc/ctdbd.1
-===================================================================
---- a/doc/ctdbd.1
-+++ b/doc/ctdbd.1
-@@ -48,7 +48,7 @@
- .it 1 an-trap
- .nr an-no-space-flag 1
- .nr an-break-flag 1
--\." make the size of the head bigger
-+.\" make the size of the head bigger
- .ps +3
- .ft B
- .ne (2v + 1u)
-@@ -82,7 +82,7 @@
- .nr an-no-space-flag 1
- .nr an-break-flag 1
- .ps \\n[PS-SS]u
--\." make the size of the head bigger
-+.\" make the size of the head bigger
- .ps +2
- .ft B
- .ne (2v + 1u)
More information about the Pkg-samba-maint
mailing list