[ctdb] Update to ctdb version 2.4
sbose
sbose at fedoraproject.org
Mon Aug 26 08:43:12 UTC 2013
commit c08be83be1a615217e0a11d8ef846c2c4d3f4041
Author: Sumit Bose <sbose at redhat.com>
Date: Mon Aug 26 10:38:59 2013 +0200
Update to ctdb version 2.4
- Update to ctdb version 2.4
Resolves: rhbz#1000471
- removed version from doc dir
Resolves: rhbz#993712
.gitignore | 1 +
0001-Add-missing-eval-to-m4-script.patch | 28 --
...-some-init-functions-into-a-separate-file.patch | 388 ----------------
0001-Fix-for-tevent-autoconf-check.patch | 26 -
...ixes-for-various-issues-found-by-Coverity.patch | 217 ---------
0001-IPv6-neighbor-solicit-cleanup.patch | 50 --
...Set-FD_CLOEXEC-for-epoll-file-descriptors.patch | 51 --
0002-Add-systemd-support.patch | 479 --------------------
clean-up-systemd-integration.patch | 64 ---
ctdb-no_default_runlevel.patch | 22 +-
ctdb.spec | 79 ++--
sources | 3 +-
use_var_lib.patch | 13 +
13 files changed, 67 insertions(+), 1354 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fa3898b..f102db6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ ctdb-1.0.113.tar.bz2
/ctdb-1.2.28.tar.bz2
/ctdb-1.2.39.tar.bz2
/ctdb-2.1.tar.gz
+/ctdb-2.4.tar.gz
diff --git a/ctdb-no_default_runlevel.patch b/ctdb-no_default_runlevel.patch
index 1b578f6..fc42b18 100644
--- a/ctdb-no_default_runlevel.patch
+++ b/ctdb-no_default_runlevel.patch
@@ -1,11 +1,13 @@
---- ctdb-1.0.71/config/ctdb.init.orig 2009-02-06 19:52:08.591170458 +0100
-+++ ctdb-1.0.71/config/ctdb.init 2009-02-06 19:53:32.137882847 +0100
-@@ -14,7 +14,7 @@
- # Required-Start: $network
- # Required-Stop: $network
- # Default-Stop:
--# Default-Start: 3 5
-+# Default-Start:
+diff --git a/config/ctdb.init b/config/ctdb.init
+index e761fec..2f4acb1 100755
+--- a/config/ctdb.init
++++ b/config/ctdb.init
+@@ -12,7 +12,7 @@
+ # Provides: ctdb
+ # Required-Start: $local_fs $syslog $network
+ # Required-Stop: $local_fs $syslog $network
+-# Default-Start: 2 3 4 5
++# Default-Start:
+ # Default-Stop: 0 1 6
# Short-Description: start and stop ctdb service
- # Description: initscript for the ctdb service
- ### END INIT INFO
+ # Description: Start and stop CTDB (Clustered TDB daemon)
diff --git a/ctdb.spec b/ctdb.spec
index a4be897..c1aed62 100644
--- a/ctdb.spec
+++ b/ctdb.spec
@@ -5,8 +5,8 @@
Summary: A Clustered Database based on Samba's Trivial Database (TDB)
Name: ctdb
-Version: 2.1
-Release: 4%{?dist}
+Version: 2.4
+Release: 1%{?dist}
License: GPLv3+
Group: System Environment/Daemons
URL: http://ctdb.samba.org/
@@ -16,19 +16,8 @@ Source0: https://ftp.samba.org/pub/ctdb/%{name}-%{version}.tar.gz
# Fedora specific patch, ctdb should not be enabled by default in the runlevels
Patch1: ctdb-no_default_runlevel.patch
-Patch4: 0001-Fixes-for-various-issues-found-by-Coverity.patch
-
-# Submitted to upstream for review https://lists.samba.org/archive/samba-technical/2011-September/079198.html
-Patch5: 0001-IPv6-neighbor-solicit-cleanup.patch
-
-# Submitted to upstream for review https://lists.samba.org/archive/samba-technical/2012-January/081155.html
-Patch6: 0001-Extract-some-init-functions-into-a-separate-file.patch
-Patch7: 0002-Add-systemd-support.patch
-
-Patch8: clean-up-systemd-integration.patch
-
-# Submitted to upstream for review https://lists.samba.org/archive/samba-technical/2013-March/091165.html
-Patch9: 0001-Fix-for-tevent-autoconf-check.patch
+# Fedora specific patch, ctdb should use /var/lib/ctdb as state directory
+Patch2: use_var_lib.patch
Requires: chkconfig coreutils psmisc
@@ -56,9 +45,9 @@ BuildRequires: procps iproute
# If the above options are changed then mandate minimum system
# versions.
-%define libtalloc_version 2.0.6
-%define libtdb_version 1.2.9
-%define libtevent_version 0.9.13
+%define libtalloc_version 2.0.8
+%define libtdb_version 1.2.11
+%define libtevent_version 0.9.18
%if ! %with_included_talloc
BuildRequires: libtalloc-devel >= %{libtalloc_version}
@@ -109,12 +98,7 @@ and use CTDB instead.
# setup the init script and sysconfig file
%setup -T -D -n ctdb-%{version} -q
%patch1 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%patch2 -p1
%build
@@ -134,7 +118,6 @@ CFLAGS="$(echo '%{optflags}') $EXTRA -D_GNU_SOURCE -DCTDB_VERS=\"%{version}-%{re
--with-included-tevent
%endif
-
make showflags
make %{_smp_mflags}
@@ -148,6 +131,7 @@ rm -rf %{buildroot}
# Create the target build directory hierarchy
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_sysconfdir}/sudoers.d
mkdir -p %{buildroot}%{initdir}
make DESTDIR=%{buildroot} install
@@ -157,11 +141,6 @@ make DESTDIR=%{buildroot} docdir=%{_docdir} install install_tests
install -m644 config/ctdb.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/ctdb
%if %{with_systemd}
-mkdir -p %{buildroot}%{_sysconfdir}/ctdb/systemd
-install -m 755 config/systemd/ctdb_check_persistent_databases.pre %{buildroot}%{_sysconfdir}/ctdb/systemd
-install -m 755 config/systemd/ctdb_set_ctdb_variables.post %{buildroot}%{_sysconfdir}/ctdb/systemd
-install -m 755 config/systemd/ctdb_drop_all_public_ips %{buildroot}%{_sysconfdir}/ctdb/systemd
-install -m 755 config/systemd/ctdb.systemd %{buildroot}%{_sysconfdir}/ctdb/systemd
mkdir -p %{buildroot}%{_unitdir}
install -m 755 config/ctdb.service %{buildroot}%{_unitdir}
%else
@@ -169,6 +148,14 @@ mkdir -p %{buildroot}%{initdir}
install -m755 config/ctdb.init %{buildroot}%{initdir}/ctdb
%endif
+# create /run/ctdbd
+mkdir -p %{buildroot}%{_tmpfilesdir}
+echo "d /run/ctdbd 755 root root" >> %{buildroot}%{_tmpfilesdir}/%{name}.conf
+
+mkdir -p %{buildroot}/run
+install -d -m 0755 %{buildroot}/run/ctdbd/
+
+install -d -m 0755 %{buildroot}%{_localstatedir}/lib/ctdb/
mkdir -p %{buildroot}%{_docdir}/ctdb/tests/bin
install -m755 tests/bin/ctdb_transaction %{buildroot}%{_docdir}/ctdb/tests/bin
@@ -177,9 +164,7 @@ install -m755 tests/bin/ctdb_transaction %{buildroot}%{_docdir}/ctdb/tests/bin
# Remove "*.old" files
find %{buildroot} -name "*.old" -exec rm -f {} \;
-# fix doc path
-mv %{buildroot}%{_docdir}/ctdb %{buildroot}%{_docdir}/ctdb-%{version}
-cp -r COPYING web %{buildroot}%{_docdir}/ctdb-%{version}
+cp -r COPYING web %{buildroot}%{_docdir}/ctdb
%clean
rm -rf %{buildroot}
@@ -220,28 +205,38 @@ fi
%config(noreplace) %{_sysconfdir}/ctdb/ctdb-crash-cleanup.sh
%config(noreplace) %{_sysconfdir}/ctdb/gcore_trace.sh
%config(noreplace) %{_sysconfdir}/ctdb/functions
+%config(noreplace) %{_sysconfdir}/ctdb/debug_locks.sh
+%dir /run/ctdbd/
+%dir %{_localstatedir}/lib/ctdb/
+%{_tmpfilesdir}/%{name}.conf
+
%if %{with_systemd}
-%{_sysconfdir}/ctdb/systemd/ctdb_check_persistent_databases.pre
-%{_sysconfdir}/ctdb/systemd/ctdb_set_ctdb_variables.post
-%{_sysconfdir}/ctdb/systemd/ctdb_drop_all_public_ips
-%{_sysconfdir}/ctdb/systemd/ctdb.systemd
%{_unitdir}/ctdb.service
%else
%attr(755,root,root) %{initdir}/ctdb
%endif
-%{_docdir}/ctdb-%{version}
+%{_docdir}/ctdb
%dir %{_sysconfdir}/ctdb
%{_sysconfdir}/ctdb/statd-callout
-%{_sysconfdir}/ctdb/init_functions
+%dir %{_sysconfdir}/ctdb/nfs-rpc-checks.d
+%{_sysconfdir}/ctdb/nfs-rpc-checks.d/10.statd.check
+%{_sysconfdir}/ctdb/nfs-rpc-checks.d/20.nfsd.check
+%{_sysconfdir}/ctdb/nfs-rpc-checks.d/30.lockd.check
+%{_sysconfdir}/ctdb/nfs-rpc-checks.d/40.mountd.check
+%{_sysconfdir}/ctdb/nfs-rpc-checks.d/50.rquotad.check
+%{_sysconfdir}/sudoers.d/ctdb
%{_sysconfdir}/ctdb/events.d/
%{_sbindir}/ctdbd
+%{_sbindir}/ctdbd_wrapper
%{_bindir}/ctdb
%{_bindir}/smnotify
%{_bindir}/ping_pong
%{_bindir}/ltdbtool
%{_bindir}/ctdb_diagnostics
%{_bindir}/onnode
+%{_bindir}/ctdb_lock_helper
+
%{_mandir}/man1/ctdb.1.gz
%{_mandir}/man1/ctdbd.1.gz
%{_mandir}/man1/onnode.1.gz
@@ -269,6 +264,12 @@ fi
%doc tests/README
%changelog
+* Fri Aug 23 2013 Sumit Bose <sbose at redhat.com> - 2.4-1
+- Update to ctdb version 2.4
+ Resolves: rhbz#1000471
+- removed version from doc dir
+ Resolves: rhbz#993712
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index dc194df..69d8ca6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ab1ca6f2e37055440ed0f2212ccb4d7f ctdb-1.2.39.tar.bz2
-61733cc10b4df20fa35dfd4d2697d8b8 ctdb-2.1.tar.gz
+0cfd24a056f0dbffc8ca64a2373f084c ctdb-2.4.tar.gz
diff --git a/use_var_lib.patch b/use_var_lib.patch
new file mode 100644
index 0000000..c51b07e
--- /dev/null
+++ b/use_var_lib.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 41bdb7e..da5f598 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -64,7 +64,7 @@ endif
+
+ CFLAGS=@CPPFLAGS@ -g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
+ $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(TDB_CFLAGS) -I at libreplacedir@ \
+- -DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
++ -DVARDIR=\"$(localstatedir)/lib\" -DETCDIR=\"$(etcdir)\" \
+ -DLOGDIR=\"$(logdir)\" -DBINDIR=\"$(bindir)\" \
+ -DSOCKPATH=\"$(sockpath)\" \
+ -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS) \
More information about the scm-commits
mailing list