[Pkg-samba-maint] r3287 - in branches/ctdb/lenny-backports/debian: . patches
sathieu at alioth.debian.org
sathieu at alioth.debian.org
Wed Feb 10 18:53:06 UTC 2010
tags 560385 pending
thanks
Author: sathieu
Date: 2010-02-10 18:53:01 +0000 (Wed, 10 Feb 2010)
New Revision: 3287
Added:
branches/ctdb/lenny-backports/debian/README.hurd
branches/ctdb/lenny-backports/debian/ctdb.install
branches/ctdb/lenny-backports/debian/patches/60-spelling-errors.diff
Removed:
branches/ctdb/lenny-backports/debian/patches/50-fix-bashism.diff
Modified:
branches/ctdb/lenny-backports/debian/changelog
branches/ctdb/lenny-backports/debian/ctdb.init
branches/ctdb/lenny-backports/debian/patches/05-hurd.diff
branches/ctdb/lenny-backports/debian/patches/10_no-lib64.diff
branches/ctdb/lenny-backports/debian/patches/series
branches/ctdb/lenny-backports/debian/rules
branches/ctdb/lenny-backports/debian/uupdate-wrapper
Log:
Release 1.0.111.really.1.0.108-1~bpo50+1
Copied: branches/ctdb/lenny-backports/debian/README.hurd (from rev 3152, trunk/ctdb/debian/README.hurd)
===================================================================
--- branches/ctdb/lenny-backports/debian/README.hurd (rev 0)
+++ branches/ctdb/lenny-backports/debian/README.hurd 2010-02-10 18:53:01 UTC (rev 3287)
@@ -0,0 +1,8 @@
+CTDB has the following limitations on GNU Hurd:
+
+The pid of a peer is not get from the socket [1]. As a consequence, the peer
+process is not killed when releasing IP [2].
+
+[1]: ctdb_accept_client() in server/ctdb_daemon.c: there is no SO_PEERCRED
+ option to getsockopt on Hurd.
+[2]: release_kill_clients() in server/ctdb_takeover.c
Modified: branches/ctdb/lenny-backports/debian/changelog
===================================================================
--- branches/ctdb/lenny-backports/debian/changelog 2010-02-10 18:42:10 UTC (rev 3286)
+++ branches/ctdb/lenny-backports/debian/changelog 2010-02-10 18:53:01 UTC (rev 3287)
@@ -1,9 +1,63 @@
-ctdb (1.0.99-1~bpo50+1) lenny-backports; urgency=low
+ctdb (1.0.111.really.1.0.108-1~bpo50+1) lenny-backports; urgency=low
* Rebuild for lenny-backports.
- -- Mathieu Parent <sathieu at debian.org> Tue, 03 Nov 2009 20:37:28 +0100
+ -- Mathieu Parent <sathieu at debian.org> Wed, 10 Feb 2010 19:51:44 +0100
+ctdb (1.0.111.really.1.0.108-1) unstable; urgency=low
+
+ * Back to 1.0.108 which works better with samba 3.4.x and 3.5.0
+ (See <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/
+ 2010-February/009100.html>)
+ * Cheery pick some commits from 1.0.108-3 to 1.0.111-1
+
+ -- Mathieu Parent <sathieu at debian.org> Wed, 10 Feb 2010 19:39:13 +0100
+
+ctdb (1.0.111-1) unstable; urgency=low
+
+ * New upstream release
+ - Refreshed patches
+ - Refreshed ctdb.init
+
+ -- Mathieu Parent <sathieu at debian.org> Mon, 04 Jan 2010 23:13:12 +0100
+
+ctdb (1.0.108-3) unstable; urgency=low
+
+ * 05-hurd.diff updated: to make it build on GNU Hurd again.
+ * Added README.hurd for CTDB limitations on GNU Hurd.
+
+ -- Mathieu Parent <sathieu at debian.org> Sun, 13 Dec 2009 20:56:27 +0100
+
+ctdb (1.0.108-2) unstable; urgency=low
+
+ * Fix "auto init style detection fails with Debian's init script"
+ by replacing ubuntu by debian in the initscript (Closes: #560385)
+
+ -- Mathieu Parent <sathieu at debian.org> Thu, 10 Dec 2009 21:43:54 +0100
+
+ctdb (1.0.108-1) unstable; urgency=low
+
+ * New upstream release
+ - removed 50-fix-bashism.diff: patch integrated
+ - Updated ctdb.init (Commit 058e21d96c3c02759833fd5ddfe7b43e6a5f5740
+ "From Rusty")
+ - refreshed patches
+ * debian/uupdate-wrapper can now pull master branch with:
+ ./debian/uupdate-wrapper --version master
+ * New 60-spelling-errors.diff, thanks to lintian
+ * Install tests/bin/ctdb_transaction in /usr/sbin instead of docdir (as
+ upstream) where it was gzipped and not executable.
+
+ -- Mathieu Parent <sathieu at debian.org> Thu, 10 Dec 2009 17:00:27 +0100
+
+ctdb (1.0.103-1) unstable; urgency=low
+
+ * New upstream release
+ * upstream changelog is now in packaging/RPM/ctdb.spec.in instead of
+ packaging/RPM/ctdb.spec. Reflects this in debian/rules
+
+ -- Mathieu Parent <sathieu at debian.org> Thu, 05 Nov 2009 08:27:23 +0100
+
ctdb (1.0.99-1) unstable; urgency=low
* New upstream release
Modified: branches/ctdb/lenny-backports/debian/ctdb.init
===================================================================
--- branches/ctdb/lenny-backports/debian/ctdb.init 2010-02-10 18:42:10 UTC (rev 3286)
+++ branches/ctdb/lenny-backports/debian/ctdb.init 2010-02-10 18:53:01 UTC (rev 3287)
@@ -124,10 +124,6 @@
fi
build_ctdb_options () {
- [ -z "$CTDB_RECOVERY_LOCK" ] && {
- echo "You must configure the location of the CTDB_RECOVERY_LOCK"
- exit 1
- }
maybe_set () {
# If the 2nd arg is null then return - don't set anything.
@@ -176,7 +172,7 @@
check_persistent_databases () {
case $init_style in
- ubuntu) PERSISTENT_DB_DIR="${CTDB_DBDIR:-/var/lib/ctdb}/persistent" ;;
+ debian) PERSISTENT_DB_DIR="${CTDB_DBDIR:-/var/lib/ctdb}/persistent" ;;
*) PERSISTENT_DB_DIR="${CTDB_DBDIR:-/var/ctdb}/persistent" ;;
esac
mkdir -p $PERSISTENT_DB_DIR 2>/dev/null
@@ -212,6 +208,12 @@
check_persistent_databases || return $?
+ if [ yes = "$CTDB_SUPPRESS_COREFILE" ]; then
+ ulimit -c 0
+ else
+ ulimit -c unlimited
+ fi
+
case $init_style in
valgrind)
valgrind -q --log-file=/var/log/ctdb_valgrind \
@@ -230,7 +232,7 @@
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ctdb || RETVAL=1
;;
- ubuntu)
+ debian)
start-stop-daemon --start --quiet --background \
--exec $ctdbd -- $CTDB_OPTIONS
RETVAL=$?
@@ -248,7 +250,7 @@
ctdb shutdown >/dev/null 2>&1
RETVAL=$?
count=0
- if [ "$init_style" = "ubuntu" ]; then
+ if [ "$init_style" = "debian" ]; then
start-stop-daemon --stop --quiet --exec $ctdbd
RETVAL=$?
fi
Copied: branches/ctdb/lenny-backports/debian/ctdb.install (from rev 3152, trunk/ctdb/debian/ctdb.install)
===================================================================
--- branches/ctdb/lenny-backports/debian/ctdb.install (rev 0)
+++ branches/ctdb/lenny-backports/debian/ctdb.install 2010-02-10 18:53:01 UTC (rev 3287)
@@ -0,0 +1 @@
+tests/bin/ctdb_transaction usr/sbin
Modified: branches/ctdb/lenny-backports/debian/patches/05-hurd.diff
===================================================================
--- branches/ctdb/lenny-backports/debian/patches/05-hurd.diff 2010-02-10 18:42:10 UTC (rev 3286)
+++ branches/ctdb/lenny-backports/debian/patches/05-hurd.diff 2010-02-10 18:53:01 UTC (rev 3287)
@@ -1,14 +1,16 @@
Goal: GNU Hurd port
+See README.hurd for limitations.
+
Author: Marc Dequènes (Duck) <duck at duckcorp.org>
-Upstream status: TODO
+Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=6424
-Index: ctdb-1.0.82/configure
+Index: b/configure
===================================================================
---- ctdb-1.0.82.orig/configure 2009-05-24 17:51:12.000000000 +0200
-+++ ctdb-1.0.82/configure 2009-05-24 18:19:57.000000000 +0200
-@@ -1865,6 +1865,11 @@
+--- a/configure
++++ b/configure
+@@ -2468,6 +2468,11 @@
CTDB_SCSI_IO=
CTDB_PCAP_LDFLAGS=-lpcap
;;
@@ -20,10 +22,10 @@
*)
echo unknown system cant configure
exit
-Index: ctdb-1.0.82/configure.ac
+Index: b/configure.ac
===================================================================
---- ctdb-1.0.82.orig/configure.ac 2009-05-24 17:50:47.000000000 +0200
-+++ ctdb-1.0.82/configure.ac 2009-05-24 18:19:50.000000000 +0200
+--- a/configure.ac
++++ b/configure.ac
@@ -36,6 +36,11 @@
CTDB_SCSI_IO=
CTDB_PCAP_LDFLAGS=-lpcap
@@ -36,19 +38,19 @@
*)
echo unknown system cant configure
exit
-Index: ctdb-1.0.82/server/ctdb_daemon.c
+Index: b/server/ctdb_daemon.c
===================================================================
---- ctdb-1.0.82.orig/server/ctdb_daemon.c 2009-05-24 17:50:48.000000000 +0200
-+++ ctdb-1.0.82/server/ctdb_daemon.c 2009-05-24 17:51:12.000000000 +0200
-@@ -532,6 +532,7 @@
- int fd;
+--- a/server/ctdb_daemon.c
++++ b/server/ctdb_daemon.c
+@@ -556,6 +556,7 @@
struct ctdb_context *ctdb = talloc_get_type(private_data, struct ctdb_context);
struct ctdb_client *client;
+ struct ctdb_client_pid_list *client_pid;
+#if ! defined(__GNU__)
#ifdef _AIX
struct peercred_struct cr;
socklen_t crl = sizeof(struct peercred_struct);
-@@ -539,6 +540,7 @@
+@@ -563,6 +564,7 @@
struct ucred cr;
socklen_t crl = sizeof(struct ucred);
#endif
@@ -56,26 +58,43 @@
memset(&addr, 0, sizeof(addr));
len = sizeof(addr);
-@@ -551,6 +553,7 @@
- set_close_on_exec(fd);
+@@ -577,6 +579,7 @@
+ DEBUG(DEBUG_DEBUG,(__location__ " Created SOCKET FD:%d to connected child\n", fd));
client = talloc_zero(ctdb, struct ctdb_client);
+#if ! defined(__GNU__)
#ifdef _AIX
if (getsockopt(fd, SOL_SOCKET, SO_PEERID, &cr, &crl) == 0) {
#else
-@@ -558,6 +561,7 @@
+@@ -584,11 +587,14 @@
#endif
- talloc_asprintf(client, "struct ctdb_client: pid:%u", (unsigned)cr.pid);
+ DEBUG(DEBUG_INFO,("Connected client with pid:%u\n", (unsigned)cr.pid));
}
+#endif
client->ctdb = ctdb;
client->fd = fd;
-Index: ctdb-1.0.82/common/system_gnu.c
+ client->client_id = ctdb_reqid_new(ctdb, client);
++#if ! defined(__GNU__)
+ client->pid = cr.pid;
++#endif
+
+ client_pid = talloc(client, struct ctdb_client_pid_list);
+ if (client_pid == NULL) {
+@@ -598,7 +604,9 @@
+ return;
+ }
+ client_pid->ctdb = ctdb;
++#if ! defined(__GNU__)
+ client_pid->pid = cr.pid;
++#endif
+ client_pid->client = client;
+
+ DLIST_ADD(ctdb->client_pids, client_pid);
+Index: b/common/system_gnu.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ctdb-1.0.82/common/system_gnu.c 2009-05-24 18:18:47.000000000 +0200
+--- /dev/null
++++ b/common/system_gnu.c
@@ -0,0 +1,355 @@
+/*
+ ctdb system specific code to manage raw sockets on linux
Modified: branches/ctdb/lenny-backports/debian/patches/10_no-lib64.diff
===================================================================
--- branches/ctdb/lenny-backports/debian/patches/10_no-lib64.diff 2010-02-10 18:42:10 UTC (rev 3286)
+++ branches/ctdb/lenny-backports/debian/patches/10_no-lib64.diff 2010-02-10 18:53:01 UTC (rev 3287)
@@ -10,7 +10,7 @@
===================================================================
--- a/configure
+++ b/configure
-@@ -1845,7 +1845,7 @@
+@@ -2448,7 +2448,7 @@
if test "${libdir}" = '${exec_prefix}/lib'; then
case `uname -m` in
Deleted: branches/ctdb/lenny-backports/debian/patches/50-fix-bashism.diff
===================================================================
--- branches/ctdb/lenny-backports/debian/patches/50-fix-bashism.diff 2010-02-10 18:42:10 UTC (rev 3286)
+++ branches/ctdb/lenny-backports/debian/patches/50-fix-bashism.diff 2010-02-10 18:53:01 UTC (rev 3287)
@@ -1,24 +0,0 @@
-Goal: Fix bashism
-
-See http://bugs.debian.org/547741
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=6407
-
-diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw
-index bd31197..4d97b9a 100644
---- a/config/events.d/11.natgw
-+++ b/config/events.d/11.natgw
-@@ -43,7 +43,7 @@ case $cmd in
- NATGWIP=`ctdb natgwlist | head -1 | sed -e "s/^[^ ]* *//"`
-
- CTDB_NATGW_PUBLIC_IP_HOST=`echo $CTDB_NATGW_PUBLIC_IP | sed -e "s/\/.*/\/32/"`
-- if [ "$NATGWMASTER" == "-1" ]; then
-+ if [ "$NATGWMASTER" = "-1" ]; then
- echo "There is not NATGW master node"
- exit 1
- fi
---
-1.6.3.3
-
Copied: branches/ctdb/lenny-backports/debian/patches/60-spelling-errors.diff (from rev 3152, trunk/ctdb/debian/patches/60-spelling-errors.diff)
===================================================================
--- branches/ctdb/lenny-backports/debian/patches/60-spelling-errors.diff (rev 0)
+++ branches/ctdb/lenny-backports/debian/patches/60-spelling-errors.diff 2010-02-10 18:53:01 UTC (rev 3287)
@@ -0,0 +1,47 @@
+Goal: Correction of spelling errors thanks to lintian
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=6935
+
+From 4e44118f5b08454369cdc3a700ad1b852db72207 Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Fri, 27 Nov 2009 21:45:51 +0100
+Subject: [PATCH] Correction of spelling errors.
+
+* interupted -> interrupted
+* dont -> don't
+---
+ lib/replace/getpass.c | 2 +-
+ server/ctdbd.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/replace/getpass.c b/lib/replace/getpass.c
+index d91d029..787cd1d 100644
+--- a/lib/replace/getpass.c
++++ b/lib/replace/getpass.c
+@@ -211,7 +211,7 @@ char *rep_getpass(const char *prompt)
+ catch_signal(SIGINT, SIGNAL_CAST SIG_DFL);
+
+ if (gotintr) {
+- printf("Interupted by signal.\n");
++ printf("Interrupted by signal.\n");
+ fflush(stdout);
+ exit(1);
+ }
+diff --git a/server/ctdbd.c b/server/ctdbd.c
+index 8647aad..a8f13a9 100644
+--- a/server/ctdbd.c
++++ b/server/ctdbd.c
+@@ -135,7 +135,7 @@ int main(int argc, const char *argv[])
+ { "no-recmaster", 0, POPT_ARG_NONE, &options.no_recmaster, 0, "disable recmaster role on this node", NULL },
+ { "lvs", 0, POPT_ARG_NONE, &options.lvs, 0, "lvs is enabled on this node", NULL },
+ { "script-log-level", 0, POPT_ARG_INT, &options.script_log_level, DEBUG_ERR, "log level of event script output", NULL },
+- { "nopublicipcheck", 0, POPT_ARG_NONE, &options.no_publicipcheck, 0, "dont check we have/dont have the correct public ip addresses", NULL },
++ { "nopublicipcheck", 0, POPT_ARG_NONE, &options.no_publicipcheck, 0, "don't check we have/don't have the correct public ip addresses", NULL },
+ POPT_TABLEEND
+ };
+ int opt, ret;
+--
+1.6.5
+
Modified: branches/ctdb/lenny-backports/debian/patches/series
===================================================================
--- branches/ctdb/lenny-backports/debian/patches/series 2010-02-10 18:42:10 UTC (rev 3286)
+++ branches/ctdb/lenny-backports/debian/patches/series 2010-02-10 18:53:01 UTC (rev 3287)
@@ -1,4 +1,4 @@
02_ctdb_diagnostics.diff
05-hurd.diff
10_no-lib64.diff
-50-fix-bashism.diff
+60-spelling-errors.diff
Modified: branches/ctdb/lenny-backports/debian/rules
===================================================================
--- branches/ctdb/lenny-backports/debian/rules 2010-02-10 18:42:10 UTC (rev 3286)
+++ branches/ctdb/lenny-backports/debian/rules 2010-02-10 18:53:01 UTC (rev 3287)
@@ -93,10 +93,13 @@
dh_testroot
dh_installchangelogs
dh_installdocs
+ifeq ($(DEB_BUILD_ARCH_OS), hurd)
+ dh_installdocs debian/README.hurd
+endif
#patch doc
sed -i 's|/etc/sysconfig/|/etc/default/|' $(DESTDIR)/usr/share/doc/ctdb/web/*.html
#upstream changelog
- grep -A 10000 '%changelog' packaging/RPM/ctdb.spec > $(DESTDIR)/usr/share/doc/ctdb/changelog
+ grep -A 10000 '%changelog' packaging/RPM/ctdb.spec.in > $(DESTDIR)/usr/share/doc/ctdb/changelog
dh_installexamples
dh_installlogrotate
#install init script
Modified: branches/ctdb/lenny-backports/debian/uupdate-wrapper
===================================================================
--- branches/ctdb/lenny-backports/debian/uupdate-wrapper 2010-02-10 18:42:10 UTC (rev 3286)
+++ branches/ctdb/lenny-backports/debian/uupdate-wrapper 2010-02-10 18:53:01 UTC (rev 3287)
@@ -1,12 +1,22 @@
#!/bin/sh
-version=$2
file=$3
+if [ $2 = 'master' ]; then
+ version=0.0.0+git0
+ git_version=$2
+else
+ version=$2
+ git_version=ctdb-$version
+ #remove git log (only used by uscan)
+ rm -f $file
+fi
-#remove git log (only used by uscan)
-rm $file
#pull source from git
-git clone git://git.samba.org/sahlberg/ctdb.git;h=ctdb-$version
+git clone git://git.samba.org/sahlberg/ctdb.git;h=$git_version
+if [ $2 = 'master' ]; then
+ #construct version with latest release+git0
+ version=`grep -A 1 '%changelog' ctdb/packaging/RPM/ctdb.spec.in | tail -n1 | sed 's/.* \([0-9\.]\+\)$/\1/'`+git0
+fi
mv ctdb ctdb-$version.orig
#clean source
rm -rf ctdb-$version.orig/.git
More information about the Pkg-samba-maint
mailing list