From: Maniacikarus Date: Sat, 16 Aug 2008 09:02:00 +0000 (+0200) Subject: Added qos.sh to backup include X-Git-Tag: v2.3-beta3~34 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=3fcb086ea07827aea9a950193fd1f3a143ee2375 Added qos.sh to backup include Finalized core16 Correted mpfire CGI Updated hdparm Deleted mpg123 --- diff --git a/config/backup/include b/config/backup/include index e6a46f939a..0ce2dc6ca0 100644 --- a/config/backup/include +++ b/config/backup/include @@ -20,6 +20,7 @@ /var/ipfire/ppp /var/ipfire/proxy /var/ipfire/qos/* +/var/ipfire/qos/bin/qos.sh /var/ipfire/time/ /var/ipfire/urlfilter /var/ipfire/vpn @@ -27,4 +28,5 @@ /var/log/rrd/* /etc/sysconfig/firewall.local /etc/sysconfig/rc.local - +/root/.gitconfig +/root/.bash_history diff --git a/config/rootfiles/core/16/files b/config/rootfiles/core/16/files index 8defef9eda..8ac09543e9 100644 --- a/config/rootfiles/core/16/files +++ b/config/rootfiles/core/16/files @@ -17,3 +17,5 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat var/ipfire/langs var/ipfire/header.pl usr/share/terminfo/x/xterm-color +sbin/hdparm +var/ipfire/backup/include diff --git a/config/rootfiles/updater/filelists/core16 b/config/rootfiles/updater/filelists/core16 index 8defef9eda..8ac09543e9 100644 --- a/config/rootfiles/updater/filelists/core16 +++ b/config/rootfiles/updater/filelists/core16 @@ -17,3 +17,5 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat var/ipfire/langs var/ipfire/header.pl usr/share/terminfo/x/xterm-color +sbin/hdparm +var/ipfire/backup/include diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 54ed899e42..1a1f753628 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -119,7 +119,7 @@ * gutenprint-5.0.2 * gzip-1.3.5 * hddtemp-0.3-beta14 -* hdparm-8.6 +* hdparm-8.9 * hostapd-0.5.10 * hplip-2.7.10 * htop-0.7 @@ -197,7 +197,6 @@ * mpd-0.13.1 * mpeg2dec-0.4.0b * mpfire-ipfire -* mpg123-0.59r * mtd-CVS-20070507 * mtools-3.9.10 * mysql-5.0.24a diff --git a/html/cgi-bin/mpfire.cgi b/html/cgi-bin/mpfire.cgi index 06134af83d..c010fd4941 100644 --- a/html/cgi-bin/mpfire.cgi +++ b/html/cgi-bin/mpfire.cgi @@ -80,7 +80,7 @@ if ( $ENV{'QUERY_STRING'} =~ /title/){ my $song = ""; if ( $mpd->current() ) { - $song = substr("-= ".$mpd->current()->Artist()." | ".$mpd->current()->Title(),0,90)." =-
"; + $song = substr("-= ".$mpd->current()->Artist()." | ".$mpd->current()->Title(),0,85)." =-
"; if ( $song eq "-= | =-
" ){ $song = "None
" }; @@ -601,7 +601,7 @@ foreach (@webradio){ }else{ print ""; } - chomp $stream[1];chop $stream[2]; + chomp $stream[1];chomp $stream[2]; print <$stream[1]
diff --git a/lfs/hdparm b/lfs/hdparm index f8fd28e9b7..33a43d053e 100644 --- a/lfs/hdparm +++ b/lfs/hdparm @@ -24,7 +24,7 @@ include Config -VER = 8.6 +VER = 8.9 THISAPP = hdparm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 237fbceeeba6318b987983fd858994df +$(DL_FILE)_MD5 = 19fa013956612581af7d00907990ac84 install : $(TARGET) diff --git a/lfs/mpfire b/lfs/mpfire index a7e2e91fca..171f04ae64 100644 --- a/lfs/mpfire +++ b/lfs/mpfire @@ -30,7 +30,7 @@ THISAPP = mpfire-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpfire -PAK_VER = 3 +PAK_VER = 4 DEPS = "mpd mpc alsa libshout libogg libmad libid3tag libvorbis" diff --git a/lfs/mpg123 b/lfs/mpg123 deleted file mode 100644 index ab3267f761..0000000000 --- a/lfs/mpg123 +++ /dev/null @@ -1,85 +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 . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.59r - -THISAPP = mpg123-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = mpg123 -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 95df59ad1651dd2346d49fafc83747e7 - -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_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/mpg123-0.59r-security-1.patch - cd $(DIR_APP) && patch < $(DIR_SRC)/src/patches/mpg123-0.59r-makefile.patch - cd $(DIR_APP) && make PREFIX=/usr linux $(MAKETUNING) - cd $(DIR_APP) && make PREFIX=/usr install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index efd7e8f71a..e7a1c0f25a 100755 --- a/make.sh +++ b/make.sh @@ -505,7 +505,6 @@ buildipfire() { ipfiremake spamassassin ipfiremake amavisd ipfiremake alsa -# ipfiremake mpg123 ipfiremake mpfire ipfiremake guardian ipfiremake libid3tag @@ -547,18 +546,18 @@ buildipfire() { ipfiremake which ipfiremake openswan ipfiremake lsof - # ipfiremake centerim + ipfiremake centerim ipfiremake br2684ctl ipfiremake pcmciautils ipfiremake lm_sensors ipfiremake collectd - # ipfiremake lcd4linux + ipfiremake lcd4linux ipfiremake neon - # ipfiremake subversion + ipfiremake subversion ipfiremake tcptrack ipfiremake teamspeak ipfiremake elinks - # ipfiremake igmpproxy + ipfiremake igmpproxy ipfiremake fbset ipfiremake sdl ipfiremake qemu @@ -566,7 +565,7 @@ buildipfire() { ipfiremake netpbm ipfiremake phpSANE ipfiremake tunctl - # ipfiremake nagios + ipfiremake nagios ipfiremake ebtables ipfiremake arptables ipfiremake fontconfig