aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorRyan Wagoner <rsw686@pfsense.org>2006-10-27 17:58:06 +0000
committerRyan Wagoner <rsw686@pfsense.org>2006-10-27 17:58:06 +0000
commitba1f255a2b0ff256c2994da0ee6835374bb4ec26 (patch)
treed82c23f68d430bc2132375dfe59151761c6161b7 /packages
parent1a31011aa24dfce57f016deed19d04cf142ddda9 (diff)
downloadpfsense-packages-ba1f255a2b0ff256c2994da0ee6835374bb4ec26.tar.gz
pfsense-packages-ba1f255a2b0ff256c2994da0ee6835374bb4ec26.tar.bz2
pfsense-packages-ba1f255a2b0ff256c2994da0ee6835374bb4ec26.zip
miniupnpd version bump 20061027
Diffstat (limited to 'packages')
-rw-r--r--packages/miniupnpd/miniupnpd.inc13
-rw-r--r--packages/miniupnpd/miniupnpd.xml2
-rwxr-xr-xpackages/miniupnpd/sbin/miniupnpdbin51986 -> 47012 bytes
3 files changed, 9 insertions, 6 deletions
diff --git a/packages/miniupnpd/miniupnpd.inc b/packages/miniupnpd/miniupnpd.inc
index fa3e70c7..a74a0377 100644
--- a/packages/miniupnpd/miniupnpd.inc
+++ b/packages/miniupnpd/miniupnpd.inc
@@ -45,21 +45,24 @@
if($ifaces_final) {
/* valid paramters lets create rc file and start miniupnpd */
- $start = "/usr/bin/killall miniupnpd\n";
+ $start = "if [ -e /var/run/miniupnpd.pid ]; then\n";
+ $start .= "/usr/bin/killall miniupnpd\n";
$start .= "# Clear existing rules and rdr entries \n";
$start .= "/sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null\n";
$start .= "/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null\n";
- $start .= "while [ `pgrep miniupnpd | wc -l` != 0 ]; do sleep 1; done\n";
+ $start .= "while [ -e /var/run/miniupnpd.pid ]; do sleep 1; done\n";
+ $start .= "fi\n";
$start .= "/usr/local/sbin/miniupnpd -p 2869{$ifaces_final}";
/* override wan ip address, common for carp, etc */
if($overridewanip)
$start .= " -o {$overridewanip}";
- $stop = "/usr/bin/killall miniupnpd \n";
- $stop .= "# Clear existing rules and rdr entries \n";
+ $stop = "/usr/bin/killall miniupnpd \n";
+ $stop .= "# Clear existing rules and rdr entries \n";
$stop .= "/sbin/pfctl -aminiupnpd -Fr 2>&1 >/dev/null\n";
- $stop .= "/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null";
+ $stop .= "/sbin/pfctl -aminiupnpd -Fn 2>&1 >/dev/null\n";
+ $stop .= "while [ -e /var/run/miniupnpd.pid ]; do sleep 1; done";
write_rcfile(array(
"file" => "miniupnpd.sh",
"start" => $start,
diff --git a/packages/miniupnpd/miniupnpd.xml b/packages/miniupnpd/miniupnpd.xml
index 3b9e75ee..36e3bb1e 100644
--- a/packages/miniupnpd/miniupnpd.xml
+++ b/packages/miniupnpd/miniupnpd.xml
@@ -2,7 +2,7 @@
<packagegui>
<title>Services: Miniupnpd</title>
<name>miniupnpd</name>
- <version>20061023</version>
+ <version>20061027</version>
<savetext>Change</savetext>
<include_file>/usr/local/pkg/miniupnpd.inc</include_file>
<aftersaveredirect>status_upnp.php</aftersaveredirect>
diff --git a/packages/miniupnpd/sbin/miniupnpd b/packages/miniupnpd/sbin/miniupnpd
index a1577d9f..54c66dcc 100755
--- a/packages/miniupnpd/sbin/miniupnpd
+++ b/packages/miniupnpd/sbin/miniupnpd
Binary files differ