Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 16 Jan 2011 12:41:34 +0000 (13:41 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 16 Jan 2011 12:41:34 +0000 (13:41 +0100)
17 files changed:
config/rootfiles/core/44/filelists/files
config/rootfiles/packages/ipfireseeder
doc/language_issues.es
doc/language_issues.fr
doc/language_missings
html/cgi-bin/fireinfo.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
lfs/hostapd
lfs/installer
lfs/ipfireseeder
lfs/linux
lfs/streamripper
make.sh
src/initscripts/init.d/fireinfo
src/install+setup/install/downloadsource.sh
src/scripts/backupiso

index 48c38e2..0958059 100644 (file)
@@ -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
index e31f42c..56480db 100644 (file)
@@ -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
index a91996d..00f1f8f 100644 (file)
@@ -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
index 8107ab9..e491a0f 100644 (file)
@@ -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
index e72d7d6..d0ba138 100644 (file)
 < 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
 < 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
index 31f899f..1be0ebe 100644 (file)
@@ -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
index bbf9d30..b4db1fe 100644 (file)
 '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',
index ad16ec2..a1d687d 100644 (file)
 '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',
index 57d511a..0ca035c 100644 (file)
@@ -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       = ""
 
index 553d599..7661963 100644 (file)
@@ -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)
index 37ba3d1..8e75257 100644 (file)
@@ -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)
 
index d01a046..1aec511 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.
index ed8452d..9ef65af 100644 (file)
@@ -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 854f4a2..fe473ae 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
index bedf3a5..47565b3 100644 (file)
@@ -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
                ;;
index fad2609..5c6360d 100644 (file)
@@ -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
index 6aacf8d..426c1e4 100644 (file)
@@ -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