From f92a56013f11348248f36e754caa5458f4e41f18 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 29 Dec 2008 12:14:51 +0100
Subject: [PATCH] Updated libupnp to 1.6.6 and remove linux-igd

---
 config/rootfiles/common/libupnp   | 11 +++--
 config/rootfiles/common/linux-igd |  8 ----
 lfs/libupnp                       |  8 ++--
 lfs/linux-igd                     | 77 -------------------------------
 4 files changed, 10 insertions(+), 94 deletions(-)
 delete mode 100644 config/rootfiles/common/linux-igd
 delete mode 100644 lfs/linux-igd

diff --git a/config/rootfiles/common/libupnp b/config/rootfiles/common/libupnp
index 651334bf12..619567fa76 100644
--- a/config/rootfiles/common/libupnp
+++ b/config/rootfiles/common/libupnp
@@ -13,15 +13,16 @@
 #usr/lib/libixml.la
 usr/lib/libixml.so
 usr/lib/libixml.so.2
-usr/lib/libixml.so.2.0.0
 #usr/lib/libthreadutil.a
 #usr/lib/libthreadutil.la
 usr/lib/libthreadutil.so
 usr/lib/libthreadutil.so.2
-usr/lib/libthreadutil.so.2.0.0
 #usr/lib/libupnp.a
 #usr/lib/libupnp.la
-usr/lib/libupnp.so
-usr/lib/libupnp.so.2
-usr/lib/libupnp.so.2.0.1
 #usr/lib/pkgconfig/libupnp.pc
+#usr/include/upnp/upnpdebug.h
+usr/lib/libixml.so.2.0.4
+usr/lib/libthreadutil.so.2.2.3
+usr/lib/libupnp.so
+usr/lib/libupnp.so.3
+usr/lib/libupnp.so.3.0.5
diff --git a/config/rootfiles/common/linux-igd b/config/rootfiles/common/linux-igd
deleted file mode 100644
index 96cc23a6c8..0000000000
--- a/config/rootfiles/common/linux-igd
+++ /dev/null
@@ -1,8 +0,0 @@
-#etc/linuxigd
-#etc/linuxigd/dummy.xml
-etc/linuxigd/gateconnSCPD.xml
-etc/linuxigd/gatedesc.xml
-etc/linuxigd/gateicfgSCPD.xml
-etc/upnpd.conf
-usr/sbin/upnpd
-#usr/share/man/man8/upnpd.8
diff --git a/lfs/libupnp b/lfs/libupnp
index d130492488..7d6d6d3acb 100644
--- a/lfs/libupnp
+++ b/lfs/libupnp
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.3.1
+VER        = 1.6.6
 
 THISAPP    = libupnp-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6646be5e31e58188e8f47c6ce64faa4c
+$(DL_FILE)_MD5 = 8918dcf7428cd119d0c8275765ff2833
 
 install : $(TARGET)
 
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
diff --git a/lfs/linux-igd b/lfs/linux-igd
deleted file mode 100644
index 5603a8afb4..0000000000
--- a/lfs/linux-igd
+++ /dev/null
@@ -1,77 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 0.95
-
-THISAPP    = linuxigd-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 0f203a2db5e3fb01496b73e417dbd9a6
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make $(MAKETUNING) #HAVE_LIBIPTC=1
-	cd $(DIR_APP) && make install
-	cp -vf $(DIR_SRC)/config/upnp/* /etc/linuxigd/
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
-- 
2.39.2