From: maniacikarus Date: Wed, 27 Feb 2008 17:36:46 +0000 (+0000) Subject: updated squid X-Git-Tag: v2.3-beta1~169 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=323208ea0165aceb323b8837475105f654f04049 updated squid added igmpproxy updated hdparm added recent changes to core9 git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1239 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 4a24e7585f..9de45f9440 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -419,7 +419,7 @@ sub updatelqgraph { "AREA:r2".$color{"color14"}."A0:70-150 ms", "AREA:r1".$color{"color17"}."A0:30-70 ms", "AREA:r0".$color{"color12"}."A0:<30 ms\\j", - "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), + "COMMENT:".sprintf("%-15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), "COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j", diff --git a/config/rootfiles/core/9/files b/config/rootfiles/core/9/files index e69de29bb2..e1872ac99b 100644 --- a/config/rootfiles/core/9/files +++ b/config/rootfiles/core/9/files @@ -0,0 +1,9 @@ +sbin/hdparm +usr/lib/collectd +usr/sbin/collectd +usr/sbin/collectdmon +etc/init.d/networking/red +etc/squid +usr/lib/squid +usr/sbin/squid +var/ipfire/graphs.pl diff --git a/config/rootfiles/packages/igmpproxy b/config/rootfiles/packages/igmpproxy new file mode 100644 index 0000000000..5ab13a8318 --- /dev/null +++ b/config/rootfiles/packages/igmpproxy @@ -0,0 +1,4 @@ +etc/igmpproxy.conf +usr/local/bin/igmpproxy +#usr/share/man/man5/igmpproxy.conf.5 +#usr/share/man/man8/igmpproxy.8 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 52feb95748..f8ba6e427f 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -101,7 +101,8 @@ * guardian-ipfire * gzip-1.3.5 * hddtemp-0.3-beta14 -* hdparm-8.4 +* hdparm-8.5 +* hdparm-8.6 * hplip-2.7.10 * htop-0.7 * httpd-2.2.6 @@ -109,8 +110,8 @@ * iana-etc-2.10 * icecast-2.3.1 * icegenerator-0.5.5-pre2 +* igmpproxy-src-0.1-beta2 * inetutils-1.4.2 -* ip1000a-2.10c * ipac-ng-1.31 * ipaddr-1.2 * ipfireseeder-1.00 @@ -236,7 +237,7 @@ * sox-12.18.1 * spandsp-0.0.3pre24 * squashfs3.2-r2 -* squid-2.6.STABLE16 +* squid-2.6.STABLE18 * squid-graph-3.2 * squidGuard-1.3 * subversion-1.4.4 diff --git a/lfs/hdparm b/lfs/hdparm index 9b4902900c..f8fd28e9b7 100644 --- a/lfs/hdparm +++ b/lfs/hdparm @@ -24,7 +24,7 @@ include Config -VER = 8.4 +VER = 8.6 THISAPP = hdparm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f29945ce67796253157dc3a8041131fb +$(DL_FILE)_MD5 = 237fbceeeba6318b987983fd858994df install : $(TARGET) diff --git a/lfs/igmpproxy b/lfs/igmpproxy new file mode 100644 index 0000000000..4633282ed6 --- /dev/null +++ b/lfs/igmpproxy @@ -0,0 +1,83 @@ +############################################################################### +# # +# 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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.1-beta2 + +THISAPP = igmpproxy-src-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = igmpproxy +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 2a5a59480f44d4b14077a6b5319e9940 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# 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_SRC)/$(PROG)/src && make $(MAKETUNING) + cd $(DIR_SRC)/$(PROG)/src && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/squid b/lfs/squid index cb6319aedf..e195a7da76 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 2.6.STABLE16 +VER = 2.6.STABLE18 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 849bee6f269e6c773f215fd4b41de0e3 +$(DL_FILE)_MD5 = eb49bc06ea1a40421b6f1ac9e76d1757 install : $(TARGET) diff --git a/make.sh b/make.sh index d65dad0c71..873f472b05 100755 --- a/make.sh +++ b/make.sh @@ -536,6 +536,7 @@ buildipfire() { ipfiremake tcptrack ipfiremake teamspeak ipfiremake elinks + ipfiremake igmpproxy }