From: Arne Fitzenreiter Date: Sun, 7 Nov 2010 14:40:36 +0000 (+0100) Subject: Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x X-Git-Tag: v2.9-beta1~60 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=3bb552552806066293fcfbedb8a41458393cfcd0;hp=bab14e7ee263c0d19028130061b8376f7ed17fbc Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x --- diff --git a/config/rootfiles/common/bzip2 b/config/rootfiles/common/bzip2 index b91b89d799..4292fd3054 100644 --- a/config/rootfiles/common/bzip2 +++ b/config/rootfiles/common/bzip2 @@ -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 diff --git a/config/rootfiles/core/42/exclude b/config/rootfiles/core/42/exclude new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/42/filelists/files b/config/rootfiles/core/42/filelists/files new file mode 100644 index 0000000000..0037af1833 --- /dev/null +++ b/config/rootfiles/core/42/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/42/meta b/config/rootfiles/core/42/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/42/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/42/update.sh b/config/rootfiles/core/42/update.sh new file mode 100644 index 0000000000..6b54995df0 --- /dev/null +++ b/config/rootfiles/core/42/update.sh @@ -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 . # +# # +############################################################################ +# +. /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 diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 0179e73da8..70ef2149cc 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -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', diff --git a/lfs/mISDN b/lfs/mISDN index a6dd753728..01bd77d7d4 100644 --- a/lfs/mISDN +++ b/lfs/mISDN @@ -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) \ diff --git a/make.sh b/make.sh index 06782e1e57..03cf937360 100755 --- a/make.sh +++ b/make.sh @@ -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 diff --git a/src/patches/mISDN_hfc-s_add_id.patch b/src/patches/mISDN_hfc-s_add_id.patch new file mode 100644 index 0000000000..d544b1fcf7 --- /dev/null +++ b/src/patches/mISDN_hfc-s_add_id.patch @@ -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]}, + {}, + }; +