From 490256d5e6da75bbbb08d2c13b949e9df8bdd145 Mon Sep 17 00:00:00 2001 From: ms Date: Sat, 3 Feb 2007 20:26:00 +0000 Subject: [PATCH] UPnP-Tools kompiliert und getestet -> GEIL :D git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@403 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/libupnp | 27 +++++++++ config/rootfiles/common/linux-idg | 8 +++ doc/packages-list.txt | 2 + lfs/libupnp | 79 +++++++++++++++++++++++++++ lfs/linux-igd | 78 ++++++++++++++++++++++++++ make.sh | 2 + src/install+setup/install/probenic.sh | 2 +- 7 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/common/libupnp create mode 100644 config/rootfiles/common/linux-idg create mode 100644 lfs/libupnp create mode 100644 lfs/linux-igd diff --git a/config/rootfiles/common/libupnp b/config/rootfiles/common/libupnp new file mode 100644 index 0000000000..651334bf12 --- /dev/null +++ b/config/rootfiles/common/libupnp @@ -0,0 +1,27 @@ +#usr/include/upnp +#usr/include/upnp/FreeList.h +#usr/include/upnp/LinkedList.h +#usr/include/upnp/ThreadPool.h +#usr/include/upnp/TimerThread.h +#usr/include/upnp/iasnprintf.h +#usr/include/upnp/ithread.h +#usr/include/upnp/ixml.h +#usr/include/upnp/upnp.h +#usr/include/upnp/upnpconfig.h +#usr/include/upnp/upnptools.h +#usr/lib/libixml.a +#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 diff --git a/config/rootfiles/common/linux-idg b/config/rootfiles/common/linux-idg new file mode 100644 index 0000000000..04a78a4d15 --- /dev/null +++ b/config/rootfiles/common/linux-idg @@ -0,0 +1,8 @@ +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/doc/packages-list.txt b/doc/packages-list.txt index ebd20f1af1..5947ec2975 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -132,6 +132,7 @@ * libpri-1.4.0 * libsafe_2.0-16 * libtool-1.5.22 +* libupnp-1.3.1 * libusb-0.1.12 * libvorbis-1.1.2 * libwww-perl-5.803 @@ -139,6 +140,7 @@ * linux-2.6.16.29-ipfire * linux-atm-2.4.1 * linux-libc-headers-2.6.12.0 +* linuxigd-0.95 * logrotate-3.7.1 * logwatch_7.3.1 * lynx2.8.5 diff --git a/lfs/libupnp b/lfs/libupnp new file mode 100644 index 0000000000..baf9e3a4fb --- /dev/null +++ b/lfs/libupnp @@ -0,0 +1,79 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop 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 IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.3.1 + +THISAPP = libupnp-$(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 = 6646be5e31e58188e8f47c6ce64faa4c + +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) && ./configure --prefix=/usr --disable-nls + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/linux-igd b/lfs/linux-igd new file mode 100644 index 0000000000..704fa1b4ee --- /dev/null +++ b/lfs/linux-igd @@ -0,0 +1,78 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop 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 IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +############################################################################### +# 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 + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index d8e06dd44e..e383b05313 100644 --- a/make.sh +++ b/make.sh @@ -390,7 +390,9 @@ buildipfire() { ipfiremake ibod ipfiremake initscripts ipfiremake iptables + ipfiremake libupnp ipfiremake ipp2p IPT=1 + ipfiremake linux-igd ipfiremake ipac-ng ipfiremake ipaddr ipfiremake iptstate diff --git a/src/install+setup/install/probenic.sh b/src/install+setup/install/probenic.sh index 93ce48967e..42b1ea4265 100644 --- a/src/install+setup/install/probenic.sh +++ b/src/install+setup/install/probenic.sh @@ -15,4 +15,4 @@ else echo "$MODULES" > /nicdriver fi -# kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" | awk -F': ' '{print $2}' | sed -e '/..:..:..:..:..:../a\\' -e "s/$/\;/g" +# kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" | awk -F': ' '{print $2}' | sed -e '/..:..:..:..:..:../a\\' -e "s/$/\;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" -- 2.39.2