FreeBSD Bugzilla – Attachment 248481 Details for
Bug 277003
security/munge: service munged restart sometimes fails
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Unified diff for more robust RC script
patch (text/plain), 1.57 KB, created by
Jason W. Bacon
on 2024-02-15 13:27:42 UTC
(
hide
)
Description:
Unified diff for more robust RC script
Filename:
MIME Type:
Creator:
Jason W. Bacon
Created:
2024-02-15 13:27:42 UTC
Size:
1.57 KB
patch
obsolete
>diff --git a/security/munge/Makefile b/security/munge/Makefile >index fc2e5360a3ea..f0b232fb692c 100644 >--- a/security/munge/Makefile >+++ b/security/munge/Makefile >@@ -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 --git a/security/munge/files/munged.in b/security/munge/files/munged.in >old mode 100644 >new mode 100755 >index 4a78b22acd4c..80bba011209f >--- a/security/munge/files/munged.in >+++ b/security/munge/files/munged.in >@@ -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 @@ command_args="--key-file=${munged_keyfile}" > > 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"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 277003
:
248391
|
248392
|
248413
| 248481