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 e6a46f939ab7bc9fcc289b3b09caebf0a7c6eb4f..0ce2dc6ca0486b065858cee2eb8938f55b9da8e9 100644 (file)
--- 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 8defef9eda190941aa113883a3e93e786ffe8b08..8ac09543e9b22011db165500064a19ed28f81127 100644 (file)
--- 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 8defef9eda190941aa113883a3e93e786ffe8b08..8ac09543e9b22011db165500064a19ed28f81127 100644 (file)
--- 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 54ed899e42f798a9b0f356c7ea1f3583c91dff83..1a1f753628c56e91b4a99d9a8966054a399eea38 100644 (file)
--- 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 06134af83d4e5d4c348de7a0aa2702ad704ca1c8..c010fd494117d79d15db6982c317358097eb6dbe 100644 (file)
--- 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)." =-<br /> ";
+               $song = substr("-= ".$mpd->current()->Artist()." | ".$mpd->current()->Title(),0,85)." =-<br /> ";
                if ( $song eq "-=  |  =-<br /> " ){
                        $song = "None<br />"
                };
@@ -601,7 +601,7 @@ foreach (@webradio){
        }else{
                print "<tr>";
        }
-       chomp $stream[1];chop $stream[2];
+       chomp $stream[1];chomp $stream[2];
        print <<END
 <td align='left'><a href='$stream[2]' target='_blank'>$stream[1]</a></td>
 <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='FILE' value='$stream[0]' /><input type='hidden' name='ACTION' value='playweb' /><input type='image' alt='$Lang::tr{'play'}' title='$Lang::tr{'play'}' src='/images/media-playback-start.png' align='middle' /></form></td>

diff --git a/lfs/hdparm b/lfs/hdparm
index f8fd28e9b7557f28e56d39c2f7f8e34d2f23ad77..33a43d053e7d63feeb0ae9a38261f75ac7cb4778 100644 (file)
--- 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 a7e2e91fca84d3dadc23508f149efe5e45917438..171f04ae64984741927cd1c7b22b6f14f66c0aa9 100644 (file)
--- 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 (file)
index ab3267f..0000000
--- 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 <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# 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 efd7e8f71a2b0d969ad85cf481ae6f30e7fc7068..e7a1c0f25ab06a758d8ece6200bc69e9aabdb09e 100755 (executable)
--- 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