summaryrefslogtreecommitdiff
path: root/source/n/bind
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-09-25 01:05:55 +0000
committerEric Hameleers <alien@slackware.com>2021-09-25 08:59:58 +0200
commit33d703602d5c2f4d51f5a253fbc3939d30729aaf (patch)
tree4eaf2e003461a6cd41b4c67bb2c7556569b6f7b4 /source/n/bind
parent0f7d38bee156c0926945743e1902ece2b531809f (diff)
downloadcurrent-33d703602d5c2f4d51f5a253fbc3939d30729aaf.tar.gz
Sat Sep 25 01:05:55 UTC 202120210925010555
a/coreutils-9.0-x86_64-1.txz: Upgraded. Thanks to GazL for pointing out where I needed to be looking in the code to stick with the traditional (for us, anyway) ls quoting style. n/ca-certificates-20210924-noarch-1.txz: Upgraded. Removed DST_Root_CA_X3.crt. n/cifs-utils-6.14-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n/bind')
-rwxr-xr-xsource/n/bind/bind.SlackBuild15
-rw-r--r--source/n/bind/default.named21
-rw-r--r--source/n/bind/rc.bind20
3 files changed, 28 insertions, 28 deletions
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild
index 7af3a204..5e752c76 100755
--- a/source/n/bind/bind.SlackBuild
+++ b/source/n/bind/bind.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=bind
VERSION=${VERSION:-$(echo ${PKGNAM}-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -112,9 +112,11 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
)
# We like a lot of symlinks.
-( cd $PKG/usr/man/man3
- sh $CWD/3link.sh
-)
+if [ -d $PKG/usr/man/man3 ]; then
+ ( cd $PKG/usr/man/man3
+ sh $CWD/3link.sh
+ )
+fi
# Install init script:
mkdir -p $PKG/etc/rc.d
@@ -122,7 +124,6 @@ cp -a $CWD/rc.bind $PKG/etc/rc.d/rc.bind.new
chmod 644 $PKG/etc/rc.d/rc.bind.new
# Install default options file for named:
-mkdir $PKG/etc/default
cat $CWD/default.named > $PKG/etc/default/named.new
# Fix library perms:
@@ -152,7 +153,9 @@ cp -a \
$PKG/usr/doc/${PKGNAM}-$VERSION
# This one should have the correct perms of the config file:
-chmod 644 $PKG/usr/doc/${PKGNAM}-$VERSION/misc/rndc.conf-sample
+if [ -r $PKG/usr/doc/${PKGNAM}-$VERSION/misc/rndc.conf-sample ]; then
+ chmod 644 $PKG/usr/doc/${PKGNAM}-$VERSION/misc/rndc.conf-sample
+fi
# One format of this is plenty. Especially get rid of the bloated PDF.
( cd $PKG/usr/doc/bind-$VERSION/arm
diff --git a/source/n/bind/default.named b/source/n/bind/default.named
index 2983934f..50e18664 100644
--- a/source/n/bind/default.named
+++ b/source/n/bind/default.named
@@ -1,15 +1,12 @@
# User to run named as:
-BIND_USER=named
+NAMED_USER=named
-# By default, named will also run as the primary group of $BIND_USER.
-# We will determine this now for the purpose of also chowning /run/named
-# and /var/named to this group. You may also comment this section out and
-# set BIND_GROUP manually if desired.
-BIND_GROUP="$(groups $BIND_USER | cut -f 3 -d " ")"
-# Fallback if there's no primary group for $BIND_USER:
-if [ -z "$BIND_GROUP" ]; then
- BIND_GROUP=wheel
-fi
+# Group to use for chowning named related files and directories.
+# By default, named will also run as the primary group of $NAMED_USER,
+# which will usually be the same as what's listed below, but not
+# necessarily if something other than the default of "named" is used.
+NAMED_GROUP=named
-# Options to run named with:
-NAMED_OPTIONS="-u $BIND_USER"
+# Options to run named with. At least -u $NAMED_USER is required, but
+# additional options may be added if needed.
+NAMED_OPTIONS="-u $NAMED_USER"
diff --git a/source/n/bind/rc.bind b/source/n/bind/rc.bind
index 4cc8f49c..169db812 100644
--- a/source/n/bind/rc.bind
+++ b/source/n/bind/rc.bind
@@ -16,15 +16,15 @@
if [ -f /etc/default/named ] ; then . /etc/default/named ; fi
if [ -f /etc/default/rndc ] ; then . /etc/default/rndc ; fi
-# In case /etc/default/named was missing:
-if [ -z "$BIND_USER" ]; then
- BIND_USER="named"
+# In case /etc/default/named was missing, provide fallbacks:
+if [ -z "$NAMED_USER" ]; then
+ NAMED_USER="named"
fi
-if [ -z "$BIND_GROUP" ]; then
- BIND_GROUP="named"
+if [ -z "$NAMED_GROUP" ]; then
+ NAMED_GROUP="named"
fi
-if [ -z "$BIND_OPTIONS" ]; then
- BIND_OPTIONS="-u $BIND_USER"
+if [ -z "$NAMED_OPTIONS" ]; then
+ NAMED_OPTIONS="-u $NAMED_USER"
fi
# Sanity check. If /usr/sbin/named is missing then it
@@ -41,12 +41,12 @@ bind_start() {
# Make sure /var/run/named exists:
mkdir -p /var/run/named
# Make sure that /var/run/named has correct ownership:
- chown -R ${BIND_USER}:${BIND_GROUP} /var/run/named
+ chown -R ${NAMED_USER}:${NAMED_GROUP} /var/run/named
# Make sure that /var/named has correct ownership:
- chown -R ${BIND_USER}:${BIND_GROUP} /var/named
+ chown -R ${NAMED_USER}:${NAMED_GROUP} /var/named
if [ -r /etc/rndc.key ]; then
# Make sure that /etc/rndc.key has correct ownership:
- chown ${BIND_USER}:${BIND_GROUP} /etc/rndc.key
+ chown ${NAMED_USER}:${NAMED_GROUP} /etc/rndc.key
fi
# Start named:
if [ -x /usr/sbin/named ]; then