| components/cluster/cluster-glue/Makefile | ●●●●● patch | view | raw | blame | history | |
| components/cluster/cluster-glue/cluster-glue.p5m | ●●●●● patch | view | raw | blame | history | |
| components/cluster/cluster-glue/manifests/sample-manifest.p5m | ●●●●● patch | view | raw | blame | history | |
| components/cluster/cluster-glue/patches/cl_syslog.c.patch | ●●●●● patch | view | raw | blame | history | |
| components/cluster/cluster-glue/patches/doc_makefile_am.patch | ●●●●● patch | view | raw | blame | history | |
| components/cluster/cluster-glue/patches/hb_report-man8.patch | ●●●●● patch | view | raw | blame | history | |
| components/cluster/cluster-glue/patches/man.patch | ●●●●● patch | view | raw | blame | history |
components/cluster/cluster-glue/Makefile
@@ -19,12 +19,12 @@ COMPONENT_VERSION= 1.0.12 COMPONENT_FMRI= application/cluster/$(COMPONENT_NAME) COMPONENT_CLASSIFICATION= System/Services COMPONENT_HG_REV= 0a7add1d9996 COMPONENT_SRC= Reusable-Cluster-Components-glue--$(COMPONENT_HG_REV) COMPONENT_ARCHIVE= $(COMPONENT_NAME)-$(COMPONENT_HG_REV).tar.bz2 COMPONENT_ARCHIVE_HASH= sha256:c47bfffbfe11401379d5248fc7518a3de9532c02090d614f314037fc3a7c4ceb COMPONENT_COMMIT= bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_COMMIT) COMPONENT_ARCHIVE= $(COMPONENT_SRC).zip COMPONENT_ARCHIVE_HASH= sha256:ae8cf05384e76be1cb0cd6b75708271e70f143a34aae1426684ed5b19033748f COMPONENT_PROJECT_URL= http://linux-ha.org/wiki/Cluster_Glue COMPONENT_ARCHIVE_URL= http://hg.linux-ha.org/glue/archive/$(COMPONENT_HG_REV).tar.bz2 COMPONENT_ARCHIVE_URL= https://github.com/ClusterLabs/cluster-glue/archive/$(COMPONENT_COMMIT).zip COMPONENT_LICENSE= GPLv2, LGPLv2 COMPONENT_SUMMARY= Cluster Glue is a set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack.
@@ -13,7 +13,7 @@ # Copyright 2016 Andreas Grueninger, Grueninger GmbH, (grueni). All rights reserved. # <transform file path=usr/share/man/man1m/(.+).1m$ -> set action.hash usr/share/man/man8/%<1>.8 > <transform file path=usr/share/man/man1m/(.+).1m$ -> set action.hash usr/share/man/man1/%<1>.1m > set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="$(COMPONENT_SUMMARY)" @@ -117,6 +117,7 @@ file path=usr/lib/stonith/plugins/external/drac5 mode=0555 file path=usr/lib/stonith/plugins/external/dracmc-telnet mode=0555 file path=usr/lib/stonith/plugins/external/ec2 mode=0555 file path=usr/lib/stonith/plugins/external/hetzner mode=0555 file path=usr/lib/stonith/plugins/external/hmchttp mode=0555 file path=usr/lib/stonith/plugins/external/ibmrsa mode=0555 @@ -174,7 +175,6 @@ file path=usr/sbin/cibsecret file path=usr/sbin/ha_logger file path=usr/sbin/hb_report file path=usr/sbin/lrmadmin file path=usr/sbin/meatclient file path=usr/sbin/stonith @@ -199,8 +199,5 @@ file path=usr/share/doc/cluster-glue/stonith/README_kdumpcheck.txt file path=usr/share/man/man1/ha_logger.1 file path=usr/share/man/man1m/ha_logd.1m file path=usr/share/man/man1m/hb_report.1m file path=usr/share/man/man1m/lrmadmin.1m file path=usr/share/man/man1m/meatclient.1m file path=usr/share/man/man1m/stonith.1m
@@ -10,7 +10,7 @@ # # # Copyright 2016 <contributor> # Copyright 2017 <contributor> # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -118,6 +118,7 @@ file path=usr/lib/libstonith.so.1.0.0 file path=usr/lib/stonith/plugins/external/drac5 file path=usr/lib/stonith/plugins/external/dracmc-telnet file path=usr/lib/stonith/plugins/external/ec2 file path=usr/lib/stonith/plugins/external/hetzner file path=usr/lib/stonith/plugins/external/hmchttp file path=usr/lib/stonith/plugins/external/ibmrsa @@ -174,7 +175,6 @@ file path=usr/lib/stonith/plugins/xen0-ha-dom0-stonith-helper file path=usr/sbin/cibsecret file path=usr/sbin/ha_logger file path=usr/sbin/hb_report file path=usr/sbin/lrmadmin file path=usr/sbin/meatclient file path=usr/sbin/stonith @@ -221,9 +221,8 @@ file path=usr/share/doc/cluster-glue/stonith/README.vcenter file path=usr/share/doc/cluster-glue/stonith/README.wti_mpc file path=usr/share/doc/cluster-glue/stonith/README_kdumpcheck.txt file path=usr/share/man/man1/ha_logd.1m file path=usr/share/man/man1/ha_logger.1 file path=usr/share/man/man8/ha_logd.8 file path=usr/share/man/man8/hb_report.8 file path=usr/share/man/man1/meatclient.1m file path=usr/share/man/man1/stonith.1m file path=usr/share/man/man8/lrmadmin.8 file path=usr/share/man/man8/meatclient.8 file path=usr/share/man/man8/stonith.8 components/cluster/cluster-glue/patches/cl_syslog.c.patch
New file @@ -0,0 +1,15 @@ Fixes ld: warning: symbol 'facilitynames' has differing sizes: (file /usr/lib/libplumb.so value=0xb0; file /usr/lib/libqb.so value=0xa8); /usr/lib/libplumb.so definition taken --- cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/lib/clplumbing/cl_syslog.c.1 2017-09-17 09:26:13.802105258 +0000 +++ cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/lib/clplumbing/cl_syslog.c 2017-09-17 09:26:19.869679768 +0000 @@ -48,7 +48,6 @@ { #ifdef LOG_AUTH { "auth", LOG_AUTH }, - { "security", LOG_AUTH }, /* DEPRECATED */ #endif #ifdef LOG_AUTHPRIV { "authpriv", LOG_AUTHPRIV }, components/cluster/cluster-glue/patches/doc_makefile_am.patch
@@ -1,10 +1,20 @@ diff -Nura a/doc/Makefile.am b/doc/Makefile.am --- a/doc/Makefile.am 2016-11-01 08:50:36.819220851 +0100 +++ b/doc/Makefile.am 2016-11-01 10:12:52.023882517 +0100 @@ -49,5 +49,6 @@ --- cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc/Makefile.am.~1~ 2017-09-17 09:20:04.219246144 +0000 +++ cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc/Makefile.am 2017-09-17 09:21:09.639502953 +0000 @@ -27,7 +27,7 @@ man_MANS = hb_report.8: hb_report.8.txt a2x -f manpage $< + mv $(@:.8=.1m) $@ if BUILD_DOC -man_MANS += ha_logd.8 ha_logger.1 stonith.8 meatclient.8 +man_MANS += ha_logd.1m ha_logger.1 stonith.1m meatclient.1m endif EXTRA_DIST = $(man_MANS) @@ -41,7 +41,7 @@ XSLTPROC_HTML_OPTIONS ?= $(XSLTPROC_OPTIONS) XSLTPROC_FO_OPTIONS ?= $(XSLTPROC_OPTIONS) -%.5 %.8 %.1: %.xml +%.5 %.1m %.1: %.xml $(XSLTPROC) \ $(XSLTPROC_MANPAGES_OPTIONS) \ $(MANPAGES_STYLESHEET) $< components/cluster/cluster-glue/patches/hb_report-man8.patch
File was deleted components/cluster/cluster-glue/patches/man.patch
New file @@ -0,0 +1,79 @@ diff -ur cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc1/ha_logger.xml.in cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc/ha_logger.xml.in --- cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc1/ha_logger.xml.in 2017-09-17 09:34:08.893024952 +0000 +++ cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc/ha_logger.xml.in 2017-09-17 09:35:11.721935313 +0000 @@ -103,8 +103,8 @@ <refsection id="rs-ha_logger-seealso"> <title>See also</title> <para> - <citerefentry><refentrytitle>heartbeat</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>ha_logd</refentrytitle><manvolnum>8</manvolnum></citerefentry> + <citerefentry><refentrytitle>heartbeat</refentrytitle><manvolnum>1m</manvolnum></citerefentry>, + <citerefentry><refentrytitle>ha_logd</refentrytitle><manvolnum>1m</manvolnum></citerefentry> </para> </refsection> </refentry> diff -ur cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc1/stonith.xml.in cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc/stonith.xml.in --- cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc1/stonith.xml.in 2017-09-17 09:34:08.893240899 +0000 +++ cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc/stonith.xml.in 2017-09-17 09:35:49.046442523 +0000 @@ -28,7 +28,7 @@ </refentryinfo> <refmeta> <refentrytitle>stonith</refentrytitle> - <manvolnum>8</manvolnum> + <manvolnum>1m</manvolnum> <refmiscinfo class="manual">System administration utilities</refmiscinfo> </refmeta> <refnamediv> @@ -319,8 +319,8 @@ <refsection id="rs-stonith-seealso"> <title>See also</title> <para> - <citerefentry><refentrytitle>heartbeat</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>meatclient</refentrytitle><manvolnum>8</manvolnum></citerefentry> + <citerefentry><refentrytitle>heartbeat</refentrytitle><manvolnum>1m</manvolnum></citerefentry>, + <citerefentry><refentrytitle>meatclient</refentrytitle><manvolnum>1m</manvolnum></citerefentry> </para> </refsection> </refentry> --- cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc/ha_logd.xml.in.~1~ 2017-08-03 11:41:13.000000000 +0000 +++ cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc/ha_logd.xml.in 2017-09-17 09:40:07.250355358 +0000 @@ -34,7 +34,7 @@ </refentryinfo> <refmeta> <refentrytitle>ha_logd</refentrytitle> - <manvolnum>8</manvolnum> + <manvolnum>1m</manvolnum> <refmiscinfo class="manual">System administration utilities</refmiscinfo> </refmeta> <refnamediv> @@ -127,7 +127,7 @@ <refsection id="rs-ha_logd-seealso"> <title>See also</title> <para> - <citerefentry><refentrytitle>heartbeat</refentrytitle><manvolnum>8</manvolnum></citerefentry>, + <citerefentry><refentrytitle>heartbeat</refentrytitle><manvolnum>1m</manvolnum></citerefentry>, <citerefentry><refentrytitle>ha_logger</refentrytitle><manvolnum>1</manvolnum></citerefentry> </para> </refsection> --- cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc/meatclient.xml.in.1 2017-09-17 09:42:27.607796329 +0000 +++ cluster-glue-bdd95fd0f89f31b19fa46ffa0ea3f5022ebcd858/doc/meatclient.xml.in 2017-09-17 09:42:43.369887187 +0000 @@ -34,7 +34,7 @@ </refentryinfo> <refmeta> <refentrytitle>meatclient</refentrytitle> - <manvolnum>8</manvolnum> + <manvolnum>1m</manvolnum> <refmiscinfo class="manual">System administration utilities</refmiscinfo> </refmeta> <refnamediv> @@ -70,8 +70,8 @@ <refsection id="rs-meatclient-seealso"> <title>See also</title> <para> - <citerefentry><refentrytitle>heartbeat</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>stonith</refentrytitle><manvolnum>8</manvolnum></citerefentry> + <citerefentry><refentrytitle>heartbeat</refentrytitle><manvolnum>1m</manvolnum></citerefentry>, + <citerefentry><refentrytitle>stonith</refentrytitle><manvolnum>1m</manvolnum></citerefentry> </para> </refsection> </refentry>
