Attachment 248413 Details for Bug 277003 – Unified diff for more robust RC script

[patch] Unified diff for more robust RC script

patch (text/plain), 1.67 KB, created by Jason W. Bacon on 2024-02-13 00:05:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason W. Bacon

Created: 2024-02-13 00:05:36 UTC

Size: 1.67 KB

patch

obsolete

>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/security/munge/Makefile /usr/ports/wip/munge/Makefile
>--- /usr/ports/security/munge/Makefile	2024-02-01 20:10:30.300726000 -0600
>+++ /usr/ports/wip/munge/Makefile	2024-02-12 18:03:39.558738000 -0600
>@@ -1,6 +1,6 @@
> PORTNAME=	munge
> DISTVERSION=	0.5.15
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	security
> MASTER_SITES=	https://github.com/dun/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
> 
>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/security/munge/files/munged.in /usr/ports/wip/munge/files/munged.in
>--- /usr/ports/security/munge/files/munged.in	2022-10-29 16:51:22.270262000 -0500
>+++ /usr/ports/wip/munge/files/munged.in	2024-02-12 17:59:46.984429000 -0600
>@@ -7,7 +7,7 @@
> # Add the following line to /etc/rc.conf to enable munged:
> # munged_enable (bool): Set to "NO" by default.
> #                       Set it to "YES" to enable munged.
>-# munged_keyfile (str): Set to "/usr/local/etc/munge/munge.key" by default.
>+# munged_keyfile (str): Set to "%%PREFIX%%/etc/munge/munge.key" by default.
> #                       Custom munge key.
> # munged_pidfile (str): Set to "/var/run/munged.pid" by default.
> #                       Custom PID file path and name.
>@@ -31,10 +31,23 @@
> 
> munged_stop()
> {
>-	if [ -f "${pidfile}" ]; then
>-		kill `cat ${pidfile}`
>+    if checkyesno $rcvar; then
>+	echo "Stopping $name."
>+	pids="$(pgrep -d ' ' $name)"
>+	if [ -n "$pids" ]; then
>+	    echo "Waiting for PIDs: $pids"
>+	    for signal in TERM INT QUIT KILL
>+	    do
>+		kill -s $signal $pids
>+		sleep 1
>+		pids=$(pgrep -d ' ' $name)
>+		if [ -z "$pids" ]; then
>+		    break
>+		fi
>+	    done
> 	fi
>-
>+	rm -f $pidfile
>+    fi
> }
> 
> run_rc_command "$1"

Actions: View | Diff

Attachments on bug 277003: 248391 | 248392 | 248413 | 248481