From dba2771e932227541afc45ae9b231c132c349508 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 30 Jun 2020 18:56:59 +0000
Subject: Tue Jun 30 18:56:59 UTC 2020

a/kernel-firmware-20200629_1a0c0c2-noarch-1.txz:  Upgraded.
ap/mariadb-10.5.4-x86_64-2.txz:  Rebuilt.
  rc.mysqld: stop the database by PID to avoid improperly stopping other
  instances that were not started by this script. Thanks to denydias.
d/vala-0.48.7-x86_64-1.txz:  Upgraded.
l/opusfile-0.12-x86_64-1.txz:  Upgraded.
n/ca-certificates-20200630-noarch-1.txz:  Upgraded.
  This update provides the latest CA certificates to check for the
  authenticity of SSL connections.
x/libwacom-1.4.1-x86_64-1.txz:  Upgraded.
---
 source/ap/mariadb/mariadb.SlackBuild | 2 +-
 source/ap/mariadb/rc.mysqld          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source/ap')

diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild
index 2291bb573..fb9204b04 100755
--- a/source/ap/mariadb/mariadb.SlackBuild
+++ b/source/ap/mariadb/mariadb.SlackBuild
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mariadb
 VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # To reduce the package size, the embedded server may be omitted.  Currently
 # only amarok uses this.  To build without embedded support, set this to NO.
diff --git a/source/ap/mariadb/rc.mysqld b/source/ap/mariadb/rc.mysqld
index 5ba4ebfe1..8f63c29e7 100644
--- a/source/ap/mariadb/rc.mysqld
+++ b/source/ap/mariadb/rc.mysqld
@@ -58,10 +58,10 @@ mysqld_start() {
 mysqld_stop() {
   # If there is no PID file, ignore this request...
   if [ -r /var/run/mysql/mysql.pid ]; then
-    killall mysqld
+    PID=$(cat /var/run/mysql/mysql.pid)
+    kill $PID
     # Wait at least one minute for it to exit, as we don't know how big the DB is...
-    for second in 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 \
-      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 60 ; do
+    for second in $(seq 0 60) ; do
       if [ ! -r /var/run/mysql/mysql.pid ]; then
         break;
       fi
-- 
cgit v1.2.3