[Astlinux-commits] SF.net SVN: astlinux:[6990] branches/1.0

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

Revision: 6990
          http://sourceforge.net/p/astlinux/code/6990
Author:   abelbeck
Date:     2015-02-27 17:48:43 +0000 (Fri, 27 Feb 2015)
Log Message:
-----------
miniupnpd, version bump to 1.9.20141209

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux-ast13.config
    branches/1.0/astlinux18.config
    branches/1.0/initrd.config
    branches/1.0/package/Config.in
    branches/1.0/package/miniupnpd/Config.in
    branches/1.0/package/miniupnpd/miniupnpd.init
    branches/1.0/package/miniupnpd/miniupnpd.mk
    branches/1.0/runnix-uclibc.config
    branches/1.0/runnix.config

Added Paths:
-----------
    branches/1.0/package/libnfnetlink/
    branches/1.0/package/libnfnetlink/Config.in
    branches/1.0/package/libnfnetlink/libnfnetlink.mk

Removed Paths:
-------------
    branches/1.0/package/miniupnpd/miniupnpd-config.patch
    branches/1.0/package/miniupnpd/miniupnpd-portinuse.patch

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/astlinux-ast11.config	2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6965-dirty Configuration
-# Sat Feb  7 17:51:44 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:10 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -604,6 +604,7 @@
 BR2_PACKAGE_NEON_LIBXML2=y
 # BR2_PACKAGE_LIBMNL is not set
 # BR2_PACKAGE_LIBNET is not set
+BR2_PACKAGE_LIBNFNETLINK=y
 # BR2_PACKAGE_LIBNL is not set
 BR2_PACKAGE_LIBPCAP=y
 # BR2_PACKAGE_PJSIP is not set

Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config	2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/astlinux-ast13.config	2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6965-dirty Configuration
-# Sat Feb  7 17:52:06 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:11 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -604,6 +604,7 @@
 BR2_PACKAGE_NEON_LIBXML2=y
 # BR2_PACKAGE_LIBMNL is not set
 # BR2_PACKAGE_LIBNET is not set
+BR2_PACKAGE_LIBNFNETLINK=y
 # BR2_PACKAGE_LIBNL is not set
 BR2_PACKAGE_LIBPCAP=y
 BR2_PACKAGE_PJSIP=y

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/astlinux18.config	2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6965-dirty Configuration
-# Sat Feb  7 17:51:39 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:10 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -604,6 +604,7 @@
 BR2_PACKAGE_NEON_LIBXML2=y
 # BR2_PACKAGE_LIBMNL is not set
 # BR2_PACKAGE_LIBNET is not set
+BR2_PACKAGE_LIBNFNETLINK=y
 # BR2_PACKAGE_LIBNL is not set
 BR2_PACKAGE_LIBPCAP=y
 # BR2_PACKAGE_PJSIP is not set

Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config	2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/initrd.config	2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6897-dirty Configuration
-# Sat Jan  3 11:05:55 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:56 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -489,6 +489,7 @@
 # BR2_PACKAGE_NEON is not set
 # BR2_PACKAGE_LIBMNL is not set
 # BR2_PACKAGE_LIBNET is not set
+# BR2_PACKAGE_LIBNFNETLINK is not set
 # BR2_PACKAGE_LIBNL is not set
 # BR2_PACKAGE_LIBPCAP is not set
 # BR2_PACKAGE_PJSIP is not set

Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in	2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/Config.in	2015-02-27 17:48:43 UTC (rev 6990)
@@ -370,6 +370,7 @@
 source "package/neon/Config.in"
 source "package/libmnl/Config.in"
 source "package/libnet/Config.in"
+source "package/libnfnetlink/Config.in"
 source "package/libnl/Config.in"
 source "package/libpcap/Config.in"
 source "package/pjsip/Config.in"

Added: branches/1.0/package/libnfnetlink/Config.in
===================================================================
--- branches/1.0/package/libnfnetlink/Config.in	                        (rev 0)
+++ branches/1.0/package/libnfnetlink/Config.in	2015-02-27 17:48:43 UTC (rev 6990)
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBNFNETLINK
+	bool "libnfnetlink"
+	help
+	  libnfnetlink is the low-level library for netfilter related
+	  kernel/userspace communication.
+	  It provides a generic messaging infrastructure for in-kernel
+	  netfilter subsystems (such as nfnetlink_log, nfnetlink_queue,
+	  nfnetlink_conntrack) and their respective users
+	  and/or management tools in userspace.
+
+	  http://www.netfilter.org/projects/libnfnetlink/
+

Added: branches/1.0/package/libnfnetlink/libnfnetlink.mk
===================================================================
--- branches/1.0/package/libnfnetlink/libnfnetlink.mk	                        (rev 0)
+++ branches/1.0/package/libnfnetlink/libnfnetlink.mk	2015-02-27 17:48:43 UTC (rev 6990)
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libnfnetlink
+#
+################################################################################
+
+LIBNFNETLINK_VERSION = 1.0.1
+LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
+LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files
+LIBNFNETLINK_AUTORECONF = YES
+LIBNFNETLINK_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,libnfnetlink))

Modified: branches/1.0/package/miniupnpd/Config.in
===================================================================
--- branches/1.0/package/miniupnpd/Config.in	2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/Config.in	2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_MINIUPNPD
 	bool "miniupnpd"
 	depends on BR2_LINUX_KERNEL
-	depends on BR2_PACKAGE_IPTABLES
+	select BR2_PACKAGE_IPTABLES
+	select BR2_PACKAGE_LIBNFNETLINK
 	help
-	  Implements UPnP and NAT-PMP protocols.
+	  Implements UPnP and NAT-PMP/PCP protocols.
 
 	  http://miniupnp.free.fr/

Deleted: branches/1.0/package/miniupnpd/miniupnpd-config.patch
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd-config.patch	2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/miniupnpd-config.patch	2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,27 +0,0 @@
---- miniupnpd-1.6.20120509-orig/genconfig.sh	2012-05-09 06:40:34.000000000 -0400
-+++ miniupnpd-1.6.20120509/genconfig.sh	2012-05-24 21:13:04.412605721 -0400
-@@ -56,6 +56,12 @@
- 	OS_VERSION=$(cat ./os.openwrt)
- fi
- 
-+# AstLinux special case
-+if [ -f ./os.astlinux ]; then
-+	OS_NAME=AstLinux
-+	OS_VERSION=$(cat ./os.astlinux)
-+fi
-+
- # Tomato USB special case
- if [ -f ../shared/tomato_version ]; then
- 	OS_NAME=Tomato
-@@ -223,6 +229,11 @@
- 		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
- 		FW=netfilter
- 		;;
-+	AstLinux)
-+		OS_URL=http://www.astlinux.org/
-+		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
-+		FW=netfilter
-+		;;
- 	Tomato)
- 		OS_NAME=UPnP
- 		OS_URL=http://tomatousb.org/

Deleted: branches/1.0/package/miniupnpd/miniupnpd-portinuse.patch
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd-portinuse.patch	2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/miniupnpd-portinuse.patch	2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,268 +0,0 @@
-diff -rupN miniupnpd-1.7-orig/Makefile.linux miniupnpd-1.7/Makefile.linux
---- miniupnpd-1.7-orig/Makefile.linux	2012-05-23 04:46:14.000000000 -0400
-+++ miniupnpd-1.7/Makefile.linux	2012-07-06 15:42:39.000000000 -0400
-@@ -41,7 +41,7 @@ SBININSTALLDIR = $(INSTALLPREFIX)/sbin
- ETCINSTALLDIR = $(PREFIX)/etc/miniupnpd
- 
- BASEOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \
--           upnpreplyparse.o minixml.o \
-+           upnpreplyparse.o minixml.o portinuse.o \
-            upnpredirect.o getifaddr.o daemonize.o upnpglobalvars.o \
-            options.o upnppermissions.o minissdp.o natpmp.o \
-            upnpevents.o upnputils.o getconnstatus.o \
-@@ -191,7 +191,7 @@ upnpreplyparse.o: upnpreplyparse.h minix
- minixml.o: minixml.h
- upnpredirect.o: macros.h config.h upnpredirect.h upnpglobalvars.h
- upnpredirect.o: upnppermissions.h miniupnpdtypes.h upnpevents.h
--upnpredirect.o: netfilter/iptcrdr.h commonrdr.h
-+upnpredirect.o: netfilter/iptcrdr.h commonrdr.h  portinuse.h
- getifaddr.o: config.h getifaddr.h
- daemonize.o: daemonize.h config.h
- upnpglobalvars.o: config.h upnpglobalvars.h upnppermissions.h
-@@ -203,7 +203,7 @@ minissdp.o: config.h upnpdescstrings.h m
- minissdp.o: upnpglobalvars.h upnppermissions.h miniupnpdtypes.h minissdp.h
- minissdp.o: upnputils.h codelength.h
- natpmp.o: macros.h config.h natpmp.h upnpglobalvars.h upnppermissions.h
--natpmp.o: miniupnpdtypes.h getifaddr.h upnpredirect.h commonrdr.h
-+natpmp.o: miniupnpdtypes.h getifaddr.h upnpredirect.h commonrdr.h portinuse.h
- upnpevents.o: config.h upnpevents.h miniupnpdpath.h upnpglobalvars.h
- upnpevents.o: upnppermissions.h miniupnpdtypes.h upnpdescgen.h upnputils.h
- upnputils.o: config.h upnputils.h
-diff -rupN miniupnpd-1.7-orig/natpmp.c miniupnpd-1.7/natpmp.c
---- miniupnpd-1.7-orig/natpmp.c	2012-05-27 19:12:51.000000000 -0400
-+++ miniupnpd-1.7/natpmp.c	2012-07-07 08:32:14.087915642 -0400
-@@ -23,9 +23,11 @@
- #include "upnpredirect.h"
- #include "commonrdr.h"
- #include "upnputils.h"
-+#include "portinuse.h"
- 
- #ifdef ENABLE_NATPMP
- 
-+
- int OpenAndConfNATPMPSocket(in_addr_t addr)
- {
- 	int snatpmp;
-@@ -267,6 +269,12 @@ void ProcessIncomingNATPMPPacket(int s)
- 						continue;
- 					}
- 				}
-+				if (port_in_use(ext_if_name, eport, proto, senderaddrstr, iport)) {
-+					syslog(LOG_INFO, "port %hu protocol %s already in use", eport, (proto==IPPROTO_TCP)?"tcp":"udp");
-+					eport++;
-+					r = 0;
-+					continue;
-+				}
- 				{ /* do the redirection */
- 					char desc[64];
- #if 0
-diff -rupN miniupnpd-1.7-orig/netfilter/iptcrdr.c miniupnpd-1.7/netfilter/iptcrdr.c
---- miniupnpd-1.7-orig/netfilter/iptcrdr.c	2012-05-01 05:11:16.000000000 -0400
-+++ miniupnpd-1.7/netfilter/iptcrdr.c	2012-07-06 22:07:34.537558699 -0400
-@@ -238,6 +238,18 @@ get_redirect_rule(const char * ifname, u
-                   unsigned int * timestamp,
-                   u_int64_t * packets, u_int64_t * bytes)
- {
-+	return get_nat_redirect_rule(miniupnpd_nat_chain, ifname, eport, proto, iaddr, iaddrlen, iport,
-+				 desc, desclen, rhost, rhostlen,timestamp, packets, bytes);
-+}
-+
-+int
-+get_nat_redirect_rule(const char * nat_chain_name, const char * ifname, unsigned short eport, int proto,
-+                  char * iaddr, int iaddrlen, unsigned short * iport,
-+                  char * desc, int desclen,
-+                  char * rhost, int rhostlen,
-+                  unsigned int * timestamp,
-+                  u_int64_t * packets, u_int64_t * bytes)
-+{
- 	int r = -1;
- 	IPTC_HANDLE h;
- 	const struct ipt_entry * e;
-@@ -254,18 +266,18 @@ get_redirect_rule(const char * ifname, u
- 		       iptc_strerror(errno));
- 		return -1;
- 	}
--	if(!iptc_is_chain(miniupnpd_nat_chain, h))
-+	if(!iptc_is_chain(nat_chain_name, h))
- 	{
--		syslog(LOG_ERR, "chain %s not found", miniupnpd_nat_chain);
-+		syslog(LOG_ERR, "chain %s not found", nat_chain_name);
- 	}
- 	else
- 	{
- #ifdef IPTABLES_143
--		for(e = iptc_first_rule(miniupnpd_nat_chain, h);
-+		for(e = iptc_first_rule(nat_chain_name, h);
- 		    e;
- 			e = iptc_next_rule(e, h))
- #else
--		for(e = iptc_first_rule(miniupnpd_nat_chain, &h);
-+		for(e = iptc_first_rule(nat_chain_name, &h);
- 		    e;
- 			e = iptc_next_rule(e, &h))
- #endif
-diff -rupN miniupnpd-1.7-orig/netfilter/iptcrdr.h miniupnpd-1.7/netfilter/iptcrdr.h
---- miniupnpd-1.7-orig/netfilter/iptcrdr.h	2012-03-05 15:37:14.000000000 -0500
-+++ miniupnpd-1.7/netfilter/iptcrdr.h	2012-07-06 22:03:25.000000000 -0400
-@@ -25,6 +25,14 @@ add_filter_rule2(const char * ifname,
- int
- delete_redirect_and_filter_rules(unsigned short eport, int proto);
- 
-+int
-+get_nat_redirect_rule(const char * nat_chain_name, const char * ifname, unsigned short eport, int proto,
-+                  char * iaddr, int iaddrlen, unsigned short * iport,
-+                  char * desc, int desclen,
-+                  char * rhost, int rhostlen,
-+                  unsigned int * timestamp,
-+                  u_int64_t * packets, u_int64_t * bytes);
-+
- /* for debug */
- int
- list_redirect_rule(const char * ifname);
-diff -rupN miniupnpd-1.7-orig/portinuse.c miniupnpd-1.7/portinuse.c
---- miniupnpd-1.7-orig/portinuse.c	1969-12-31 19:00:00.000000000 -0500
-+++ miniupnpd-1.7/portinuse.c	2012-07-07 08:46:20.000000000 -0400
-@@ -0,0 +1,95 @@
-+/* */
-+/* MiniUPnP project
-+ * (c) 2007-2012 Thomas Bernard
-+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
-+ * This software is subject to the conditions detailed
-+ * in the LICENCE file provided within the distribution */
-+#include <stdio.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <syslog.h>
-+#include <errno.h>
-+#include <time.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+
-+#include "macros.h"
-+#include "config.h"
-+#include "upnpglobalvars.h"
-+#include "getifaddr.h"
-+#include "portinuse.h"
-+
-+/* Hardcoded for now.  Ideally would come from .conf file */
-+char *chains_to_check[] = { "PREROUTING" , 0 };
-+
-+int port_in_use(const char *if_name, unsigned eport, int proto, const char *iaddr, unsigned iport)
-+{
-+	char line[256];
-+	FILE *f;
-+	int found = 0;
-+	char ip_addr_str[INET_ADDRSTRLEN];
-+	struct in_addr ip_addr = { .s_addr = 0 };
-+	const char tcpfile[] = "/proc/net/tcp";
-+	const char udpfile[] = "/proc/net/udp";
-+
-+	f = fopen((proto==IPPROTO_TCP)?tcpfile:udpfile, "r");
-+	if (!f) return 0;
-+	
-+	if(getifaddr(if_name, ip_addr_str, INET_ADDRSTRLEN) == 0)
-+		ip_addr.s_addr = inet_addr(ip_addr_str);
-+
-+	syslog(LOG_DEBUG, "Check protocol %s for port %d on ext_if %s %s, %8X",
-+		(proto==IPPROTO_TCP)?"tcp":"udp", eport, if_name, ip_addr_str, (unsigned)ip_addr.s_addr);
-+
-+	while (fgets(line, 255, f)) {
-+		char eaddr[68];
-+		unsigned tmp_port;
-+		if (sscanf(line, "%*d: %64[0-9A-Fa-f]:%x %*x:%*x %*x %*x:%*x "
-+				"%*x:%*x %*x %*d %*d %*llu",
-+				eaddr, &tmp_port) == 2
-+		) {
-+			/* TODO add IPV6 support if enabled
-+			 * Presently assumes IPV4 */
-+			// syslog(LOG_DEBUG, "port_in_use check port %d and address %s", tmp_port, eaddr);
-+			if (tmp_port == eport) {
-+				char tmp_addr[4];
-+				struct in_addr *tmp_ip_addr = (struct in_addr *)tmp_addr;
-+				if (sscanf(eaddr,"%2hhx%2hhx%2hhx%2hhx",
-+					&tmp_addr[3],&tmp_addr[2],&tmp_addr[1],&tmp_addr[0]) == 4)
-+				{
-+					if (tmp_ip_addr->s_addr == 0 || tmp_ip_addr->s_addr == ip_addr.s_addr)
-+					{
-+						found++;
-+						break;  /* don't care how many, just that we found at least one */
-+					}
-+				}
-+			}
-+		}
-+	}
-+	fclose(f);
-+
-+	if (!found) {
-+		char iaddr_old[16];
-+		unsigned short iport_old;
-+		int i = 0;
-+		while (chains_to_check[i]) {
-+			if (get_nat_redirect_rule(chains_to_check[i], if_name, eport, proto,
-+					iaddr_old, sizeof(iaddr_old),&iport_old,
-+					0, 0, 0, 0, 0, 0, 0) == 0)
-+			{
-+				syslog(LOG_DEBUG, "port_in_use check port %d on nat chain %s redirected to %s port %d", eport,
-+						chains_to_check[i], iaddr_old, iport_old);
-+				if (!(strcmp(iaddr, iaddr_old)==0 && iport==iport_old)) {
-+					/* only "in use" if redirected to somewhere else */
-+					found++;
-+					break;  /* don't care how many, just that we found at least one */
-+				}
-+			}
-+			i++;
-+		}
-+	}
-+	return found;
-+}
-+
-diff -rupN miniupnpd-1.7-orig/portinuse.h miniupnpd-1.7/portinuse.h
---- miniupnpd-1.7-orig/portinuse.h	1969-12-31 19:00:00.000000000 -0500
-+++ miniupnpd-1.7/portinuse.h	2012-07-07 08:31:27.479918032 -0400
-@@ -0,0 +1,19 @@
-+/*  */
-+/* MiniUPnP project
-+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
-+ * (c) 2006-2011 Thomas Bernard
-+ * This software is subject to the conditions detailed
-+ * in the LICENCE file provided within the distribution */
-+
-+#ifndef __PORTINUSE_H__
-+#define __PORTINUSE_H__
-+
-+/* portinuse()
-+ * determine wither a port is already in use
-+ * on a given interface.
-+ * returns: 0 not in use, 1 in use */
-+int
-+port_in_use(const char *if_name, unsigned port, int proto, const char *iaddr, unsigned iport);
-+
-+#endif
-+
-diff -rupN miniupnpd-1.7-orig/upnpredirect.c miniupnpd-1.7/upnpredirect.c
---- miniupnpd-1.7-orig/upnpredirect.c	2012-05-01 16:11:50.000000000 -0400
-+++ miniupnpd-1.7/upnpredirect.c	2012-07-07 08:47:44.000000000 -0400
-@@ -23,6 +23,7 @@
- #include "upnpredirect.h"
- #include "upnpglobalvars.h"
- #include "upnpevents.h"
-+#include "portinuse.h"
- #if defined(USE_NETFILTER)
- #include "netfilter/iptcrdr.h"
- #endif
-@@ -294,7 +295,12 @@ upnp_redirect(const char * rhost, unsign
- 				eport, protocol, iaddr_old, iport_old);
- 			return -2;
- 		}
--	} else {
-+	}
-+	else if (port_in_use(ext_if_name, eport, proto, iaddr, iport)) {
-+		syslog(LOG_INFO, "port %hu protocol %s already in use", eport, protocol);
-+		return -2;
-+	} 
-+	else {
- 		timestamp = (leaseduration > 0) ? time(NULL) + leaseduration : 0;
- 		syslog(LOG_INFO, "redirecting port %hu to %s:%hu protocol %s for: %s",
- 			eport, iaddr, iport, protocol, desc);

Modified: branches/1.0/package/miniupnpd/miniupnpd.init
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.init	2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/miniupnpd.init	2015-02-27 17:48:43 UTC (rev 6990)
@@ -169,7 +169,6 @@
 notify_interval=60
 clean_ruleset_interval=600
 uuid=$UUID
-friendly_name=AstLinux Router
 serial=000001
 model_number=$(cat /etc/astlinux-release)" >> $MINIUPNPD_CONF
   if [ -n "$UPNP_ALLOW" ]; then

Modified: branches/1.0/package/miniupnpd/miniupnpd.mk
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.mk	2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/miniupnpd.mk	2015-02-27 17:48:43 UTC (rev 6990)
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-MINIUPNPD_VERSION = 1.7
+MINIUPNPD_VERSION = 1.9.20141209
 MINIUPNPD_SOURCE = miniupnpd-$(MINIUPNPD_VERSION).tar.gz
 MINIUPNPD_SITE = http://miniupnp.free.fr/files
-MINIUPNPD_DEPENDENCIES = linux iptables
+MINIUPNPD_DEPENDENCIES = host-pkg-config linux iptables libnfnetlink
 
 define MINIUPNPD_IPTABLES_PATH_FIX
 	$(SED) 's:/sbin/iptables:/usr/sbin/iptables:g' \
@@ -17,18 +17,13 @@
 MINIUPNPD_POST_PATCH_HOOKS += MINIUPNPD_IPTABLES_PATH_FIX
 
 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
 
 define MINIUPNPD_BUILD_CMDS
-	$(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \
-		CFLAGS="$(TARGET_CFLAGS) -I$(BUILD_DIR)/iptables-$(IPTABLES_VERSION)/include/ -DIPTABLES_143" \
-		LIBS="$(STAGING_DIR)/usr/lib/libiptc.so $(STAGING_DIR)/usr/lib/libip4tc.so $(STAGING_DIR)/usr/lib/libip6tc.so" \
-		-f Makefile.linux -C $(@D) miniupnpd
+	$(TARGET_CONFIGURE_OPTS) \
+	CONFIG_OPTIONS="--leasefile --portinuse" \
+	$(MAKE) -f Makefile.linux -C $(@D) miniupnpd
 endef
 
 define MINIUPNPD_INSTALL_TARGET_CMDS

Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config	2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/runnix-uclibc.config	2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6943-dirty Configuration
-# Sun Jan 25 21:06:44 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:53 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -724,6 +724,7 @@
 # libmnl requires a toolchain with LARGEFILE support
 #
 # BR2_PACKAGE_LIBNET is not set
+# BR2_PACKAGE_LIBNFNETLINK is not set
 # BR2_PACKAGE_LIBNL is not set
 # BR2_PACKAGE_LIBPCAP is not set
 # BR2_PACKAGE_PJSIP is not set
@@ -889,6 +890,7 @@
 # BR2_PACKAGE_LRZSZ is not set
 # BR2_PACKAGE_MDNSRESPONDER is not set
 # BR2_PACKAGE_MII_DIAG is not set
+# BR2_PACKAGE_MINIUPNPD is not set
 # BR2_PACKAGE_MROUTED is not set
 # BR2_PACKAGE_MSMTP is not set
 # BR2_PACKAGE_MTR is not set

Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config	2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/runnix.config	2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6897-dirty Configuration
-# Sat Jan  3 11:05:47 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:49 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -515,6 +515,7 @@
 # BR2_PACKAGE_NEON is not set
 # BR2_PACKAGE_LIBMNL is not set
 # BR2_PACKAGE_LIBNET is not set
+# BR2_PACKAGE_LIBNFNETLINK is not set
 # BR2_PACKAGE_LIBNL is not set
 # BR2_PACKAGE_LIBPCAP is not set
 # BR2_PACKAGE_PJSIP is not set
@@ -625,6 +626,7 @@
 # BR2_PACKAGE_LRZSZ is not set
 # BR2_PACKAGE_MDNSRESPONDER is not set
 # BR2_PACKAGE_MII_DIAG is not set
+# BR2_PACKAGE_MINIUPNPD is not set
 # BR2_PACKAGE_MROUTED is not set
 # BR2_PACKAGE_MSMTP is not set
 # BR2_PACKAGE_MTR is not set

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