From 1e4e21c5047511d3bf04e4e475803e9bbe29b11a Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 25 Apr 2021 19:00:34 +0000
Subject: Sun Apr 25 19:00:34 UTC 2021

d/gdb-10.2-x86_64-1.txz:  Upgraded.
d/python-pip-21.1-x86_64-1.txz:  Upgraded.
n/dnsmasq-2.85-x86_64-2.txz:  Rebuilt.
  rc.dnsmasq: display stop message. Thanks to vineetmehta.
  rc.dnsmasq: kill by .pid file (or at least within the current namespace).
  Thanks to Petri Kaukasoina.
n/wireguard-tools-1.0.20210424-x86_64-1.txz:  Upgraded.
x/fcitx-qt5-1.2.6-x86_64-1.txz:  Upgraded.
---
 source/d/gdb/gdb.SlackBuild               | 2 +-
 source/d/python-pip/python-pip.SlackBuild | 2 +-
 source/n/dnsmasq/dnsmasq.SlackBuild       | 2 +-
 source/n/dnsmasq/doinst.sh                | 3 ---
 source/n/dnsmasq/rc.dnsmasq               | 9 ++++++++-
 source/x/fcitx-qt5/fcitx-qt5.SlackBuild   | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'source')

diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild
index f88c82c51..fae55a98a 100755
--- a/source/d/gdb/gdb.SlackBuild
+++ b/source/d/gdb/gdb.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gdb
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/d/python-pip/python-pip.SlackBuild b/source/d/python-pip/python-pip.SlackBuild
index 0df68a919..1ee81c396 100755
--- a/source/d/python-pip/python-pip.SlackBuild
+++ b/source/d/python-pip/python-pip.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=python-pip
 VERSION=${VERSION:-$(echo pip-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 SRCNAM=pip
 
diff --git a/source/n/dnsmasq/dnsmasq.SlackBuild b/source/n/dnsmasq/dnsmasq.SlackBuild
index 29a79927c..329ca6272 100755
--- a/source/n/dnsmasq/dnsmasq.SlackBuild
+++ b/source/n/dnsmasq/dnsmasq.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dnsmasq
 VERSION=${VERSION:-$(echo dnsmasq-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 EXTRA_BUILD_OPTS=${EXTRA_BUILD_OPTS:-"-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK"}
 
diff --git a/source/n/dnsmasq/doinst.sh b/source/n/dnsmasq/doinst.sh
index 9aadc3e55..92914eb3e 100644
--- a/source/n/dnsmasq/doinst.sh
+++ b/source/n/dnsmasq/doinst.sh
@@ -21,6 +21,3 @@ preserve_perms() {
 }
 config etc/dnsmasq.conf.new
 preserve_perms etc/rc.d/rc.dnsmasq.new
-
-# This should be mostly useless...
-rm -f etc/rc.d/rc.dnsmasq.new
diff --git a/source/n/dnsmasq/rc.dnsmasq b/source/n/dnsmasq/rc.dnsmasq
index ce584cbd2..f19a17239 100644
--- a/source/n/dnsmasq/rc.dnsmasq
+++ b/source/n/dnsmasq/rc.dnsmasq
@@ -11,7 +11,14 @@ dnsmasq_start() {
 
 # Stop dnsmasq:
 dnsmasq_stop() {
-  killall dnsmasq
+  # Try to use the .pid file first:
+  if pgrep -l -F /var/run/dnsmasq.pid 2> /dev/null | grep -q dnsmasq ; then
+    echo "Stopping dnsmasq."
+    pkill -F /var/run/dnsmasq.pid 2> /dev/null
+  else # kill any dnsmasq processes in this namespace:
+    echo "Stopping dnsmasq."
+    killall --ns $$ dnsmasq 2> /dev/null  
+  fi
 }
 
 # Restart dnsmasq:
diff --git a/source/x/fcitx-qt5/fcitx-qt5.SlackBuild b/source/x/fcitx-qt5/fcitx-qt5.SlackBuild
index 8f9e483c9..90aa739a2 100755
--- a/source/x/fcitx-qt5/fcitx-qt5.SlackBuild
+++ b/source/x/fcitx-qt5/fcitx-qt5.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-qt5
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
-- 
cgit v1.2.3