From: Tim Yardley <lst@openwrt.org>
Date: Mon, 17 Sep 2007 22:46:42 +0000 (+0000)
Subject: miniupnpd updated to RC8
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=69ca28b65e4a24d8ba70c8ce9ef818764a2d2a4d

miniupnpd updated to RC8

SVN-Revision: 8829
---

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index b621883ad5..50f5f03084 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -9,9 +9,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.0-RC6
-PKG_RELEASE:=2
-PKG_MD5SUM:=6cb5f0710050b5be0d976383985b012b
+PKG_VERSION:=1.0-RC8
+PKG_RELEASE:=1
+PKG_MD5SUM:=54536b268f630449e9ecb0e2552a1d52
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/net/miniupnpd/patches/001-makefile-tweaks.patch b/net/miniupnpd/patches/001-makefile-tweaks.patch
index eaed59e112..8a2be093bf 100644
--- a/net/miniupnpd/patches/001-makefile-tweaks.patch
+++ b/net/miniupnpd/patches/001-makefile-tweaks.patch
@@ -1,7 +1,7 @@
-Index: miniupnpd-1.0-RC6/Makefile.openwrt
+Index: miniupnpd-1.0-RC8/Makefile.openwrt
 ===================================================================
---- miniupnpd-1.0-RC6.orig/Makefile.openwrt	2007-06-30 18:30:56.000000000 +0200
-+++ miniupnpd-1.0-RC6/Makefile.openwrt	2007-06-30 18:30:57.000000000 +0200
+--- miniupnpd-1.0-RC8.orig/Makefile.openwrt	2007-09-17 17:43:54.000000000 -0500
++++ miniupnpd-1.0-RC8/Makefile.openwrt	2007-09-17 17:43:54.000000000 -0500
 @@ -2,7 +2,7 @@
  # http://miniupnp.free.fr/
  # Author : Thomas Bernard
diff --git a/net/miniupnpd/patches/100-iptables-wan-device-name.patch b/net/miniupnpd/patches/100-iptables-wan-device-name.patch
index f502f7fd5d..000cc23a27 100644
--- a/net/miniupnpd/patches/100-iptables-wan-device-name.patch
+++ b/net/miniupnpd/patches/100-iptables-wan-device-name.patch
@@ -1,7 +1,7 @@
-Index: miniupnpd-1.0-RC6/linux/iptables_init.sh
+Index: miniupnpd-1.0-RC8/linux/iptables_init.sh
 ===================================================================
---- miniupnpd-1.0-RC6.orig/linux/iptables_init.sh	2007-06-30 18:30:56.000000000 +0200
-+++ miniupnpd-1.0-RC6/linux/iptables_init.sh	2007-06-30 18:30:57.000000000 +0200
+--- miniupnpd-1.0-RC8.orig/linux/iptables_init.sh	2007-09-17 17:43:54.000000000 -0500
++++ miniupnpd-1.0-RC8/linux/iptables_init.sh	2007-09-17 17:43:54.000000000 -0500
 @@ -1,9 +1,12 @@
  #! /bin/sh
  # $Id: iptables_init.sh,v 1.3 2006/11/23 12:32:57 nanard Exp $
@@ -16,10 +16,10 @@ Index: miniupnpd-1.0-RC6/linux/iptables_init.sh
  EXTIP="`LC_ALL=C /sbin/ifconfig $EXTIF | grep 'inet addr' | awk '{print $2}' | sed -e 's/.*://'`"
  echo "External IP = $EXTIP"
  
-Index: miniupnpd-1.0-RC6/linux/iptables_removeall.sh
+Index: miniupnpd-1.0-RC8/linux/iptables_removeall.sh
 ===================================================================
---- miniupnpd-1.0-RC6.orig/linux/iptables_removeall.sh	2007-06-30 18:30:56.000000000 +0200
-+++ miniupnpd-1.0-RC6/linux/iptables_removeall.sh	2007-06-30 18:30:57.000000000 +0200
+--- miniupnpd-1.0-RC8.orig/linux/iptables_removeall.sh	2007-09-17 17:43:54.000000000 -0500
++++ miniupnpd-1.0-RC8/linux/iptables_removeall.sh	2007-09-17 17:43:54.000000000 -0500
 @@ -1,9 +1,12 @@
  #! /bin/sh
  # $Id: iptables_removeall.sh,v 1.3 2006/11/23 12:32:57 nanard Exp $
diff --git a/net/miniupnpd/patches/101-netfilter_nat_headers.patch b/net/miniupnpd/patches/101-netfilter_nat_headers.patch
deleted file mode 100644
index 8824e91d93..0000000000
--- a/net/miniupnpd/patches/101-netfilter_nat_headers.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN miniupnpd-1.0-RC6/linux/iptcrdr.c miniupnpd-1.0-RC6.new/linux/iptcrdr.c
---- miniupnpd-1.0-RC6/linux/iptcrdr.c	2007-06-11 15:25:40.000000000 +0200
-+++ miniupnpd-1.0-RC6.new/linux/iptcrdr.c	2007-07-13 14:59:58.000000000 +0200
-@@ -15,7 +15,12 @@
- #include <dlfcn.h>
- #include <libiptc/libiptc.h>
- #include <iptables.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
-+#include <linux/netfilter/nf_nat.h>
-+#else
- #include <linux/netfilter_ipv4/ip_nat.h>
-+#endif
- #include "iptcrdr.h"
- 
- /* chain name to use, both in the nat table