From ec2eef2b166df4a4174bc0b9446a228f03b2754a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 19 Jun 2009 19:42:23 +0200 Subject: [PATCH] Started core update 29 Add credits.cgi to core29 Add system-release to credits.cgi --- config/rootfiles/core/29/exclude | 0 config/rootfiles/core/29/filelists/files | 2 ++ config/rootfiles/core/29/meta | 1 + config/rootfiles/core/29/update.sh | 27 ++++++++++++++++++++++++ doc/packages-list.txt | 1 + html/cgi-bin/credits.cgi | 3 ++- make.sh | 2 +- 7 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 config/rootfiles/core/29/exclude create mode 100644 config/rootfiles/core/29/filelists/files create mode 100644 config/rootfiles/core/29/meta create mode 100644 config/rootfiles/core/29/update.sh diff --git a/config/rootfiles/core/29/exclude b/config/rootfiles/core/29/exclude new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/29/filelists/files b/config/rootfiles/core/29/filelists/files new file mode 100644 index 0000000000..32f319c316 --- /dev/null +++ b/config/rootfiles/core/29/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +srv/web/ipfire/cgi-bin/credits.cgi diff --git a/config/rootfiles/core/29/meta b/config/rootfiles/core/29/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/29/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/29/update.sh b/config/rootfiles/core/29/update.sh new file mode 100644 index 0000000000..4cf08abc3f --- /dev/null +++ b/config/rootfiles/core/29/update.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2009 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 +ecxtract_files +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" diff --git a/doc/packages-list.txt b/doc/packages-list.txt index c3a086ae39..3087973da6 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -136,6 +136,7 @@ * iana-etc-2.10 * icecast-2.3.2 * icegenerator-0.5.5-pre2 +* iftop-0.17 * igmpproxy-src-0.1-beta2 * inetutils-1.4.2 * ipaddr-1.2 diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index a6f28810c7..4945e6ef85 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -36,7 +36,8 @@ require "${General::swroot}/header.pl"; &Header::openbigbox('100%', 'center'); &Header::openbox('100%', 'left', 'Version'); -print "This is IPFire ".`cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`; +print "This is ".`cat /etc/system-release`; +print " - Pakfire ".`cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`; print "
".`uname -a`; &Header::closebox(); diff --git a/make.sh b/make.sh index 9da9a16879..04ed56cf3b 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.5" -CORE="28" +CORE="29" GIT_BRANCH=master:master # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir -- 2.39.2