From e955a93b7020a197bbf341069212c1575bf1f79a Mon Sep 17 00:00:00 2001
From: Oliver Ertl <oliver@ertl-net.net>
Date: Sat, 30 Jun 2007 16:40:06 +0000
Subject: [PATCH] Update miniupnpd: 1.0-RC5 > 1.0-RC6

SVN-Revision: 7802
---
 net/miniupnpd/Makefile                        |  6 ++---
 .../patches/001-makefile-tweaks.patch         |  6 +++--
 .../100-iptables-wan-device-name.patch        | 22 ++++++++++---------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 05dca4cdf..b621883ad 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -9,11 +9,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=1.0-RC5
+PKG_VERSION:=1.0-RC6
 PKG_RELEASE:=2
-PKG_MD5SUM:=fce12f92178409f0026a635d4bb5d8be
+PKG_MD5SUM:=6cb5f0710050b5be0d976383985b012b
 
-PKG_SOURCE_URL:=http://miniupnp.tuxfamily.org/files
+PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
diff --git a/net/miniupnpd/patches/001-makefile-tweaks.patch b/net/miniupnpd/patches/001-makefile-tweaks.patch
index 7f3781bbd..eaed59e11 100644
--- a/net/miniupnpd/patches/001-makefile-tweaks.patch
+++ b/net/miniupnpd/patches/001-makefile-tweaks.patch
@@ -1,5 +1,7 @@
---- miniupnpd-1.0-RC4/Makefile.openwrt.orig	2007-04-26 14:46:51.000000000 -0500
-+++ miniupnpd-1.0-RC4/Makefile.openwrt	2007-04-26 14:52:55.000000000 -0500
+Index: miniupnpd-1.0-RC6/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
 @@ -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 93e11ca9c..f502f7fd5 100644
--- a/net/miniupnpd/patches/100-iptables-wan-device-name.patch
+++ b/net/miniupnpd/patches/100-iptables-wan-device-name.patch
@@ -1,12 +1,13 @@
-diff -urN miniupnpd.orig/linux/iptables_init.sh miniupnpd/linux/iptables_init.sh
---- miniupnpd.orig/linux/iptables_init.sh	2007-04-13 10:02:22.291113712 -0500
-+++ miniupnpd/linux/iptables_init.sh	2007-04-13 10:04:33.346190312 -0500
+Index: miniupnpd-1.0-RC6/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
 @@ -1,9 +1,12 @@
  #! /bin/sh
  # $Id: iptables_init.sh,v 1.3 2006/11/23 12:32:57 nanard Exp $
 +. /etc/functions.sh
  IPTABLES=iptables
-
+ 
  #change this parameters :
 -EXTIF=eth0
 +include /lib/network
@@ -15,20 +16,21 @@ diff -urN miniupnpd.orig/linux/iptables_init.sh miniupnpd/linux/iptables_init.sh
  EXTIP="`LC_ALL=C /sbin/ifconfig $EXTIF | grep 'inet addr' | awk '{print $2}' | sed -e 's/.*://'`"
  echo "External IP = $EXTIP"
  
-diff -urN miniupnpd.orig/linux/iptables_removeall.sh miniupnpd/linux/iptables_removeall.sh
---- miniupnpd.orig/linux/iptables_removeall.sh	2007-04-13 10:01:53.455497392 -0500
-+++ miniupnpd/linux/iptables_removeall.sh	2007-04-13 10:04:19.444303720 -0500
+Index: miniupnpd-1.0-RC6/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
 @@ -1,9 +1,12 @@
  #! /bin/sh
  # $Id: iptables_removeall.sh,v 1.3 2006/11/23 12:32:57 nanard Exp $
 +. /etc/functions.sh
  IPTABLES=iptables
-
+ 
  #change this parameters :
 -EXTIF=eth0
 +include /lib/network
 +scan_interfaces
 +config_get EXTIF wan ifname
  EXTIP="`LC_ALL=C /sbin/ifconfig $EXTIF | grep 'inet addr' | awk '{print $2}' | sed -e 's/.*://'`"
-
- #removing the MINIUPNPD chain for nat
\ No newline at end of file
+ 
+ #removing the MINIUPNPD chain for nat
-- 
2.30.2