From 086112c734c9b6018855be83798bcdaf61505c14 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 15 Jun 2018 00:03:49 +0000
Subject: Fri Jun 15 00:03:49 UTC 2018

a/dcron-4.5-x86_64-8.txz:  Rebuilt.
  rc.crond: match the running process more accurately.
a/glibc-zoneinfo-2018e-noarch-3.txz:  Rebuilt.
  Don't emit an error if the /etc/localtime-copied-from is not present when
  the package is initially installed.
a/libcgroup-0.41-x86_64-5.txz:  Rebuilt.
  Added /etc/cgconfig.d/ directory.
a/pkgtools-15.0-noarch-19.txz:  Rebuilt.
  installpkg, makebootdisk, removepkg, upgradepkg: don't try to remove admin
  directories (supposedly "in case" they are a symlink).
a/sysvinit-scripts-2.1-noarch-12.txz:  Rebuilt.
  rc.6: stop haveged
  rc.S: start rc.cgconfig and rc.cgred
ap/at-3.1.20-x86_64-5.txz:  Rebuilt.
  rc.atd: match the running process more accurately.
ap/slackpkg-2.83.0-noarch-2.txz:  Rebuilt.
  Patched to handle the case where /var/log/packages is a symlink.
l/gsl-2.5-x86_64-1.txz:  Upgraded.
---
 source/a/dcron/dcron.SlackBuild | 2 +-
 source/a/dcron/rc.crond         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source/a/dcron')

diff --git a/source/a/dcron/dcron.SlackBuild b/source/a/dcron/dcron.SlackBuild
index abd76e219..72fd6a6b4 100755
--- a/source/a/dcron/dcron.SlackBuild
+++ b/source/a/dcron/dcron.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dcron
 VERSION=${VERSION:-$(echo dcron-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-7}
+BUILD=${BUILD:-8}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/dcron/rc.crond b/source/a/dcron/rc.crond
index c9c94ec89..d9076b330 100644
--- a/source/a/dcron/rc.crond
+++ b/source/a/dcron/rc.crond
@@ -7,7 +7,7 @@ if [ -r /etc/default/crond ]; then
 fi
 
 start_crond() {
-  if ! /usr/bin/pgrep --ns $$ --exact crond 1> /dev/null 2> /dev/null ; then
+  if ! /usr/bin/pgrep --ns $$ --euid root -f "^/usr/sbin/crond" 1> /dev/null 2> /dev/null ; then
     echo "Starting crond:  /usr/sbin/crond $CROND_OPTS"
     mkdir -p /run/cron
     /usr/sbin/crond $CROND_OPTS
@@ -16,7 +16,7 @@ start_crond() {
 
 stop_crond() {
   echo "Stopping crond."
-  /usr/bin/pkill --ns $$ --exact crond 2> /dev/null
+  /usr/bin/pkill --ns $$ --euid root -f "^/usr/sbin/crond" 2> /dev/null 
 }
 
 restart_crond() {
-- 
cgit v1.2.3