- updated to 2.2

- updated ib patch, removed obsolete pcp patch

diff --git a/ctdb-ib.patch b/ctdb-ib.patch
index b87deb92c9fb198a97c1721929d2cfbbcf4a6210..8b2e3d461b3e35fd0db8f4110e45896e6ed38aab 100644 (file)
--- a/ctdb-ib.patch
+++ b/ctdb-ib.patch
@@ -19,18 +19,18 @@
  #include <system/network.h>
  #include <assert.h>
  #include "ctdb_private.h"
---- ctdb-2.0/Makefile.in.orig  2012-10-31 02:33:25.000000000 +0100
-+++ ctdb-2.0/Makefile.in       2012-12-16 17:18:19.044072664 +0100
-@@ -267,7 +267,7 @@
+--- ctdb-2.2/Makefile.in.orig  2013-05-30 04:30:32.000000000 +0200
++++ ctdb-2.2/Makefile.in       2013-06-07 20:27:01.381037615 +0200
+@@ -285,7 +285,7 @@
  CTDB_TEST_C = $(CTDB_CLIENT_OBJ:.o=.c) tools/ctdb.c tools/ctdb_vacuum.c  tests/src/ctdb_test.c
  
  CTDB_TEST_OBJ =  $(TALLOC_OBJ) $(TDB_OBJ) \
--      @CTDB_SYSTEM_OBJ@ @LIBREPLACEOBJ@ $(EXTRA_OBJ) $(TEVENT_OBJ) $(SOCKET_WRAPPER_OBJ)
-+      @CTDB_SYSTEM_OBJ@ @LIBREPLACEOBJ@ $(EXTRA_OBJ) $(TEVENT_OBJ) $(SOCKET_WRAPPER_OBJ) @INFINIBAND_WRAPPER_OBJ@
+-      @CTDB_SYSTEM_OBJ@ $(REPLACE_OBJ) $(EXTRA_OBJ) $(TEVENT_OBJ) $(SOCKET_WRAPPER_OBJ)
++      @CTDB_SYSTEM_OBJ@ $(REPLACE_OBJ) $(EXTRA_OBJ) $(TEVENT_OBJ) $(SOCKET_WRAPPER_OBJ) @INFINIBAND_WRAPPER_OBJ@
  
  tests/src/ctdb_takeover_tests.o: tests/src/ctdb_takeover_tests.c $(CTDBD_TEST_C)
  
-@@ -287,9 +287,9 @@
+@@ -305,9 +305,9 @@
        @echo Linking $@
        @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_stubby.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
  

diff --git a/ctdb-pcp.patch b/ctdb-pcp.patch
deleted file mode 100644 (file)
index daf366a..0000000
--- a/ctdb-pcp.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- ctdb-2.0/utils/pmda/pmda_ctdb.c.orig       2012-12-22 18:36:54.933169295 +0100
-+++ ctdb-2.0/utils/pmda/pmda_ctdb.c    2012-12-22 19:04:46.719801116 +0100
-@@ -423,10 +423,10 @@
-               atom->ul = stats->pending_calls;
-               break;
-       case 15:
--              atom->ul = stats->lockwait_calls;
-+              atom->ul = stats->locks.num_calls;
-               break;
-       case 16:
--              atom->ul = stats->pending_lockwait_calls;
-+              atom->ul = stats->locks.num_pending;
-               break;
-       case 17:
-               atom->ul = stats->childwrite_calls;
-@@ -450,7 +450,7 @@
-               atom->d = stats->call_latency.max;
-               break;
-       case 24:
--              atom->d = stats->lockwait_latency.max;
-+              atom->d = stats->locks.latency.max;
-               break;
-       case 25:
-               atom->d = stats->childwrite_latency.max;
---- ctdb-2.0/Makefile.in.orig  2012-12-22 19:49:01.286412453 +0100
-+++ ctdb-2.0/Makefile.in       2012-12-22 20:40:38.173014572 +0100
-@@ -46,7 +46,7 @@
- 
- PMDA_LIBS = -lpcp -lpcp_pmda
- PMDA_INSTALL = @CTDB_PMDA_INSTALL@
--PMDA_DEST_DIR = /var/lib/pcp/pmdas
-+PMDA_DEST_DIR = /var/lib/pcp/pmdas/ctdb
- 
- CFLAGS=@CPPFLAGS@ -g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
-        $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(TDB_CFLAGS) -I@libreplacedir@ \
-@@ -368,10 +368,10 @@
-       if [ ! -f $(DESTDIR)$(etcdir)/ctdb/gcore_trace.sh ];then ${INSTALLCMD} -m 755 config/gcore_trace.sh $(DESTDIR)$(etcdir)/ctdb; fi
- 
- install_pmda:
--      $(INSTALLCMD) -m 755 -d $(PMDA_DEST_DIR)
--      $(INSTALLCMD) -m 755 pmda/Install pmda/Remove $(PMDA_DEST_DIR)
--      $(INSTALLCMD) -m 644 pmda/pmns pmda/domain.h pmda/help pmda/README $(PMDA_DEST_DIR)
--      $(INSTALLCMD) -m 755 bin/pmdactdb $(PMDA_DEST_DIR)
-+      $(INSTALLCMD) -m 755 -d $(DESTDIR)$(PMDA_DEST_DIR)
-+      $(INSTALLCMD) -m 755 utils/pmda/Install utils/pmda/Remove $(DESTDIR)$(PMDA_DEST_DIR)
-+      $(INSTALLCMD) -m 644 utils/pmda/pmns utils/pmda/domain.h utils/pmda/help utils/pmda/README $(DESTDIR)$(PMDA_DEST_DIR)
-+      $(INSTALLCMD) -m 755 bin/pmdactdb $(DESTDIR)$(PMDA_DEST_DIR)
- 
- # Should use $(datarootdir) but older autoconfs don't do this.  :-(
- install_tests: all

diff --git a/ctdb.spec b/ctdb.spec
index bf0b2572518324874dffaec0af8666691d5d0307..ea51daae774298730bf05bb5efef9306c49251df 100644 (file)
--- a/ctdb.spec
+++ b/ctdb.spec
@@ -15,15 +15,14 @@
 Summary:       A Clustered Database based on Samba's Trivial Database (TDB)
 Summary(pl.UTF-8):     Klastrowa baza danych oparta na bazie danych Trivial Database z Samby (TDB)
 Name:          ctdb
-Version:       2.1
+Version:       2.2
 Release:       1
 License:       GPL v3+
 Group:         Daemons
 Source0:       http://www.samba.org/ftp/ctdb/%{name}-%{version}.tar.gz
-# Source0-md5: 61733cc10b4df20fa35dfd4d2697d8b8
+# Source0-md5: c5aa3c887d1cb1eb2cfd84bb22c3d142
 Patch0:                %{name}-ib.patch
-Patch1:                %{name}-pcp.patch
-Patch2:                %{name}-format.patch
+Patch1:                %{name}-format.patch
 URL:           http://ctdb.samba.org/
 %{?with_pcp:BuildRequires:     pcp-devel}
 BuildRequires: popt-devel
@@ -87,11 +86,10 @@ wyeksportowania do PMCD.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure \
-       %{!?with_pcp:ac_cv_header_pcp_pmda_h=no} \
+       %{?with_pcp:--enable-pmda} \
        %{?with_ibverbs:--enable-infiniband}
 %{__make} showflags
 %{__make}
@@ -134,6 +132,8 @@ fi
 %{_docdir}/ctdb-%{version}
 %dir %{_sysconfdir}/ctdb
 %{_sysconfdir}/ctdb/events.d
+%{_sysconfdir}/ctdb/nfs-rpc-checks.d
+%{_sysconfdir}/ctdb/notify.d
 %config(noreplace) %verify(not md5 mtime size) %attr(755,root,root) %{_sysconfdir}/ctdb/ctdb-crash-cleanup.sh
 %config(noreplace) %verify(not md5 mtime size) %attr(755,root,root) %{_sysconfdir}/ctdb/debug-hung-script.sh
 %config(noreplace) %verify(not md5 mtime size) %attr(755,root,root) %{_sysconfdir}/ctdb/gcore_trace.sh
@@ -142,9 +142,11 @@ fi
 %{_sysconfdir}/ctdb/statd-callout
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ctdb
 %attr(754,root,root) /etc/rc.d/init.d/ctdb
+%attr(440,root,root) /etc/sudoers.d/ctdb
 %attr(755,root,root) %{_sbindir}/ctdbd
 %attr(755,root,root) %{_bindir}/ctdb
 %attr(755,root,root) %{_bindir}/ctdb_diagnostics
+%attr(755,root,root) %{_bindir}/ctdb_lock_helper
 %attr(755,root,root) %{_bindir}/ltdbtool
 %attr(755,root,root) %{_bindir}/onnode
 %attr(755,root,root) %{_bindir}/ping_pong