From 58f5f8f1bc055bc08850eee8aa33341ae2700881 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 14 Mar 2023 07:55:10 +0100 Subject: [PATCH] net/upnp: change killbypid() to wait by default --- net/upnp/Makefile | 2 +- net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/upnp/Makefile b/net/upnp/Makefile index 0b0b4e371..7a170f82e 100644 --- a/net/upnp/Makefile +++ b/net/upnp/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= upnp PLUGIN_VERSION= 1.5 -PLUGIN_REVISION= 1 +PLUGIN_REVISION= 2 PLUGIN_DEPENDS= miniupnpd-devel PLUGIN_COMMENT= Universal Plug and Play Service PLUGIN_MAINTAINER= franco@opnsense.org diff --git a/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc b/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc index d63c65199..cf3233c6e 100644 --- a/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc +++ b/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc @@ -80,7 +80,8 @@ function miniupnpd_start() function miniupnpd_stop() { - killbypid('/var/run/miniupnpd.pid', 'TERM', true); + killbypid('/var/run/miniupnpd.pid'); + mwexec('/sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null'); mwexec('/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null'); }