1 files changed, 21 insertions, 3 deletions
diff --git a/system/resource-agents/resource-agents.SlackBuild b/system/resource-agents/resource-agents.SlackBuild
index e25b48105e..cfab5d284e 100644
--- a/system/resource-agents/resource-agents.SlackBuild
+++ b/system/resource-agents/resource-agents.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for resource-agents
 
@@ -22,10 +22,20 @@
 #  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: add --disable-fatal-warnings
+# to fix the build on 15.0.
+
+# Note: this still isn't perfect: running the SlackBuild results in
+# /run/resource-agents and /run/resource-agents/tomcat_tomcatstate
+# getting created (that's the real /run, not under $PKG).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=resource-agents
 VERSION=${VERSION:-4.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +45,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}
@@ -81,6 +98,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-dependency-tracking \
+  --disable-fatal-warnings \
   --build=$ARCH-slackware-linux
 
 make
@@ -102,4 +120,4 @@ 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