Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/core/44/filelists/files
index 48c38e2f501fd534238f9ee044bffc72c116dc1b..09580590652d4a5b961966bdf01a640af6ac16bb 100644 (file)
--- a/config/rootfiles/core/44/filelists/files
+++ b/config/rootfiles/core/44/filelists/files
@@ -41,6 +41,7 @@ var/ipfire/langs/es.pl
 var/ipfire/menu.d/10-system.menu
 usr/local/bin/fireinfoctrl
 var/ipfire/qos/bin/makeqosscripts.pl
+usr/local/bin/backupiso
 usr/local/bin/timectrl
 usr/local/bin/rebuild-initrd
 usr/local/bin/scanhd

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index e31f42c581835f516e3480b3863bb61b11bb9bb6..56480dba0101cfe27a8652a6459189f24a2ad44c 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.7.i586-full-core43.iso.torrent
+var/ipfire/seeder/ipfire-2.9.i586-full-core44.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/doc/language_issues.es b/doc/language_issues.es
index a91996dd24f231f9743551f46fd7919bc77d02bc..00f1f8f18db27d2cb8f9c56f41f06afc6fe16857 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -507,6 +507,10 @@ WARNING: untranslated string: fireinfo pakfire version
 WARNING: untranslated string: fireinfo please enable
 WARNING: untranslated string: fireinfo settings
 WARNING: untranslated string: fireinfo system version
+WARNING: untranslated string: fireinfo why descr1
+WARNING: untranslated string: fireinfo why descr2
+WARNING: untranslated string: fireinfo why enable
+WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
 WARNING: untranslated string: new
 WARNING: untranslated string: outgoing firewall add ip group

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 8107ab9b6fc63c2c4503d710065a2524d518795c..e491a0fce32ea0323ab9035e98c70011c89d06d4 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -509,6 +509,10 @@ WARNING: untranslated string: fireinfo pakfire version
 WARNING: untranslated string: fireinfo please enable
 WARNING: untranslated string: fireinfo settings
 WARNING: untranslated string: fireinfo system version
+WARNING: untranslated string: fireinfo why descr1
+WARNING: untranslated string: fireinfo why descr2
+WARNING: untranslated string: fireinfo why enable
+WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
 WARNING: untranslated string: new
 WARNING: untranslated string: ntp common settings

diff --git a/doc/language_missings b/doc/language_missings
index e72d7d66393b82764a02bb7b0bc9020bc4fc4600..d0ba138976c8c868fef1727cf7353c0af645097b 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -24,6 +24,10 @@
 < fireinfo please enable
 < fireinfo settings
 < fireinfo system version
+< fireinfo why descr1
+< fireinfo why descr2
+< fireinfo why enable
+< fireinfo why read more
 < fireinfo your profile id
 < ntp common settings
 < ntp sync
@@ -71,6 +75,10 @@
 < fireinfo please enable
 < fireinfo settings
 < fireinfo system version
+< fireinfo why descr1
+< fireinfo why descr2
+< fireinfo why enable
+< fireinfo why read more
 < fireinfo your profile id
 < outgoing firewall add ip group
 < outgoing firewall add mac group

diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi
index 31f899f8274b6c618780657d3037f9485e89bd0b..1be0ebe3388a9d260666c154bb6485814408fd4c 100644 (file)
--- a/html/cgi-bin/fireinfo.cgi
+++ b/html/cgi-bin/fireinfo.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2011  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        #
@@ -61,13 +61,13 @@ if ("$fireinfosettings{'ACTION'}" eq "trigger") {
 &Header::openpage('Fireinfo', 1, '');
 
 if ($fireinfosettings{'ENABLE_FIREINFO'} ne "on") {
-       &Header::openbox("100%", "left", "Why should I enable fireinfo?");
+       &Header::openbox("100%", "left", "$Lang::tr{'fireinfo why enable'}");
 
        print <<END;
 <font color="$Header::colourred">
        <p>
-               It is very important for the development of IPFire that you enable this
-               service. <a href="http://fireinfo.ipfire.org" target="_blank">Read more about the reasons.</a>
+               $Lang::tr{'fireinfo why descr1'}
+               $Lang::tr{'fireinfo why descr2'}<a href="http://fireinfo.ipfire.org" target="_blank">$Lang::tr{'fireinfo why read more'}</a>
        </p>
 </font>
 END

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index bbf9d303f35ee9127a5080686861d9d6c4170fd8..b4db1feee23336fac3fe5109718c62fc412489de 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -793,6 +793,10 @@
 'fireinfo please enable' => 'Bitte schalten Sie den Fireinfo-Dienst ein.',
 'fireinfo settings' => 'Fireinfo-Einstellungen',
 'fireinfo system version' => 'Systemversionen',
+'fireinfo why descr1' => 'Es ist sehr wichtig für die Entwicklung von IPFire, das dieser Dienst',
+'fireinfo why descr2' => 'eingeschaltet ist. ',
+'fireinfo why enable' => 'Warum sollte man Fireinfo einschalten?',
+'fireinfo why read more' => 'Mehr über die Gründe.',
 'fireinfo your profile id' => 'Profil-ID',
 'firewall' => 'Firewall',
 'firewall graphs' => 'Firewall Diagramme',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index ad16ec2bd359855243718d4c6b43a01654c0ce33..a1d687d05fd25aa3401110f0c9d419de88f61f73 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -817,6 +817,10 @@
 'fireinfo please enable' => 'Please enable the fireinfo service.',
 'fireinfo settings' => 'Fireinfo settings',
 'fireinfo system version' => 'System versions',
+'fireinfo why descr1' => 'It is very important for the development of IPFire that you enable this',
+'fireinfo why descr2' => 'service. ',
+'fireinfo why enable' => 'Why should I enable fireinfo?',
+'fireinfo why read more' => 'Read more about the reasons.',
 'fireinfo your profile id' => 'Your profile ID',
 'firewall' => 'Firewall',
 'firewall graphs' => 'Firewall Graphs',

diff --git a/lfs/hostapd b/lfs/hostapd
index 57d511a394d68213bb9aaf8c1c4b0ff8da4756a9..0ca035c4aade9d9ab7e54f921287347c79277d3f 100644 (file)
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  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        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 20
+PAK_VER    = 21
 
 DEPS       = ""
 

diff --git a/lfs/installer b/lfs/installer
index 553d59901c9dfd30758610c92303cb90fe4cecbd..76619630de10e80682e3864852412b056514e269 100644 (file)
--- a/lfs/installer
+++ b/lfs/installer
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2011  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        #
@@ -63,7 +63,7 @@ $(TARGET) :
        cd $(DIR_APP)/install && install -v -m 0755 install probenic.sh \
                probehw.sh downloadsource.sh mountsource.sh mountdest.sh /install/initrd/bin
        #Patch ISO Name for download ...
-       sed -i -e "s|ipfire.iso|$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso|g" \
+       sed -i -e "s|ipfire.iso|download.ipfire.org/releases/ipfire-2.x/$(VERSION)-core$(CORE)/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso|g" \
                                /install/initrd/bin/downloadsource.sh
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 37ba3d1e6a1902b2158d4e3a68b8fd53f7f31e74..8e7525744009f59f4054ec85d653b280839758fe 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2011  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        #
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.7.i586-full-core43.iso.torrent
+DL_FILE    = ipfire-2.9.i586-full-core44.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 18
+PAK_VER    = 20
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0a8d7e52332c12d29847b0a7ab263bc3
+$(DL_FILE)_MD5 = 70365fee7ca86b2e059eda81ed804b49
 
 install : $(TARGET)
 

diff --git a/lfs/linux b/lfs/linux
index d01a04687c497e7ecacbae7334a60dd58de8ab1c..1aec51112e32cfe957bcd34f352e783b146068f3 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -35,7 +35,7 @@ CFLAGS     =
 CXXFLAGS   =
 
 PROG      = linux-xen
-PAK_VER    = 15
+PAK_VER    = 16
 DEPS      = ""
 
 # Normal build or XEN build.

diff --git a/lfs/streamripper b/lfs/streamripper
index ed8452dcbfc6c044d002b7d8d8d813de41eed9e2..9ef65af0b26455cc92a2372b27e996137a9d15fa 100644 (file)
--- a/lfs/streamripper
+++ b/lfs/streamripper
@@ -1,7 +1,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        #
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = streamripper
 PAK_VER    = 1
 
-DEPS       = "glib libmad libogg libvorbis"
+DEPS       = "glib libmad libogg libvorbis faad2"
 
 ###############################################################################
 # Top-level Rules

diff --git a/make.sh b/make.sh
index 854f4a297b4059e42409386fa275518a3b9ea896..fe473aeec4e7a9d0a5e14da159c582f6ed4b9868 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.9rc1"                                               # Version number
-CORE="43"                                                      # Core Level (Filename)
-PAKFIRE_CORE="43"                                              # Core Level (PAKFIRE)
+VERSION="2.9"                                                  # Version number
+CORE="44"                                                      # Core Level (Filename)
+PAKFIRE_CORE="44"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir

diff --git a/src/initscripts/init.d/fireinfo b/src/initscripts/init.d/fireinfo
index bedf3a548f834e14c41a73285e93bdde86e3861d..47565b3e1ac32404c92a659271ec02233ac86258 100644 (file)
--- a/src/initscripts/init.d/fireinfo
+++ b/src/initscripts/init.d/fireinfo
@@ -19,6 +19,11 @@ case "${1}" in
        start)
                mkdir -p /var/ipfire/fireinfo 2>/dev/null
 
+               # Generate Pakfire uuid if not present
+               if [ ! -e /opt/pakfire/db/uuid ]; then
+                   uuidgen > /opt/pakfire/db/uuid
+               fi
+
                sendprofile --public-id > /var/ipfire/fireinfo/public_id
                sendprofile --dump > /var/ipfire/fireinfo/profile
                ;;

diff --git a/src/install+setup/install/downloadsource.sh b/src/install+setup/install/downloadsource.sh
index fad2609d59db40a6b9ce03bdcdad5b0f2b415e89..5c6360dca16bfc540354bc70dd1818bc96593968 100644 (file)
--- a/src/install+setup/install/downloadsource.sh
+++ b/src/install+setup/install/downloadsource.sh
@@ -19,7 +19,9 @@
 #                                                                             #
 ###############################################################################
 
-IPFireISO=download.ipfire.org/iso/ipfire.iso
+#lfs change the url while build!
+IPFireISO=ipfire.iso
+#
 
 #Get user defined download from boot cmdline
 grep "netinstall=" /proc/cmdline > /dev/null && CMDLINE=1

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 6aacf8dde0950b24354f8a78b7dc9e47009f680b..426c1e45fb9c7be66eefa2b65594bdfb2c87ecc1 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -2,8 +2,8 @@
 
 COREVER=`cat /opt/pakfire/db/core/mine`
 # FIXME: edit this lines before release
-URL=http://download.ipfire.org/iso/
-ISO=ipfire-2.9rc1.i586-full-core$COREVER.iso
+URL=http://download.ipfire.org/releases/ipfire-2.x/2.9-core$COREVER/
+ISO=ipfire-2.9.i586-full-core$COREVER.iso
 
 if [ -z "$1" ]; then 
        echo usage: $0 backup-file