sys-cluster/heartbeat: version bump

Package-Manager: Portage-2.3.5, Repoman-2.3.2

2 files changed, 162 insertions, 0 deletions

diff --git a/sys-cluster/heartbeat/files/3.0.6-configure.patch b/sys-cluster/heartbeat/files/3.0.6-configure.patch
new file mode 100644
index 000000000000..36054dd23d3b
--- /dev/null
+++ b/sys-cluster/heartbeat/files/3.0.6-configure.patch
@@ -0,0 +1,103 @@
+diff -ru a/configure.ac b/configure.ac
+--- a/configure.ac	2015-02-04 15:57:04.000000000 +0100
++++ b/configure.ac	2017-04-25 13:33:58.668521006 +0200
+@@ -243,9 +243,9 @@
+ mandir=`var "$mandir" "$exec_prefix/man"`
+ dnl docdir is available in autoconf 2.60+, for older versions preseed
+ dnl with the same value that 2.60+ uses
+-docdir=`var "$docdir" "${datadir}/doc/${HB_PKG}"`
+-libdir=`var "$libdir" "$exec_prefix/lib"`
+-libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
++dnl docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
++dnl libdir=`var "$libdir" "$exec_prefix/lib"`
++dnl libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
+ noarchlibdir=`var "$noarchlibdir" "$prefix/lib"`
+ 
+ 
+@@ -284,53 +284,12 @@
+   LIBC=`${LDD} ${tmpOutfile} | grep libc | sed -e 's%.*=> *%%' -e 's% .*$%%'`
+   LibCdir=`dirname $LIBC`
+   dirlist=`echo $LibCdir | tr '/' ' '`
+-  LibDirSuffix=unknown
+-  for dir in $dirlist
+-  do
+-    case $dir in
+-      *lib*)	LibDirSuffix=$dir; break;;
+-      *);;
+-    esac
+-  done
+-  case $LibDirSuffix in
+-    unknown)	LibDirSuffix=`basename $LibCdir`;;
+-  esac
+   OutFileType=`file $tmpOutfile`
+   rm -f $tmpCfile $tmpOutfile
+ else
+   AC_MSG_ERROR([Cannot Compile trivial C program])
+ fi
+-#
+-#	The code above doesn't work right everywhere
+-#		(like Fedora and OpenBSD) 
+-#
+-case ${LibDirSuffix} in
+-	*lib*)	: Cool;;
+-	*)	: Sigh...
+-		case $OutFileType in
+-		  *64-bit*)	
+-		  	case $host_os in
+-			  openbsd*)	LibDirSuffix=lib;;
+-		  	  *)		LibDirSuffix=lib64;;
+-			esac;;
+-		  *32-bit*)	LibDirSuffix=lib;;
+-		  *)		LibDirSuffix=lib;;
+-		esac;;
+-esac
+-#
+-#	This may not yet be quite right for PPC where the default
+-#	is to produce 32-bit binaries, even though the OS is 64-bit
+-#	or for that matter for system Z, But, it's a lot better than
+-#	it used to be.
+-#
+-AC_MSG_RESULT($LibDirSuffix)
+ 
+-case $libdir in
+-  */*${LibDirSuffix})	: Cool ;;
+-  *)			: Uh Oh... 
+-	libdir=`dirname $libdir`/$LibDirSuffix
+-	AC_MSG_WARN([Overriding libdir to: $libdir]);;
+-esac
+ for j in exec_prefix bindir sbindir datadir sysconfdir localstatedir \
+ 	includedir oldincludedir mandir docdir stdocdir libdir noarchlibdir
+ do 
+@@ -379,7 +338,6 @@
+ fi
+ 
+ AC_CHECK_HEADERS(heartbeat/glue_config.h)
+-GLUE_HEADER=none
+ if test "$ac_cv_header_heartbeat_glue_config_h" = "yes";  then
+    GLUE_HEADER=heartbeat/glue_config.h
+ else
+@@ -463,15 +421,6 @@
+ 
+ dnl	We use this in the RPM specfile...
+ AC_SUBST(ac_configure_args)
+-cleaned_configure_args=""
+-for j in ${ac_configure_args}
+-do
+-  case $j in
+-    *--libdir=*|*--libexecdir=*)	;;
+-    *)		cleaned_configure_args="$cleaned_configure_args $j";;
+-  esac
+-done
+-AC_SUBST(cleaned_configure_args)
+ 
+ dnl *************************************************************************
+ PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
+@@ -2087,7 +2036,7 @@
+ fi
+ 
+ if test "$GCC" = yes; then
+-  CFLAGS="$CFLAGS -ggdb3"
++  CFLAGS="$CFLAGS"
+   if
+     cc_supports_flag -funsigned-char
+   then
diff --git a/sys-cluster/heartbeat/files/3.0.6-docs.patch b/sys-cluster/heartbeat/files/3.0.6-docs.patch
new file mode 100644
index 000000000000..7c5c9573109f
--- /dev/null
+++ b/sys-cluster/heartbeat/files/3.0.6-docs.patch
@@ -0,0 +1,59 @@
+diff -ru a/configure.ac b/configure.ac
+--- a/configure.ac	2015-02-04 15:57:04.000000000 +0100
++++ b/configure.ac	2017-04-25 11:57:33.706753890 +0200
+@@ -574,8 +574,14 @@
+ AC_PATH_PROGS(TEST, test)
+ PKG_PROG_PKG_CONFIG
+ 
+-dnl xsltproc is required for building the man pages
+-AC_PATH_PROGS(XSLTPROC, xsltproc)
++AC_ARG_ENABLE([doc],
++	AS_HELP_STRING([--enable-doc],[Build documentation]
++))
++AS_IF([test "x$enable_doc" = "xyes"], [
++	AC_PATH_PROGS(XSLTPROC, xsltproc)
++])
++AM_CONDITIONAL([BUILD_DOC], [test "x$enable_doc" = "xyes"] )
++AC_SUBST(XSLTPROC)
+ 
+ dnl ************************************************************************
+ dnl Check whether non-root user can chown.
+diff -ru a/doc/Makefile.am b/doc/Makefile.am
+--- a/doc/Makefile.am	2015-02-04 15:57:04.000000000 +0100
++++ b/doc/Makefile.am	2017-04-25 11:58:35.459257834 +0200
+@@ -33,11 +33,12 @@
+ 
+ doc_DATA		= $(OTHER_DOCS)
+ 
++if BUILD_DOC
+ man_MANS		= heartbeat.8 apphbd.8 cl_status.1  \
+ 			 hb_standby.1 hb_takeover.1 hb_addnode.1 hb_delnode.1 \
+ 			 ha.cf.5 authkeys.5
+ 
+-STYLESHEET_PREFIX 	?= http://docbook.sourceforge.net/release/xsl/current
++STYLESHEET_PREFIX 	?= /usr/share/sgml/docbook/xsl-stylesheets
+ MANPAGES_STYLESHEET 	?= $(STYLESHEET_PREFIX)/manpages/docbook.xsl
+ HTML_STYLESHEET 	?= $(STYLESHEET_PREFIX)/xhtml/docbook.xsl
+ FO_STYLESHEET 		?= $(STYLESHEET_PREFIX)/fo/docbook.xsl
+@@ -47,6 +48,12 @@
+ XSLTPROC_HTML_OPTIONS 	?= $(XSLTPROC_OPTIONS)
+ XSLTPROC_FO_OPTIONS 	?= $(XSLTPROC_OPTIONS)
+ 
++%.5 %.8 %.1: %.xml
++	$(XSLTPROC) \
++	$(XSLTPROC_MANPAGES_OPTIONS) \
++	$(MANPAGES_STYLESHEET) $<
++endif
++
+ EXTRA_DIST = $(txtfiles) $(htmlfiles) $(man_MANS) $(OTHER_DOCS)
+ 
+ ChangeLog: $(SPECSRC)
+@@ -55,8 +62,3 @@
+ 
+ .html.txt:
+ 	if [ "X$(HTML2TXT)" = "X" ]; then echo "Lynx or w3m or user-defined HTML2TXT required to convert $< to $@" >$@ ; else $(HTML2TXT) -dump $< >$@ ; fi
+-
+-%.5 %.8 %.1: %.xml
+-	$(XSLTPROC) \
+-	$(XSLTPROC_MANPAGES_OPTIONS) \
+-	$(MANPAGES_STYLESHEET) $<