network/munge: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 28 insertions, 8 deletions

diff --git a/network/munge/etc.default.munge b/network/munge/etc.default.munge
new file mode 100644
index 0000000000..70f9a98b85
--- /dev/null
+++ b/network/munge/etc.default.munge
@@ -0,0 +1,13 @@
+# MUNGE configuration
+
+# Pass additional command-line options to munged.
+# OPTIONS="--key-file=/etc/munge/munge.key --num-threads=2"
+
+# Adjust the scheduling priority of munged.
+# NICE=
+
+# Execute munged under another username.
+# USER="munge"
+
+# Execute munged under another groupname.
+# GROUP="munge"
diff --git a/network/munge/munge.SlackBuild b/network/munge/munge.SlackBuild
index b71f79b733..006ceb9fd5 100644
--- a/network/munge/munge.SlackBuild
+++ b/network/munge/munge.SlackBuild
@@ -22,6 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220308 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=munge
@@ -31,7 +33,7 @@ TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 DOCS="AUTHORS COPYING COPYING.LESSER DISCLAIMER.LLNS DISCLAIMER.UC \
-      HISTORY INSTALL JARGON KEYS NEWS PLATFORMS QUICKSTART README README.MULTILIB THANKS"
+      HISTORY JARGON KEYS NEWS PLATFORMS QUICKSTART README README.MULTILIB THANKS"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -41,9 +43,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# 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
@@ -78,9 +77,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -95,15 +94,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --host=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
 # Remove systemd files
 rm -rf $PKG/usr/lib/systemd/
 
 mv $PKG/etc/rc.d/init.d/munge $PKG/etc/rc.d/rc.munge.new
-mv $PKG/etc/default/munge $PKG/etc/default/munge.new
 rm -rf $PKG/etc/rc.d/init.d/
 
+# 20220308 bkw: sometimes, this file doesn't exist. but sometimes it
+# does. no idea why, no time to deal with it, just add it to git and
+# always install it.
+#mv $PKG/etc/default/munge $PKG/etc/default/munge.new
+
+rm -f $PKG/etc/default/  # might or might not exist...
+mkdir -p $PKG/etc/default/
+cat $CWD/etc.default.munge > $PKG/etc/default/munge.new
+
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done