Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 http/squid/HISTORY         |    1 +
 http/squid/init.d/squid    |    8 ++++++++
 net/dnsmasq/HISTORY        |    1 +
 net/dnsmasq/init.d/dnsmasq |    6 ++++++
 4 files changed, 16 insertions(+)

New commits:
commit 5b20313e09a0e6ec9e5dd7e5281c376ca222a530
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    squid: Fix restart()

commit 207f3557816f2fca80648272e6352994d81b962b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    dnsmasq: Fix restart()

diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index f3f0420..1fa93f9 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -3,6 +3,7 @@
        * BUILD, CONFIGURE: Allow building addtional storage filesystems 
(rock, diskd, aufs)
        * INSTALL: Don't recursively chown cachedir, unless you want Sorcery 
owning my local cache
        * init.d/squid: loadproc doesn't fails right after swap create if 
cache_dir is enabled
+         Fix restart()
 
 2017-08-07 David C. Haley <khoralin AT gmail.com>
        * DETAILS: Removed signature-related lines
diff --git a/http/squid/init.d/squid b/http/squid/init.d/squid
index 34575a1..9fbc283 100644
--- a/http/squid/init.d/squid
+++ b/http/squid/init.d/squid
@@ -28,3 +28,11 @@ stop()
   /usr/sbin/squid -k shutdown > /dev/null 2>&1
   evaluate_retval
 }
+
+restart()
+{
+  stop
+  # Squid has a 30s connection timeout when shutting down
+  sleep 35
+  start
+}
diff --git a/net/dnsmasq/HISTORY b/net/dnsmasq/HISTORY
index 168858c..e5864ef 100644
--- a/net/dnsmasq/HISTORY
+++ b/net/dnsmasq/HISTORY
@@ -4,6 +4,7 @@
          When using any 'dhcp-' options (e.g. dhcp-range), I get this error:
          dnsmasq: unsupported option (check that dnsmasq was compiled with 
DHCP/TFTP/DNSSEC/DBus support) at line 157 of /etc/dnsmasq.conf
          ALL of those settings were enabled at build-time.
+       * init.d/dnsmasq: Fix restart()
 
 2017-10-02 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.78
diff --git a/net/dnsmasq/init.d/dnsmasq b/net/dnsmasq/init.d/dnsmasq
index 8dd69c1..e9cf437 100644
--- a/net/dnsmasq/init.d/dnsmasq
+++ b/net/dnsmasq/init.d/dnsmasq
@@ -5,3 +5,9 @@ RUNLEVEL=3
 NEEDS="+remote_fs +network"
 
 . /etc/init.d/smgl_init
+
+restart()
+{
+  run_func stop
+  run_func start
+}