webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 02:55:55 +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
2010-11-07 15:40:36 +01:00
parent bab14e7ee2 83db6800dd
commit 3bb5525528
9 changed files with 84 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/bzip2
View File

@@ -14,7 +14,7 @@ usr/bin/bzip2
usr/bin/bzip2recover
usr/bin/bzless
usr/bin/bzmore
usr/include/bzlib.h
#usr/include/bzlib.h
#usr/lib/libbz2.a
#usr/lib/libbz2.so
#usr/man/man1/bzcmp.1

0
config/rootfiles/core/42/exclude Normal file
View File

1
config/rootfiles/core/42/filelists/files Normal file
View File

@@ -0,0 +1 @@
etc/system-release

1
config/rootfiles/core/42/meta Normal file
View File

@@ -0,0 +1 @@
DEPS=""

48
config/rootfiles/core/42/update.sh Normal file
View File

@@ -0,0 +1,48 @@
#!/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) 2010 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
#
#Stop services
#
#Extract files
extract_files
#
#Start services
#
#Update Language cache
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#Rebuild module dep's
#depmod 2.6.32.15-ipfire
#depmod 2.6.32.15-ipfire-xen
#
#Finish
#Don't report the exitcode last command
exit 0

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

@@ -543,13 +543,13 @@
'could not open update information file' => 'Impossible d\'ouvrir le fichier d\'information de mise à jour. Le fichier est corrompu.',
'could not retrieve common name from certificate' => 'Impossible de récupérer le nom courant depuis le certificat.',
'country' => 'Pays',
'cpu idle usage' => 'Utilisation du CPU',
'cpu idle usage' => 'Pourcentage d\'inactivite CPU',
'cpu interrupt usage' => 'Utilisation des interruptions CPU',
'cpu iowait usage' => 'Le COU attend des IO',
'cpu irq usage' => 'Utilisation CPU IRQ',
'cpu nice usage' => 'Utilisation CPU Nice',
'cpu steal usage' => 'Utilisation CPU Steal',
'cpu system usage' => 'Utilisation CPU Système',
'cpu system usage' => 'Utilisation CPU Systeme',
'cpu usage per' => 'Utilisation du CPU par',
'cpu user usage' => 'Utilisation du CPU par l\'utilisateur',
'create' => 'Créer',

1
lfs/mISDN
View File

@@ -77,6 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch
cd $(DIR_SRC)/mISDN && ./configure --with-kerneldir=/usr/src/linux
cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) modules
cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \

4
make.sh
View File

@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.7" # Version number
CORE="41" # Core Level (Filename)
PAKFIRE_CORE="40" # Core Level (PAKFIRE)
CORE="42" # Core Level (Filename)
PAKFIRE_CORE="41" # 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

28
src/patches/mISDN_hfc-s_add_id.patch Normal file
View File

@@ -0,0 +1,28 @@
diff -Naur mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c mISDN/drivers/isdn/hardware/mISDN/hfcpci.c
--- mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c 2010-05-25 10:41:29.000000000 +0200
+++ mISDN/drivers/isdn/hardware/mISDN/hfcpci.c 2010-10-31 11:19:05.000000000 +0100
@@ -88,6 +88,7 @@
HFC_DIGI_DF_M_A,
HFC_ABOCOM_2BD1,
HFC_SITECOM_DC105V2,
+ HFC_NONAME_1AE7_0520,
};
struct hfcPCI_hw {
@@ -2182,6 +2183,7 @@
{HFC_DIGI_DF_M_A, 0,
"Digi International DataFire Micro V (North America)"},
{HFC_SITECOM_DC105V2, 0, "Sitecom Connectivity DC-105 ISDN TA"},
+ {HFC_NONAME_1AE7_0520, 0, "NoName HFC-S (1AE7:0520) ISDN TA"},
{},
};
@@ -2233,6 +2235,8 @@
PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[21]},
{PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[22]},
+ {0x1ae7, 0x0520,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[23]},
{},
};