From 444973a44492dfd6f26a3c960b9780ec7489994e Mon Sep 17 00:00:00 2001 From: ms Date: Mon, 6 Aug 2007 09:32:46 +0000 Subject: [PATCH] Wieder einige Fixes. Das System ist nun wieder auf dem letzten Stand vor unserem Unfall mit dem Kernel. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@740 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/mISDN | 3 +- doc/packages-list.txt | 3 -- lfs/ethereal | 8 +++- lfs/nmap | 6 ++- lfs/rsync | 8 +++- lfs/sox | 6 ++- lfs/squashfstools | 78 +++++++++++++++++++++++++++++++++++ make.sh | 3 +- 8 files changed, 106 insertions(+), 9 deletions(-) create mode 100644 lfs/squashfstools diff --git a/config/rootfiles/common/mISDN b/config/rootfiles/common/mISDN index b60d5f7912..0423816550 100644 --- a/config/rootfiles/common/mISDN +++ b/config/rootfiles/common/mISDN @@ -1,5 +1,5 @@ -usr/bin/isdnbridge usr/bin/loadfirm +usr/bin/mISDNdebugtool usr/bin/misdnportinfo usr/bin/sendhwctrl usr/bin/testcon @@ -41,6 +41,7 @@ usr/lib/mISDN/mISDN.conf.bnx.xsl usr/lib/mISDN/mISDN.conf.hfcmulti.xsl usr/lib/mISDN/mISDN.conf.inc.xsl usr/lib/mISDN/mISDN.conf.l1oip.xsl +usr/lib/mISDN/mISDN.conf.mISDN_debugtool.xsl usr/lib/mISDN/mISDN.conf.mISDN_dsp.xsl usr/lib/mISDN/mISDN.conf.singlepci.xsl usr/lib/mISDN/mISDN.conf.xsl diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 626d06516d..411954dffe 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -123,7 +123,6 @@ * ipp2p-0.8.2-iptables * iproute2-2.6.16-060323 * iptables-1.3.5 -* iptables-1.3.8 * iptstate-2.1 * iputils-ss020927 * isdn4k-utils-CVS-2006-07-20 @@ -155,7 +154,6 @@ * libxml2-2.6.26 * libxslt-1.1.17 * linux-2.6.16.50 -* linux-2.6.22.1 * linux-atm-2.4.1 * linux-libc-headers-2.6.12.0 * linuxigd-0.95 @@ -164,7 +162,6 @@ * lsof-4.78 * lzo-2.02 * m4-1.4.4 -* mISDNuser-1_1_3 * mISDNuser-1_1_5 * mailx-12.0 * make-3.80 diff --git a/lfs/ethereal b/lfs/ethereal index ac9ea83a34..fcacb59cb0 100644 --- a/lfs/ethereal +++ b/lfs/ethereal @@ -33,6 +33,12 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +PROG = ethereal +PAK_VER = 1 + +DESCDE = "Ethereal ist ein Netzwerksniffer." +DESCEN = "Ethereal is a network sniffer." +DEPS = "" ############################################################################### # Top-level Rules @@ -53,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) dist: - make-packages.sh ethereal $(THISAPP)-ipfire-beta-1 + @$(PAK) ############################################################################### # Downloading, checking, md5sum diff --git a/lfs/nmap b/lfs/nmap index ddc8232902..55f297213c 100644 --- a/lfs/nmap +++ b/lfs/nmap @@ -34,7 +34,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nmap -PAK_VER = ipfire-beta1 +PAK_VER = 1 + +DESCDE = "nmap ist ein vielseitiger Portscanner." +DESCEN = "nmap is a versatile portscanner." +DEPS = "" ############################################################################### # Top-level Rules diff --git a/lfs/rsync b/lfs/rsync index 0d4af74b9e..f87f367fad 100644 --- a/lfs/rsync +++ b/lfs/rsync @@ -33,6 +33,12 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +PROG = rsync +PAK_VER = 1 + +DESCDE = "rsync ist ein Mirroring-Tool." +DESCEN = "rsync is a tool for mirroring." +DEPS = "" ############################################################################### # Top-level Rules @@ -53,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) dist: - make-packages.sh rsync $(THISAPP)-ipfire-beta-1 + @$(PAK) ############################################################################### # Downloading, checking, md5sum diff --git a/lfs/sox b/lfs/sox index 180bd5dac3..243c55c005 100644 --- a/lfs/sox +++ b/lfs/sox @@ -34,7 +34,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sox -PAK_VER = ipfire-beta1 +PAK_VER = 1 + +DESCDE = "Sox spielt gsm-Dateien ab." +DESCEN = "Sox is a player for gsm-files." +DEPS = "" ############################################################################### # Top-level Rules diff --git a/lfs/squashfstools b/lfs/squashfstools new file mode 100644 index 0000000000..74b9d21ac9 --- /dev/null +++ b/lfs/squashfstools @@ -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 = 3.2-r2 + +THISAPP = squashfs$(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 = bf360b92eba9e6d5610196ce2e02fcd1 + +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)/squashfs-tools && make mksquashfs + cd $(DIR_APP)/squashfs-tools && cp -f mksquashfs /bin + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 31e5fc013b..7e51cef755 100755 --- a/make.sh +++ b/make.sh @@ -388,6 +388,7 @@ buildipfire() { ipfiremake cdrtools ipfiremake dnsmasq ipfiremake dosfstools + ipfiremake squashfstools ipfiremake reiserfsprogs ipfiremake sysfsutils ipfiremake ntfs-3g @@ -412,8 +413,8 @@ buildipfire() { ipfiremake iptstate ipfiremake iputils ipfiremake l7-protocols - ipfiremake isdn4k-utils ipfiremake mISDN + ipfiremake isdn4k-utils ipfiremake hwdata ipfiremake kudzu ipfiremake logrotate -- 2.39.2