webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-24 18:03:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-01-16 13:41:34 +01:00
parent 738e90f637 79f8faa733
commit eff5c1d30c
17 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/44/filelists/files
View 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

2
config/rootfiles/packages/ipfireseeder
View 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

4
doc/language_issues.es
View 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

4
doc/language_issues.fr
View 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

8
doc/language_missings
View File

@@ -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

8
html/cgi-bin/fireinfo.cgi
View 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

4
langs/de/cgi-bin/de.pl
View File

@@ -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',

4
langs/en/cgi-bin/en.pl
View File

@@ -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',

4
lfs/hostapd
View 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 = ""

4
lfs/installer
View 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)

8
lfs/ipfireseeder
View 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)

2
lfs/linux
View File

@@ -35,7 +35,7 @@ CFLAGS =
CXXFLAGS =
PROG = linux-xen
PAK_VER = 15
PAK_VER = 16
DEPS = ""
# Normal build or XEN build.

4
lfs/streamripper
View 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

6
make.sh
View File

@@ -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

5
src/initscripts/init.d/fireinfo
View 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
;;

4
src/install+setup/install/downloadsource.sh
View 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

4
src/scripts/backupiso
View 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