[packages/heartbeat] - updated to 3.0.6 - updated ac,libs,tls patches; tls patch enhanced to cover gnutls 3.4.x - removed
qboosh
qboosh at pld-linux.org
Sun Dec 20 07:56:28 CET 2015
commit e6d224683ba014904248983aa41f3536e9e53a7f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Dec 20 07:57:46 2015 +0100
- updated to 3.0.6
- updated ac,libs,tls patches; tls patch enhanced to cover gnutls 3.4.x
- removed obsolete type_mismatch,ucast patches
- use upstream tmpfiles conf file
heartbeat-ac.patch | 8 ++---
heartbeat-libs.patch | 70 +++++--------------------------------------
heartbeat-tls.patch | 30 +++++++++++++++++++
heartbeat-type_mismatch.patch | 26 ----------------
heartbeat-ucast.patch | 34 ---------------------
heartbeat.spec | 40 +++++++++++--------------
heartbeat.tmpfiles | 2 --
7 files changed, 59 insertions(+), 151 deletions(-)
---
diff --git a/heartbeat.spec b/heartbeat.spec
index 792445b..5aed845 100644
--- a/heartbeat.spec
+++ b/heartbeat.spec
@@ -1,49 +1,46 @@
# TODO
-# - merge mibs supackage from 2.1 branch
+# - tipc?
+# - merge mibs subpackage from 2.1 branch
# - cleanup deps, users for 3.x
# - fixup deps, inner deps, think of subpackages, ugprade path from 2.1
#
-# Conditional build:
-%bcond_with openais # OpenAIS (pre-corosync) support
-#
Summary: Heartbeat - subsystem for High-Availability Linux
Summary(es.UTF-8): Subsistema heartbeat para Linux "High-Availability"
Summary(pl.UTF-8): Podsystem heartbeat dla systemów o podwyższonej niezawodności
Summary(pt_BR.UTF-8): Implementa sistema de monitoração (heartbeats) visando Alta Disponibilidade
Name: heartbeat
-Version: 3.0.5
-Release: 8
+Version: 3.0.6
+Release: 1
License: GPL v2+
Group: Networking/Daemons
Source0: http://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-%{version}.tar.bz2
-# Source0-md5: f8686abde8722c42265c6d84fbe3d3bf
+# Source0-md5: 8a5e1fc2b44750c052d1007226a84dbe
Source1: %{name}.init
-Source2: %{name}.tmpfiles
-Patch0: %{name}-type_mismatch.patch
-Patch1: %{name}-ac.patch
-Patch2: %{name}-libs.patch
-Patch3: %{name}-tls.patch
-Patch4: %{name}-ucast.patch
+Patch0: %{name}-ac.patch
+Patch1: %{name}-libs.patch
+Patch2: %{name}-tls.patch
URL: http://www.linux-ha.org/Heartbeat
BuildRequires: autoconf >= 2.53
BuildRequires: automake
+BuildRequires: bzip2-devel
BuildRequires: cluster-glue-libs-devel
BuildRequires: docbook-dtd44-xml
BuildRequires: docbook-style-xsl
BuildRequires: glib2-devel >= 2.0
BuildRequires: glibc-misc
BuildRequires: gnutls-devel
+BuildRequires: hbaapi-devel
BuildRequires: libltdl-devel
BuildRequires: libtool
BuildRequires: libuuid-devel
BuildRequires: libxslt-progs
BuildRequires: ncurses-devel >= 5.4
-%{?with_openais:BuildRequires: openais-devel}
BuildRequires: pkgconfig
BuildRequires: python
BuildRequires: python-devel
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: zlib-devel
Requires: %{name}-libs = %{version}-%{release}
Requires: cluster-glue
Requires: psmisc >= 22.5-2
@@ -136,8 +133,6 @@ Zestaw testów klastra opartego o heartbeat.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
%{__libtoolize} --ltdl
@@ -146,8 +141,8 @@ Zestaw testów klastra opartego o heartbeat.
%{__autoheader}
%{__automake}
%configure \
- %{!?with_openais:ac_cv_header_evs_h=no} \
--with-initdir=/etc/rc.d/init.d \
+ --with-systemdunitdir=%{systemdunitdir} \
--docdir=%{_docdir}/%{name}-%{version} \
--enable-fatal-warnings=no \
--enable-mgmt \
@@ -161,7 +156,7 @@ rm -rf $RPM_BUILD_ROOT
%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/run/heartbeat,/usr/lib/tmpfiles.d}
+install -d $RPM_BUILD_ROOT/var/run/heartbeat/{crm,dopd}
# plugins are lt_dlopened, but using *.so names, so *.la are not used
%{__rm} $RPM_BUILD_ROOT%{_libdir}/heartbeat/plugins/*/*.{la,a}
@@ -181,8 +176,6 @@ done
%{__rm} $RPM_BUILD_ROOT%{_datadir}/heartbeat/cts/README
-install %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
-
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%clean
@@ -216,8 +209,6 @@ fi
%attr(755,root,root) %{_libdir}/heartbeat/plugins/HBauth/*.so
%dir %{_libdir}/heartbeat/plugins/HBcomm
%attr(755,root,root) %{_libdir}/heartbeat/plugins/HBcomm/*.so
-%dir %{_libdir}/heartbeat/plugins/HBcompress
-%attr(755,root,root) %{_libdir}/heartbeat/plugins/HBcompress/*.so
%dir %{_libdir}/heartbeat/plugins/quorum
%attr(755,root,root) %{_libdir}/heartbeat/plugins/quorum/*.so
%dir %{_libdir}/heartbeat/plugins/quorumd
@@ -255,10 +246,13 @@ fi
%attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/*
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/heartbeat
%attr(754,root,root) /etc/rc.d/init.d/heartbeat
+%{systemdunitdir}/heartbeat.service
%dir /var/run/heartbeat
%attr(750,hacluster,haclient) %dir /var/run/heartbeat/ccm
+%attr(750,hacluster,haclient) %dir /var/run/heartbeat/crm
+%attr(750,hacluster,haclient) %dir /var/run/heartbeat/dopd
%dir /var/lib/heartbeat
-/usr/lib/tmpfiles.d/%{name}.conf
+%{systemdtmpfilesdir}/%{name}.conf
%{_mandir}/man1/cl_status.1*
%{_mandir}/man1/hb_addnode.1*
%{_mandir}/man1/hb_delnode.1*
diff --git a/heartbeat-ac.patch b/heartbeat-ac.patch
index 0b8fee1..c6fae95 100644
--- a/heartbeat-ac.patch
+++ b/heartbeat-ac.patch
@@ -1,5 +1,5 @@
---- heartbeat-1.2.0/configure.in.orig Tue Feb 17 06:50:30 2004
-+++ heartbeat-1.2.0/configure.in Tue Mar 16 13:36:09 2004
+--- heartbeat-3.0.6/configure.ac.orig Tue Feb 17 06:50:30 2004
++++ heartbeat-3.0.6/configure.ac Tue Mar 16 13:36:09 2004
@@ -258,18 +258,7 @@
dnl Determine if we use -w1 or -t1 for ping (in PYTHON Scripts)
@@ -39,8 +39,8 @@
AC_SUBST(IFCONFIG_A_OPT)
AC_SUBST(WHOAMI)
---- heartbeat-2.0.7/configure.in.orig 2006-08-08 14:41:54.000000000 +0200
-+++ heartbeat-2.0.7/configure.in 2007-01-27 19:23:30.919741000 +0100
+--- heartbeat-3.0.6/configure.ac.orig 2006-08-08 14:41:54.000000000 +0200
++++ heartbeat-3.0.6/configure.ac 2007-01-27 19:23:30.919741000 +0100
@@ -1693,8 +1693,12 @@ dnl ************ printw ****************
[
#if defined(HAVE_CURSES_H)
diff --git a/heartbeat-libs.patch b/heartbeat-libs.patch
index f67e2a2..9cde30d 100644
--- a/heartbeat-libs.patch
+++ b/heartbeat-libs.patch
@@ -1,53 +1,6 @@
-diff -ru heartbeat-3.0.2-rc2.orig/lib/apphb/Makefile.am heartbeat-3.0.2-rc2/lib/apphb/Makefile.am
---- heartbeat-3.0.2-rc2.orig/lib/apphb/Makefile.am 2009-12-19 19:46:52.000000000 +0100
-+++ heartbeat-3.0.2-rc2/lib/apphb/Makefile.am 2011-04-27 16:03:17.553343763 +0200
-@@ -38,4 +38,4 @@
- libapphb_la_CFLAGS = -lpthread
- endif
-
--libapphb_la_LDFLAGS = -version-info 2:0:0
-+libapphb_la_LDFLAGS = -version-info 2:0:0 -lglib-2.0 -lplumb
-diff -ru heartbeat-3.0.2-rc2.orig/lib/hbclient/Makefile.am heartbeat-3.0.2-rc2/lib/hbclient/Makefile.am
---- heartbeat-3.0.2-rc2.orig/lib/hbclient/Makefile.am 2011-04-27 15:59:06.973343764 +0200
-+++ heartbeat-3.0.2-rc2/lib/hbclient/Makefile.am 2011-04-27 16:03:17.553343763 +0200
-@@ -44,8 +44,8 @@
- lib_LTLIBRARIES = libhbclient.la
-
- libhbclient_la_SOURCES = client_lib.c
--libhbclient_la_LDFLAGS = -version-info 1:0:0
--libhbclient_la_LIBADD = $(top_builddir)/replace/libreplace.la
-+libhbclient_la_LDFLAGS = -version-info 1:0:0 -lplumb
-+libhbclient_la_LIBADD = $(top_builddir)/replace/libreplace.la $(gliblib)
-
- ## binary progs
- halib_PROGRAMS = api_test
-diff -ru heartbeat-3.0.2-rc2.orig/membership/ccm/Makefile.am heartbeat-3.0.2-rc2/membership/ccm/Makefile.am
---- heartbeat-3.0.2-rc2.orig/membership/ccm/Makefile.am 2009-12-19 19:46:52.000000000 +0100
-+++ heartbeat-3.0.2-rc2/membership/ccm/Makefile.am 2011-04-27 16:07:02.910011000 +0200
-@@ -82,7 +82,7 @@
-
-
- libccmclient_la_SOURCES = ccmlib_memapi.c ccmlib_eventapi.c ccmlib.h
--libccmclient_la_LDFLAGS = -version-info 1:0:0
-+libccmclient_la_LDFLAGS = -version-info 1:0:0 $(gliblib) -lplumb
-
-
- ## library libclm.la
-@@ -95,7 +95,10 @@
-
- ## Add -DPOSIX_THREADS to CFLAGS to compile a thread-safe version library
- libclm_la_CFLAGS = -g #-DPOSIX_THREADS
--libclm_la_LDFLAGS = -version-info 1:0:0
-+libclm_la_LDFLAGS = -version-info 1:0:0 \
-+ -lplumb \
-+ $(gliblib)
-+libclm_la_LIBADD = libccmclient.la
-
- clmtest_SOURCES = clmtest.c
- clmtest_LDADD = libclm.la libccmclient.la \
---- Heartbeat-3-0-STABLE-3.0.5/configure.in.orig 2013-09-06 19:02:36.552797324 +0200
-+++ Heartbeat-3-0-STABLE-3.0.5/configure.in 2013-09-06 21:47:09.149049676 +0200
-@@ -614,6 +614,7 @@
+--- Heartbeat-3-0-STABLE-3.0.6/configure.ac.orig 2015-12-19 16:20:41.745674168 +0100
++++ Heartbeat-3-0-STABLE-3.0.6/configure.ac 2015-12-19 16:47:03.728941113 +0100
+@@ -624,6 +624,7 @@
fi
AC_SUBST(DLOPEN_FORCE_FLAGS)
@@ -55,7 +8,7 @@ diff -ru heartbeat-3.0.2-rc2.orig/membership/ccm/Makefile.am heartbeat-3.0.2-rc2
dnl ************ uuid **********************
AC_ARG_WITH(uuid,
[ --with-uuid=UUID mechanism for uuid {e2fsprogs|ossp|any|no}
-@@ -626,25 +627,26 @@
+@@ -636,25 +637,26 @@
)
case $uuidimpl in
e2fsprogs)
@@ -85,7 +38,7 @@ diff -ru heartbeat-3.0.2-rc2.orig/membership/ccm/Makefile.am heartbeat-3.0.2-rc2
case "$host_os" in
darwin*)
-@@ -1854,7 +1854,7 @@
+@@ -1892,7 +1894,7 @@
dnl getopt: If this is valid, define HAVE_DECL_GETOPT to make the getopt.h header compile cleanly.
dnl
@@ -94,7 +47,7 @@ diff -ru heartbeat-3.0.2-rc2.orig/membership/ccm/Makefile.am heartbeat-3.0.2-rc2
dnl AC_CHECK_FUNCS(alphasort inet_pton NoSuchFunctionName scandir setenv strerror unsetenv strnlen strndup daemon uuid_parse)
AC_CHECK_FUNCS(getopt,
-@@ -1951,7 +1953,7 @@
+@@ -1991,7 +1993,7 @@
dnl check if header file and lib are there for zlib
zlib_installed="yes"
AC_CHECK_HEADERS(zlib.h, , [zlib_installed="no"],)
@@ -103,7 +56,7 @@ diff -ru heartbeat-3.0.2-rc2.orig/membership/ccm/Makefile.am heartbeat-3.0.2-rc2
AM_CONDITIONAL(BUILD_ZLIB_COMPRESS_MODULE, test "x${zlib_installed}" = "xyes")
if test "x${zlib_installed}" = "xno"; then
FatalMissingThing "zlib" \
-@@ -1962,13 +1964,13 @@
+@@ -2002,7 +2004,7 @@
dnl check if header file and lib are there for zlib
bz2_installed="yes"
AC_CHECK_HEADERS(bzlib.h, , [bz2_installed="no"],)
@@ -111,15 +64,8 @@ diff -ru heartbeat-3.0.2-rc2.orig/membership/ccm/Makefile.am heartbeat-3.0.2-rc2
+AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress , [LIBBZ2=-lbz2], [bz2_installed="no"])
AM_CONDITIONAL(BUILD_BZ2_COMPRESS_MODULE, test "x${bz2_installed}" = "xyes")
- dnl check if header file and lib are there for openais module
- openais_installed="yes"
- AC_CHECK_HEADERS(evs.h, , [openais_installed="no"],)
--AC_CHECK_LIB(evs, evs_initialize , , [openais_installed="no"])
-+AC_CHECK_LIB(evs, evs_initialize , [LIBEVS=-levs] , [openais_installed="no"])
- AM_CONDITIONAL(BUILD_OPENAIS_MODULE, test "x${openais_installed}" = "xyes")
-
dnl check if there are getpid() inconsistency
-@@ -2086,7 +2086,7 @@
+@@ -2118,7 +2120,7 @@
GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`";
AC_MSG_RESULT($GNUTLSLIBS)
else
diff --git a/heartbeat-tls.patch b/heartbeat-tls.patch
index 3b1e719..37e7ce6 100644
--- a/heartbeat-tls.patch
+++ b/heartbeat-tls.patch
@@ -48,3 +48,33 @@
if (ret < 0)
{
+--- Heartbeat-3-0-STABLE-3.0.6/lib/plugins/quorum/quorumd.c.orig 2015-12-19 16:58:59.832244393 +0100
++++ Heartbeat-3-0-STABLE-3.0.6/lib/plugins/quorum/quorumd.c 2015-12-19 18:28:21.428686050 +0100
+@@ -327,11 +327,10 @@
+ {
+ int ret;
+ gnutls_session session;
+- const int cert_type_priority[2] = { GNUTLS_CRT_X509,0};
+
+ gnutls_init (&session, GNUTLS_CLIENT);
+ gnutls_set_default_priority (session);
+- gnutls_certificate_type_set_priority (session, cert_type_priority);
++ gnutls_priority_set_direct(session, "NORMAL", NULL);
+ gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
+ gnutls_transport_set_ptr (session, (gnutls_transport_ptr) GINT_TO_POINTER(sd));
+ ret = gnutls_handshake (session);
+--- Heartbeat-3-0-STABLE-3.0.6/membership/quorumd/quorumdtest.c.orig 2015-12-19 16:58:59.832244393 +0100
++++ Heartbeat-3-0-STABLE-3.0.6/membership/quorumd/quorumdtest.c 2015-12-19 18:22:04.308701882 +0100
+@@ -136,11 +136,10 @@
+ {
+ int ret;
+ gnutls_session session;
+- const int cert_type_priority[2] = { GNUTLS_CRT_X509,0};
+
+ gnutls_init (&session, GNUTLS_CLIENT);
+ gnutls_set_default_priority (session);
+- gnutls_certificate_type_set_priority (session, cert_type_priority);
++ gnutls_priority_set_direct(session, "NORMAL", NULL);
+ gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
+ gnutls_transport_set_ptr (session, (gnutls_transport_ptr) GINT_TO_POINTER(sd));
+ ret = gnutls_handshake (session);
diff --git a/heartbeat-type_mismatch.patch b/heartbeat-type_mismatch.patch
deleted file mode 100644
index 208ee2e..0000000
--- a/heartbeat-type_mismatch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://hg.linux-ha.org/heartbeat-STABLE_3_0/rev/7e3a82377fa8
-
-# HG changeset patch
-# User Lars Ellenberg <lars at linbit.com>
-# Date 1308306763 -7200
-# Node ID 7e3a82377fa8c88b4d9ee47e29020d4531f4629a
-# Parent 66b99da853910131ed599e8b06d200883f51b895
-Fix type mismatch in reset_seqtrack
-
-Would result in compilation warning, and probably bad runtime behaviour on
-32bit arch, if facing packet loss when packet sequence numbers already left
-the 32bit value space.
-
---- a/heartbeat/heartbeat.c
-+++ b/heartbeat/heartbeat.c
-@@ -5517,7 +5517,8 @@ static void
- reset_seqtrack(struct node_info *n)
- {
- struct seqtrack *t = &n->track;
-- int i, seq;
-+ seqno_t seq;
-+ int i;
-
- for (i = 0; i < t->nmissing; ++i) {
- seq = t->seqmissing[i];
-
diff --git a/heartbeat-ucast.patch b/heartbeat-ucast.patch
deleted file mode 100644
index 1a2469a..0000000
--- a/heartbeat-ucast.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- Heartbeat-3-0-STABLE-3.0.5/lib/plugins/HBcomm/ucast.c.orig 2011-06-16 12:46:23.000000000 +0200
-+++ Heartbeat-3-0-STABLE-3.0.5/lib/plugins/HBcomm/ucast.c 2013-09-06 18:42:54.906180245 +0200
-@@ -462,7 +462,7 @@
- struct ip_private *ei;
- int tos;
- #if defined(SO_BINDTODEVICE)
-- struct ifreq i;
-+ struct ifreq ifrq;
- #endif
- #if defined(SO_REUSEPORT)
- int i = 1;
-@@ -499,18 +499,18 @@
- *
- * This is so we can have redundant NICs, and heartbeat on both
- */
-- strcpy(i.ifr_name, ei->interface);
-+ strcpy(ifrq.ifr_name, ei->interface);
-
- if (setsockopt(sockfd, SOL_SOCKET, SO_BINDTODEVICE,
-- &i, sizeof(i)) == -1) {
-+ &ifrq, sizeof(ifrq)) == -1) {
- PILCallLog(LOG, PIL_CRIT,
- "ucast: error setting option SO_BINDTODEVICE(w) on %s: %s",
-- i.ifr_name, strerror(errno));
-+ ifrq.ifr_name, strerror(errno));
- close(sockfd);
- return -1;
- }
- PILCallLog(LOG, PIL_INFO, "ucast: bound send socket to device: %s",
-- i.ifr_name);
-+ ifrq.ifr_name);
- }
- #endif
- #if defined(SO_REUSEPORT)
diff --git a/heartbeat.tmpfiles b/heartbeat.tmpfiles
deleted file mode 100644
index 4f090b2..0000000
--- a/heartbeat.tmpfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-d /var/run/heartbeat 0755 root root -
-d /var/run/heartbeat/ccm 0750 hacluster haclient -
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/heartbeat.git/commitdiff/e6d224683ba014904248983aa41f3536e9e53a7f
More information about the pld-cvs-commit
mailing list