4 files changed, 29 insertions, 13 deletions
diff --git a/system/cluster-glue/README b/system/cluster-glue/README
index b9e1a6c915..0f255839f9 100644
--- a/system/cluster-glue/README
+++ b/system/cluster-glue/README
@@ -2,8 +2,8 @@ cluster-glue (Reusable Cluster Components)
 
 Additional cluster tools to play with e.g. some STONITH scripts.
 
-You might also want to install corosync, pacemaker, resource-agents, crmsh,
-fence-agents and eventually cluster-glue.
+You might also want to install cluster-glue, heartbeat, resource-agents,
+fence-agents.
 
 You must have a haclient group and hacluster user to run this script.
 
diff --git a/system/cluster-glue/cluster-glue.SlackBuild b/system/cluster-glue/cluster-glue.SlackBuild
index 0b36765a43..ae30fb192f 100644
--- a/system/cluster-glue/cluster-glue.SlackBuild
+++ b/system/cluster-glue/cluster-glue.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cluster-glue
 
@@ -22,11 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220209 bkw: Modified by SlackBuilds.org: turn off fatal warnings to
+# fix the build on 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cluster-glue
-VERSION=${VERSION:-20180409_43b22d1}
-COMMIT=${COMMIT:-43b22d15db165b27743519da2c431a9f5d8062a6}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-20161102_afaeeb}
+COMMIT=${COMMIT:-afaeeb2f3e2a576c8a50ee3ce98e83e4da635c76}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +42,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -95,6 +108,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-dependency-tracking \
+  --disable-fatal-warnings \
   --disable-static \
   --build=$ARCH-slackware-linux
 
@@ -113,8 +127,10 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/cluster-glue/cluster-glue.info b/system/cluster-glue/cluster-glue.info
index 5116c9026c..8c61443bd0 100644
--- a/system/cluster-glue/cluster-glue.info
+++ b/system/cluster-glue/cluster-glue.info
@@ -1,8 +1,8 @@
 PRGNAM="cluster-glue"
-VERSION="20180409_43b22d1"
+VERSION="20161102_afaeeb"
 HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-DOWNLOAD="https://github.com/ClusterLabs/cluster-glue/archive/43b22d1/cluster-glue-43b22d15db165b27743519da2c431a9f5d8062a6.tar.gz"
-MD5SUM="d27f0580e690ed5425ad8e5135073c3e"
+DOWNLOAD="https://github.com/ClusterLabs/cluster-glue/archive/afaeeb/cluster-glue-afaeeb2f3e2a576c8a50ee3ce98e83e4da635c76.tar.gz"
+MD5SUM="50c799bb708921e9b44b1df161574fba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cluster-glue/slack-desc b/system/cluster-glue/slack-desc
index 62e9d250e8..1a57233cd3 100644
--- a/system/cluster-glue/slack-desc
+++ b/system/cluster-glue/slack-desc
@@ -10,8 +10,8 @@ cluster-glue: cluster-glue (Reusable Cluster Components)
 cluster-glue:
 cluster-glue: Additional cluster tools to play with e.g. some STONITH scripts.
 cluster-glue:
-cluster-glue: You might also want to install corosync, pacemaker, resource-agents,
-cluster-glue: crmsh, fence-agents and eventually cluster-glue.
+cluster-glue: You might also want to install cluster-glue, heartbeat,
+cluster-glue: resource-agents, fence-agents.
 cluster-glue:
 cluster-glue:
 cluster-glue: