From ba1f255a2b0ff256c2994da0ee6835374bb4ec26 Mon Sep 17 00:00:00 2001
From: Ryan Wagoner <rsw686@pfsense.org>
Date: Fri, 27 Oct 2006 17:58:06 +0000
Subject: miniupnpd version bump 20061027

---
 packages/miniupnpd/miniupnpd.inc  |  13 ++++++++-----
 packages/miniupnpd/miniupnpd.xml  |   2 +-
 packages/miniupnpd/sbin/miniupnpd | Bin 51986 -> 47012 bytes
 pkg_config.xml                    |   4 ++--
 4 files changed, 11 insertions(+), 8 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
Binary files a/packages/miniupnpd/sbin/miniupnpd and b/packages/miniupnpd/sbin/miniupnpd differ
diff --git a/pkg_config.xml b/pkg_config.xml
index 7a6e1700..9551ad5a 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -121,8 +121,8 @@
       work properly from behind a NAT firewall.</descr>
       <website>http://miniupnp.free.fr/</website>
       <category>Network Management</category>
-      <maintainer>seth.mos@xs4all.nl</maintainer>
-      <version>20061023</version>
+      <maintainer>seth.mos@xs4all.nl ryan@wgnrs.dynu.com</maintainer>
+      <version>20061027</version>
       <required_version>1.0</required_version>
       <status>BETA</status>
       <config_file>http://www.pfsense.com/packages/config/miniupnpd/miniupnpd.xml</config_file>
-- 
cgit v1.2.3