This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via edd540ce4e37f65399d0b68a695eaec7e30301be (commit) via 8cd7fc6b02726609e261c3681031f5b8c094afb8 (commit) from 523e791c6176e6656b2f890b6ded3eab185374fe (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit edd540ce4e37f65399d0b68a695eaec7e30301be Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Dec 6 00:41:25 2010 +0100

stages2 rootfile update. Add gpl to core updater.

commit 8cd7fc6b02726609e261c3681031f5b8c094afb8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Dec 6 00:28:05 2010 +0100

Set 2.9 as pakfire tree.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/stage2 | 19 ++++++++----------- config/rootfiles/core/44/filelists/files | 2 +- src/pakfire/pakfire.conf | 4 ++-- 3 files changed, 11 insertions(+), 14 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index a7655e6..8a32bde 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -4,8 +4,6 @@ bin/grep bin/pwd bin/stty #boot -dev/null -dev/console etc/bashrc etc/certparams etc/e2fsck.conf @@ -54,8 +52,6 @@ mnt root/ipfire #sbin #srv -#sys -tmp #usr/bin/perl #usr/include #usr/lib @@ -69,9 +65,10 @@ usr/local/bin/httpscert usr/local/bin/makegraphs usr/local/bin/qosd usr/local/bin/readhash +usr/local/bin/rebuild-initrd usr/local/bin/run-parts +#usr/local/bin/sanedloop usr/local/bin/scanhd -usr/local/bin/rebuild-initrd usr/local/bin/setddns.pl usr/local/bin/settime usr/local/bin/timecheck @@ -79,12 +76,9 @@ usr/local/bin/vpn-watch #usr/local/include #usr/local/lib #usr/local/sbin -#usr/local/share #usr/local/share/doc #usr/local/share/info #usr/local/share/locale -#usr/local/share/man -#usr/local/share/man/man1 #usr/local/share/man/man2 #usr/local/share/man/man3 #usr/local/share/man/man4 @@ -99,6 +93,8 @@ usr/local/bin/vpn-watch #usr/sbin #usr/share #usr/share/doc +#usr/share/doc/licenses +usr/share/doc/licenses/GPLv3 #usr/share/info #usr/share/locale #usr/share/man @@ -126,6 +122,7 @@ var/log/btmp var/log/calamaris var/log/counter var/log/lastlog +#var/log/net-traffic.log var/log/wtmp var/mail #var/opt @@ -133,6 +130,6 @@ var/run var/run/utmp #var/spool var/tmp -#usr/local/bin/asterisk -#usr/local/bin/sanedloop -#var/log/net-traffic.log +dev/null +dev/console +tmp diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/core/44/filelists/files index 13694ca..6470a5d 100644 --- a/config/rootfiles/core/44/filelists/files +++ b/config/rootfiles/core/44/filelists/files @@ -22,4 +22,4 @@ usr/local/bin/rebuild-initrd usr/local/bin/scanhd usr/local/sbin/setup usr/bin/ldd - +usr/share/doc/licenses/GPLv3 diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index 16fee14..ae174af 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team info@ipfire.org # # # # 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 # @@ -21,7 +21,7 @@

package Conf;

-$version = "2.7"; +$version = "2.9";

$mainserver = "pakfire.ipfire.org";

hooks/post-receive -- IPFire 2.x development tree