[packages/cluster-glue] - added heartbeat-libexecdir patch (use libexecdir for heartbeat daemons, for consistency with heart

qboosh qboosh at pld-linux.org
Sun Sep 2 21:44:09 CEST 2018 

commit d6a380fad2685f2b75f0887f5f44203104925d59
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 2 21:46:58 2018 +0200

    - added heartbeat-libexecdir patch (use libexecdir for heartbeat daemons, for consistency with heartbeat and resource-agents packages)
    - release 2

 cluster-glue-heartbeat-libexecdir.patch | 82 +++++++++++++++++++++++++++++++++
 cluster-glue.spec                       | 34 +++++++-------
 logd.service                            | 13 ------
 3 files changed, 99 insertions(+), 30 deletions(-)
---
diff --git a/cluster-glue.spec b/cluster-glue.spec
index e69b606..f8f5b13 100644
--- a/cluster-glue.spec
+++ b/cluster-glue.spec
@@ -10,17 +10,17 @@ Summary:	Reusable cluster components
 Summary(pl.UTF-8):	Komponenty klastrowe wielokrotnego użytku
 Name:		cluster-glue
 Version:	1.0.12
-Release:	1
+Release:	2
 License:	GPL v2+ and LGPL v2+
 Group:		Aplications/System
 #Source0Download: http://linux-ha.org/wiki/Downloads
 Source0:	http://hg.linux-ha.org/glue/archive/glue-%{version}.tar.bz2
 # Source0-md5:	ec620466d6f23affa3b074b72bca7870
-#Source1:	logd.service
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-opt.patch
 Patch2:		%{name}-rc.patch
-Patch3:		x32-long-long-time-types.patch
+Patch3:		%{name}-heartbeat-libexecdir.patch
+Patch4:		x32-long-long-time-types.patch
 URL:		http://linux-ha.org/wiki/Cluster_Glue
 BuildRequires:	OpenIPMI-devel >= 1.4
 BuildRequires:	autoconf >= 2.53
@@ -144,8 +144,9 @@ STONITH (Shoot The Other Node In The Head) to interfejs służący do
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%ifarch x32
 %patch3 -p1
+%ifarch x32
+%patch4 -p1
 %endif
 
 sed -i -e's;#!/usr/bin/env \(python\|perl\);#!/usr/bin/\1;' \
@@ -157,6 +158,7 @@ sed -i -e's;#!/usr/bin/env \(python\|perl\);#!/usr/bin/\1;' \
 %{__autoheader}
 %{__automake}
 %{__autoconf}
+CPPFLAGS="%{rpmcppflags} -DOPENIPMI_DEFINE_SELECTOR_T"
 %configure \
 	--docdir=%{_docdir}/%{name}-%{version} \
 	--disable-fatal-warnings \
@@ -177,9 +179,6 @@ install -d $RPM_BUILD_ROOT%{systemdunitdir}
 
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
-#%{__sed} -e 's;@libdir@;%{_libdir};g' \
-#	%{SOURCE1} > $RPM_BUILD_ROOT%{systemdunitdir}/logd.service
-
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %clean
@@ -234,15 +233,16 @@ fi
 %attr(755,root,root) %{_datadir}/%{name}/utillib.sh
 %attr(755,root,root) %{_datadir}/%{name}/ha_log.sh
 
-%dir %{_libdir}/heartbeat/plugins/RAExec
+%attr(755,root,root) %{_libexecdir}/heartbeat/ha_logd
+%attr(755,root,root) %{_libexecdir}/heartbeat/lrmd
+
 %dir %{_libdir}/heartbeat/plugins/InterfaceMgr
-%dir %{_libdir}/heartbeat/plugins/compress
-%attr(755,root,root) %{_libdir}/heartbeat/lrmd
-%attr(755,root,root) %{_libdir}/heartbeat/ha_logd
 %attr(755,root,root) %{_libdir}/heartbeat/plugins/InterfaceMgr/generic.so
+%dir %{_libdir}/heartbeat/plugins/RAExec
 %attr(755,root,root) %{_libdir}/heartbeat/plugins/RAExec/heartbeat.so
 %attr(755,root,root) %{_libdir}/heartbeat/plugins/RAExec/lsb.so
 %attr(755,root,root) %{_libdir}/heartbeat/plugins/RAExec/ocf.so
+%dir %{_libdir}/heartbeat/plugins/compress
 %attr(755,root,root) %{_libdir}/heartbeat/plugins/compress/bz2.so
 %attr(755,root,root) %{_libdir}/heartbeat/plugins/compress/zlib.so
 
@@ -287,12 +287,12 @@ fi
 
 %files tests
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/heartbeat/ipctest
-%attr(755,root,root) %{_libdir}/heartbeat/ipctransientclient
-%attr(755,root,root) %{_libdir}/heartbeat/ipctransientserver
-%attr(755,root,root) %{_libdir}/heartbeat/transient-test.sh
-%attr(755,root,root) %{_libdir}/heartbeat/base64_md5_test
-%attr(755,root,root) %{_libdir}/heartbeat/logtest
+%attr(755,root,root) %{_libexecdir}/heartbeat/ipctest
+%attr(755,root,root) %{_libexecdir}/heartbeat/ipctransientclient
+%attr(755,root,root) %{_libexecdir}/heartbeat/ipctransientserver
+%attr(755,root,root) %{_libexecdir}/heartbeat/transient-test.sh
+%attr(755,root,root) %{_libexecdir}/heartbeat/base64_md5_test
+%attr(755,root,root) %{_libexecdir}/heartbeat/logtest
 
 %dir %{_libdir}/heartbeat/plugins/test
 %attr(755,root,root) %{_libdir}/heartbeat/plugins/test/test.so
diff --git a/cluster-glue-heartbeat-libexecdir.patch b/cluster-glue-heartbeat-libexecdir.patch
new file mode 100644
index 0000000..fac1e5d
--- /dev/null
+++ b/cluster-glue-heartbeat-libexecdir.patch
@@ -0,0 +1,82 @@
+--- Reusable-Cluster-Components-glue--glue-1.0.12/configure.ac.orig	2018-09-02 19:59:05.526581895 +0200
++++ Reusable-Cluster-Components-glue--glue-1.0.12/configure.ac	2018-09-02 20:16:41.086569843 +0200
+@@ -378,7 +378,7 @@
+ AC_SUBST(GLUE_DAEMON_GROUP)
+ 
+ dnl Eventually move out of the heartbeat dir tree and create symlinks when needed
+-GLUE_DAEMON_DIR=$libdir/heartbeat
++GLUE_DAEMON_DIR=$libexecdir/heartbeat
+ AC_DEFINE_UNQUOTED(GLUE_DAEMON_DIR,"$GLUE_DAEMON_DIR", Location for daemons)
+ AC_SUBST(GLUE_DAEMON_DIR)
+ 
+--- Reusable-Cluster-Components-glue--glue-1.0.12/logd/logd.in.orig	2014-07-18 13:40:19.000000000 +0200
++++ Reusable-Cluster-Components-glue--glue-1.0.12/logd/logd.in	2018-09-02 21:02:53.446538187 +0200
+@@ -35,7 +35,7 @@
+ LOGD_CFG=@sysconfdir@/logd.cf
+ LOGD_OPT=""
+ [ -f "$LOGD_CFG" ] && LOGD_OPT="-c $LOGD_CFG"
+-LOGD_BIN="@libdir@/@HB_PKG@/ha_logd"
++LOGD_BIN="@libexecdir@/@HB_PKG@/ha_logd"
+ 
+ if [ ! -f $LOGD_BIN ]; then
+   echo -n "ha_logd not installed."
+--- Reusable-Cluster-Components-glue--glue-1.0.12/logd/logd.service.in.orig	2014-07-18 13:40:19.000000000 +0200
++++ Reusable-Cluster-Components-glue--glue-1.0.12/logd/logd.service.in	2018-09-02 21:03:11.789871314 +0200
+@@ -4,7 +4,7 @@
+ PartOf=pacemaker.service
+ 
+ [Service]
+-ExecStart=@libdir@/@HB_PKG@/ha_logd -c @sysconfdir@/logd.cf
++ExecStart=@libexecdir@/@HB_PKG@/ha_logd -c @sysconfdir@/logd.cf
+ ExecStartPre=/bin/rm -f @HA_VARRUNDIR@/logd.pid
+ ExecStopPost=/bin/rm -f @HA_VARRUNDIR@/logd.pid
+ PIDFile=@HA_VARRUNDIR@/logd.pid
+--- Reusable-Cluster-Components-glue--glue-1.0.12/lrm/lrmd/Makefile.am.orig	2014-07-18 13:40:19.000000000 +0200
++++ Reusable-Cluster-Components-glue--glue-1.0.12/lrm/lrmd/Makefile.am	2018-09-02 21:06:51.293202137 +0200
+@@ -23,13 +23,13 @@
+ 		  -I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha    \
+ 		  -I$(top_builddir)          -I$(top_srcdir)
+ 
+-halibdir	=  $(libdir)/@HB_PKG@
++halibexecdir	=  $(libexecdir)/@HB_PKG@
+ 
+ COMMONLIBS	=  $(top_builddir)/lib/clplumbing/libplumb.la   \
+ 		   $(GLIBLIB)
+ #		   $(top_builddir)/lib/apphb/libapphb.la 	
+ 
+-halib_PROGRAMS 	=  lrmd
++halibexec_PROGRAMS 	=  lrmd
+ 
+ lrmd_SOURCES 	=  lrmd.c audit.c cib_secrets.c lrmd_fdecl.h lrmd.h
+ 
+--- Reusable-Cluster-Components-glue--glue-1.0.12/logd/Makefile.am.orig	2018-09-02 19:59:05.523248561 +0200
++++ Reusable-Cluster-Components-glue--glue-1.0.12/logd/Makefile.am	2018-09-02 21:09:16.383200482 +0200
+@@ -24,7 +24,7 @@
+ 			-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha \
+ 			-I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
+ 
+-halibdir		= $(libdir)/@HB_PKG@
++halibexecdir		= $(libexecdir)/@HB_PKG@
+ ha_sbindir		= $(sbindir)
+ 
+ LIBRT 			= @LIBRT@
+@@ -34,7 +34,7 @@
+   
+ ## binary progs
+ ha_sbin_PROGRAMS  = ha_logger
+-halib_PROGRAMS	  = ha_logd logtest
++halibexec_PROGRAMS	  = ha_logd logtest
+ 
+ ha_logd_SOURCES	  = ha_logd.c
+ ha_logd_LDADD	  = $(top_builddir)/lib/clplumbing/libplumb.la		\
+--- Reusable-Cluster-Components-glue--glue-1.0.12/lib/clplumbing/Makefile.am.orig	2018-09-02 19:59:05.509915228 +0200
++++ Reusable-Cluster-Components-glue--glue-1.0.12/lib/clplumbing/Makefile.am	2018-09-02 21:16:57.366528550 +0200
+@@ -69,7 +69,7 @@
+ 			$(top_builddir)/lib/pils/libpils.la
+ libplumbgpl_la_LDFLAGS	= -version-info 2:0:0
+ 
+-testdir = $(libdir)/@HB_PKG@
++testdir = $(libexecdir)/@HB_PKG@
+ test_PROGRAMS = ipctest ipctransientclient ipctransientserver base64_md5_test
+ test_SCRIPTS  = transient-test.sh
+ 
diff --git a/logd.service b/logd.service
deleted file mode 100644
index e73ff49..0000000
--- a/logd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=HA Logging Daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/logd.pid
-ExecStart=@libdir@/heartbeat/ha_logd -d
-ExecStop=@libdir@/heartbeat/ha_logd -k
-TimeoutSec=1
-
-[Install]
-WantedBy=multi-user.target
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cluster-glue.git/commitdiff/d6a380fad2685f2b75f0887f5f44203104925d59

More information about the pld-cvs-commit mailing list