+# TODO
+# - 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
#
-# TODO:
-# - think how to handle /etc/ha.d/haresources file, which is v1 config file
-# and should not exist if v2 configuration is enabled ("crm yes", default is
-# "no").
-#
-%include /usr/lib/rpm/macros.perl
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: 2.1.3
-Release: 1
+Version: 3.0.6
+Release: 2
License: GPL v2+
-Group: Applications/System
-Source0: http://linux-ha.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: bca53530a3802f7677772323047405cd
+Group: Networking/Daemons
+Source0: http://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-%{version}.tar.bz2
+# Source0-md5: 8a5e1fc2b44750c052d1007226a84dbe
Source1: %{name}.init
-Source2: ldirectord.init
Patch0: %{name}-ac.patch
-Patch1: %{name}-no_ipmilan_test.patch
-URL: http://linux-ha.org/
-BuildRequires: OpenIPMI-devel >= 2.0.3
-BuildRequires: autoconf
+Patch1: %{name}-libs.patch
+Patch2: %{name}-tls.patch
+Patch3: %{name}-tipc.patch
+URL: http://www.linux-ha.org/Heartbeat
+BuildRequires: autoconf >= 2.53
BuildRequires: automake
-BuildRequires: gdbm-devel
-BuildRequires: glib2-devel
+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: libnet-devel >= 1.1.0
BuildRequires: libtool
BuildRequires: libuuid-devel
-BuildRequires: libwrap-devel
-BuildRequires: libxml2-devel
-BuildRequires: lm_sensors-devel
+BuildRequires: libxslt-progs
BuildRequires: ncurses-devel >= 5.4
-BuildRequires: net-snmp-devel >= 5.1
-BuildRequires: pam-devel
BuildRequires: pkgconfig
+BuildRequires: python
BuildRequires: python-devel
-BuildRequires: rpm-perlprov
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.268
-BuildRequires: swig-perl >= 1.3.25
-BuildRequires: swig-python >= 1.3.25
-Requires(post,postun): /sbin/ldconfig
-Requires(post,preun): /sbin/chkconfig
-Requires(postun): /usr/sbin/groupdel
-Requires(postun): /usr/sbin/userdel
-Requires(pre): /bin/id
-Requires(pre): /usr/bin/getgid
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
+BuildRequires: zlib-devel
+Requires: %{name}-libs = %{version}-%{release}
+Requires: cluster-glue
Requires: psmisc >= 22.5-2
Requires: rc-scripts
+Requires: resource-agents >= 3.9.2-2
Requires: syslogdaemon
-Provides: group(haclient)
-Provides: user(hacluster)
+Requires: which
# disappeared
Obsoletes: perl-heartbeat
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define specflags -fgnu89-inline
-%define filterout_ld -Wl,--as-needed
+%define specflags -fgnu89-inline
%description
heartbeat is a basic heartbeat subsystem for Linux-HA. It will run
konfiguracji składającej się z 2 hostów, można je również stosować do
bardziej skomplikowanych konfiguracji.
-%package stonith
-Summary: Provides an interface to Shoot The Other Node In The Head
-Summary(pl.UTF-8): Interfejs do "odstrzelenia" drugiego węzła w klastrze
-Group: Applications/System
-Requires: OpenIPMI >= 2.0.3
-
-%description stonith
-Provides an interface to Shoot The Other Node In The Head.
-
-%description stonith -l pl.UTF-8
-STONITH (Shoot The Other Node In The Head) to interfejs służący do
-"odstrzelenia" drugiego węzła w klastrze.
+%package libs
+Summary: Heartbeat libraries
+Summary(pl.UTF-8): Biblioteki heartbeat
+Group: Libraries
+Conflicts: heartbeat < 2.99.2-0.1
-%package ldirectord
-Summary: Monitor virtual services provided by LVS
-Summary(pl.UTF-8): Demon monitorujący wirtualne usługi dostarczane poprzez LVS
-Group: Applications/System
-Requires(post,preun): /sbin/chkconfig
-Requires: ipvsadm
-Requires: rc-scripts
-
-%description ldirectord
-ldirectord is a stand-alone daemon to monitor services of real for
-virtual services provided by The Linux Virtual Server
-(http://www.linuxvirtualserver.org/).
+%description libs
+Heartbeat libraries.
-%description ldirectord -l pl.UTF-8
-ldirectord to samodzielny demon monitorujący rzeczywiste usługi dla
-wirtualnych usług dostarczanych poprzez Linux Virtual Server
-(http://www.linuxvirtualserver.org/).
+%description libs -l pl.UTF-8
+Biblioteki heartbeat.
%package devel
-Summary: Heartbeat developement header files and libraries
-Summary(pl.UTF-8): Pliki nagłówkowe i biblioteki heartbeat
+Summary: Heartbeat development header files
+Summary(pl.UTF-8): Pliki nagłówkowe bibliotek heartbeat
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires: cluster-glue-libs-devel
+Requires: glib2-devel >= 2.0
+Requires: libltdl-devel
%description devel
-Heartbeat developement header files and libraries.
+Heartbeat development header files.
%description devel -l pl.UTF-8
-Pliki nagłówkowe i biblioteki heartbeat.
+Pliki nagłówkowe bibliotek heartbeat.
%package static
Summary: Heartbeat static libraries
%description cts -l pl.UTF-8
Zestaw testów klastra opartego o heartbeat.
-%package gui
-Summary: Heartbeat GUI
-Summary(pl.UTF-8): Graficzny interfejs użytkownika dla heartbeat
-Group: Applications/System
-Requires: %{name} = %{version}-%{release}
-
-%description gui
-Graphical user interface for heartbeat.
-
-%description gui -l pl.UTF-8
-Graficzny interfejs użytkownika dla heartbeat.
-
%prep
-%setup -q
+%setup -qn Heartbeat-3-0-STABLE-%{version}
%patch0 -p1
%patch1 -p1
-
-rm -rf libltdl
+%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize} --ltdl
%{__aclocal}
%{__autoconf}
+%{__autoheader}
%{__automake}
%configure \
- FSCK=/sbin/fsck \
- FUSER=/bin/fuser \
- IPTABLES=/usr/sbin/iptables \
- MAILCMD=/bin/mail \
- MOUNT=/bin/mount \
- PING=/bin/ping \
--with-initdir=/etc/rc.d/init.d \
- --enable-crm \
- --enable-lrm \
+ --with-systemdunitdir=%{systemdunitdir} \
+ --docdir=%{_docdir}/%{name}-%{version} \
+ --enable-fatal-warnings=no \
--enable-mgmt \
+ --enable-quorumd \
--enable-snmp-subagent
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
+%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/var/run/heartbeat
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/ldirectord
-ln -sf %{_sbindir}/ldirectord $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/ldirectord
+install -d $RPM_BUILD_ROOT/var/run/heartbeat/{crm,dopd}
# plugins are lt_dlopened, but using *.so names, so *.la are not used
-rm -f $RPM_BUILD_ROOT%{_libdir}/{heartbeat,pils,stonith}/plugins/*/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/heartbeat/plugins/*/*.{la,a}
-rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/heartbeat
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/heartbeat
+%{__rm} $RPM_BUILD_ROOT/etc/rc.d/init.d/heartbeat
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/heartbeat
> $RPM_BUILD_ROOT/etc/ha.d/haresources
echo -e "auth 2\n2 crc" > $RPM_BUILD_ROOT/etc/ha.d/authkeys
-install doc/ha.cf $RPM_BUILD_ROOT/etc/ha.d
-
-rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/ldirectord
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldirectord
-install ldirectord/ldirectord.cf $RPM_BUILD_ROOT%{_sysconfdir}/ha.d
+cp -a doc/ha.cf $RPM_BUILD_ROOT/etc/ha.d
-rm -f $RPM_BUILD_ROOT%{_datadir}/heartbeat/cts/README
-
-for tool in ha_logger hb_addnode hb_delnode hb_standby hb_takeover; do
- ln -sf %{_libdir}/heartbeat/$tool $RPM_BUILD_ROOT%{_bindir}
+for tool in hb_addnode hb_delnode hb_standby hb_takeover; do
+ tool=%{_datadir}/%{name}/$tool
+ [ -x $RPM_BUILD_ROOT$tool ] || exit 1
+ ln -s $tool $RPM_BUILD_ROOT%{_bindir}
done
-sed -i -e's, /%{_lib}/libpam.la, /usr/%{_lib}/libpam.la,g' $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/heartbeat/cts/README
-%find_lang haclient
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
-%pre
-%groupadd -g 60 haclient
-%useradd -u 17 -d /var/lib/heartbeat/cores/hacluster -c "Heartbeat User" -g haclient hacluster
-
%post
-/sbin/ldconfig
/sbin/chkconfig --add heartbeat
-%service %{name} restart
+%service heartbeat restart
%preun
if [ "$1" = "0" ]; then
- %service -q %{name} stop
+ %service -q heartbeat stop
/sbin/chkconfig --del heartbeat
fi
-%postun
-/sbin/ldconfig
-if [ "$1" = "0" ]; then
- %userremove hacluster
- %groupremove haclient
-fi
-
-%post stonith -p /sbin/ldconfig
-%postun stonith -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
-%files -f haclient.lang
+%files
%defattr(644,root,root,755)
-%doc doc/{*.html,AUTHORS,apphbd.cf,authkeys,ha.cf,logd.cf,haresources,startstop}
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%doc doc/{*.html,AUTHORS,apphbd.cf,authkeys,ha.cf,haresources,startstop}
+%attr(755,root,root) %{_bindir}/cl_respawn
+%attr(2755,root,haclient) %{_bindir}/cl_status
+%attr(755,root,root) %{_bindir}/hb_addnode
+%attr(755,root,root) %{_bindir}/hb_delnode
+%attr(755,root,root) %{_bindir}/hb_standby
+%attr(755,root,root) %{_bindir}/hb_takeover
%dir %{_libdir}/heartbeat
%dir %{_libdir}/heartbeat/plugins
-%dir %{_libdir}/heartbeat/plugins/*
-%attr(755,root,root) %{_libdir}/heartbeat/plugins/*/*.so
-%attr(755,root,root) %{_libdir}/heartbeat/[!cp]*
-%attr(755,root,root) %{_libdir}/heartbeat/c[!t]*
-%attr(755,root,root) %{_libdir}/heartbeat/p[!l]*
-%dir %{_libdir}/pils
-%dir %{_libdir}/pils/plugins
-%dir %{_libdir}/pils/plugins/*
+%dir %{_libdir}/heartbeat/plugins/HBauth
+%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/quorum
+%attr(755,root,root) %{_libdir}/heartbeat/plugins/quorum/*.so
+%dir %{_libdir}/heartbeat/plugins/quorumd
+%attr(755,root,root) %{_libdir}/heartbeat/plugins/quorumd/*.so
+%dir %{_libdir}/heartbeat/plugins/tiebreaker
+%attr(755,root,root) %{_libdir}/heartbeat/plugins/tiebreaker/*.so
+%attr(755,root,root) %{_libdir}/heartbeat/api_test
+%attr(755,root,root) %{_libdir}/heartbeat/apphbd
+%attr(755,root,root) %{_libdir}/heartbeat/apphbtest
+%attr(755,root,root) %{_libdir}/heartbeat/ccm
+%attr(755,root,root) %{_libdir}/heartbeat/ccm_testclient
+%attr(755,root,root) %{_libdir}/heartbeat/clmtest
+%attr(755,root,root) %{_libdir}/heartbeat/dopd
+%attr(755,root,root) %{_libdir}/heartbeat/drbd-peer-outdater
+%attr(755,root,root) %{_libdir}/heartbeat/heartbeat
+%attr(755,root,root) %{_libdir}/heartbeat/ipfail
+%attr(755,root,root) %{_libdir}/heartbeat/mlock
+%attr(755,root,root) %{_libdir}/heartbeat/quorumd
+%attr(755,root,root) %{_libdir}/heartbeat/quorumdtest
%dir %{_datadir}/heartbeat
%attr(755,root,root) %{_datadir}/heartbeat/BasicSanityCheck
%attr(755,root,root) %{_datadir}/heartbeat/ResourceManager
-%attr(755,root,root) %{_datadir}/heartbeat/SNMPAgentSanityCheck
%attr(755,root,root) %{_datadir}/heartbeat/TestHeartbeatComm
%attr(755,root,root) %{_datadir}/heartbeat/ha_*
%attr(755,root,root) %{_datadir}/heartbeat/hb_*
-%attr(755,root,root) %{_datadir}/heartbeat/lrmtest
%attr(755,root,root) %{_datadir}/heartbeat/mach_down
%attr(755,root,root) %{_datadir}/heartbeat/req_resource
-%attr(755,root,root) %{_datadir}/heartbeat/utillib.sh
-%{_datadir}/heartbeat/crm.dtd
-%attr(755,root,root) %{_libdir}/pils/plugins/*/*.so
-%dir %{_sysconfdir}/ha.d
-%attr(755,root,root) %{_sysconfdir}/ha.d/rc.d
-%attr(755,root,root) %{_sysconfdir}/ha.d/resource.d
-%exclude %{_sysconfdir}/ha.d/resource.d/ldirectord
%{_sysconfdir}/ha.d/README.config
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ha.d/authkeys
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ha.d/ha.cf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ha.d/haresources
%attr(755,root,root) %{_sysconfdir}/ha.d/harc
-%{_sysconfdir}/ha.d/shellfuncs
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/hbmgmtd
+%dir %{_sysconfdir}/ha.d/rc.d
+%attr(755,root,root) %{_sysconfdir}/ha.d/rc.d/*
+%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
-%attr(755,root,root) %{_prefix}/lib/ocf
+%{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
-%attr(770,root,haclient) %dir /var/lib/heartbeat/lrm
-%attr(770,root,haclient) %dir /var/lib/heartbeat/mgmt
-%attr(750,hacluster,haclient) %dir /var/lib/heartbeat/pengine
-%attr(750,hacluster,haclient) %dir /var/lib/heartbeat/crm
-%attr(750,root,haclient) %dir /var/lib/heartbeat/fencing
-%attr(711,root,root) %dir /var/lib/heartbeat/cores
-%attr(700,root,root) %dir /var/lib/heartbeat/cores/root
-# we don't want any files owned by nobody
-%attr(700,root,root) %dir /var/lib/heartbeat/cores/nobody
-%attr(700,hacluster,root) %dir /var/lib/heartbeat/cores/hacluster
-%{_mandir}/man1/*.1*
-%{_mandir}/man8/[a-h]*.8*
-%attr(755,root,root) %{_bindir}/cl_respawn
-%attr(2755,root,haclient) %{_bindir}/cl_status
-%attr(755,root,root) %{_bindir}/ha_logger
-%attr(755,root,root) %{_bindir}/hb_addnode
-%attr(755,root,root) %{_bindir}/hb_delnode
-%attr(755,root,root) %{_bindir}/hb_standby
-%attr(755,root,root) %{_bindir}/hb_takeover
-%attr(755,root,root) %{_sbindir}/[a-i]*
-%attr(755,root,root) %{_sbindir}/ptest
-%attr(755,root,root) %{_sbindir}/ocf-tester
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/ha.d/haresources
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/ha.d/authkeys
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/ha.d/ha.cf
-%{_datadir}/snmp/mibs/*mib
-
-%files stonith
-%defattr(644,root,root,755)
-%dir %{_libdir}/stonith
-%dir %{_libdir}/stonith/plugins
-%dir %{_libdir}/stonith/plugins/external
-%dir %{_libdir}/stonith/plugins/stonith2
-%attr(755,root,root) %{_libdir}/stonith/plugins/*/*
-%attr(755,root,root) %{_sbindir}/meatclient
-%attr(755,root,root) %{_sbindir}/stonith
-%dir %{_datadir}/heartbeat/stonithdtest
-%attr(755,root,root) %{_datadir}/heartbeat/stonithdtest/STONITHDBasicSanityCheck
-%{_mandir}/man8/stonith.8*
-%{_mandir}/man8/meatclient.8*
-
-%files ldirectord
+%{systemdtmpfilesdir}/%{name}.conf
+%{_mandir}/man1/cl_status.1*
+%{_mandir}/man1/hb_addnode.1*
+%{_mandir}/man1/hb_delnode.1*
+%{_mandir}/man1/hb_standby.1*
+%{_mandir}/man1/hb_takeover.1*
+%{_mandir}/man5/authkeys.5*
+%{_mandir}/man5/ha.cf.5*
+%{_mandir}/man8/apphbd.8*
+%{_mandir}/man8/heartbeat.8*
+
+%files libs
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/ha.d/ldirectord.cf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ldirectord
-%attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/ldirectord
-%attr(754,root,root) /etc/rc.d/init.d/ldirectord
-%attr(755,root,root) %{_sbindir}/*ldirectord*
-%{_mandir}/man8/*ldirectord*.8*
+%attr(755,root,root) %{_libdir}/libapphb.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libapphb.so.2
+%attr(755,root,root) %{_libdir}/libccmclient.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libccmclient.so.1
+%attr(755,root,root) %{_libdir}/libclm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclm.so.1
+%attr(755,root,root) %{_libdir}/libhbclient.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libhbclient.so.1
%files devel
%defattr(644,root,root,755)
-%{_includedir}/*
-%{_libdir}/*.la
+%attr(755,root,root) %{_libdir}/libapphb.so
+%attr(755,root,root) %{_libdir}/libccmclient.so
+%attr(755,root,root) %{_libdir}/libclm.so
+%attr(755,root,root) %{_libdir}/libhbclient.so
+%{_libdir}/libapphb.la
+%{_libdir}/libccmclient.la
+%{_libdir}/libclm.la
+%{_libdir}/libhbclient.la
+%{_includedir}/heartbeat/HB*.h
+%{_includedir}/heartbeat/apphb*.h
+%{_includedir}/heartbeat/hb_*.h
+%{_includedir}/heartbeat/heartbeat.h
+%{_includedir}/ocf
+%{_includedir}/saf
%files static
%defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libapphb.a
+%{_libdir}/libccmclient.a
+%{_libdir}/libclm.a
+%{_libdir}/libhbclient.a
%files cts
%defattr(644,root,root,755)
%{_datadir}/heartbeat/cts/*.py[co]
%attr(755,root,root) %{_datadir}/heartbeat/cts/*.sh
%attr(755,root,root) %{_datadir}/heartbeat/cts/*Dummy
-
-%files gui
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/hb_gui
-%dir %{_libdir}/heartbeat-gui
-%attr(755,root,root) %{_libdir}/heartbeat-gui/*.so.*
-%{_libdir}/heartbeat-gui/*.a
-%{_libdir}/heartbeat-gui/*.la
-%attr(755,root,root) %{_libdir}/heartbeat-gui/*.py
-%dir %{_datadir}/heartbeat-gui
-%{_datadir}/heartbeat-gui/*.png
-%attr(755,root,root) %{_datadir}/heartbeat-gui/*.py
-%{_datadir}/heartbeat-gui/haclient.glade
projects / packages / heartbeat.git / blobdiff