[Astlinux-commits] SF.net SVN: astlinux:[5592] branches/1.0/package/miniupnpd

[<abe...@us...>]

Revision: 5592
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5592&view=rev
Author:   abelbeck
Date:     2012-07-05 21:53:14 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
miniupnpd, enable lease_file and default to secure_mode=yes, more closely matches OpenWRT

Modified Paths:
--------------
    branches/1.0/package/miniupnpd/miniupnpd.init
    branches/1.0/package/miniupnpd/miniupnpd.mk

Modified: branches/1.0/package/miniupnpd/miniupnpd.init
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.init	2012-07-05 13:25:11 UTC (rev 5591)
+++ branches/1.0/package/miniupnpd/miniupnpd.init	2012-07-05 21:53:14 UTC (rev 5592)
@@ -8,14 +8,15 @@
 if [ "$UPNP_ENABLE_UPNP" != "yes" ]; then
   UPNP_ENABLE_UPNP="no"
 fi
-if [ "$UPNP_SECURE_MODE" != "yes" ]; then
-  UPNP_SECURE_MODE="no"
+if [ "$UPNP_SECURE_MODE" != "no" ]; then
+  UPNP_SECURE_MODE="yes"
 fi
 UPNP_BITRATE_UP="${UPNP_BITRATE_UP:-1000000}"
 UPNP_BITRATE_DOWN="${UPNP_BITRATE_DOWN:-10000000}"
 
 MINIUPNPD=/usr/sbin/miniupnpd
 MINIUPNPD_CONF=/tmp/etc/miniupnpd.conf
+MINIUPNPD_LEASEFILE=/var/db/upnp.leases
 
 is_upnp_enabled()
 {
@@ -88,9 +89,10 @@
     return
   fi
 
-  echo "port=0
+  echo "port=5000
 enable_natpmp=$UPNP_ENABLE_NATPMP
 enable_upnp=$UPNP_ENABLE_UPNP
+lease_file=$MINIUPNPD_LEASEFILE
 bitrate_up=$UPNP_BITRATE_UP
 bitrate_down=$UPNP_BITRATE_DOWN
 secure_mode=$UPNP_SECURE_MODE
@@ -108,6 +110,7 @@
 start () {
   if [ -f $MINIUPNPD_CONF ]; then
     echo "Starting miniupnpd..."
+    touch $MINIUPNPD_LEASEFILE
     $MINIUPNPD -f $MINIUPNPD_CONF
   fi
 }

Modified: branches/1.0/package/miniupnpd/miniupnpd.mk
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.mk	2012-07-05 13:25:11 UTC (rev 5591)
+++ branches/1.0/package/miniupnpd/miniupnpd.mk	2012-07-05 21:53:14 UTC (rev 5592)
@@ -19,6 +19,7 @@
 define MINIUPNPD_CONFIGURE_CMDS
 # add this to make for IPv6... CONFIG_OPTIONS="--ipv6"
 	echo "$(LINUX_VERSION_PROBED)" >$(@D)/os.astlinux
+	CONFIG_OPTIONS="--leasefile" \
 	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" CFLAGS="$(TARGET_CFLAGS)" \
 		-f Makefile.linux -C $(@D) config.h
 endef
@@ -36,14 +37,16 @@
 #	-mkdir $(TARGET_DIR)/etc/miniupnpd
 #	$(INSTALL) -D $(@D)/netfilter/iptables_*.sh $(TARGET_DIR)/etc/miniupnpd/
 #	$(INSTALL) -D $(@D)/netfilter/ip6tables_*.sh $(TARGET_DIR)/etc/miniupnpd/
-	ln -snf ../../init.d/miniupnpd $(TARGET_DIR)/etc/runlevels/default/S54miniupnpd
-	ln -snf ../../init.d/miniupnpd $(TARGET_DIR)/etc/runlevels/default/K09miniupnpd
+	ln -sf /tmp/etc/miniupnpd.conf $(TARGET_DIR)/etc/miniupnpd.conf
+	ln -sf ../../init.d/miniupnpd $(TARGET_DIR)/etc/runlevels/default/S54miniupnpd
+	ln -sf ../../init.d/miniupnpd $(TARGET_DIR)/etc/runlevels/default/K09miniupnpd
 endef
 
 define MINIUPNPD_UNINSTALL_TARGET_CMDS
 	rm -f $(TARGET_DIR)/etc/init.d/miniupnpd
 	rm -f $(TARGET_DIR)/usr/sbin/miniupnpd
 	rm -rf $(TARGET_DIR)/etc/miniupnpd/
+	rm -f $(TARGET_DIR)/etc/miniupnpd.conf
 	rm -f $(TARGET_DIR)/etc/runlevels/default/S54miniupnpd
 	rm -f $(TARGET_DIR)/etc/runlevels/default/K09miniupnpd
 endef

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.