From 94c93fbaaa5eb59e73beaf5ca5284a484ce77bd4 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 31 Oct 2018 22:49:36 +0000
Subject: Wed Oct 31 22:49:36 UTC 2018

d/subversion-1.11.0-x86_64-1.txz:  Upgraded.
l/SDL2-2.0.9-x86_64-1.txz:  Upgraded.
l/SDL2_gfx-1.0.4-x86_64-1.txz:  Upgraded.
l/SDL2_image-2.0.4-x86_64-1.txz:  Upgraded.
l/SDL2_mixer-2.0.4-x86_64-1.txz:  Upgraded.
n/autofs-5.1.5-x86_64-1.txz:  Upgraded.
n/curl-7.62.0-x86_64-1.txz:  Upgraded.
  This release fixes the following security issues:
  SASL password overflow via integer overflow.
  Use-after-free in handle close.
  Warning message out-of-buffer read.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-16839
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-16840
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-16842
  (* Security fix *)
xap/mozilla-thunderbird-60.3.0-x86_64-1.txz:  Upgraded.
  This is a bugfix release. For more information, see:
  https://www.mozilla.org/en-US/thunderbird/60.3.0/releasenotes/
---
 source/n/autofs/autofs.SlackBuild | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

(limited to 'source/n/autofs/autofs.SlackBuild')

diff --git a/source/n/autofs/autofs.SlackBuild b/source/n/autofs/autofs.SlackBuild
index e0cbeaa4d..37c7326d8 100755
--- a/source/n/autofs/autofs.SlackBuild
+++ b/source/n/autofs/autofs.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=autofs
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -94,12 +94,39 @@ CPPFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Add /run directory:
+mkdir -p $PKG/run
+
 # Referenced in the auto.master config file, but not created:
 mkdir -p $PKG/etc/auto.master.d
 
-mv $PKG/etc/init.d $PKG/etc/rc.d
-mv $PKG/etc/rc.d/autofs $PKG/etc/rc.d/rc.autofs.new
+# Install rc.autofs.new:
+mkdir -p $PKG/etc/rc.d
+cp -a samples/rc.autofs $PKG/etc/rc.d/rc.autofs.new
+chown root:root $PKG/etc/rc.d/rc.autofs.new
 chmod 644 $PKG/etc/rc.d/rc.autofs.new
+# Fix confdir:
+sed -i "s|/etc/sysconfig|/etc/default|g" $PKG/etc/rc.d/rc.autofs.new
+
+# Install sample config files:
+for file in auto.master auto.misc auto.net auto.smb autofs_ldap_auth.conf default/autofs ; do
+  cp -a samples/$file $PKG/etc/${file}
+  chown root:root $PKG/etc/${file}
+  chmod 644 $PKG/etc/${file}
+done
+cp -a samples/autofs.conf.default $PKG/etc/autofs.conf
+chown root:root $PKG/etc/autofs.conf
+chmod 644 $PKG/etc/autofs.conf
+mkdir -p $PKG/etc/default
+cp -a samples/autofs.init.conf $PKG/etc/default/autofs.new
+chown root:root $PKG/etc/default/autofs.new
+chmod 644 $PKG/etc/default/autofs.new
+# Fix typo:
+sed -i "s/syatem/system/g" $PKG/etc/default/autofs.new
+
+# Fix perms on some config files:
+chmod 755 $PKG/etc/auto.smb $PKG/etc/auto.net
+chmod 600 $PKG/etc/autofs_ldap_auth.conf
 
 # Prep the config files:
 for file in auto.master auto.misc autofs.conf autofs_ldap_auth.conf default/autofs ; do
-- 
cgit v1.2.3