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

Merge branch 'master' into next

Browse Source 
Conflicts:
	doc/language_issues.nl
	doc/language_issues.tr
This commit is contained in:
Michael Tremer
2014-05-09 01:31:43 +02:00
parent c80303cd45 a257ce6b8d
commit 03d0b8c7e8
92 changed files with 7609 additions and 3886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/backup/includes/stunnel Normal file
View File

@@ -0,0 +1 @@
/etc/stunnel/

1
config/backup/includes/watchdog
View File

@@ -1 +1,2 @@
/etc/sysconfig/watchdog
/etc/watchdog.conf

14
config/cfgroot/general-functions.pl
View File

@@ -353,7 +353,7 @@ sub iporsubtodec
}
#Subnet already in decimal and valid?
if ($mask=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) {
for (my $i=8;$i<=32;$i++){
for (my $i=0;$i<=32;$i++){
if (&General::cidrtosub($i) eq $mask){
if ($full == 0){return $mask;}else{
return $net."/".$mask;
@@ -362,7 +362,7 @@ sub iporsubtodec
}
}
#Subnet in binary format?
if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=0))){
if($full == 0){ return &General::cidrtosub($mask);}else{
return $net."/".&General::cidrtosub($mask);
}
@@ -389,7 +389,7 @@ sub iporsubtocidr
}
#Subnet in decimal and valid?
if ($mask=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) {
for (my $i=8;$i<=32;$i++){
for (my $i=0;$i<=32;$i++){
if (&General::cidrtosub($i) eq $mask){
if ($full == 0){return &General::subtocidr($mask);}else{
return $net."/".&General::subtocidr($mask);
@@ -398,7 +398,7 @@ sub iporsubtocidr
}
}
#Subnet already in binary format?
if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
if ($mask=~/^(\d{1,2})$/ && (($1<=32 && $1>=0))){
if($full == 0){ return $mask;}else{
return $net."/".$mask;
}
@@ -488,13 +488,13 @@ sub validipandmask
if ($ccdip=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1>0 && $1<=255 && $2>=0 && $2<=255 && $3>=0 && $3<=255 && $4<=255 ))) {
#Subnet in decimal and valid?
if ($ccdsubnet=~/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/ &&(($1<=255 && $2<=$1 && $3<=$2 && $4<=$3 ))) {
for (my $i=8;$i<=32;$i++){
for (my $i=0;$i<=32;$i++){
if (&General::cidrtosub($i) eq $ccdsubnet){
return 1;
}
}
}
#Subnet already in binary format?
}elsif ($ccdsubnet=~/^(\d{1,2})$/ && (($1<=32 && $1>=8))){
}elsif ($ccdsubnet=~/^(\d{1,2})$/ && (($1<=32 && $1>=0))){
return 1;
}else{
return 0;

1
config/etc/passwd
View File

@@ -8,6 +8,7 @@ mysql:x:41:41:MySQL Server:/dev/null:/bin/false
ftp:x:45:45:anonymous_user:/home/ftp:/bin/false
vsftpd:x:47:47:vsftpd User:/home/ftp:/bin/false
rsyncd:x:48:48:rsyncd Daemon:/home/rsync:/bin/false
stunnel:x:51:51:stunnel Daemon:/var/lib/stunnel:/bin/false
sshd:x:74:74:sshd:/var/empty:/bin/false
nobody:x:99:99:Nobody:/home/nobody:/bin/false
postfix:x:100:100::/var/spool/postfix:/bin/false

6
config/firewall/convert-outgoingfw
View File

@@ -427,8 +427,8 @@ sub process_rules
$grp1='std_net_src';
$source='ORANGE';
}elsif ($configline[2] eq 'red') {
$grp1='std_net_src';
$source='IPFire';
$grp1='ipfire_src';
$source='RED1';
&General::readhash($fwdfwsettings,\%fwdsettings);
$fwdsettings{'POLICY1'}=$outsettings{'POLICY'};
$fwdsettings{'POLICY'}=$outsettings{'POLICY'};
@@ -538,7 +538,7 @@ sub process_rules
my $chain;
foreach my $protocol (@prot){
my $now=localtime;
if ($source eq 'IPFire'){
if ($source eq 'RED1'){
$chain='OUTGOINGFW';
}else{
$chain='FORWARDFW';

15
config/firewall/rules.pl
View File

@@ -354,20 +354,21 @@ sub buildrules {
# Destination NAT
if ($NAT_MODE eq "DNAT") {
# Make port-forwardings useable from the internal networks.
my @internal_addresses = &fwlib::get_internal_firewall_ip_addresses(1);
unless ($nat_address ~~ @internal_addresses) {
&add_dnat_mangle_rules($nat_address, @options);
}
my @nat_options = ();
if ($protocol ne "all") {
my @nat_protocol_options = &get_protocol_options($hash, $key, $protocol, 1);
push(@nat_options, @nat_protocol_options);
}
push(@nat_options, @time_options);
# Make port-forwardings useable from the internal networks.
my @internal_addresses = &fwlib::get_internal_firewall_ip_addresses(1);
unless ($nat_address ~~ @internal_addresses) {
&add_dnat_mangle_rules($nat_address, @nat_options);
}
push(@nat_options, @source_options);
push(@nat_options, ("-d", $nat_address));
push(@nat_options, @time_options);
my $dnat_port;
if ($protocol_has_ports) {

1
config/kernel/kernel.config.armv5tel-ipfire-kirkwood
View File

@@ -1934,6 +1934,7 @@ CONFIG_WLAN=y
CONFIG_LIBERTAS_THINFIRM=m
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
CONFIG_LIBERTAS_THINFIRM_USB=m
CONFIG_LIBERTAS_UAP=m
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
CONFIG_AT76C50X_USB=m

1
config/kernel/kernel.config.armv5tel-ipfire-multi
View File

@@ -2141,6 +2141,7 @@ CONFIG_WLAN=y
CONFIG_LIBERTAS_THINFIRM=m
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
CONFIG_LIBERTAS_THINFIRM_USB=m
CONFIG_LIBERTAS_UAP=m
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
CONFIG_AT76C50X_USB=m

9
config/kernel/kernel.config.armv5tel-ipfire-rpi
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.10.32 Kernel Configuration
# Linux/arm 3.10.38 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -681,6 +681,8 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m
CONFIG_NETFILTER_XT_MATCH_HL=m
CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
CONFIG_NETFILTER_XT_MATCH_IPVS=m
CONFIG_NETFILTER_XT_MATCH_LAYER7=m
# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -699,8 +701,6 @@ CONFIG_NETFILTER_XT_MATCH_RECENT=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_LAYER7=m
# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -1530,6 +1530,7 @@ CONFIG_WLAN=y
CONFIG_LIBERTAS_THINFIRM=m
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
CONFIG_LIBERTAS_THINFIRM_USB=m
CONFIG_LIBERTAS_UAP=m
CONFIG_AT76C50X_USB=m
CONFIG_USB_ZD1201=m
CONFIG_USB_NET_RNDIS_WLAN=m
@@ -2956,11 +2957,13 @@ CONFIG_SND_BCM2708_SOC_I2S=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
CONFIG_SND_BCM2708_SOC_RPI_DAC=m
# CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC is not set
CONFIG_SND_DESIGNWARE_I2S=m
CONFIG_SND_SOC_I2C_AND_SPI=m
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_PCM1794A=m
CONFIG_SND_SOC_PCM5102A=m
# CONFIG_SND_SOC_PCM512x is not set
CONFIG_SND_SOC_WM8804=m
CONFIG_SND_SIMPLE_CARD=m
# CONFIG_SOUND_PRIME is not set

31
config/kernel/kernel.config.i586-ipfire
View File

@@ -2120,6 +2120,7 @@ CONFIG_WLAN=y
CONFIG_LIBERTAS_THINFIRM=m
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
CONFIG_LIBERTAS_THINFIRM_USB=m
CONFIG_LIBERTAS_UAP=m
CONFIG_AIRO=m
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
@@ -3052,37 +3053,37 @@ CONFIG_WATCHDOG_NOWAYOUT=y
#
CONFIG_SOFT_WATCHDOG=m
CONFIG_RETU_WATCHDOG=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
CONFIG_ACQUIRE_WDT=m
CONFIG_ADVANTECH_WDT=m
CONFIG_ALIM1535_WDT=m
CONFIG_ALIM7101_WDT=m
CONFIG_F71808E_WDT=m
CONFIG_SP5100_TCO=m
CONFIG_GEODE_WDT=m
# CONFIG_SC520_WDT is not set
CONFIG_SC520_WDT=m
CONFIG_SBC_FITPC2_WATCHDOG=m
# CONFIG_EUROTECH_WDT is not set
CONFIG_EUROTECH_WDT=m
CONFIG_IB700_WDT=m
CONFIG_IBMASR=m
# CONFIG_WAFER_WDT is not set
CONFIG_WAFER_WDT=m
CONFIG_I6300ESB_WDT=m
CONFIG_IE6XX_WDT=m
CONFIG_ITCO_WDT=m
# CONFIG_ITCO_VENDOR_SUPPORT is not set
CONFIG_ITCO_VENDOR_SUPPORT=y
CONFIG_IT8712F_WDT=m
CONFIG_IT87_WDT=m
CONFIG_HP_WATCHDOG=m
CONFIG_HPWDT_NMI_DECODING=y
# CONFIG_SC1200_WDT is not set
# CONFIG_SCx200_WDT is not set
# CONFIG_PC87413_WDT is not set
CONFIG_SC1200_WDT=m
CONFIG_SCx200_WDT=m
CONFIG_PC87413_WDT=m
CONFIG_NV_TCO=m
# CONFIG_60XX_WDT is not set
# CONFIG_SBC8360_WDT is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_CPU5_WDT is not set
CONFIG_60XX_WDT=m
CONFIG_SBC8360_WDT=m
CONFIG_SBC7240_WDT=m
CONFIG_CPU5_WDT=m
CONFIG_SMSC_SCH311X_WDT=m
# CONFIG_SMSC37B787_WDT is not set
CONFIG_SMSC37B787_WDT=m
CONFIG_VIA_WDT=m
CONFIG_W83627HF_WDT=m
CONFIG_W83697HF_WDT=m
@@ -3090,7 +3091,7 @@ CONFIG_W83697UG_WDT=m
CONFIG_W83877F_WDT=m
CONFIG_W83977F_WDT=m
CONFIG_MACHZ_WDT=m
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
CONFIG_SBC_EPX_C3_WATCHDOG=m
#
# ISA-based Watchdog Cards

29
config/kernel/kernel.config.i586-ipfire-pae
View File

@@ -2134,6 +2134,7 @@ CONFIG_WLAN=y
CONFIG_LIBERTAS_THINFIRM=m
# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
CONFIG_LIBERTAS_THINFIRM_USB=m
CONFIG_LIBERTAS_UAP=m
CONFIG_AIRO=m
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
@@ -3071,36 +3072,36 @@ CONFIG_WATCHDOG_NOWAYOUT=y
#
CONFIG_SOFT_WATCHDOG=m
CONFIG_RETU_WATCHDOG=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
CONFIG_ACQUIRE_WDT=m
CONFIG_ADVANTECH_WDT=m
CONFIG_ALIM1535_WDT=m
CONFIG_ALIM7101_WDT=m
CONFIG_F71808E_WDT=m
CONFIG_SP5100_TCO=m
CONFIG_GEODE_WDT=m
# CONFIG_SC520_WDT is not set
CONFIG_SC520_WDT=m
CONFIG_SBC_FITPC2_WATCHDOG=m
# CONFIG_EUROTECH_WDT is not set
CONFIG_EUROTECH_WDT=m
CONFIG_IB700_WDT=m
CONFIG_IBMASR=m
# CONFIG_WAFER_WDT is not set
CONFIG_WAFER_WDT=m
CONFIG_I6300ESB_WDT=m
CONFIG_IE6XX_WDT=m
CONFIG_ITCO_WDT=m
# CONFIG_ITCO_VENDOR_SUPPORT is not set
CONFIG_ITCO_VENDOR_SUPPORT=y
CONFIG_IT8712F_WDT=m
CONFIG_IT87_WDT=m
CONFIG_HP_WATCHDOG=m
CONFIG_HPWDT_NMI_DECODING=y
# CONFIG_SC1200_WDT is not set
# CONFIG_PC87413_WDT is not set
CONFIG_SC1200_WDT=m
CONFIG_PC87413_WDT=m
CONFIG_NV_TCO=m
# CONFIG_60XX_WDT is not set
# CONFIG_SBC8360_WDT is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_CPU5_WDT is not set
CONFIG_60XX_WDT=m
CONFIG_SBC8360_WDT=m
CONFIG_SBC7240_WDT=m
CONFIG_CPU5_WDT=m
CONFIG_SMSC_SCH311X_WDT=m
# CONFIG_SMSC37B787_WDT is not set
CONFIG_SMSC37B787_WDT=m
CONFIG_VIA_WDT=m
CONFIG_W83627HF_WDT=m
CONFIG_W83697HF_WDT=m
@@ -3108,7 +3109,7 @@ CONFIG_W83697UG_WDT=m
CONFIG_W83877F_WDT=m
CONFIG_W83977F_WDT=m
CONFIG_MACHZ_WDT=m
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
CONFIG_SBC_EPX_C3_WATCHDOG=m
CONFIG_XEN_WDT=m
#

1
config/rootfiles/common/armv5tel/initscripts
View File

@@ -115,6 +115,7 @@ etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd

2
config/rootfiles/common/armv5tel/linux-kirkwood
View File

@@ -1394,6 +1394,8 @@ lib/modules/KVER-ipfire-kirkwood
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_tf
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_uap
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/mac80211_hwsim.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/mwifiex
#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/mwifiex/mwifiex.ko

2
config/rootfiles/common/armv5tel/linux-multi
View File

@@ -1356,6 +1356,8 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_tf
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_uap
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/mac80211_hwsim.ko
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/mwifiex
#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/mwifiex/mwifiex.ko

2
config/rootfiles/common/armv5tel/linux-rpi
View File

@@ -1125,6 +1125,8 @@ lib/modules/KVER-ipfire-rpi
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_tf
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_uap
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/mwifiex
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko

1
config/rootfiles/common/i586/initscripts
View File

@@ -117,6 +117,7 @@ etc/rc.d/init.d/squid
etc/rc.d/init.d/sshd
#etc/rc.d/init.d/sslh
etc/rc.d/init.d/static-routes
#etc/rc.d/init.d/stunnel
etc/rc.d/init.d/swap
etc/rc.d/init.d/sysctl
etc/rc.d/init.d/sysklogd

20
config/rootfiles/common/i586/linux
View File

@@ -1299,9 +1299,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/misc/ics932s401.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/lis3lv02d
#lib/modules/KVER-ipfire/kernel/drivers/misc/lis3lv02d/lis3lv02d.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/mei
#lib/modules/KVER-ipfire/kernel/drivers/misc/mei/mei-me.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/mei/mei.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/pch_phub.ko
#lib/modules/KVER-ipfire/kernel/drivers/misc/ti-st
#lib/modules/KVER-ipfire/kernel/drivers/misc/ti-st/st_drv.ko
@@ -1651,6 +1648,8 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_uap
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
@@ -2191,12 +2190,17 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/w1/slaves/w1_therm.ko
#lib/modules/KVER-ipfire/kernel/drivers/w1/wire.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/acquirewdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/advantechwdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/alim1535_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/alim7101_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/cpu5wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/eurotechwdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/f71808e_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/geodewdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/hpwdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/i6300esb.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/iTCO_vendor_support.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/iTCO_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/ib700wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/ibmasr.ko
@@ -2205,11 +2209,20 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/it87_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/machzwd.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/nv_tco.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/pc87413_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/pcwd_pci.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/pcwd_usb.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/retu_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc60xxwdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc7240_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc8360.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc_epx_c3.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sbc_fitpc2_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sc1200wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sc520_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sch311x_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/scx200_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/smsc37b787_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/softdog.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/sp5100_tco.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/via_wdt.ko
@@ -2218,6 +2231,7 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83697ug_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83877f_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/w83977f_wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/wafer5823wdt.ko
#lib/modules/KVER-ipfire/kernel/drivers/watchdog/wdt_pci.ko
#lib/modules/KVER-ipfire/kernel/fs
#lib/modules/KVER-ipfire/kernel/fs/btrfs

1368
config/rootfiles/common/libsigc++
View File

File diff suppressed because it is too large Load Diff

48
config/rootfiles/common/libtorrent
View File

@@ -1,48 +0,0 @@
#usr/include/torrent
#usr/include/torrent/bitfield.h
#usr/include/torrent/chunk_manager.h
#usr/include/torrent/common.h
#usr/include/torrent/connection_manager.h
#usr/include/torrent/data
#usr/include/torrent/data/block.h
#usr/include/torrent/data/block_list.h
#usr/include/torrent/data/block_transfer.h
#usr/include/torrent/data/file.h
#usr/include/torrent/data/file_list.h
#usr/include/torrent/data/file_list_iterator.h
#usr/include/torrent/data/file_manager.h
#usr/include/torrent/data/file_utils.h
#usr/include/torrent/data/piece.h
#usr/include/torrent/data/transfer_list.h
#usr/include/torrent/download.h
#usr/include/torrent/error.h
#usr/include/torrent/event.h
#usr/include/torrent/exceptions.h
#usr/include/torrent/hash_string.h
#usr/include/torrent/http.h
#usr/include/torrent/object.h
#usr/include/torrent/object_stream.h
#usr/include/torrent/path.h
#usr/include/torrent/peer
#usr/include/torrent/peer/client_info.h
#usr/include/torrent/peer/client_list.h
#usr/include/torrent/peer/peer.h
#usr/include/torrent/peer/peer_info.h
#usr/include/torrent/peer/peer_list.h
#usr/include/torrent/poll.h
#usr/include/torrent/poll_epoll.h
#usr/include/torrent/poll_kqueue.h
#usr/include/torrent/poll_select.h
#usr/include/torrent/rate.h
#usr/include/torrent/resume.h
#usr/include/torrent/torrent.h
#usr/include/torrent/tracker.h
#usr/include/torrent/tracker_list.h
#usr/lib/libtorrent.la
#usr/lib/libtorrent.so
#usr/lib/libtorrent.so.11
#usr/lib/libtorrent.so.11.0.6
#usr/lib/pkgconfig/libtorrent.pc
#usr/include/torrent/dht_manager.h
#usr/include/torrent/peer/connection_list.h
#usr/include/torrent/throttle.h

5
config/rootfiles/common/strongswan
View File

@@ -58,6 +58,7 @@ etc/strongswan.d/charon/updown.conf
etc/strongswan.d/charon/x509.conf
etc/strongswan.d/charon/xauth-eap.conf
etc/strongswan.d/charon/xauth-generic.conf
etc/strongswan.d/charon/xauth-noauth.conf
etc/strongswan.d/charon/xcbc.conf
etc/strongswan.d/starter.conf
etc/strongswan.d/tools.conf
@@ -134,17 +135,18 @@ usr/lib/ipsec/plugins/libstrongswan-updown.so
usr/lib/ipsec/plugins/libstrongswan-x509.so
usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so
usr/lib/ipsec/plugins/libstrongswan-xauth-generic.so
usr/lib/ipsec/plugins/libstrongswan-xauth-noauth.so
usr/lib/ipsec/plugins/libstrongswan-xcbc.so
#usr/libexec/ipsec
usr/libexec/ipsec/_copyright
usr/libexec/ipsec/_updown
usr/libexec/ipsec/_updown_espmark
usr/libexec/ipsec/charon
usr/libexec/ipsec/openac
usr/libexec/ipsec/scepclient
usr/libexec/ipsec/starter
usr/libexec/ipsec/stroke
usr/sbin/ipsec
#usr/share/man/man1/pki---acert.1
#usr/share/man/man1/pki---gen.1
#usr/share/man/man1/pki---issue.1
#usr/share/man/man1/pki---keyid.1
@@ -212,6 +214,7 @@ usr/sbin/ipsec
#usr/share/strongswan/templates/config/plugins/x509.conf
#usr/share/strongswan/templates/config/plugins/xauth-eap.conf
#usr/share/strongswan/templates/config/plugins/xauth-generic.conf
#usr/share/strongswan/templates/config/plugins/xauth-noauth.conf
#usr/share/strongswan/templates/config/plugins/xcbc.conf
#usr/share/strongswan/templates/config/strongswan.conf
#usr/share/strongswan/templates/config/strongswan.d

16
config/rootfiles/common/usb_modeswitch_data
View File

@@ -43,6 +43,7 @@ usr/share/usb_modeswitch/05c6:6503
usr/share/usb_modeswitch/05c6:9024
usr/share/usb_modeswitch/05c6:f000
usr/share/usb_modeswitch/05c7:1000
usr/share/usb_modeswitch/0685:2000
usr/share/usb_modeswitch/072f:100d
usr/share/usb_modeswitch/07d1:a800
usr/share/usb_modeswitch/07d1:a804
@@ -174,6 +175,8 @@ usr/share/usb_modeswitch/12d1:1553
usr/share/usb_modeswitch/12d1:1557
usr/share/usb_modeswitch/12d1:155b
usr/share/usb_modeswitch/12d1:156a
usr/share/usb_modeswitch/12d1:157c
usr/share/usb_modeswitch/12d1:157d
usr/share/usb_modeswitch/12d1:1805
usr/share/usb_modeswitch/12d1:1c0b
usr/share/usb_modeswitch/12d1:1c1b
@@ -188,6 +191,10 @@ usr/share/usb_modeswitch/12d1:1f16
usr/share/usb_modeswitch/12d1:1f17
usr/share/usb_modeswitch/12d1:1f18
usr/share/usb_modeswitch/12d1:1f19
usr/share/usb_modeswitch/12d1:1f1b
usr/share/usb_modeswitch/12d1:1f1c
usr/share/usb_modeswitch/12d1:1f1d
usr/share/usb_modeswitch/12d1:1f1e
usr/share/usb_modeswitch/12d1:380b
usr/share/usb_modeswitch/1307:1169
usr/share/usb_modeswitch/1410:5010
@@ -228,25 +235,34 @@ usr/share/usb_modeswitch/19d2:0166
usr/share/usb_modeswitch/19d2:0169
usr/share/usb_modeswitch/19d2:0266
usr/share/usb_modeswitch/19d2:0304
usr/share/usb_modeswitch/19d2:0318
usr/share/usb_modeswitch/19d2:0325
usr/share/usb_modeswitch/19d2:1001
usr/share/usb_modeswitch/19d2:1007
usr/share/usb_modeswitch/19d2:1009
usr/share/usb_modeswitch/19d2:1013
usr/share/usb_modeswitch/19d2:1017
usr/share/usb_modeswitch/19d2:1030
usr/share/usb_modeswitch/19d2:1171
usr/share/usb_modeswitch/19d2:1175
usr/share/usb_modeswitch/19d2:1179
usr/share/usb_modeswitch/19d2:1201
usr/share/usb_modeswitch/19d2:1207
usr/share/usb_modeswitch/19d2:1210
usr/share/usb_modeswitch/19d2:1216
usr/share/usb_modeswitch/19d2:1219
usr/share/usb_modeswitch/19d2:1224
usr/share/usb_modeswitch/19d2:1225
usr/share/usb_modeswitch/19d2:1227
usr/share/usb_modeswitch/19d2:1233
usr/share/usb_modeswitch/19d2:1238
usr/share/usb_modeswitch/19d2:1511
usr/share/usb_modeswitch/19d2:1514
usr/share/usb_modeswitch/19d2:1517
usr/share/usb_modeswitch/19d2:1520
usr/share/usb_modeswitch/19d2:1523
usr/share/usb_modeswitch/19d2:1528
usr/share/usb_modeswitch/19d2:1536
usr/share/usb_modeswitch/19d2:1542
usr/share/usb_modeswitch/19d2:2000
usr/share/usb_modeswitch/19d2:2004

1
config/rootfiles/core/77/filelists/GeoIP Normal file
View File

@@ -0,0 +1 @@
usr/local/share/GeoIP/GeoIP.dat

2
config/rootfiles/core/77/filelists/files
View File

@@ -20,6 +20,7 @@ srv/web/ipfire/html/themes/ipfire
srv/web/ipfire/html/themes/ipfire-legacy
srv/web/ipfire/html/themes/maniac
usr/lib/firewall
usr/local/bin/backupiso
usr/local/bin/timezone-transition
usr/local/bin/setddns.pl
usr/sbin/updxlrator
@@ -31,3 +32,4 @@ var/ipfire/header.pl
var/ipfire/graphs.pl
var/ipfire/langs
var/ipfire/menu.d/10-system.menu
var/ipfire/menu.d/20-status.menu

2
config/rootfiles/core/77/filelists/hwdata Normal file
View File

@@ -0,0 +1,2 @@
usr/share/hwdata/pci.ids
usr/share/hwdata/usb.ids

6
config/rootfiles/core/77/update.sh
View File

@@ -399,13 +399,17 @@ if [ -e /var/ipfire/qos/enable ]; then
/usr/local/bin/qosctrl start
fi
chown cron:cron /var/spool/cron
# Update crontab
cat <<EOF >> /var/spool/cron/root.orig
grep -q timezone-transition /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
# Re-read firewall rules every Sunday in March, October and November to take care of daylight saving time
00 3 * 3 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
00 2 * 10-11 0 /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
EOF
# Remove dialctrl script.
sed -i /var/spool/cron/root.orig -e "/Dialup/,/dialctrl.pl/d"
fcrontab -z &>/dev/null

0
config/rootfiles/core/75/exclude → config/rootfiles/oldcore/75/exclude
View File

0
config/rootfiles/core/75/filelists/files → config/rootfiles/oldcore/75/filelists/files
View File

0
config/rootfiles/core/75/meta → config/rootfiles/oldcore/75/meta
View File

0
config/rootfiles/core/75/update.sh → config/rootfiles/oldcore/75/update.sh
View File

19
config/rootfiles/packages/linux-pae
View File

@@ -1295,9 +1295,6 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/ics932s401.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/lis3lv02d
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/lis3lv02d/lis3lv02d.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/mei
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/mei/mei-me.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/mei/mei.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/pch_phub.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/ti-st
#lib/modules/KVER-ipfire-pae/kernel/drivers/misc/ti-st/st_drv.ko
@@ -1647,6 +1644,8 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_uap
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mac80211_hwsim.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwifiex
#lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
@@ -2192,12 +2191,17 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/slaves/w1_therm.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/w1/wire.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/acquirewdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/advantechwdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/alim1535_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/alim7101_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/cpu5wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/eurotechwdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/f71808e_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/geodewdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/hpwdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/i6300esb.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/iTCO_vendor_support.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/iTCO_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/ib700wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/ibmasr.ko
@@ -2206,11 +2210,19 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/it87_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/machzwd.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/nv_tco.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/pc87413_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/pcwd_pci.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/pcwd_usb.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/retu_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc60xxwdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc7240_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc8360.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc_epx_c3.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sbc_fitpc2_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sc1200wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sc520_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sch311x_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/smsc37b787_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/softdog.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/sp5100_tco.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/via_wdt.ko
@@ -2219,6 +2231,7 @@ lib/modules/KVER-ipfire-pae
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83697ug_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83877f_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/w83977f_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/wafer5823wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/wdt_pci.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/watchdog/xen_wdt.ko
#lib/modules/KVER-ipfire-pae/kernel/drivers/xen

3
config/rootfiles/packages/pound
View File

@@ -1,7 +1,4 @@
etc/rc.d/init.d/pound
etc/rc.d/rc0.d/K40pound
etc/rc.d/rc3.d/S60pound
etc/rc.d/rc6.d/K40pound
#etc/pound.cfg
usr/sbin/pound
usr/sbin/poundctl

1372
config/rootfiles/packages/rtorrent
View File

File diff suppressed because it is too large Load Diff

41
config/rootfiles/packages/stunnel Normal file
View File

@@ -0,0 +1,41 @@
etc/rc.d/init.d/stunnel
etc/stunnel
etc/stunnel/stunnel.conf
#etc/stunnel/stunnel.conf-sample
usr/bin/stunnel
#usr/bin/stunnel3
#usr/lib/stunnel
#usr/lib/stunnel/libstunnel.la
usr/lib/stunnel/libstunnel.so
#usr/share/doc/stunnel
#usr/share/doc/stunnel/AUTHORS
#usr/share/doc/stunnel/BUGS
#usr/share/doc/stunnel/COPYING
#usr/share/doc/stunnel/COPYRIGHT.GPL
#usr/share/doc/stunnel/CREDITS
#usr/share/doc/stunnel/ChangeLog
#usr/share/doc/stunnel/INSTALL
#usr/share/doc/stunnel/INSTALL.FIPS
#usr/share/doc/stunnel/INSTALL.W32
#usr/share/doc/stunnel/INSTALL.WCE
#usr/share/doc/stunnel/PORTS
#usr/share/doc/stunnel/README
#usr/share/doc/stunnel/TODO
#usr/share/doc/stunnel/examples
#usr/share/doc/stunnel/examples/ca.html
#usr/share/doc/stunnel/examples/ca.pl
#usr/share/doc/stunnel/examples/importCA.html
#usr/share/doc/stunnel/examples/importCA.sh
#usr/share/doc/stunnel/examples/script.sh
#usr/share/doc/stunnel/examples/stunnel.init
#usr/share/doc/stunnel/examples/stunnel.service
#usr/share/doc/stunnel/examples/stunnel.spec
#usr/share/doc/stunnel/stunnel.fr.html
#usr/share/doc/stunnel/stunnel.html
#usr/share/doc/stunnel/stunnel.pl.html
#usr/share/man/man8/stunnel.8
#usr/share/man/man8/stunnel.fr.8
#usr/share/man/man8/stunnel.pl.8
var/ipfire/backup/addons/includes/stunnel
var/lib/stunnel
var/lib/stunnel/run

21
config/stunnel/stunnel.conf Normal file
View File

@@ -0,0 +1,21 @@
; File: /etc/stunnel/stunnel.conf
; Note: The pid and output locations are relative to the chroot location.
pid = /run/stunnel.pid
chroot = /var/lib/stunnel
client = no
setuid = stunnel
setgid = stunnel
cert = /etc/stunnel/stunnel.pem
;debug = 7
;output = stunnel.log
;[https]
;accept = 443
;connect = 80
;; "TIMEOUTclose = 0" is a workaround for a design flaw in Microsoft SSL
;; Microsoft implementations do not use SSL close-notify alert and thus
;; they are vulnerable to truncation attacks
;TIMEOUTclose = 0

19
config/xen-image/xen-image-maker.sh
View File

@@ -27,15 +27,16 @@ KERN_TYPE=pae
KVER=xxxKVERxxx
KERN_PACK=xxxKERN_PACKxxx
KRNDOWN=http://mirror0.ipfire.org/pakfire2/$VERSION/paks
CONSOLE=hvc0
###############################################################################
# If you really want to use outdated legacy kernel uncomment this lines. #####
# Not recommended!!! ##########################################################
######################
#KERN_TYPE=xen
#KVER=2.6.32.61
#KERN_PACK=28
#KERN_PACK=29
#KRNDOWN=http://mirror0.ipfire.org/pakfire2/2.15/paks
#CONSOLE=xvc0
###############################################################################
SIZEboot=64
@@ -108,10 +109,10 @@ mount -o loop $IMGvar $MNThdd/var
# Install IPFire without kernel modules
tar -C $MNThdd/ -xvf $ISODIR/$SNAME-$VERSION.tlz --lzma \
--exclude=lib/modules* --exclude=boot*
--exclude=lib/modules* --exclude=boot* --numeric-owner
#Install Kernel
tar -C $MNThdd/opt/pakfire/tmp -xvf $TMPDIR/$KERNEL
tar -C $MNThdd/opt/pakfire/tmp -xvf $TMPDIR/$KERNEL --numeric-owner
chroot $MNThdd /opt/pakfire/tmp/install.sh
rm -rf $MNThdd/opt/pakfire/tmp/*
@@ -120,7 +121,7 @@ mkdir $MNThdd/boot/grub
echo "timeout 10" > $MNThdd/boot/grub/grub.conf
echo "default 0" >> $MNThdd/boot/grub/grub.conf
echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf
echo " kernel /vmlinuz-$KVER-ipfire-xen root=/dev/xvda3 rootdelay=10 panic=10 console=xvc0 ro" \
echo " kernel /vmlinuz-$KVER-ipfire-xen root=/dev/xvda3 rootdelay=10 panic=10 console=$CONSOLE ro" \
>> $MNThdd/boot/grub/grub.conf
echo " initrd /ipfirerd-$KVER-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf
echo "# savedefault 0" >> $MNThdd/boot/grub/grub.conf
@@ -161,12 +162,12 @@ rm -rf $MNThdd/etc/rc.d/rcsysinit.d/S19checkfstab
#Remove console init
rm -rf $MNThdd/etc/rc.d/rcsysinit.d/S70console
#Add xvc0 to securetty
echo xvc0 >> $MNThdd/etc/securetty
#Add console to securetty
echo $CONSOLE >> $MNThdd/etc/securetty
#Add getty for xvc0
#Add getty for console
echo "#Enable login for XEN" >> $MNThdd/etc/inittab
echo "8:2345:respawn:/sbin/agetty xvc0 9600 --noclear" >> $MNThdd/etc/inittab
echo "8:2345:respawn:/sbin/agetty $CONSOLE 9600 --noclear" >> $MNThdd/etc/inittab
#Disable some initskripts
echo "#!/bin/sh" > $MNThdd/etc/rc.d/init.d/setclock

8
doc/language_issues.de
View File

@@ -226,6 +226,14 @@ WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
WARNING: translation string unused: fwdfw time
WARNING: translation string unused: fwdfw xt access
WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
WARNING: translation string unused: fwhost IpSec Host
WARNING: translation string unused: fwhost IpSec Network
WARNING: translation string unused: fwhost OpenVPN N-2-N
WARNING: translation string unused: fwhost OpenVPN static host
WARNING: translation string unused: fwhost OpenVPN static network
WARNING: translation string unused: fwhost Standard Network
WARNING: translation string unused: fwhost attention
WARNING: translation string unused: fwhost blue
WARNING: translation string unused: fwhost changeremark

8
doc/language_issues.en
View File

@@ -248,6 +248,14 @@ WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
WARNING: translation string unused: fwdfw time
WARNING: translation string unused: fwdfw xt access
WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
WARNING: translation string unused: fwhost IpSec Host
WARNING: translation string unused: fwhost IpSec Network
WARNING: translation string unused: fwhost OpenVPN N-2-N
WARNING: translation string unused: fwhost OpenVPN static host
WARNING: translation string unused: fwhost OpenVPN static network
WARNING: translation string unused: fwhost Standard Network
WARNING: translation string unused: fwhost attention
WARNING: translation string unused: fwhost blue
WARNING: translation string unused: fwhost changeremark

2
doc/language_issues.es
View File

@@ -588,6 +588,7 @@ WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit
WARNING: untranslated string: bytes
@@ -903,6 +904,7 @@ WARNING: untranslated string: proxy reports monthly
WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: red1
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added

2
doc/language_issues.fr
View File

@@ -598,6 +598,7 @@ WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit
WARNING: untranslated string: bytes
@@ -910,6 +911,7 @@ WARNING: untranslated string: proxy reports monthly
WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: red1
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added

358
doc/language_issues.nl
View File

@@ -42,6 +42,11 @@ WARNING: translation string unused: advproxy no cre groups
WARNING: translation string unused: advproxy ssadvanced proxy
WARNING: translation string unused: advproxy update information
WARNING: translation string unused: advproxy update notification
WARNING: translation string unused: age second
WARNING: translation string unused: age seconds
WARNING: translation string unused: age shour
WARNING: translation string unused: age sminute
WARNING: translation string unused: age ssecond
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
@@ -133,6 +138,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: description
@@ -212,6 +218,7 @@ WARNING: translation string unused: firewall log viewer
WARNING: translation string unused: firmware
WARNING: translation string unused: firmware upload
WARNING: translation string unused: force update
WARNING: translation string unused: forward firewall
WARNING: translation string unused: forwarding rule added
WARNING: translation string unused: forwarding rule removed
WARNING: translation string unused: forwarding rule updated
@@ -223,6 +230,47 @@ WARNING: translation string unused: from email pw
WARNING: translation string unused: from email server
WARNING: translation string unused: from email user
WARNING: translation string unused: from warn email bad
WARNING: translation string unused: fwdfw MODE1
WARNING: translation string unused: fwdfw MODE2
WARNING: translation string unused: fwdfw addrule
WARNING: translation string unused: fwdfw err nosrcip
WARNING: translation string unused: fwdfw err notgtip
WARNING: translation string unused: fwdfw err prot_port1
WARNING: translation string unused: fwdfw final_rule
WARNING: translation string unused: fwdfw from
WARNING: translation string unused: fwdfw ipsec network
WARNING: translation string unused: fwdfw man port
WARNING: translation string unused: fwdfw menu
WARNING: translation string unused: fwdfw natport used
WARNING: translation string unused: fwdfw p2p txt
WARNING: translation string unused: fwdfw rule action
WARNING: translation string unused: fwdfw rules
WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
WARNING: translation string unused: fwdfw time
WARNING: translation string unused: fwdfw xt access
WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
WARNING: translation string unused: fwhost IpSec Host
WARNING: translation string unused: fwhost IpSec Network
WARNING: translation string unused: fwhost OpenVPN N-2-N
WARNING: translation string unused: fwhost OpenVPN static host
WARNING: translation string unused: fwhost OpenVPN static network
WARNING: translation string unused: fwhost Standard Network
WARNING: translation string unused: fwhost attention
WARNING: translation string unused: fwhost blue
WARNING: translation string unused: fwhost changeremark
WARNING: translation string unused: fwhost err addrgrp
WARNING: translation string unused: fwhost err hostorip
WARNING: translation string unused: fwhost err mac
WARNING: translation string unused: fwhost green
WARNING: translation string unused: fwhost hosts
WARNING: translation string unused: fwhost ipadr
WARNING: translation string unused: fwhost ipsec host
WARNING: translation string unused: fwhost orange
WARNING: translation string unused: fwhost reread
WARNING: translation string unused: fwhost reset
WARNING: translation string unused: fwhost wo subnet
WARNING: translation string unused: g.dtm
WARNING: translation string unused: g.lite
WARNING: translation string unused: gen static key
@@ -268,6 +316,7 @@ WARNING: translation string unused: invalid upstream proxy username or password
WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
WARNING: translation string unused: isdn
WARNING: translation string unused: isdn settings
@@ -517,6 +566,13 @@ WARNING: translation string unused: to email adr
WARNING: translation string unused: to install an update
WARNING: translation string unused: to warn email bad
WARNING: translation string unused: too long 80 char max
WARNING: translation string unused: tor 0 = disabled
WARNING: translation string unused: tor accounting period daily
WARNING: translation string unused: tor accounting period monthly
WARNING: translation string unused: tor accounting period weekly
WARNING: translation string unused: tor bridge enabled
WARNING: translation string unused: tor errmsg invalid node id
WARNING: translation string unused: tor exit country
WARNING: translation string unused: total connection time
WARNING: translation string unused: traffic back
WARNING: translation string unused: traffic calc time
@@ -547,9 +603,12 @@ WARNING: translation string unused: updates is old1
WARNING: translation string unused: updates is old2
WARNING: translation string unused: updxlrtr children
WARNING: translation string unused: updxlrtr invalid num of children
WARNING: translation string unused: updxlrtr sources
WARNING: translation string unused: updxlrtr standard view
WARNING: translation string unused: updxlrtr unknown
WARNING: translation string unused: updxlrtr update information
WARNING: translation string unused: updxlrtr update notification
WARNING: translation string unused: updxlrtr used by
WARNING: translation string unused: upload fcdsl.o
WARNING: translation string unused: upload file
WARNING: translation string unused: upload static key
@@ -559,6 +618,7 @@ WARNING: translation string unused: upload update file
WARNING: translation string unused: upstream password
WARNING: translation string unused: upstream proxy host:port
WARNING: translation string unused: upstream username
WARNING: translation string unused: uptime
WARNING: translation string unused: uptime and users
WARNING: translation string unused: urlfilter background image
WARNING: translation string unused: urlfilter background text
@@ -588,218 +648,22 @@ WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: ConnSched dial
WARNING: untranslated string: ConnSched hangup
WARNING: untranslated string: ConnSched reboot
WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: MB read
WARNING: untranslated string: MB written
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: addons
WARNING: untranslated string: advproxy cache-digest
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: bit
WARNING: untranslated string: atm device
WARNING: untranslated string: bytes
WARNING: untranslated string: capabilities
WARNING: untranslated string: ccd err isipsecrw
WARNING: untranslated string: ccd err isovpnn2n
WARNING: untranslated string: ccd iroute2
WARNING: untranslated string: count
WARNING: untranslated string: countries
WARNING: untranslated string: country codes and flags
WARNING: untranslated string: countrycode
WARNING: untranslated string: dead peer detection
WARNING: untranslated string: details
WARNING: untranslated string: dh
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh name is invalid
WARNING: untranslated string: dnat address
WARNING: untranslated string: dns servers
WARNING: untranslated string: dnsforward
WARNING: untranslated string: dnsforward add a new entry
WARNING: untranslated string: dnsforward configuration
WARNING: untranslated string: dnsforward edit an entry
WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
WARNING: untranslated string: downlink
WARNING: untranslated string: dpd delay
WARNING: untranslated string: dpd timeout
WARNING: untranslated string: drop action
WARNING: untranslated string: drop action1
WARNING: untranslated string: drop action2
WARNING: untranslated string: drop forward
WARNING: untranslated string: drop outgoing
WARNING: untranslated string: encryption
WARNING: untranslated string: entropy
WARNING: untranslated string: entropy graphs
WARNING: untranslated string: firewall logs country
WARNING: untranslated string: firewall rules
WARNING: untranslated string: first
WARNING: untranslated string: flag
WARNING: untranslated string: fw default drop
WARNING: untranslated string: fw settings
WARNING: untranslated string: fw settings color
WARNING: untranslated string: fw settings dropdown
WARNING: untranslated string: fw settings remark
WARNING: untranslated string: fw settings ruletable
WARNING: untranslated string: fwdfw ACCEPT
WARNING: untranslated string: fwdfw DROP
WARNING: untranslated string: fwdfw REJECT
WARNING: untranslated string: fwdfw action
WARNING: untranslated string: fwdfw additional
WARNING: untranslated string: fwdfw all icmp
WARNING: untranslated string: fwdfw change
WARNING: untranslated string: fwdfw copy
WARNING: untranslated string: fwdfw delete
WARNING: untranslated string: fwdfw dnat
WARNING: untranslated string: fwdfw dnat error
WARNING: untranslated string: fwdfw dnat extport
WARNING: untranslated string: fwdfw dnat nochoice
WARNING: untranslated string: fwdfw dnat porterr
WARNING: untranslated string: fwdfw dnat porterr2
WARNING: untranslated string: fwdfw edit
WARNING: untranslated string: fwdfw err nosrc
WARNING: untranslated string: fwdfw err notgt
WARNING: untranslated string: fwdfw err prot_port
WARNING: untranslated string: fwdfw err remark
WARNING: untranslated string: fwdfw err ruleexists
WARNING: untranslated string: fwdfw err same
WARNING: untranslated string: fwdfw err samesub
WARNING: untranslated string: fwdfw err src_addr
WARNING: untranslated string: fwdfw err tgt_addr
WARNING: untranslated string: fwdfw err tgt_grp
WARNING: untranslated string: fwdfw err tgt_mac
WARNING: untranslated string: fwdfw err tgt_port
WARNING: untranslated string: fwdfw err time
WARNING: untranslated string: fwdfw external port nat
WARNING: untranslated string: fwdfw hint ip1
WARNING: untranslated string: fwdfw hint ip2
WARNING: untranslated string: fwdfw hint mac
WARNING: untranslated string: fwdfw iface
WARNING: untranslated string: fwdfw log
WARNING: untranslated string: fwdfw log rule
WARNING: untranslated string: fwdfw many
WARNING: untranslated string: fwdfw movedown
WARNING: untranslated string: fwdfw moveup
WARNING: untranslated string: fwdfw newrule
WARNING: untranslated string: fwdfw pol allow
WARNING: untranslated string: fwdfw pol block
WARNING: untranslated string: fwdfw pol text
WARNING: untranslated string: fwdfw pol text1
WARNING: untranslated string: fwdfw pol title
WARNING: untranslated string: fwdfw prot41
WARNING: untranslated string: fwdfw prot41 short
WARNING: untranslated string: fwdfw red
WARNING: untranslated string: fwdfw reread
WARNING: untranslated string: fwdfw rule activate
WARNING: untranslated string: fwdfw rulepos
WARNING: untranslated string: fwdfw snat
WARNING: untranslated string: fwdfw source
WARNING: untranslated string: fwdfw sourceip
WARNING: untranslated string: fwdfw target
WARNING: untranslated string: fwdfw targetip
WARNING: untranslated string: fwdfw timeframe
WARNING: untranslated string: fwdfw toggle
WARNING: untranslated string: fwdfw togglelog
WARNING: untranslated string: fwdfw use nat
WARNING: untranslated string: fwdfw use srcport
WARNING: untranslated string: fwdfw use srv
WARNING: untranslated string: fwdfw useless rule
WARNING: untranslated string: fwdfw warn1
WARNING: untranslated string: fwdfw wd_fri
WARNING: untranslated string: fwdfw wd_mon
WARNING: untranslated string: fwdfw wd_sat
WARNING: untranslated string: fwdfw wd_sun
WARNING: untranslated string: fwdfw wd_thu
WARNING: untranslated string: fwdfw wd_tue
WARNING: untranslated string: fwdfw wd_wed
WARNING: untranslated string: fwhost addgrp
WARNING: untranslated string: fwhost addgrpname
WARNING: untranslated string: fwhost addhost
WARNING: untranslated string: fwhost addnet
WARNING: untranslated string: fwhost addservice
WARNING: untranslated string: fwhost addservicegrp
WARNING: untranslated string: fwhost any
WARNING: untranslated string: fwhost back
WARNING: untranslated string: fwhost ccdhost
WARNING: untranslated string: fwhost ccdnet
WARNING: untranslated string: fwhost change
WARNING: untranslated string: fwhost cust addr
WARNING: untranslated string: fwhost cust grp
WARNING: untranslated string: fwhost cust net
WARNING: untranslated string: fwhost cust service
WARNING: untranslated string: fwhost cust srvgrp
WARNING: untranslated string: fwhost deleted
WARNING: untranslated string: fwhost empty
WARNING: untranslated string: fwhost err addr
WARNING: untranslated string: fwhost err empty
WARNING: untranslated string: fwhost err emptytable
WARNING: untranslated string: fwhost err groupempty
WARNING: untranslated string: fwhost err grpexist
WARNING: untranslated string: fwhost err hostexist
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: fwhost err ip
WARNING: untranslated string: fwhost err ipcheck
WARNING: untranslated string: fwhost err ipmac
WARNING: untranslated string: fwhost err ipwithsub
WARNING: untranslated string: fwhost err isccdhost
WARNING: untranslated string: fwhost err isccdiphost
WARNING: untranslated string: fwhost err isccdipnet
WARNING: untranslated string: fwhost err isccdnet
WARNING: untranslated string: fwhost err isingrp
WARNING: untranslated string: fwhost err maxservicetcp
WARNING: untranslated string: fwhost err maxserviceudp
WARNING: untranslated string: fwhost err name
WARNING: untranslated string: fwhost err name1
WARNING: untranslated string: fwhost err net
WARNING: untranslated string: fwhost err netexist
WARNING: untranslated string: fwhost err partofnet
WARNING: untranslated string: fwhost err port
WARNING: untranslated string: fwhost err remark
WARNING: untranslated string: fwhost err srv exists
WARNING: untranslated string: fwhost err srvexist
WARNING: untranslated string: fwhost err sub32
WARNING: untranslated string: fwhost hint
WARNING: untranslated string: fwhost icmptype
WARNING: untranslated string: fwhost ip_mac
WARNING: untranslated string: fwhost ipsec net
WARNING: untranslated string: fwhost menu
WARNING: untranslated string: fwhost netaddress
WARNING: untranslated string: fwhost newgrp
WARNING: untranslated string: fwhost newhost
WARNING: untranslated string: fwhost newnet
WARNING: untranslated string: fwhost newservice
WARNING: untranslated string: fwhost newservicegrp
WARNING: untranslated string: fwhost ovpn_n2n
WARNING: untranslated string: fwhost port
WARNING: untranslated string: fwhost prot
WARNING: untranslated string: fwhost services
WARNING: untranslated string: fwhost srv_name
WARNING: untranslated string: fwhost stdnet
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: grouptype
WARNING: untranslated string: hardware support
WARNING: untranslated string: imei
WARNING: untranslated string: imsi
WARNING: untranslated string: incoming firewall access
WARNING: untranslated string: integrity
WARNING: untranslated string: invalid input for dpd delay
WARNING: untranslated string: invalid input for dpd timeout
WARNING: untranslated string: ipsec
WARNING: untranslated string: ipsec network
WARNING: untranslated string: last
WARNING: untranslated string: least preferred
WARNING: untranslated string: lifetime
WARNING: untranslated string: mac filter
WARNING: untranslated string: maximum
WARNING: untranslated string: minimum
WARNING: untranslated string: model
WARNING: untranslated string: modem hardware details
WARNING: untranslated string: modem information
@@ -814,118 +678,20 @@ WARNING: untranslated string: modem no connection message
WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
WARNING: untranslated string: openvpn network
WARNING: untranslated string: outgoing firewall access
WARNING: untranslated string: ovpn crypt options
WARNING: untranslated string: ovpn dh
WARNING: untranslated string: ovpn dh name
WARNING: untranslated string: ovpn generating the root and host certificates
WARNING: untranslated string: ovpn ha
WARNING: untranslated string: ovpn hmac
WARNING: untranslated string: ovpn mgmt in root range
WARNING: untranslated string: ovpn no connections
WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: p2p block
WARNING: untranslated string: p2p block save notice
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: red1
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: show dh
WARNING: untranslated string: snat new source ip address
WARNING: untranslated string: software version
WARNING: untranslated string: source ip country
WARNING: untranslated string: ssh
WARNING: untranslated string: support donation
WARNING: untranslated string: system has hwrng
WARNING: untranslated string: system has rdrand
WARNING: untranslated string: tor
WARNING: untranslated string: tor accounting
WARNING: untranslated string: tor accounting bytes
WARNING: untranslated string: tor accounting bytes left
WARNING: untranslated string: tor accounting interval
WARNING: untranslated string: tor accounting limit
WARNING: untranslated string: tor accounting period
WARNING: untranslated string: tor acls
WARNING: untranslated string: tor allowed subnets
WARNING: untranslated string: tor bandwidth burst
WARNING: untranslated string: tor bandwidth rate
WARNING: untranslated string: tor bandwidth settings
WARNING: untranslated string: tor bandwidth unlimited
WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
WARNING: untranslated string: tor errmsg invalid relay port
WARNING: untranslated string: tor errmsg invalid socks port
WARNING: untranslated string: tor exit country any
WARNING: untranslated string: tor exit nodes
WARNING: untranslated string: tor relay address
WARNING: untranslated string: tor relay configuration
WARNING: untranslated string: tor relay enabled
WARNING: untranslated string: tor relay external address
WARNING: untranslated string: tor relay fingerprint
WARNING: untranslated string: tor relay mode
WARNING: untranslated string: tor relay mode bridge
WARNING: untranslated string: tor relay mode exit
WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard
WARNING: untranslated string: tor traffic limit soft
WARNING: untranslated string: tor traffic read written
WARNING: untranslated string: tor use exit nodes
WARNING: untranslated string: uplink
WARNING: untranslated string: upload dh key
WARNING: untranslated string: uptime load average
WARNING: untranslated string: urlfilter redirect template
WARNING: untranslated string: vendor
WARNING: untranslated string: wlan client
WARNING: untranslated string: wlan client advanced settings
WARNING: untranslated string: wlan client and
WARNING: untranslated string: wlan client bssid
WARNING: untranslated string: wlan client ccmp
WARNING: untranslated string: wlan client configuration
WARNING: untranslated string: wlan client disconnected
WARNING: untranslated string: wlan client duplicate ssid
WARNING: untranslated string: wlan client edit entry
WARNING: untranslated string: wlan client encryption
WARNING: untranslated string: wlan client encryption none
WARNING: untranslated string: wlan client encryption wep
WARNING: untranslated string: wlan client encryption wpa
WARNING: untranslated string: wlan client encryption wpa2
WARNING: untranslated string: wlan client group cipher
WARNING: untranslated string: wlan client group key algorithm
WARNING: untranslated string: wlan client invalid key length
WARNING: untranslated string: wlan client new entry
WARNING: untranslated string: wlan client new network
WARNING: untranslated string: wlan client pairwise cipher
WARNING: untranslated string: wlan client pairwise key algorithm
WARNING: untranslated string: wlan client pairwise key group key
WARNING: untranslated string: wlan client psk
WARNING: untranslated string: wlan client ssid
WARNING: untranslated string: wlan client tkip
WARNING: untranslated string: wlan client wpa mode
WARNING: untranslated string: wlan client wpa mode all
WARNING: untranslated string: wlan client wpa mode ccmp ccmp
WARNING: untranslated string: wlan client wpa mode ccmp tkip
WARNING: untranslated string: wlan client wpa mode tkip tkip
WARNING: untranslated string: wlan clients

2
doc/language_issues.pl
View File

@@ -588,6 +588,7 @@ WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit
WARNING: untranslated string: bytes
@@ -903,6 +904,7 @@ WARNING: untranslated string: proxy reports monthly
WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: red1
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added

2
doc/language_issues.ru
View File

@@ -591,6 +591,7 @@ WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: advproxy errmsg proxy ports equal
WARNING: untranslated string: advproxy proxy port transparent
WARNING: untranslated string: atm device
WARNING: untranslated string: attention
WARNING: untranslated string: bit
WARNING: untranslated string: bytes
@@ -893,6 +894,7 @@ WARNING: untranslated string: proxy reports monthly
WARNING: untranslated string: proxy reports today
WARNING: untranslated string: proxy reports weekly
WARNING: untranslated string: qos enter bandwidths
WARNING: untranslated string: random number generator daemon
WARNING: untranslated string: red1
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added

16
doc/language_issues.tr
View File

@@ -248,6 +248,14 @@ WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
WARNING: translation string unused: fwdfw time
WARNING: translation string unused: fwdfw xt access
WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
WARNING: translation string unused: fwhost IpSec Host
WARNING: translation string unused: fwhost IpSec Network
WARNING: translation string unused: fwhost OpenVPN N-2-N
WARNING: translation string unused: fwhost OpenVPN static host
WARNING: translation string unused: fwhost OpenVPN static network
WARNING: translation string unused: fwhost Standard Network
WARNING: translation string unused: fwhost attention
WARNING: translation string unused: fwhost blue
WARNING: translation string unused: fwhost changeremark
@@ -639,26 +647,19 @@ WARNING: translation string unused: xtaccess all error
WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: ConnSched dial
WARNING: untranslated string: ConnSched hangup
WARNING: untranslated string: ConnSched reboot
WARNING: untranslated string: ConnSched shutdown
WARNING: untranslated string: Number of Countries for the pie chart
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: bytes
WARNING: untranslated string: capabilities
WARNING: untranslated string: count
WARNING: untranslated string: dh
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh name is invalid
WARNING: untranslated string: firewall logs country
WARNING: untranslated string: fwdfw many
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: gen dh
WARNING: untranslated string: generate dh key
WARNING: untranslated string: imei
WARNING: untranslated string: imsi
WARNING: untranslated string: incoming firewall access
WARNING: untranslated string: model
WARNING: untranslated string: modem hardware details
WARNING: untranslated string: modem information
@@ -674,7 +675,6 @@ WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: outgoing firewall access
WARNING: untranslated string: ovpn crypt options
WARNING: untranslated string: ovpn dh
WARNING: untranslated string: ovpn dh name

40
doc/language_missings
View File

@@ -23,6 +23,7 @@
< age shour
< age sminute
< age ssecond
< atm device
< attention
< bit
< capabilities
@@ -230,6 +231,8 @@
< fwhost cust addr
< fwhost cust grp
< fwhost cust net
< fwhost Custom Host
< fwhost Custom Network
< fwhost cust service
< fwhost cust srvgrp
< fwhost deleted
@@ -271,7 +274,9 @@
< fwhost ipadr
< fwhost ip_mac
< fwhost ipsec host
< fwhost IpSec Host
< fwhost ipsec net
< fwhost IpSec Network
< fwhost menu
< fwhost netaddress
< fwhost newgrp
@@ -279,6 +284,9 @@
< fwhost newnet
< fwhost newservice
< fwhost newservicegrp
< fwhost OpenVPN N-2-N
< fwhost OpenVPN static host
< fwhost OpenVPN static network
< fwhost orange
< fwhost ovpn_n2n
< fwhost port
@@ -287,6 +295,7 @@
< fwhost reset
< fwhost services
< fwhost srv_name
< fwhost Standard Network
< fwhost stdnet
< fwhost type
< fwhost used
@@ -376,6 +385,7 @@
< proxy reports today
< proxy reports weekly
< qos enter bandwidths
< random number generator daemon
< red1
< server restart
< show dh
@@ -524,6 +534,7 @@
< age sminute
< age ssecond
< Async logging enabled
< atm device
< attention
< bit
< capabilities
@@ -730,6 +741,8 @@
< fwhost cust addr
< fwhost cust grp
< fwhost cust net
< fwhost Custom Host
< fwhost Custom Network
< fwhost cust service
< fwhost cust srvgrp
< fwhost deleted
@@ -771,7 +784,9 @@
< fwhost ipadr
< fwhost ip_mac
< fwhost ipsec host
< fwhost IpSec Host
< fwhost ipsec net
< fwhost IpSec Network
< fwhost menu
< fwhost netaddress
< fwhost newgrp
@@ -779,6 +794,9 @@
< fwhost newnet
< fwhost newservice
< fwhost newservicegrp
< fwhost OpenVPN N-2-N
< fwhost OpenVPN static host
< fwhost OpenVPN static network
< fwhost orange
< fwhost ovpn_n2n
< fwhost port
@@ -787,6 +805,7 @@
< fwhost reset
< fwhost services
< fwhost srv_name
< fwhost Standard Network
< fwhost stdnet
< fwhost type
< fwhost used
@@ -892,6 +911,7 @@
< proxy reports today
< proxy reports weekly
< qos enter bandwidths
< random number generator daemon
< red1
< server restart
< Set time on boot
@@ -1016,6 +1036,7 @@
< age shour
< age sminute
< age ssecond
< atm device
< attention
< bit
< capabilities
@@ -1214,6 +1235,8 @@
< fwhost cust addr
< fwhost cust grp
< fwhost cust net
< fwhost Custom Host
< fwhost Custom Network
< fwhost cust service
< fwhost cust srvgrp
< fwhost deleted
@@ -1255,7 +1278,9 @@
< fwhost ipadr
< fwhost ip_mac
< fwhost ipsec host
< fwhost IpSec Host
< fwhost ipsec net
< fwhost IpSec Network
< fwhost menu
< fwhost netaddress
< fwhost newgrp
@@ -1263,6 +1288,9 @@
< fwhost newnet
< fwhost newservice
< fwhost newservicegrp
< fwhost OpenVPN N-2-N
< fwhost OpenVPN static host
< fwhost OpenVPN static network
< fwhost orange
< fwhost ovpn_n2n
< fwhost port
@@ -1271,6 +1299,7 @@
< fwhost reset
< fwhost services
< fwhost srv_name
< fwhost Standard Network
< fwhost stdnet
< fwhost type
< fwhost used
@@ -1362,6 +1391,7 @@
< proxy reports today
< proxy reports weekly
< qos enter bandwidths
< random number generator daemon
< red1
< server restart
< show dh
@@ -1485,6 +1515,7 @@
< age shour
< age sminute
< age ssecond
< atm device
< attention
< bit
< capabilities
@@ -1687,6 +1718,8 @@
< fwhost cust addr
< fwhost cust grp
< fwhost cust net
< fwhost Custom Host
< fwhost Custom Network
< fwhost cust service
< fwhost cust srvgrp
< fwhost deleted
@@ -1728,7 +1761,9 @@
< fwhost ipadr
< fwhost ip_mac
< fwhost ipsec host
< fwhost IpSec Host
< fwhost ipsec net
< fwhost IpSec Network
< fwhost menu
< fwhost netaddress
< fwhost newgrp
@@ -1736,6 +1771,9 @@
< fwhost newnet
< fwhost newservice
< fwhost newservicegrp
< fwhost OpenVPN N-2-N
< fwhost OpenVPN static host
< fwhost OpenVPN static network
< fwhost orange
< fwhost ovpn_n2n
< fwhost port
@@ -1744,6 +1782,7 @@
< fwhost reset
< fwhost services
< fwhost srv_name
< fwhost Standard Network
< fwhost stdnet
< fwhost type
< fwhost used
@@ -1835,6 +1874,7 @@
< proxy reports today
< proxy reports weekly
< qos enter bandwidths
< random number generator daemon
< red1
< server restart
< show dh

22
html/cgi-bin/entropy.cgi
View File

@@ -61,9 +61,27 @@ if ( $querry[0] ne~ "") {
$message = $Lang::tr{'no hardware random number generator'};
}
my $rngd_status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
if (&rngd_is_running()) {
$rngd_status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
}
&Header::openbox('100%', 'center', $Lang::tr{'hardware support'});
print <<EOF;
<p style="color: $message_colour; text-align: center;">$message</p>
<table width='80%' cellspacing='1' class='tbl'>
<tr>
<th align='center'><b>$Lang::tr{'service'}</b></th>
<th align='center'><b>$Lang::tr{'status'}</b></th>
</tr>
<tr>
<td align='center'>
$Lang::tr{'random number generator daemon'}
</td>
$rngd_status
</tr>
</table>
EOF
&Header::closebox();
@@ -87,3 +105,7 @@ sub has_rdrand() {
return 0;
}
sub rngd_is_running() {
return (-e "/var/run/rngd.pid");
}

15
html/cgi-bin/firewall.cgi
View File

@@ -1334,7 +1334,7 @@ sub getcolor
return;
}elsif($val =~ /^(.*?)\/(.*?)$/){
my ($sip,$scidr) = split ("/",$val);
if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
if ( &Header::orange_used() && &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
$tdcolor="style='background-color: $Header::colourorange;color:white;'";
return;
}
@@ -1342,7 +1342,7 @@ sub getcolor
$tdcolor="style='background-color: $Header::colourgreen;color:white;'";
return;
}
if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
if ( &Header::blue_used() && &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
$tdcolor="style='background-color: $Header::colourblue;color:white;'";
return;
}
@@ -1539,6 +1539,7 @@ sub newrule
$selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
$selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
$selected{'dnat'}{$fwdfwsettings{'dnat'}} ='selected';
$selected{'snat'}{$fwdfwsettings{'snat'}} ='selected';
}
}
$fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
@@ -1601,7 +1602,7 @@ END
if (! -z "${General::swroot}/ethernet/aliases"){
foreach my $alias (sort keys %aliases)
{
print "<option value='$alias' $selected{'ipfire_src'}{$alias}>$alias</option>";
print "<option value='$alias' $selected{'ipfire_src'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
}
}
print<<END;
@@ -1705,7 +1706,7 @@ END
if (! -z "${General::swroot}/ethernet/aliases"){
foreach my $alias (sort keys %aliases)
{
print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias</option>";
print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
}
}
print<<END;
@@ -2561,11 +2562,11 @@ END
push (@nat_ifaces,&fwlib::get_nat_address($$hash{$key}[29],$val));
}
@nat_ifaces=&del_double(@nat_ifaces);
$natstring = join(', ', @nat_ifaces);
$natstring = "";
}else{
$natstring = $$hash{$key}[29];
$natstring = "($$hash{$key}[29])";
}
print "$Lang::tr{'firewall'} ($natstring)";
print "$Lang::tr{'firewall'} $natstring";
if($$hash{$key}[30] ne ''){
$$hash{$key}[30]=~ tr/|/,/;
print": $$hash{$key}[30]";

14
html/cgi-bin/fwhosts.cgi
View File

@@ -909,9 +909,6 @@ if ($fwhostsettings{'ACTION'} eq 'deletegrphost')
}
&General::writehasharray("$configgrp", \%customgrp);
&General::firewall_config_changed();
if ($fwhostsettings{'grpcnt'} > 0){
&General::firewall_config_changed();
}
if ($fwhostsettings{'update'} eq 'on'){
$fwhostsettings{'remark'}= $grpremark;
$fwhostsettings{'grp_name'}=$grpname;
@@ -1635,7 +1632,7 @@ sub getcolor
}
#Now check if IP is part of ORANGE,BLUE or GREEN
if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
if ( &Header::orange_used() && &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
$tdcolor="<font style='color: $Header::colourorange;'>$c</font>";
return $tdcolor;
}
@@ -1643,7 +1640,7 @@ sub getcolor
$tdcolor="<font style='color: $Header::colourgreen;'>$c</font>";
return $tdcolor;
}
if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
if ( &Header::blue_used() && &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
$tdcolor="<font style='color: $Header::colourblue;'>$c</font>";
return $tdcolor;
}
@@ -1843,11 +1840,11 @@ sub viewtablegrp
print "$customgrp{$key}[2]</td>";
}
if ($ip eq '' && $customgrp{$key}[2] ne $Lang::tr{'fwhost err emptytable'}){
print "<td align='center' $col>$Lang::tr{'fwhost deleted'}</td><td align='center' $col>$customgrp{$key}[3]</td><td width='1%' $col><form method='post'>";
print "<td align='center' $col>$Lang::tr{'fwhost deleted'}</td><td align='center' $col>$Lang::tr{'fwhost '.$customgrp{$key}[3]}</td><td width='1%' $col><form method='post'>";
}else{
my ($colip,$colsub) = split("/",$ip);
$ip="$colip/".&General::iporsubtocidr($colsub) if ($colsub);
print"<td align='center' $col>".&getcolor($ip)."</td><td align='center' $col>$customgrp{$key}[3]</td><td width='1%' $col><form method='post'>";
print"<td align='center' $col>".&getcolor($ip)."</td><td align='center' $col>$Lang::tr{'fwhost '.$customgrp{$key}[3]}</td><td width='1%' $col><form method='post'>";
}
if ($delflag > 0 && $ip ne ''){
print"<input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' />";
@@ -1858,8 +1855,7 @@ sub viewtablegrp
}
}
}
print"<input type='hidden' name='ACTION' value='deletegrphost'><input type='hidden' name='grpcnt' value='$customgrp{$key}[4]'><input type='hidden' name='update' value='$fwhostsettings{'update'}'><input type='hidden' name='delhost' value='$grpname,$remark,$customgrp{$key}[2],$customgrp{$key}[3]'></form></td></tr>";
print"<input type='hidden' name='ACTION' value='deletegrphost'><input type='hidden' name='update' value='$fwhostsettings{'update'}'><input type='hidden' name='delhost' value='$grpname,$remark,$customgrp{$key}[2],$customgrp{$key}[3]'></form></td></tr>";
$helper=$customgrp{$key}[0];
$number++;
}

16
html/cgi-bin/pppsetup.cgi
View File

@@ -153,6 +153,9 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
if (($pppsettings{'VPI'} eq '0') && ($pppsettings{'VCI'} eq '0')) {
$errormessage = $Lang::tr{'invalid vpi vpci'};
goto ERROR; }
if ($pppsettings{'ATM_DEV'} eq '') {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
if ( $pppsettings{'PROTOCOL'} eq '' ) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
@@ -751,11 +754,12 @@ if ($pppsettings{'TYPE'} =~ /^(pppoeatm|pptpatm)$/)
print <<END
<tr>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'adsl settings'}:</b></td>
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'atm settings'}:</b></td>
<tr>
<td nowrap='nowrap'>$Lang::tr{'atm device'}</td>
<td><input type='text' size='5' name='ATM_DEV' value='$pppsettings{'ATM_DEV'}' /></td>
<td> $Lang::tr{'encapsulation'}:</td>
<td colspan='2' width='30%'>
<td>
<select name='ENCAP'>
<option value='0' $selected{'ENCAP'}{'0'}>LLC</option>
<option value='1' $selected{'ENCAP'}{'1'}>VCmux</option>
@@ -763,11 +767,10 @@ print <<END
</td>
</tr>
<tr>
<td nowrap='nowrap'>$Lang::tr{'vpi number'}</td>
<td><input type='text' size='5' name='VPI' value='$pppsettings{'VPI'}' /></td>
<td align='right'>$Lang::tr{'vci number'}</td>
<td colspan='2'><input type='text' size='5' name='VCI' value='$pppsettings{'VCI'}' /></td>
<td> $Lang::tr{'vci number'}</td>
<td><input type='text' size='5' name='VCI' value='$pppsettings{'VCI'}' /></td>
</tr>
END
;
@@ -968,6 +971,7 @@ sub initprofile
$pppsettings{'ENCAP'} = '0';
$pppsettings{'VPI'} = '1';
$pppsettings{'VCI'} = '32';
$pppsettings{'ATM_DEV'} = '0';
$pppsettings{'PPTP_PEER'} = '10.0.0.138';
$pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255';
$pppsettings{'PPTP_ROUTE'} = '';

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

@@ -18,8 +18,8 @@
'ConnSched dial' => 'Verbinden',
'ConnSched down' => 'Runter',
'ConnSched hangup' => 'Trennen',
'ConnSched ipsecstart' => 'IPSec (neu)starten',
'ConnSched ipsecstop' => 'IPSec stop',
'ConnSched ipsecstart' => 'IPsec (neu)starten',
'ConnSched ipsecstop' => 'IPsec stop',
'ConnSched reboot' => 'Neustarten',
'ConnSched reconnect' => 'Neu verbinden',
'ConnSched scheduled actions' => 'Geplante Aktionen',
@@ -99,7 +99,6 @@
'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.',
'admin users' => 'Liste der Benutzer mit Super User Rechten',
'administrator user password' => 'Passwort für Benutzer &quot;admin&quot;:',
'adsl settings' => 'ADSL-Einstellungen',
'advanced' => 'Erweitert',
'advanced server' => 'Erweiterte Server-Optionen',
'advproxy AUTH always required' => 'Authentifizierung für uneingeschränkte Quelladressen erforderlich',
@@ -366,6 +365,8 @@
'are you sure' => 'Sind Sie sicher?',
'arp table entries' => 'Einträge der ARP-Tabelle',
'artist' => 'Künstler',
'atm device' => 'Device:',
'atm settings' => 'ATM-Einstellungen',
'attemps' => 'Versuche',
'attention' => 'ACHTUNG',
'august' => 'August',
@@ -1034,6 +1035,14 @@
'fwdfw wd_tue' => 'Di',
'fwdfw wd_wed' => 'Mi',
'fwdfw xt access' => 'Input',
'fwhost Custom Host' => 'Host',
'fwhost Custom Network' => 'Netzwerk',
'fwhost IpSec Host' => 'IPsec-Host',
'fwhost IpSec Network' => 'IPsec-Netzwerk',
'fwhost OpenVPN N-2-N' => 'OpenVPN Netz-zu-Netz',
'fwhost OpenVPN static host' => 'OpenVPN statischer Host',
'fwhost OpenVPN static network' => 'OpenVPN statisches Netzwerk',
'fwhost Standard Network' => 'Standard-Netzwerk',
'fwhost addgrp' => 'Neue Gruppe hinzufügen',
'fwhost addgrpname' => 'Gruppenname:',
'fwhost addhost' => 'Neuen Host hinzufügen',
@@ -1801,6 +1810,7 @@
'qos warning' => 'Die Regel <strong>muss</strong> wieder gespeichert werden, ansonsten wird sie verworfen!',
'quick playlist' => 'Quick Playlist',
'ram' => 'RAM-Speicher',
'random number generator daemon' => 'Random Number Generator Daemon',
'read bytes' => 'Gelesene Bytes',
'read list' => 'Liste der Leseberechtigten',
'real address' => 'Reale Addresse',

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

@@ -18,8 +18,8 @@
'ConnSched dial' => 'Connect',
'ConnSched down' => 'Down',
'ConnSched hangup' => 'Disconnect',
'ConnSched ipsecstart' => 'IPSec (re)start',
'ConnSched ipsecstop' => 'IPSec stop',
'ConnSched ipsecstart' => 'IPsec (re)start',
'ConnSched ipsecstop' => 'IPsec stop',
'ConnSched reboot' => 'Reboot',
'ConnSched reconnect' => 'Reconnect',
'ConnSched scheduled actions' => 'Scheduled actions',
@@ -99,7 +99,6 @@
'admin user password has been changed' => 'Admin user password has been changed.',
'admin users' => 'User with superuser rights',
'administrator user password' => 'Admin user password:',
'adsl settings' => 'ADSL settings',
'advanced' => 'Advanced',
'advanced server' => 'Advanced server options',
'advproxy AUTH always required' => 'Require authentication for unrestricted source addresses',
@@ -368,6 +367,8 @@
'are you sure' => 'Are you sure?',
'arp table entries' => 'ARP Table Entries',
'artist' => 'Artist',
'atm device' => 'Device:',
'atm settings' => 'ATM settings',
'attemps' => 'Attempts',
'attention' => 'ATTENTION',
'august' => 'August',
@@ -1061,6 +1062,14 @@
'fwdfw wd_tue' => 'Tue',
'fwdfw wd_wed' => 'Wed',
'fwdfw xt access' => 'Input',
'fwhost Custom Host' => 'Host',
'fwhost Custom Network' => 'Network',
'fwhost IpSec Host' => 'IPsec host',
'fwhost IpSec Network' => 'IPsec network',
'fwhost OpenVPN N-2-N' => 'OpenVPN Net-to-Net',
'fwhost OpenVPN static host' => 'OpenVPN static host',
'fwhost OpenVPN static network' => 'OpenVPN static network',
'fwhost Standard Network' => 'Standard network',
'fwhost addgrp' => 'Add new network/host group',
'fwhost addgrpname' => 'Group name:',
'fwhost addhost' => 'Add new host',
@@ -1835,6 +1844,7 @@
'quick control' => 'Quick Control',
'quick playlist' => 'Quick Playlist',
'ram' => 'RAM',
'random number generator daemon' => 'Random Number Generator Daemon',
'read bytes' => 'Read Bytes',
'read list' => 'list with readonly hosts',
'real address' => 'Real Address',

6
langs/es/cgi-bin/es.pl
View File

@@ -15,8 +15,8 @@
'ConnSched change profile title' => 'Cambiar a perfil:',
'ConnSched days' => 'Días:',
'ConnSched down' => 'Abajo',
'ConnSched ipsecstart' => '(Re)iniciarIPSec',
'ConnSched ipsecstop' => 'Detener IPSec',
'ConnSched ipsecstart' => '(Re)iniciarIPsec',
'ConnSched ipsecstop' => 'Detener IPsec',
'ConnSched reconnect' => 'Reconectar',
'ConnSched scheduled actions' => 'Acciones planificadas',
'ConnSched scheduler' => 'Planificador',
@@ -90,7 +90,6 @@
'admin user password has been changed' => 'El password del usuario Admin ha cambiado',
'admin users' => 'Usuario con niveles de superusuario (root)',
'administrator user password' => 'Contraseña del usuario Admin:',
'adsl settings' => 'Configuraciones ADSL',
'advanced' => 'Avanzadas',
'advanced server' => 'Opciones avanzadas de servidor',
'advproxy AUTH always required' => 'Se necesita autentificación para acceso irrestricto de direcciones de orígen',
@@ -349,6 +348,7 @@
'are you sure' => '¿Esta seguro?',
'arp table entries' => 'Tabla de entradas ARP:',
'artist' => 'Artista',
'atm settings' => 'Configuraciones ATM',
'attemps' => 'Intentos',
'august' => 'Agosto',
'authentication' => 'Autenticación',

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

@@ -16,8 +16,8 @@
'ConnSched change profile title' => 'Changer de profil :',
'ConnSched days' => 'Jours :',
'ConnSched down' => 'Arrêt',
'ConnSched ipsecstart' => 'IPSec (re)démarrage',
'ConnSched ipsecstop' => 'IPSec arrêt',
'ConnSched ipsecstart' => 'IPsec (re)démarrage',
'ConnSched ipsecstop' => 'IPsec arrêt',
'ConnSched reconnect' => 'Reconnecter',
'ConnSched scheduled actions' => 'Actions planifiées',
'ConnSched scheduler' => 'Planificateur',
@@ -92,7 +92,6 @@
'admin user password has been changed' => 'Le mot de passe admin a été changé.',
'admin users' => 'Utilisateur avec droits super-utilisateur',
'administrator user password' => 'Mot de passe de l\'administrateur:',
'adsl settings' => 'Réglages ADSL',
'advanced' => 'Avancé',
'advanced server' => 'Options avancées du serveur',
'advproxy AUTH always required' => 'Exige l\'authentification pour un accès sans restriction des adresses sources',
@@ -351,6 +350,7 @@
'are you sure' => 'Etes vous sûr ?',
'arp table entries' => 'Table d\'entrées ARP:',
'artist' => 'Artiste',
'atm settings' => 'Réglages ATM',
'attemps' => 'Tentatives',
'august' => 'Août',
'authentication' => 'Authentification :',

374
langs/nl/cgi-bin/nl.pl
View File

@@ -15,13 +15,17 @@
'ConnSched add action' => 'Voeg actie toe',
'ConnSched change profile title' => 'Gebruik profiel:',
'ConnSched days' => 'Dagen:',
'ConnSched dial' => 'Verbind',
'ConnSched down' => 'Omlaag',
'ConnSched ipsecstart' => 'IPSec (her)starten',
'ConnSched ipsecstop' => 'IPSec stoppen',
'ConnSched hangup' => 'Verbreek',
'ConnSched ipsecstart' => 'IPsec (her)starten',
'ConnSched ipsecstop' => 'IPsec stoppen',
'ConnSched reboot' => 'Herstarten',
'ConnSched reconnect' => 'Opnieuw verbinden',
'ConnSched scheduled actions' => 'Ingeplande acties',
'ConnSched scheduler' => 'Scheduler',
'ConnSched select profile' => 'Selecteer profiel',
'ConnSched shutdown' => 'Afsluiten',
'ConnSched time' => 'Tijd:',
'ConnSched up' => 'Omhoog',
'ConnSched weekdays' => 'Dagen van de week:',
@@ -33,13 +37,15 @@
'Level7 Rule' => 'Level7-Regel',
'Level7 rule' => 'Level7 regel',
'Local VPN IP' => 'Intern Netwerk (GROEN):',
'MB read' => 'MB gelezen',
'MB written' => 'MB geschreven',
'MTU' => 'MTU grootte:',
'Number of IPs for the pie chart' => 'Aantal IPs voor de taartdiagram',
'Number of Ports for the pie chart' => 'Aantal poorten voor de taartdiagram',
'OVPN' => 'OpenVPN',
'OpenVPN' => 'OpenVPN',
'Pages' => 'Pagina\'s',
'Ping' => 'Ping:',
'Ping' => 'Ping :',
'Port Rule' => 'Poort-Regel',
'QoS not enabled' => 'QoS is niet ingeschakeld!',
'Queuelenght' => 'Wachtrijlengte',
@@ -89,10 +95,10 @@
'add xtaccess' => 'Voeg een externe toegang toe',
'add-route' => 'Extra push route',
'added from dhcp lease list' => 'Toegevoegd van DHCP lease-lijst.',
'addons' => 'Toevoegingen',
'admin user password has been changed' => 'Beheerderswachtwoord is gewijzigd.',
'admin users' => 'Gebruiker met beheerdersrechten.',
'administrator user password' => 'Beheerderswachtwoord:',
'adsl settings' => 'ADSL instellingen',
'advanced' => 'Geavanceerd',
'advanced server' => 'Geavanceerde server opties',
'advproxy AUTH always required' => 'Authenticatie vereist voor ongelimiteerde bronadressen.',
@@ -187,6 +193,7 @@
'advproxy banned mac clients' => 'Verboden MAC-adressen (een per regel)',
'advproxy cache management' => 'Cache beheer',
'advproxy cache replacement policy' => 'Cache vervangingsbeleid',
'advproxy cache-digest' => 'Inschakelen Cache-Digest Generation',
'advproxy chgwebpwd ERROR' => 'F O U T :',
'advproxy chgwebpwd SUCCESS' => 'S U C C E S V O L :',
'advproxy chgwebpwd change password' => 'Wijzig wachtwoord',
@@ -243,6 +250,7 @@
'advproxy errmsg password length 1' => 'Wachtwoord moet tenminste ',
'advproxy errmsg password length 2' => ' tekens bevatten',
'advproxy errmsg passwords different' => 'Wachtwoorden zijn niet gelijk',
'advproxy errmsg proxy ports equal' => 'De proxy poort en de transparante poort kunnen niet gelijk zijn.',
'advproxy errmsg radius port' => 'Ongeldig RADIUS poortnummer',
'advproxy errmsg radius secret' => 'RADIUS gedeeld geheim vereist',
'advproxy errmsg radius server' => 'Ongeldig IP-adres voor RADIUS server',
@@ -280,6 +288,7 @@
'advproxy on' => 'Proxy aan',
'advproxy privacy' => 'Privacy',
'advproxy proxy port' => 'Proxy poort',
'advproxy proxy port transparent' => 'Transparante poort',
'advproxy ram cache size' => 'Geheugen cache-grootte (MB)',
'advproxy redirector children' => 'Aantal filterprocessen',
'advproxy reset' => 'Reset',
@@ -323,6 +332,11 @@
'advproxy web browser' => 'Webbrowser',
'advproxy wednesday' => 'Woe',
'again' => 'Nogmaals:',
'age second' => 'seconde',
'age seconds' => 'seconden',
'age shour' => 'uur',
'age sminute' => 'min',
'age ssecond' => 'sec',
'aktiv' => 'Actief',
'album' => 'Album',
'alcatelusb help' => 'Om gebruik te kunnen maken van de SpeedTouch 330 of SpeedTouch USB modem moet u eerst de firmware naar uw IPFire machine uploaden. U kunt de <b>Embedded Firmware</b> voor de SpeedTouch 330 downloaden van speedtouch.com. Pak het uit en upload het juiste bestand naar uw modem: KQD6_3.xxx als Rev<4 of ZZZL_3.xxx, voor Rev=4 gebruik het formulier hieronder.',
@@ -353,6 +367,7 @@
'are you sure' => 'Weet u het zeker?',
'arp table entries' => 'ARP Tabelingangen:',
'artist' => 'Artiest',
'atm settings' => 'ATM instellingen',
'attemps' => 'Pogingen',
'attention' => 'LET OP',
'august' => 'Augustus',
@@ -408,6 +423,7 @@
'behind a proxy' => 'Achter een proxy:',
'bewan adsl pci st' => 'WORDT VERWIJDERD',
'bewan adsl usb' => 'WORDT VERWIJDERD',
'bit' => 'Bit',
'bitrate' => 'Bitsnelheid',
'bleeding rules' => 'Nieuwste Snort regels',
'blue' => 'BLAUW',
@@ -490,6 +506,8 @@
'ccd err iroute' => 'Netwerkadres voor route is ongeldig.',
'ccd err irouteexist' => 'Deze route is al in gebruik.',
'ccd err isipsecnet' => 'Het gegeven subnet-adres is al in gebruik door een IPsec netwerk.',
'ccd err isipsecrw' => 'Het gegeven subnet-adres is al in gebruik door het IPsec rw netwerk.',
'ccd err isovpnn2n' => 'The subnet address is already in use for an OpenVPN net-to-net connection.',
'ccd err isovpnnet' => 'Subnet-adres is al in gebruik voor OpenVPN Server.',
'ccd err issubnet' => 'Subnet-adres is al in gebruik.',
'ccd err name' => 'Kies een naam.',
@@ -503,6 +521,7 @@
'ccd hint' => 'Op deze pagina kunt u statische netwerken definiëren vanwaar de roadwarrior clients vaste IP-adressen toegewezen kunnen krijgen.',
'ccd invalid' => 'Ongeldig.',
'ccd iroute' => 'IPFire heeft toegang tot deze netwerken aan de klant-site.',
'ccd iroute2' => 'Client heeft toegang tot deze netwerken op IPFire\'s site',
'ccd iroutehint' => 'Attentie! Als u deze instellingen wijzigt, moet u de OpenVPN server herstarten om deze instellingen actief te laten worden!',
'ccd modify' => 'Wijzig netwerk',
'ccd name' => 'Naam',
@@ -574,7 +593,11 @@
'could not open installed updates file' => 'Kan het geïnstalleerde update-bestand niet openen.',
'could not open update information file' => 'Kan het update informatiebestand niet openen. Het update-bestand is beschadigd.',
'could not retrieve common name from certificate' => 'Kan de gemeenschappelijke naam van het certificaat niet bepalen.',
'count' => 'Aantal',
'countries' => 'Landen',
'country' => 'Land',
'country codes and flags' => 'Landcodes en vlaggen:',
'countrycode' => 'Code',
'cpu frequency per' => 'CPU frequentie per',
'cpu idle usage' => 'Idle CPU gebruik',
'cpu interrupt usage' => 'Interrupt CPU gebruik',
@@ -626,10 +649,12 @@
'ddns noip prefix' => 'Om no-ip in groepsmodus te gebruiken, zet <b>%</b> voor de hostnaam',
'deactivate' => 'deactiveer',
'deactivate user' => 'deactiveer gebruiker',
'dead peer detection' => 'Dode Peer-detectie',
'debugme' => 'Nog niet geïmplementeerd',
'december' => 'December',
'deep scan directories' => 'Scan recursief',
'def lease time' => 'Standaard leasetijd',
'default ip' => 'Standaard IP adres',
'default lease time' => 'Standaard leasetijd (min.):',
'default networks' => 'Standaard netwerken',
'default renewal time' => 'Standaard vernieuwtijd',
@@ -653,6 +678,7 @@
'destination port numbers' => 'Bestemmingspoort moet een geldig poortnummer of poortreeks zijn.',
'destination port overlaps' => 'Bestemming-poortreeks overlapt een bestaande poortreeks.',
'detail level' => 'Detailniveau',
'details' => 'Details',
'device' => 'Apparaat',
'devices on blue' => 'Apparaten op BLAUW',
'dhcp advopt add' => 'Voeg een DHCP optie toe',
@@ -711,6 +737,7 @@
'dmz pinhole rule added' => 'DMZ pinhole regel toegevoegd; DMZ regel wordt herstart.',
'dmz pinhole rule removed' => 'DMZ pinhole regel verwijderd; DMZ wordt herstart',
'dmzpinholes for same net not necessary' => 'DMZ Pinholes zijn niet per se nodig voor hetzelfde net. Selecteer verschillende bron- of bestemmings-net.',
'dnat address' => 'Firewallinterface',
'dns address deleted' => 'Succesvol verwijderd!',
'dns address deleted txt' => 'De DNS-Server adressen zijn succesvol verwijderd.<br />U moet herstarten of opnieuw verbinden om de wijzigingen actief te laten worden!',
'dns address done' => 'De DNS-server adresinstellingen zullen worden opgeslagen.',
@@ -730,7 +757,14 @@
'dns saved txt' => 'De twee ingevoerde DNS serveradressen zijn succesvol opgeslagen.<br />U moet herstarten of opnieuw verbinden om de wijzigingen actief te laten worden!',
'dns server' => 'DNS Server',
'dns title' => 'Domein Naam Systeem',
'do not log this port list' => 'Negeer deze poorten voordat ze worden gelogd (vermindert loggrootte)',
'dnsforward' => 'DNS Forwarding',
'dnsforward add a new entry' => 'Voeg een nieuwe regel toe',
'dnsforward configuration' => 'DNS forward configuratie',
'dnsforward edit an entry' => 'Wijzig een bestaande regel',
'dnsforward entries' => 'Huidige regels',
'dnsforward forward_server' => 'Naamserver',
'dnsforward zone' => 'Zone',
'do not log this port list' => 'Negeer deze poortlijst voordat deze wordt gelogd (beperkt grootte logbestand)',
'dod' => 'Inbellen op afroep',
'dod for dns' => 'Inbellen op afroep voor DNS:',
'dod not compatible with ddns' => 'Inkiezen op afroep compatibel met de dynamische DNS Diesten',
@@ -746,6 +780,7 @@
'done' => 'Doe het',
'dos charset' => 'DOS tekenset',
'down and up speed' => 'Voer uw down- en uploadsnelheid in<br /> en klik dan op <i>Opslaan</i>.',
'downlink' => 'Downlink',
'downlink speed' => 'Downlink snelheid (kbit/sec)',
'downlink std class' => 'downlink standaard klasse',
'download' => 'download',
@@ -756,7 +791,13 @@
'download pkcs12 file' => 'Download PKCS12 bestand',
'download root certificate' => 'Download root certificaat',
'dpd action' => 'Dead peer-detectie actie',
'dpd delay' => 'Vertraging',
'dpd timeout' => 'Timeout',
'driver' => 'Driver',
'drop action' => 'Standaard gedrag van (forward) firewall in mode "Geblokkeerd"',
'drop action1' => 'Standaard gedrag van (uitgaande) firewall in mode "Geblokkeerd"',
'drop action2' => 'Standaard gedrag van (input) firewall',
'drop forward' => 'Log geblokkeerde forward packetten',
'drop input' => 'Log geblokkeerde input pakketten',
'drop newnotsyn' => 'Log geblokkeerde new-not-syn pakketten',
'drop output' => 'Log geblokkeerde output pakketten',
@@ -805,9 +846,12 @@
'enabledtitle' => 'Ingeschakeld',
'encapsulation' => 'Inkapseling',
'encrypted' => 'Gecodeerd',
'encryption' => 'Codering:',
'end address' => 'Eindadres:',
'enter ack class' => 'Voer de ACK-klasse in <br /> en klik dan op <i>Opslaan</i>.',
'enter data' => 'Maak uw instellingen <br /> en klik dan op <i>Opslaan</i>.',
'entropy' => 'Entropy',
'entropy graphs' => 'Entropy grafieken',
'err bk 1' => 'Fout bij aanmaken van archief',
'err bk 10 password' => 'Fout met het back-up wachtwoord',
'err bk 2 key' => 'Fout bij het aanmaken van een sleutelbestand',
@@ -885,14 +929,18 @@
'firewall logs' => 'Firewall Logs',
'firewall logs ip' => 'Fw-Logdgrafieken (IP)',
'firewall logs port' => 'Fw-Loggrafieken (Poort)',
'firewall rules' => 'Firewallregels',
'firewallhits' => 'firewalltreffers',
'firmware' => 'Firmware',
'firmware upload' => 'Upload Firmware/Drivers',
'first' => 'Eerste',
'fixed ip lease added' => 'Vast IP-lease toegevoegd',
'fixed ip lease modified' => 'Vast IP-lease gewijzigd',
'fixed ip lease removed' => 'Vast IP-lease verwijderd',
'flag' => 'Vlag',
'force update' => 'Forceer update',
'force user' => 'forceer alle nieuwe bestanden naar de gebruiker',
'forward firewall' => 'Firewall',
'forwarding rule added' => 'Forwarding regel toegevoegd; herstarten van forwarder',
'forwarding rule removed' => 'Forwarding regel verwijderd; herstarten van forwarder',
'forwarding rule updated' => 'Forwarding regel bijgewerkt; herstarten van forwarder',
@@ -910,7 +958,190 @@
'from email user' => 'Van e-mail gebruiker',
'from warn email bad' => 'Het van e-mailadres is niet geldig',
'fw blue' => 'Firewallopties voor de BLAUWE interface',
'fw default drop' => 'Firewallbeleid',
'fw logging' => 'Firewall logging',
'fw settings' => 'Firewall instellingen',
'fw settings color' => 'Toon gekleurde regels in tabel',
'fw settings dropdown' => 'Toon alle netwerken op omgeving van aangemaakte regels',
'fw settings remark' => 'Toon opmerkingen in tabel',
'fw settings ruletable' => 'Toon lege tabellen',
'fwdfw ACCEPT' => 'ACCEPTEER',
'fwdfw DROP' => 'BLOKKEER',
'fwdfw MODE1' => 'Blokeer alle pakketten',
'fwdfw MODE2' => 'Accepteer alle pakketten',
'fwdfw REJECT' => 'WEIGER',
'fwdfw action' => 'Actie',
'fwdfw additional' => 'Extra instellingen',
'fwdfw addrule' => 'Voeg toe/Wijzig regel:',
'fwdfw all icmp' => 'Alle ICMP types',
'fwdfw change' => 'Bijwerken',
'fwdfw copy' => 'Kopiëer',
'fwdfw delete' => 'Verwijder',
'fwdfw dnat' => 'Bestemmings-NAT (Poort forwarding)',
'fwdfw dnat error' => 'U kunt slechts één host selecteren voor DNAT. Groepen of netwerken zijn niet toegestaan.',
'fwdfw dnat extport' => 'De externe poort moet leeg zijn wanneer bron-NAT regels worden gebruikt.',
'fwdfw dnat nochoice' => 'Kies een bron-NAT of bestemmings-NAT adres uit de NAT-sectie.',
'fwdfw dnat porterr' => 'U moet een enkele poort of poortreeks (tcp/udp) selecteren voor NAT',
'fwdfw dnat porterr2' => 'Kan geen externe poort (NAT) gebruiken als er geen bestemmingspoort is gedefiniëerd.',
'fwdfw edit' => 'Wijzigen',
'fwdfw err nosrc' => 'Geen bron geselecteerd.',
'fwdfw err nosrcip' => 'Geef a.u.b. het bron IP adres.',
'fwdfw err notgt' => 'Geen bestemming geselecteerd.',
'fwdfw err notgtip' => 'Geef a.u.b. een bestemmings IP adres.',
'fwdfw err prot_port' => 'Bron- of doelpoort zijn niet toegestaan met het geselecteerde protocol',
'fwdfw err prot_port1' => 'Als een bron- of doelpoort wordt gebruikt, moet het TCP of UDP protocol worden geselecteerd.',
'fwdfw err remark' => 'Ongeldige tekens in opmerking.',
'fwdfw err ruleexists' => 'Deze regel bestaat al.',
'fwdfw err same' => 'Bron en bestemming zijn gelijk.',
'fwdfw err samesub' => 'Bron- en bestemmings IP adres zitten in hetzelfde subnet.',
'fwdfw err src_addr' => 'Ongeldig bron MAC/IP adres.',
'fwdfw err tgt_addr' => 'Ongeldig bestemmings IP adres.',
'fwdfw err tgt_grp' => 'De bestemmings servicegroep is leeg',
'fwdfw err tgt_mac' => 'Een MAC adres kan niet worden gebruikt als bestemming.',
'fwdfw err tgt_port' => 'Ongeldige bestemmingspoort.',
'fwdfw err time' => 'U moet tenminste één dag selecteren.',
'fwdfw external port nat' => 'Externe poort (NAT)',
'fwdfw final_rule' => 'Laatste regel: ',
'fwdfw from' => 'Van:',
'fwdfw hint ip1' => 'De laatst gegenereerde regel mag nooit overeenkomen, omdat bron- en bestemmingssubnet kunnen overlappen.',
'fwdfw hint ip2' => 'Controleer of deze regel juist is: ',
'fwdfw hint mac' => 'De bestemmingsgroep bevat MAC adressen; deze zullen worden overgeslagen tijdens het aanmaken van de regels.',
'fwdfw iface' => 'Interface',
'fwdfw ipsec network' => 'IPsec netwerken:',
'fwdfw log' => 'Log',
'fwdfw log rule' => 'Log regel',
'fwdfw man port' => 'Poort(en):',
'fwdfw many' => 'Meerdere',
'fwdfw menu' => 'Firewall',
'fwdfw movedown' => 'Omlaag',
'fwdfw moveup' => 'Omhoog',
'fwdfw natport used' => 'De gegeven poort voor NAPT is al in gebruik door een andere DNAT regel.',
'fwdfw newrule' => 'Nieuwe regel',
'fwdfw p2p txt' => 'Toestaan/Verbieden toegang tot P2P netwerken.',
'fwdfw pol allow' => 'Toegestaan',
'fwdfw pol block' => 'Geblokkeerd',
'fwdfw pol text' => 'Stel het standaard gedrag in voor verbindingen van lokale netwerken. U kunt alle verbindingen standaard toestaan of blokkeren. Verbindingen tussen lokale netwerken zijn tevens geblokeerd in de laatst genoemde modus.',
'fwdfw pol text1' => 'Stel het standaard gedrag in voor verbindingen die door de firewall zelf zijn geïnitieerd. Let op! U kunt uzelf hiermee buiten sluiten.',
'fwdfw pol title' => 'Standaard firewall gedrag',
'fwdfw prot41' => 'IPv6 Encapsulation (Protocol 41)',
'fwdfw prot41 short' => 'IPv6 Encap',
'fwdfw red' => 'RED',
'fwdfw reread' => 'Wijzigingen toepassen',
'fwdfw rule action' => 'Regel actie:',
'fwdfw rule activate' => 'Activeer regel',
'fwdfw rulepos' => 'Regel positie',
'fwdfw rules' => 'Regels',
'fwdfw snat' => 'Bron NAT',
'fwdfw source' => 'Bron',
'fwdfw sourceip' => 'Bronadres (MAC/IP adres of netwerk):',
'fwdfw std network' => 'Standaard netwerken:',
'fwdfw target' => 'Bestemming',
'fwdfw targetip' => 'Bestemmingsadres (IP adres of netwerk):',
'fwdfw till' => 'Tot:',
'fwdfw time' => 'Tijdvak',
'fwdfw timeframe' => 'Gebruik tijdvakken',
'fwdfw toggle' => 'Activeer of deactiveer',
'fwdfw togglelog' => 'Activeer of deactiveer logging',
'fwdfw use nat' => 'Gebruik Netwerk Adres Translatie (NAT)',
'fwdfw use srcport' => 'Bronpoort:',
'fwdfw use srv' => 'Bestemmingspoort:',
'fwdfw useless rule' => 'Deze regel kan niet gebruikt worden.',
'fwdfw warn1' => 'Dit kan leiden tot firewallregels die worden toegepast op netwerken waar ze niet voor bedoeld zijn.',
'fwdfw wd_fri' => 'Vri',
'fwdfw wd_mon' => 'Maa',
'fwdfw wd_sat' => 'Zat',
'fwdfw wd_sun' => 'Zon',
'fwdfw wd_thu' => 'Don',
'fwdfw wd_tue' => 'Din',
'fwdfw wd_wed' => 'Woe',
'fwdfw xt access' => 'Input',
'fwhost Custom Host' => 'Host',
'fwhost Custom Network' => 'Netwerk',
'fwhost IpSec Host' => 'IPsec host',
'fwhost IpSec Network' => 'IPsec netwerk',
'fwhost OpenVPN N-2-N' => 'OpenVPN Net-to-Net',
'fwhost OpenVPN static host' => 'OpenVPN statische host',
'fwhost OpenVPN static network' => 'OpenVPN statisch netwerk',
'fwhost Standard Network' => 'Standaard netwerk',
'fwhost addgrp' => 'Voeg nieuw netwerk/host groep toe',
'fwhost addgrpname' => 'Groepnaam:',
'fwhost addhost' => 'Nieuwe host toevoegen',
'fwhost addnet' => 'Nieuw netwerk toevoegen',
'fwhost addservice' => 'Nieuwe dienst toevoegen',
'fwhost addservicegrp' => 'Nieuwe dienstgroep toevoegen',
'fwhost any' => 'Elke',
'fwhost attention' => 'LET OP',
'fwhost back' => 'Terug',
'fwhost blue' => 'Blauw',
'fwhost ccdhost' => 'OpenVPN clients:',
'fwhost ccdnet' => 'OpenVPN netwerken:',
'fwhost change' => 'Wijzigen',
'fwhost changeremark' => 'U hebt de opmerking aangepast',
'fwhost cust addr' => 'Hosts',
'fwhost cust grp' => 'Netwerk/Host Groepen',
'fwhost cust net' => 'Netwerken',
'fwhost cust service' => 'Diensten',
'fwhost cust srvgrp' => 'Dienstengroepen',
'fwhost deleted' => 'Verwijderd',
'fwhost empty' => 'Geen regels gedefinieerd',
'fwhost err addr' => 'Ongeldig IP adres of subnet',
'fwhost err addrgrp' => 'Geef a.u.b. een groepnaam op',
'fwhost err empty' => 'Vul a.u.b. alle invoervelden in',
'fwhost err emptytable' => 'Er zijn geen regels in deze groep',
'fwhost err groupempty' => 'De geselecteerde groep is leeg',
'fwhost err grpexist' => 'Een groep met dezelfde naam bestaat al',
'fwhost err hostexist' => 'Een host met dezelfde naam bestaat al',
'fwhost err hostorip' => 'Ongeldige naam of IP adres',
'fwhost err ip' => 'Ongeldig IP adres',
'fwhost err ipcheck' => 'Dit IP adres is al in gebruik',
'fwhost err ipmac' => 'Ongeldig IP/MAC adres',
'fwhost err ipwithsub' => 'Geef a.u.b. alleen een IP adres (zonder subnetmasker)',
'fwhost err isccdhost' => 'Deze naam is al in gebruik door een OpenVPN client verbinding',
'fwhost err isccdiphost' => 'Dit IP adres is al in gebruik door een OpenVPN client verbinding',
'fwhost err isccdipnet' => 'Dit IP adres is al in gebruik door een OpenVPN netwerk verbinding',
'fwhost err isccdnet' => 'Deze naam is al in gebruik door een OpenVPN netwerk',
'fwhost err isingrp' => 'Deze regel bestaat al in de groep',
'fwhost err mac' => 'Ongeldig MAC adres',
'fwhost err maxservicetcp' => 'Het maximale aantal van 15 TCP diensten is bereikt in deze groep (poortreeksen tellen dubbel)',
'fwhost err maxserviceudp' => 'Het maximale aantal van 15 UDP diensten is bereikt in deze groep (poortreeksen tellen dubbel)',
'fwhost err name' => 'Ongeldige naam. Toegestane tekens: hoofd- en kleine letters, cijfers, spatie en min-teken.',
'fwhost err name1' => 'Geen naam gegeven.',
'fwhost err net' => 'Netwerk/IP adres bestaat al',
'fwhost err netexist' => 'Een netwerk met dezelfde naam bestaat al',
'fwhost err partofnet' => 'Het netwerk is een subnet van een bestaand netwerk.',
'fwhost err port' => 'Geen poort gegeven',
'fwhost err remark' => 'Ongeldige opmerking. Toegestane tekens: hoofd- en kleine letters, cijfers, spatie, min-teken, accolades, puntkomma, vertikale streep en punt.',
'fwhost err srv exists' => 'Een dienst met dezelfde naam bestaat al',
'fwhost err srvexist' => 'Deze dienst bestaat al in de groep',
'fwhost err sub32' => 'Geef a.u.b. een enkele hostnaam op, geen netwerk.',
'fwhost green' => 'Groen',
'fwhost hint' => 'Notitie',
'fwhost hosts' => 'Firewall Hosts',
'fwhost icmptype' => 'ICMP type:',
'fwhost ip_mac' => 'IP/MAC adres',
'fwhost ipadr' => 'IP adres:',
'fwhost ipsec host' => 'IPsec clients:',
'fwhost ipsec net' => 'IPsec netwerken:',
'fwhost menu' => 'Firewallgroepen',
'fwhost netaddress' => 'Netwerkadressen',
'fwhost newgrp' => 'Netwerk/Host Groepen',
'fwhost newhost' => 'Hosts',
'fwhost newnet' => 'Netwerken',
'fwhost newservice' => 'Diensten',
'fwhost newservicegrp' => 'Dienstgroepen',
'fwhost orange' => 'Oranje',
'fwhost ovpn_n2n' => 'OpenVPN Net-to-Net',
'fwhost port' => 'Poort(en)',
'fwhost prot' => 'Protocol',
'fwhost reread' => 'Firewallregels moeten bijgewerkt worden.',
'fwhost reset' => 'Annuleren',
'fwhost services' => 'Diensten:',
'fwhost srv_name' => 'Dienstnamen',
'fwhost stdnet' => 'Standaard netweken:',
'fwhost type' => 'Type',
'fwhost used' => 'Gebruikt',
'fwhost welcome' => 'Hier kunt u enkele hosts, netwerken en diensten groeperen, waarmee nieuwe regels sneller aangemaakt kunnen worden.',
'fwhost wo subnet' => '(zonder subnet)',
'g.dtm' => 'WORDT VERWIJDERD',
'g.lite' => 'WORDT VERWIJDERD',
'gateway' => 'Gateway',
@@ -936,6 +1167,7 @@
'graph per' => 'per',
'green' => 'GROEN',
'green interface' => 'Groene Interface',
'grouptype' => 'Groeptype:',
'guaranteed bandwith' => 'Gegarandeerde bandbreedte',
'guardian alertfile' => 'Meldingenbestand',
'guardian configuration' => 'Guardian configuratie',
@@ -951,6 +1183,7 @@
'harddisk temperature' => 'Harddisk temperatuur',
'harddisk temperature graphs' => 'hdd temperatuurgrafieken',
'hardware graphs' => 'Hardware grafieken',
'hardware support' => 'Hardware ondersteuning',
'hdd temperature in' => 'Harddisk temperatuur in',
'help' => 'Help',
'high' => 'Hoog',
@@ -1002,6 +1235,7 @@
'inactive' => 'inactief',
'include logfiles' => 'Inclusief logbestanden',
'incoming' => 'inkomend',
'incoming firewall access' => 'Inkomende firewalltoegang',
'incoming traffic in bytes per second' => 'Inkomend verkeer',
'incorrect password' => 'Onjuist wachtwoord',
'info' => 'Info',
@@ -1013,6 +1247,7 @@
'installed' => 'Geïnstalleerd',
'installed updates' => 'Geïnstalleerde updates:',
'instant update' => 'Directe update',
'integrity' => 'Integriteit:',
'interface' => 'Interface',
'interfaces' => 'Interfaces',
'internet' => 'INTERNET',
@@ -1040,6 +1275,8 @@
'invalid input for dhcp dns' => ' Ongeldige invoer voor DHCP DNS',
'invalid input for dhcp domain' => ' Ongeldige invoer voor DHCP domein',
'invalid input for dhcp wins' => ' Ongeldige invoer voor DHCP WINS',
'invalid input for dpd delay' => 'Ongeldige invoer voor DPD vertraging',
'invalid input for dpd timeout' => 'Ongeldige invoer voor DPD timeout',
'invalid input for e-mail address' => ' Ongeldige invoer voor e-mailadres.',
'invalid input for esp keylife' => ' Ongeldige invoer voor ESP sleutel levensduur',
'invalid input for hostname' => ' Ongeldige invoer voor hostnaam.',
@@ -1096,6 +1333,9 @@
'ipfire side is invalid' => 'IPFire-zijde is ongeldig.',
'ipfires hostname' => 'IPFire\'s Hostnaam',
'ipinfo' => 'IP info',
'ipsec' => 'IPsec',
'ipsec network' => 'IPsec netwerk',
'ipsec no connections' => 'Geen actieve IPsec verbindingen',
'iptable rules' => 'IPTable regels',
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Adrestranslatie',
@@ -1118,11 +1358,14 @@
'lan' => 'LAN',
'lang' => 'nl',
'languagepurpose' => 'Selecteer de taal die u wilt gebruiken voor IPFire:',
'last' => 'Laatste',
'last activity' => 'Laatste activiteit',
'lateprompting' => 'Laat-prompting',
'lease expires' => 'Lease verloopt',
'least preferred' => 'Minste voorkeur',
'legend' => 'Legenda',
'length' => 'Lengte',
'lifetime' => 'Levensduur:',
'line' => 'Lijn',
'linkq' => 'Lijnkwaliteit',
'load printer' => 'Laad printer',
@@ -1180,6 +1423,7 @@
'mac address saved txt' => 'Het MAC-adres is succesvol opgeslagen, maar de wijzigingen worden pas actief na een herstart of opnieuw verbinden.',
'mac address title' => 'Medium Access Control Adres',
'mac desc' => 'Hier kunt u het MAC-adres van red0 wijzigen. Het adres moet in hexadecimale waarden (0-9,a-f) ingevoerd worden, <br />bijv. 00-01-02-0e-b8-d6 of 00:01:02:0e:b8:d6.',
'mac filter' => 'MAC filter',
'mac new' => 'nieuw MAC-adres:',
'mac1 new' => 'nieuw MAC-adres 1 (vdsl-inet):',
'mac2 new' => 'nieuw MAC-adres 2 (vdsl-iptv):',
@@ -1206,6 +1450,7 @@
'max size' => 'Max. objectgrootte (KB):',
'max throughput' => 'Maximum doorvoersnelheid',
'maximal' => 'Maximaal',
'maximum' => 'Maximum',
'maximum retries' => 'Maximum aantal pogingen:',
'may' => 'Mei',
'mbmon display' => 'Display',
@@ -1231,6 +1476,7 @@
'min delay' => 'Minimum vertraging',
'min size' => 'Min. objectgrootte (KB):',
'minimal' => 'Minimaal',
'minimum' => 'Minimum',
'minute' => 'Minuut',
'minutes' => 'Minuten',
'misc-options' => 'Overige opties',
@@ -1259,6 +1505,7 @@
'monthly volume start day short' => 'Eerste dag',
'months' => 'maanden',
'more' => 'meer',
'most preferred' => 'Meeste voorkeur',
'mount' => 'Koppelen',
'mounted on' => 'Gekoppeld op',
'mpfire' => 'Mediaspeler voor IPFire',
@@ -1314,6 +1561,7 @@
'no eciadsl synch.bin file' => 'Geen ECI ADSL synch.bin bestand. Bestand uploaden a.u.b.',
'no filter pass' => 'Geef de standaard-klasse voor niet-gefilterde pakketten.',
'no fritzdsl driver' => 'Geen Fritz!DSL driver. Bestand uploaden a.u.b.',
'no hardware random number generator' => 'Dit systeem heeft geen mogelijkheden voor entropie.',
'no information available' => 'Geen informatie beschikbaar.',
'no log selected' => 'Geen log geselecteerd',
'no modem selected' => 'Geen modem geselecteerd',
@@ -1328,6 +1576,7 @@
'not running' => 'loopt niet',
'not set' => 'niet gezet',
'notes' => 'Notities',
'notice' => 'Opmerking',
'november' => 'November',
'ntp common settings' => 'Algemene instellingen',
'ntp configuration' => 'NTP configuratie',
@@ -1360,6 +1609,7 @@
'openvpn fragment allowed with udp' => 'Het gebruik van fragment is alleen toegestaan met het UDP protocol.',
'openvpn log' => 'OpenVPN Log',
'openvpn mssfix allowed with udp' => 'Het gebruik van "mssfix" is alleen toegestaan met het UDP protocol.',
'openvpn network' => 'OpenVPN netwerken',
'openvpn prefix local subnet' => 'Het gebruik van de prefix notatie wordt niet ondersteunt op het lokale subnet. Geef a.u.b. een ander subnetmasker zoals 255.255.255.0.',
'openvpn prefix openvpn subnet' => 'Het gebruik van de prefix notatie wordt niet ondersteund voor het OpenVPN subnet. Geef a.u.b. een ander subnetmasker zoals 255.255.255.0.',
'openvpn prefix remote subnet' => 'Het gebruik van de prefix notatie wordt niet ondersteund voor het remote subnet. Geef a.u.b. een ander subnetmasker zoals 255.255.255.0.',
@@ -1387,6 +1637,7 @@
'out' => 'Uit',
'outgoing' => 'uitgaand',
'outgoing firewall' => 'Uitgaande Firewall',
'outgoing firewall access' => 'Uitgaande firewalltoegang',
'outgoing firewall add ip group' => 'Toevoegen IP-adresgroep',
'outgoing firewall add mac group' => 'Toevoegen MAC-adresgroep',
'outgoing firewall edit ip group' => 'Wijzig IP-adresgroep',
@@ -1417,6 +1668,7 @@
'ovpn errmsg green already pushed' => 'Route voor het groene netwerk is altijd aangezet',
'ovpn errmsg invalid ip or mask' => 'Ongeldig netwerkadres of subnetmasker',
'ovpn log' => 'OVPN-Log',
'ovpn mgmt in root range' => 'Een poortnummer hoger dan 1024 is vereist.',
'ovpn mtu-disc' => 'Pad MTU Discovery',
'ovpn mtu-disc and mtu not 1500' => 'Pad MTU Discovery vereist een MTU van 1500.',
'ovpn mtu-disc maybe' => 'Optioneel',
@@ -1424,10 +1676,12 @@
'ovpn mtu-disc off' => 'Uitgeschakeld',
'ovpn mtu-disc with mssfix or fragment' => 'Pad MTU Discovery kan niet worden gebruikt met mssfix of fragment.',
'ovpn mtu-disc yes' => 'Geforceerd',
'ovpn no connections' => 'Geen actieve OpenVPN verbindingen',
'ovpn on blue' => 'OpenVPN op BLAUW',
'ovpn on orange' => 'OpenVPN op ORANJE',
'ovpn on red' => 'OpenVPN op ROOD',
'ovpn routes push' => 'Routes (een per regel):',
'ovpn port in root range' => 'Een poortnummer hoger dan 1024 is vereist.',
'ovpn routes push' => 'Routes (een per regel) bijv. 192.168.10.0/255.255.255.0 192.168.20.0/24',
'ovpn routes push options' => 'Route push opties',
'ovpn server status' => 'Huidige OpenVPN server status:',
'ovpn subnet' => 'OpenVPN subnet (bijv. 10.0.10.0/255.255.255.0)',
@@ -1449,6 +1703,8 @@
'ovpn_processprioVH' => 'Zeer hoog',
'ovpnstatus log' => 'OVPN-Status-Log',
'ovpnsys log' => 'OVPN-Systeem-Log',
'p2p block' => 'P2P netwerken',
'p2p block save notice' => 'De firewallregels moeten opnieuw geladen worden om uw wijzigingen actief te maken.',
'package failed to install' => 'Pakket kon niet worden geïnstalleerd.',
'pagerefresh' => 'Pagina wordt ververst, wacht even a.u.b.',
'pakfire accept all' => 'Wilt u alle pakketten installeren?',
@@ -1551,6 +1807,7 @@
'pulse' => 'Puls',
'pulse dial' => 'Pulskiezen:',
'qos add subclass' => 'Voeg sub-klasse toe',
'qos enter bandwidths' => 'U moet uw downstream- en upstream bandbreedte opgeven!',
'qos graphs' => 'QoS grafieken',
'qos warning' => 'De regel <strong>moet</strong> worden opgeslagen, anders zal het worden genegeerd!',
'quick control' => 'Quick controle',
@@ -1569,6 +1826,7 @@
'reconnect' => 'Opnieuw verbinden',
'reconnection' => 'Opnieuw verbinding',
'red' => 'Internet',
'red1' => 'ROOD',
'references' => 'Referenties',
'refresh' => 'Ververs',
'refresh index page while connected' => 'Ververs de index.cgi pagina terwijl verbonden',
@@ -1699,6 +1957,7 @@
'smbstop' => 'Stop samba',
'smtphost' => 'SMTP host',
'smtpport' => 'SMTP poort',
'snat new source ip address' => 'Nieuw bron IP adres',
'snort hits' => 'Totaal aantal inbraakregels geactiveerd voor',
'snort working' => 'Snort is bezig ... Wacht a.u.b. totdat alle handelingen succesvol zijn afgerond.',
'socket options' => 'Socket opties',
@@ -1726,6 +1985,7 @@
'srcprt range overlaps' => 'Bronpoortreeks overlapt met een al gedefinieerde poort.',
'srcprt within existing' => 'Bronpoort ligt binnen een al gedefinieerde poortreeks.',
'ssdmz pinholes' => 'DMZ Pinholes',
'ssh' => 'SSH',
'ssh access' => 'SSH toegang',
'ssh access tip' => 'IPFire SSH gebruikt niet de standaard poort 222!',
'ssh fingerprint' => 'Vingerafdruk',
@@ -1774,10 +2034,13 @@
'successfully refreshed updates list' => 'Lijst succesvol bijgewerkt.',
'summaries kept' => 'Bewaar samenvattingen voor',
'sunday' => 'Zondag',
'support donation' => 'Steun het IPFire project met uw donatie',
'swap' => 'Swap',
'swap usage per' => 'Swap gebruik per',
'system' => 'Systeem',
'system graphs' => 'Systeemgrafieken',
'system has hwrng' => 'Dit systeem heeft een hardware-generator voor willekeurige getallen.',
'system has rdrand' => 'Dit systeem ondersteunt Intel(R) RDRAND.',
'system information' => 'Systeeminformatie',
'system log viewer' => 'Systeem Log Viewer',
'system logs' => 'Systeem logs',
@@ -1816,6 +2079,61 @@
'tone' => 'Toon',
'tone dial' => 'Toonkiezen:',
'too long 80 char max' => ' is te lang, maximaal 80 tekens toegestaan',
'tor' => 'Tor',
'tor 0 = disabled' => '0 = uitgeschakeld',
'tor accounting' => 'Verbruik',
'tor accounting bytes' => 'Verkeer (lezen/schrijven)',
'tor accounting bytes left' => 'resterend',
'tor accounting interval' => 'Interval (UTC)',
'tor accounting limit' => 'Verbruikslimiet (MB)',
'tor accounting period' => 'Verbruik periode',
'tor accounting period daily' => 'dagelijks',
'tor accounting period monthly' => 'maandelijks',
'tor accounting period weekly' => 'weekelijks',
'tor acls' => 'Toegangscontrole',
'tor allowed subnets' => 'Toegestane subnetten (een per regel)',
'tor bandwidth burst' => 'Max. burst',
'tor bandwidth rate' => 'Max. snelheid',
'tor bandwidth settings' => 'Bandbreedte instellingen',
'tor bandwidth unlimited' => 'ongelimiteerd',
'tor bridge enabled' => 'Inschakelen Tor bridge',
'tor common settings' => 'Algemene instellingen',
'tor configuration' => 'Tor Configuratie',
'tor connected relays' => 'Verbonden relays',
'tor contact info' => 'Contact Info',
'tor daemon' => 'Daemon',
'tor directory port' => 'Directory poort',
'tor enabled' => 'Inschakelen Tor',
'tor errmsg invalid accounting limit' => 'Ongeldige verbruikslimiet',
'tor errmsg invalid directory port' => 'Ongeldige directory poort',
'tor errmsg invalid ip or mask' => 'Ongeldig IP subnet',
'tor errmsg invalid node id' => 'Ongeldige node ID',
'tor errmsg invalid relay address' => 'Ongeldig relay-adres',
'tor errmsg invalid relay name' => 'Ongeldige relay-nickname',
'tor errmsg invalid relay port' => 'Ongeldige relay-poort',
'tor errmsg invalid socks port' => 'Ongeldige SOCKS poort',
'tor exit country' => 'Land eindpunt',
'tor exit country any' => 'Ieder land',
'tor exit nodes' => 'Eindpunt nodes',
'tor relay address' => 'Relay-adres',
'tor relay configuration' => 'Tor relay-configuratie',
'tor relay enabled' => 'Inschakelen Tor Relay',
'tor relay external address' => 'Relay extern adres',
'tor relay fingerprint' => 'Relay-fingerprint',
'tor relay mode' => 'Relay-mode',
'tor relay mode bridge' => 'Bridge',
'tor relay mode exit' => 'Eindpunt-Node',
'tor relay mode private bridge' => 'Private bridge',
'tor relay mode relay' => 'Relay only',
'tor relay nickname' => 'Relay nickname',
'tor relay port' => 'Relay poort',
'tor service' => 'Tor dienst',
'tor socks port' => 'SOCKS poort',
'tor stats' => 'Statistieken',
'tor traffic limit hard' => 'Verkeerslimiet is bereikt.',
'tor traffic limit soft' => 'Verkeerslimiet bijna bereikt. Nieuwe verbindigen worden niet meer geaccepteerd.',
'tor traffic read written' => 'Totaal verkeer (lezen/schrijven)',
'tor use exit nodes' => 'Gebruik alleen deze eindpunt-nodes (een per regel)',
'total connection time' => 'Totale verbindingstijd',
'total hits for log section' => 'Totaal aantal treffers voor logsectie',
'traffic back' => 'Terug',
@@ -1926,6 +2244,8 @@
'updxlrtr source' => 'Bron',
'updxlrtr source checkup' => 'Broncontrole',
'updxlrtr source checkup schedule' => 'Broncontrole planning',
'updxlrtr sources' => 'Bronnen',
'updxlrtr standard view' => 'Standaard beeld',
'updxlrtr statistics' => 'Statistieken',
'updxlrtr statistics by source' => 'Statistieken per bron',
'updxlrtr summary' => 'Samenvatting',
@@ -1936,11 +2256,13 @@
'updxlrtr update accelerator' => 'Updateversneller',
'updxlrtr update information' => 'Er is een nieuwere versie beschikbaar voor download. Bezoek <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> voor meer informatie.',
'updxlrtr update notification' => 'Update notificatie!',
'updxlrtr used by' => 'Gebruikt door',
'updxlrtr web proxy service required' => 'Web proxy service moet ingeschakeld zijn om de updateversneller te kunnen gebruiken.',
'updxlrtr week' => 'een week',
'updxlrtr weekly' => 'wekelijks',
'updxlrtr year' => 'een jaar',
'upgrade' => 'upgrade',
'uplink' => 'Uplink',
'uplink speed' => 'Uplink snelheid (kbit/sec)',
'uplink std class' => 'uplink standaardklasse',
'upload' => 'Upload',
@@ -1958,8 +2280,10 @@
'upstream password' => 'Upstream wachtwoord:',
'upstream proxy host:port' => 'Upstream proxy (host:poort)',
'upstream username' => 'Upstream gebruikersnaam:',
'uptime' => 'Bedrijfstijd',
'uptime and users' => 'Bedrijfstijd en gebruikers:',
'url filter' => 'Inhoudsfilter',
'uptime load average' => 'Gemiddelde belasting',
'url filter' => 'URL filter',
'urlfilter access' => 'Toegang',
'urlfilter activity detection' => 'Activiteitsdetectie',
'urlfilter add new time constraint rule' => 'Voeg nieuwe tijdslimietregel toe',
@@ -2084,6 +2408,7 @@
'urlfilter quota restart message' => 'Noot: de tellers worden gereset voor alle gebruikers als het URL-filter wordt herstart',
'urlfilter quota time error' => 'Ongeldige waarde voor tijdsquotum',
'urlfilter quota user error' => 'Tenminste een gebruikersnaam is vereist',
'urlfilter redirect template' => 'Omleidingspagina template',
'urlfilter redirectpage' => 'Omleiden naar deze URL',
'urlfilter remove file' => 'Verwijder bestand uit repository',
'urlfilter renewal' => 'Vernieuwing',
@@ -2177,7 +2502,7 @@
'users department' => 'Gebruikersafdeling',
'users email' => 'E-mailadres gebruiker',
'users fullname or system hostname' => 'Volledige naam gebruiker of systeemnaam',
'valid root certificate already exists' => 'Een geldig root certificaat bestaat al.',
'valid root certificate already exists' => 'Er bestaat al een geldig root certificaat.',
'valid till' => 'Geldig tot',
'vci number' => 'VCI nummer:',
'view log' => 'bekijk log',
@@ -2234,7 +2559,38 @@
'wireless config added' => 'Draadloze configuratie toegevoegd',
'wireless config changed' => ' Draadloze configuratie gewijzigd',
'wireless configuration' => 'Draadloze configuratie',
'wlanap access point' => 'Access Point',
'wlan client' => 'Draadloze client',
'wlan client advanced settings' => 'Geavanceerde instellingen',
'wlan client and' => 'en',
'wlan client bssid' => 'BSSID',
'wlan client ccmp' => 'CCMP',
'wlan client configuration' => 'Draadloze client configuratie',
'wlan client disconnected' => 'Verbroken',
'wlan client duplicate ssid' => 'Bestaande SSID',
'wlan client edit entry' => 'Wijzig draadloze client configuratie',
'wlan client encryption' => 'Encryptie',
'wlan client encryption none' => 'Geen',
'wlan client encryption wep' => 'WEP',
'wlan client encryption wpa' => 'WPA',
'wlan client encryption wpa2' => 'WPA2',
'wlan client group cipher' => 'Group cipher',
'wlan client group key algorithm' => 'GKA',
'wlan client invalid key length' => 'Ongeldige sleutellengte.',
'wlan client new entry' => 'Maak nieuwe draadloze client configuratie',
'wlan client new network' => 'Nieuw netwerk',
'wlan client pairwise cipher' => 'Paargebonden cipher',
'wlan client pairwise key algorithm' => 'PKA',
'wlan client pairwise key group key' => 'Paargebonden sleutel/groep sleutel',
'wlan client psk' => 'Pre-shared sleutel',
'wlan client ssid' => 'SSID',
'wlan client tkip' => 'TKIP',
'wlan client wpa mode' => 'WPA mode',
'wlan client wpa mode all' => 'Auto',
'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP',
'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP',
'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
'wlan clients' => 'Draadloze clients',
'wlanap access point' => 'Toegangspunt (AP)',
'wlanap channel' => 'Kanaal',
'wlanap country' => 'Landcode',
'wlanap debugging' => 'Debugging',

6
langs/nl/install/lang_nl.c
View File

@@ -588,9 +588,9 @@ char *nl_tr[] = {
/* TR_DHCP_FORCE_MTU */
"Forceer DHCP mtu:",
/* TR_IDENTIFY */
"Identify",
"Identificeer",
/* TR_IDENTIFY_SHOULD_BLINK */
"Selected port should blink now ...",
"Geselecteerde poort zou nu moeten knipperen ...",
/* TR_IDENTIFY_NOT_SUPPORTED */
"Function is not supported by this port.",
"Functie wordt niet ondersteund door deze poort.",
};

6
langs/pl/cgi-bin/pl.pl
View File

@@ -16,8 +16,8 @@
'ConnSched change profile title' => 'Zmień na profil:',
'ConnSched days' => 'Dni:',
'ConnSched down' => 'Niżej',
'ConnSched ipsecstart' => '(Re)start IPSec',
'ConnSched ipsecstop' => 'Zatrzymanie IPSec',
'ConnSched ipsecstart' => '(Re)start IPsec',
'ConnSched ipsecstop' => 'Zatrzymanie IPsec',
'ConnSched reconnect' => 'Ponowne połączenie',
'ConnSched scheduled actions' => 'Zaplanowane zadania',
'ConnSched scheduler' => 'Harmonogram',
@@ -92,7 +92,6 @@
'admin user password has been changed' => 'Hasło administratora zostało zmienione.',
'admin users' => 'Użytkownik prawami superużytkownika',
'administrator user password' => 'Hasło administratora:',
'adsl settings' => 'Ustawienia ADSL',
'advanced' => 'Zaawansowane',
'advanced server' => 'Zaawansowane ustawienia serwera',
'advproxy AUTH always required' => 'Wymagaj autoryzacji dla adresów źródłowych bez ograniczeń',
@@ -351,6 +350,7 @@
'are you sure' => 'Jesteś pewien?',
'arp table entries' => 'Wpisy tabeli ARP:',
'artist' => 'Artysta',
'atm settings' => 'Ustawienia ATM',
'attemps' => 'Prób',
'august' => 'Sierpień',
'authentication' => 'Uwierzytelnianie:',

6
langs/ru/cgi-bin/ru.pl
View File

@@ -15,8 +15,8 @@
'ConnSched change profile title' => 'Сменить профиль:',
'ConnSched days' => 'Дни:',
'ConnSched down' => 'Down',
'ConnSched ipsecstart' => 'IPSec (пере)запустить',
'ConnSched ipsecstop' => 'IPSec остановить',
'ConnSched ipsecstart' => 'IPsec (пере)запустить',
'ConnSched ipsecstop' => 'IPsec остановить',
'ConnSched reconnect' => 'Переподключить',
'ConnSched scheduled actions' => 'Действия по расписанию',
'ConnSched scheduler' => 'Расписание',
@@ -90,7 +90,6 @@
'admin user password has been changed' => 'Пароль пользователя Admin был изменён.',
'admin users' => 'Пользователь с правами суперадминистратора',
'administrator user password' => 'Пароль пользователя Admin:',
'adsl settings' => 'Настройки ADSL',
'advanced' => 'Дополнительно',
'advanced server' => 'Дополнительные настройки сервера',
'advproxy AUTH always required' => 'Требовать аутентификацию у незарегистрированных адресов',
@@ -349,6 +348,7 @@
'are you sure' => 'Вы уверены?',
'arp table entries' => 'Записи ARP-таблицы:',
'artist' => 'Artist',
'atm settings' => 'Настройки ATM',
'attemps' => 'Попытки',
'august' => 'Август',
'authentication' => 'Аутентификация:',

64
langs/tr/cgi-bin/tr.pl
View File

@@ -15,13 +15,17 @@
'ConnSched add action' => 'Eylem ekle',
'ConnSched change profile title' => 'Profili değitirin:',
'ConnSched days' => 'Günler:',
'ConnSched dial' => 'Bağlan',
'ConnSched down' => 'Aşağı',
'ConnSched ipsecstart' => 'IPSec yeniden başlat',
'ConnSched ipsecstop' => 'IPSec durudur',
'ConnSched hangup' => 'Bağlantıyı kes',
'ConnSched ipsecstart' => 'IPsec yeniden başlat',
'ConnSched ipsecstop' => 'IPsec durudur',
'ConnSched reboot' => 'Yeniden başlat',
'ConnSched reconnect' => 'Yeniden bağlan',
'ConnSched scheduled actions' => 'Planlanmış eylemler',
'ConnSched scheduler' => 'Zamanlayıcı',
'ConnSched select profile' => 'Profil seçin',
'ConnSched shutdown' => 'Kapat',
'ConnSched time' => 'Zaman:',
'ConnSched up' => 'Yukarı',
'ConnSched weekdays' => 'Haftanın günleri:',
@@ -67,9 +71,9 @@
'abort' => 'durdur',
'access allowed' => 'Erişimine izin ver:',
'access refused with this oinkcode' => 'Erişim bu Oink Kodunu reddetti',
'accounting' => 'Hesaplama',
'accounting user nonpdc' => 'Hesaplama - Hiçbir PDC Yöntemi',
'accounting user pdc' => 'Hesaplama - PDC Yöntemi',
'accounting' => 'Hesap oluşturma',
'accounting user nonpdc' => 'Hesap oluşturma - PDC yöntemi olmadan',
'accounting user pdc' => 'Hesap oluşturma - PDC yöntemi',
'action' => 'Eylem',
'activate' => 'Aktif',
'activate user' => 'Aktif kullanıcı',
@@ -95,7 +99,6 @@
'admin user password has been changed' => 'Yönetici kullanıcı şifresi değiştirildi.',
'admin users' => 'Yetkili kullanıcı hakları ile kullanıcı',
'administrator user password' => 'Admin kullanıcı parolası:',
'adsl settings' => 'ADSL ayarları',
'advanced' => 'Gelişmiş',
'advanced server' => 'Gelişmiş Sunucu Seçenekleri',
'advproxy AUTH always required' => 'Sınırsız kaynak adresleri için kimlik doğrulaması iste',
@@ -364,6 +367,8 @@
'are you sure' => 'Emin misiniz?',
'arp table entries' => 'ARP tablosu girdileri:',
'artist' => 'Sanatçı',
'atm device' => 'Aygıt:',
'atm settings' => 'ATM ayarları',
'attemps' => 'Girişim',
'attention' => 'DİKKAT',
'august' => 'Ağustos',
@@ -502,7 +507,7 @@
'ccd err iroute' => 'Ağ adresi için geçersiz yol.',
'ccd err irouteexist' => 'Bu yol zaten kullanılıyor.',
'ccd err isipsecnet' => 'Verilen ağ adresi zaten bir IPsec ağ tarafından kullanılıyor.',
'ccd err isipsecrw' => 'Verilan ağ adresi zaten IPSec rw ağı tarafından kullanılıyor.',
'ccd err isipsecrw' => 'Verilan ağ adresi zaten IPsec rw ağı tarafından kullanılıyor.',
'ccd err isovpnn2n' => 'Bu alt ağ adresi zaten OpenVPN ağdan ağa bağlantısı için kullanılıyor.',
'ccd err isovpnnet' => 'Bu adres zaten OpenVPN Sunucusu için kullanılan alt ağ adresidir.',
'ccd err issubnet' => 'Bu adres zaten kullanımda olan bir alt ağ adresidir.',
@@ -517,7 +522,7 @@
'ccd hint' => 'Bu sayfadan RoadWarrior istemcilerine sabit bir IP adresi alabilir ve statik ağları tanımlayabilirsiniz.',
'ccd invalid' => 'Geçersiz.',
'ccd iroute' => 'IPFire istemcilerinin sitesinden bu ağlara eriş',
'ccd iroute2' => 'İstemcilerin IPFire sitesinden bu ağlara eriş',
'ccd iroute2' => 'İstemciler IPFire sitesinden bu ağlara erişsin',
'ccd iroutehint' => 'Dikkat! Bu ayarları değiştirirseniz, değişikliklerin etkili olduğu OpenVPN sunucusunu yeniden başlatmanız gerekir!',
'ccd modify' => 'Ağı değiştir',
'ccd name' => 'Ad',
@@ -548,7 +553,7 @@
'clenabled' => 'Yerel ağa zaman sağla',
'click to disable' => 'Aktif (pasifleştirmek için tıklayın)',
'click to enable' => 'Pasif (aktifleştirmek için tıklayın)',
'client' => 'İş İstasyonu Adı',
'client' => 'İş istasyonun adı',
'clock has not been synchronized' => 'Saat eşitlenemedi',
'clock last synchronized at' => 'Saatin son olarak eşitlendiği zaman:',
'comment' => 'Açıklama:',
@@ -589,6 +594,7 @@
'could not open installed updates file' => 'Yüklü güncelleştirmeler dosya açılamadı',
'could not open update information file' => 'Güncelleştirme bilgileri dosyası açılamadı. Güncelleme dosyası bozuk.',
'could not retrieve common name from certificate' => 'Sertifikadan ortak ad alınamadı.',
'count' => 'Say',
'countries' => 'Ülkeler',
'country' => 'Ülke',
'country codes and flags' => 'Ülke kodları ve bayrakları:',
@@ -643,7 +649,7 @@
'ddns minimize updates' => 'Güncellemeleri azalt: Güncellemelerden önce, sunucu adı \'[host.]domain\' için dns IP adresini KIRMIZI IP ile karşılaştır.',
'ddns noip prefix' => 'Grup yönteminde ip-yok seçeneğini kullanmak için ana bilgisayar adı öneki: <b>%</b>',
'deactivate' => 'Devre dışı',
'deactivate user' => 'kullanıcı devre dışı',
'deactivate user' => 'Kullanıcı devre dışı',
'dead peer detection' => 'Sonlanmış Eş Algılama',
'debugme' => 'Henüz uygulanmadı',
'december' => 'Aralık',
@@ -925,7 +931,7 @@
'firewall logs' => 'Güvenlik Duvarı Günlükleri',
'firewall logs ip' => 'Gd-Günlük Grafikleri (IP)',
'firewall logs port' => 'Gd-Günlük Grafikleri (Port)',
'firewall rules' => 'Güvenlik duvarı kuralları',
'firewall rules' => 'Güvenlik Duvarı Kuralları',
'firewallhits' => 'güvenlik duvarı kaydı',
'firmware' => 'Yazılım',
'firmware upload' => 'Yazılım/Sürücü Yükle',
@@ -1007,6 +1013,7 @@
'fwdfw log' => 'Günlük',
'fwdfw log rule' => 'Günlük kuralı',
'fwdfw man port' => 'Bağlantı noktası:',
'fwdfw many' => 'Çok',
'fwdfw menu' => 'Güvenlik Duvarı Kuralları',
'fwdfw movedown' => 'Aşağı taşı',
'fwdfw moveup' => 'Yukarı taşı',
@@ -1050,6 +1057,14 @@
'fwdfw wd_tue' => 'Sal',
'fwdfw wd_wed' => 'Çar',
'fwdfw xt access' => 'Kayıt',
'fwhost Custom Host' => 'Ana bilgisayar',
'fwhost Custom Network' => 'Ağ',
'fwhost IpSec Host' => 'IPsec ana bilgisayarı',
'fwhost IpSec Network' => 'IPsec ağı',
'fwhost OpenVPN N-2-N' => 'Ağdan ağa OpenVPN',
'fwhost OpenVPN static host' => 'OpenVPN statik ana bilgisayar',
'fwhost OpenVPN static network' => 'OpenVPN statik ağ',
'fwhost Standard Network' => 'Standart ağ',
'fwhost addgrp' => 'Yeni ağ/ana bilgisayar grubu ekle:',
'fwhost addgrpname' => 'Grup adı:',
'fwhost addhost' => 'Yeni bir ana bilgisayar ekle:',
@@ -1222,6 +1237,7 @@
'inactive' => 'Pasif',
'include logfiles' => 'Günlük dosyaları dahil',
'incoming' => 'gelen',
'incoming firewall access' => 'Gelen güvenlik duvarı bağlantısı',
'incoming traffic in bytes per second' => 'gelen trafik',
'incorrect password' => 'Yanlış parola',
'info' => 'Bilgi',
@@ -1357,7 +1373,7 @@
'load printer' => 'Yazıcı Yükle',
'loaded modules' => 'Yüklü modüller:',
'local hard disk' => 'Sabit disk',
'local master' => 'Yerel Yönetici',
'local master' => 'Yerel yönetici',
'local ntp server specified but not enabled' => 'Belirtilen yerel NTP sunucusu aktif değil',
'local subnet' => 'Yerel Alt Ağ:',
'local subnet is invalid' => 'Geçersiz yerel alt ağ.',
@@ -1490,7 +1506,7 @@
'monthly volume start day' => 'Aylık dönemin ilk günü',
'monthly volume start day short' => 'İlk gün',
'months' => 'ay',
'more' => 'daha',
'more' => 'Daha fazla',
'most preferred' => 'En çok tercih edilen',
'mount' => 'Bağla',
'mounted on' => 'Bağlı',
@@ -1623,6 +1639,7 @@
'out' => 'Dışarı',
'outgoing' => 'giden',
'outgoing firewall' => 'Giden güvenlik duvarı',
'outgoing firewall access' => 'giden güvenlik duvarı bağlantısı',
'outgoing firewall add ip group' => 'IP Adres Grubu Ekle',
'outgoing firewall add mac group' => 'MAC Adres Grubu Ekle',
'outgoing firewall edit ip group' => 'IP Adres Grubunu Düzenle',
@@ -1656,7 +1673,7 @@
'ovpn mgmt in root range' => 'Bağlantı noktası numarası 1024 ya da daha yüksek bir numara olmalıdır.',
'ovpn mtu-disc' => 'MTU algılama',
'ovpn mtu-disc and mtu not 1500' => 'MTU algılama 1500 MTU olmasını gerektirir.',
'ovpn mtu-disc maybe' => 'İsteğe Bağlı',
'ovpn mtu-disc maybe' => 'İsteğe bağlı',
'ovpn mtu-disc no' => 'Asla',
'ovpn mtu-disc off' => 'Devre dışı',
'ovpn mtu-disc with mssfix or fragment' => 'MTU algılama mssfix veya parçası ile kullanılamaz.',
@@ -1725,7 +1742,7 @@
'passwords do not match' => 'Parolalar eşleşmiyor.',
'passwords must be at least 6 characters in length' => 'Parolalar en az 6 karakter olmalıdır',
'path to directory' => 'paylaşım yolu',
'pc' => 'İş İstasyonu',
'pc' => 'İş istasyonu',
'pc add' => 'İş istasyonu ekle',
'pdc options' => 'PDC seçenekleri',
'percentage' => 'Yüzde',
@@ -1748,7 +1765,7 @@
'pppoe settings' => 'Ek PPPoE ayarları:',
'pptp settings' => 'Ek PPTP ayarları:',
'pre-shared key is too short' => 'Ön paylaşımlı anahtar çok kısa.',
'prefered master' => 'Tercih Edilen Yönetici',
'prefered master' => 'Tercih edilen yönetici',
'present' => 'Mevcut',
'prev' => 'önceki',
'primary dns' => 'Birincil DNS:',
@@ -1798,6 +1815,7 @@
'quick control' => 'Hızlı Kontrol',
'quick playlist' => 'Hızlı Oynatıcı',
'ram' => 'RAM',
'random number generator daemon' => 'Rastgele sayı oluşturucu programı',
'read bytes' => 'okunan bayt',
'read list' => 'salt okunur bilgisayarlar ile liste',
'real address' => 'Gerçek Adres',
@@ -1818,7 +1836,7 @@
'refresh update list' => 'Güncelleme listesini yenile',
'registered user rules' => 'Kayıtlı kullanıcılar için kaynak güvenlik duvarı VRT kuralları',
'released' => 'Çıkış',
'reload' => 'yeniden yükle',
'reload' => 'Yeniden yükle',
'remark' => 'Açıklama',
'remark title' => 'Açıklama:',
'remote access' => 'Uzak erişim',
@@ -1850,7 +1868,7 @@
'restore' => 'Geri Yükle',
'restore defaults' => 'Varsayılanı Geri Yükle',
'restore hardware settings' => 'Donanım ayarlarını geri yükle',
'restore settings' => 'Ayarları Sıfırla',
'restore settings' => 'Ayarları sıfırla',
'reverse sort' => 'Ters kronolojik sıralama',
'root' => 'Root',
'root certificate' => 'Root sertifika',
@@ -1868,7 +1886,7 @@
'samba status' => 'Samba durumu',
'saturday' => 'Cumartesi',
'save' => 'Kaydet',
'save config' => 'ayarları kaydet',
'save config' => 'Ayarları kaydet',
'save error' => 'Yapılandırma arşiv dosyası kaydedilemiyor.',
'save settings' => 'Ayarları kaydet',
'save-adv-options' => 'Gelişmiş Seçenekleri Kaydet',
@@ -1902,7 +1920,7 @@
'servicename' => 'Hizmet Adı',
'services' => 'Hizmetler',
'services settings' => 'Güvenlik Duvarı - Hizmet Ayarları',
'set' => 'ayar',
'set' => 'Ayarlı',
'set time now' => 'Zamanı Şimdi Ayarla',
'set time now help' => 'Herhangi bir zamanda eşitleme etkinliği sırasında (hatta yinelenen bir program kullanılırken) <i>Zamanı şimdi ayarla</i> düğmesine basın. Bir eşitleme olmadan önce beş dakika veya daha fazla beklemek zorunda olduğunuzu unutmayın.',
'settings' => 'Ayarlar',
@@ -1999,7 +2017,7 @@
'standard login script' => 'Standart oturum açma komut dosyası',
'start' => 'Başlat',
'start address' => 'Başlangıç adresi:',
'start ovpn server' => 'OpenVPN Sunucu Başlangıcı',
'start ovpn server' => 'OpenVPN Sunucusunu Başlat',
'state or province' => 'İlçe',
'static ip' => 'Statik IP',
'static routes' => 'Statik Yollar',
@@ -2162,7 +2180,7 @@
'unix charset' => 'UNIX karakterleri',
'unix group' => ' UNIX kullanıcı grubu',
'unix password sync' => 'Unix Parola Eşitleme',
'unix shell' => 'UNIX Kabuğu',
'unix shell' => 'UNIX kabuğu',
'unknown' => 'BİLİNMEYEN',
'unnamed' => 'Adsız',
'update' => 'Güncelle',
@@ -2251,7 +2269,7 @@
'uplink speed' => 'Yükleme hızı (kbit/san)',
'uplink std class' => 'Standart yükleme hızı sınıf',
'upload' => 'Yükle',
'upload a certificate' => 'Sertifikası yükle:',
'upload a certificate' => 'Sertifika yükle:',
'upload a certificate request' => 'Sertifika isteği yükle:',
'upload ca certificate' => 'CA Sertifikası Yükle',
'upload fcdsl.o' => 'KALDIRILACAK',

6
lfs/GeoIP
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2014 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 #
@@ -25,7 +25,7 @@
include Config
VER = 1.17
DATVER = 01102013
DATVER = 06052014
THISAPP = Geo-IP-PurePerl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
GeoIP.dat-$(DATVER).gz_MD5 = 4aecef560aa6dacfe7e59dad8a12914b
GeoIP.dat-$(DATVER).gz_MD5 = aba5fc86202337c53a33bbc47d2083d0
install : $(TARGET)

6
lfs/fireinfo
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.1.9
VER = 2.1.10
THISAPP = fireinfo-v$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = a4dbb3a4111f263b5059b2f76b14b32c
$(DL_FILE)_MD5 = cc7838cda22d7d4e9bb177aa1dc6f25a
install : $(TARGET)
@@ -71,8 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-0001-Exclude-some-more-invalid-patterns.patch
cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)

4
lfs/flash-images
View File

@@ -65,9 +65,9 @@ else
endif
# /boot: 64MB - OFFSET
# / : 600MB
# / : 700MB
S_BOOT := $(shell echo $$(( 131072 - $(S_OFFSET) )))
S_ROOT := 1228800
S_ROOT := 1433600
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
rm -rf $(MNThdd) $(IMGinst) $(IMGpart) $(IMGboot) $(IMGroot) && mkdir -p $(MNThdd)

24
lfs/initrd
View File

@@ -64,11 +64,25 @@ $(TARGET) :
-cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES
# Copy hid and network modules
# Copy hid and network modules (and deps)
cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/hid \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/net \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/pcmcia \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/ssb \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/uio \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/ptp \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/dca \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/pps \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
# Remove wireless modules
rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/net/wireless
cd /install/initrd/etc && rm -f fstab
cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/
@@ -93,6 +107,14 @@ $(TARGET) :
cp -f /etc/nsswitch.conf /install/initrd/etc/
cp -f $(DIR_SRC)/config/initrd/dhcpc/* /install/initrd/var/ipfire/dhcpc/dhcpcd-hooks/
# Install needed locales.
-mkdir -pv /install/initrd/usr/lib/locale
for lang in $(DIR_SRC)/langs/*; do \
for path in /usr/lib/locale/$${lang##*/}*; do \
[ -d "$${path}" ] && cp -lrvf "$${path}" /install/initrd/usr/lib/locale/; \
done; \
done
cd /install/initrd && find . | cpio -o -H newc | lzma > /install/images/initrd
cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log

78
lfs/libsigc++
View File

@@ -1,78 +0,0 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 2.0.18
THISAPP = libsigc++-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ddebf5aafc8525d10366a8724abc9f28
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsigc++-gcc43.patch
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

79
lfs/libtorrent
View File

@@ -1,79 +0,0 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 0.12.6
THISAPP = libtorrent-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
CFLAGS =
CXXFLAGS =
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 037499ed708aaf72988cee60e5a8d96b
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-ipv6
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

16
lfs/linux
View File

@@ -24,10 +24,10 @@
include Config
VER = 3.10.37
VER = 3.10.39
RPI_PATCHES = linux-3.10.34-grsec-dea8280
GRS_PATCHES = grsecurity-2.9.1-3.10.37-ipfire1.patch.xz
RPI_PATCHES = linux-3.10.38-grsec-1b49b45
GRS_PATCHES = grsecurity-2.9.1-3.10.39-ipfire1.patch.xz
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
PAK_VER = 42
PAK_VER = 44
DEPS = ""
VERSUFIX=ipfire$(KCFG)
@@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
$(DL_FILE)_MD5 = a08a10ffc31b07d9422af1cd2baa3274
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 522683db031f7033b1b5dfe1b1f30e67
$(GRS_PATCHES)_MD5 = 7b0f44571974217d79dbcdf5d7e33976
$(DL_FILE)_MD5 = 74db7cc558a1a72ebf5044d286e2bc47
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a7408e8bad57b4b2cb677dd5a0bfb7ff
$(GRS_PATCHES)_MD5 = 6296b7ec4146544249075249e338ceb3
install : $(TARGET)
@@ -137,6 +137,8 @@ endif
# Wlan Patches
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.39-add_libertas_uap.patch
# mISDN Patches
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch

8
lfs/mc
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2014 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 #
@@ -24,7 +24,7 @@
include Config
VER = 4.8.9
VER = 4.8.12
THISAPP = mc-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mc
PAK_VER = 8
PAK_VER = 9
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0f8a05f9a9708241541ae177c8e2f209
$(DL_FILE)_MD5 = 7ecccc03df060cd0ca1414a5a14e6649
install : $(TARGET)

13
lfs/pound
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.6
VER = 2.7c
THISAPP = Pound-$(VER)
DL_FILE = $(THISAPP).tgz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = pound
PAK_VER = 5
PAK_VER = 6
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 8c913b527332694943c4c67c8f152071
$(DL_FILE)_MD5 = 56dace6b79c6be1d25b31355269c380a
install : $(TARGET)
@@ -77,16 +77,11 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/pound-2.6.patch
cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --enable-cert1l
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
install -v -m 644 $(DIR_SRC)/config/backup/includes/pound \
/var/ipfire/backup/addons/includes/pound
ln -sf ../init.d/pound /etc/rc.d/rc3.d/S60pound
ln -sf ../init.d/pound /etc/rc.d/rc0.d/K40pound
ln -sf ../init.d/pound /etc/rc.d/rc6.d/K40pound
# Remove temporary file.
rm -vf /root/.rnd

4
lfs/rpi-firmware
View File

@@ -24,7 +24,7 @@
include Config
VER = 18a7921
VER = cd50136
THISAPP = rpi-firmware-$(VER)
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 07a83d2700fb73aad67154c9e74901f3
$(DL_FILE)_MD5 = fced022c0e646affae0d5d5543f59054
install : $(TARGET)

1
lfs/strongswan
View File

@@ -89,6 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-farp \
--enable-openssl \
--enable-xauth-eap \
--enable-xauth-noauth \
--enable-eap-radius \
--enable-eap-tls \
--enable-eap-ttls \

35
lfs/rtorrent → lfs/stunnel
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# 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 #
@@ -24,17 +24,15 @@
include Config
VER = 0.8.6
VER = 5.01
THISAPP = rtorrent-$(VER)
THISAPP = stunnel-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = rtorrent
PAK_VER = 5
CFLAGS =
CXXFLAGS =
PROG = stunnel
PAK_VER = 1
DEPS = ""
@@ -46,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b804c45c01c40312926bcea6b55bb084
$(DL_FILE)_MD5 = 7b63266b6fa05da696729e245100da65
install : $(TARGET)
@@ -79,8 +77,25 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
# Create secure directory
install -v -m750 -o stunnel -g stunnel -d /var/lib/stunnel/run
chown -v stunnel:stunnel /var/lib/stunnel
# Install default configuration
-mkdir -pv /etc/stunnel
install -v -m 644 $(DIR_SRC)/config/stunnel/stunnel.conf \
/etc/stunnel
# Install backup include
install -v -m 644 $(DIR_SRC)/config/backup/includes/stunnel \
/var/ipfire/backup/addons/includes
@rm -rf $(DIR_APP)
@$(POSTBUILD)

4
lfs/usb_modeswitch
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.0.1
VER = 2.1.1
THISAPP = usb-modeswitch-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = e48d4419d0574d342bb183f7465556d0
$(DL_FILE)_MD5 = 1f0dc900df88254bd1102444cb73efbc
install : $(TARGET)

4
lfs/usb_modeswitch_data
View File

@@ -24,7 +24,7 @@
include Config
VER = 20131113
VER = 20140327
THISAPP = usb-modeswitch-data-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 7b5ac1226b360ddc366c286e62b3c3a4
$(DL_FILE)_MD5 = bbbc0a8e6a98bde2c6e119b3826658fb
install : $(TARGET)

8
lfs/watchdog
View File

@@ -24,7 +24,7 @@
include Config
VER = 5.9
VER = 5.13
THISAPP = watchdog-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = watchdog
PAK_VER = 3
PAK_VER = 4
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = d7cae3c9829f5d9a680764f314234867
$(DL_FILE)_MD5 = 153455f008f1cf8f65f6ad9586a21ff1
install : $(TARGET)
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
install -v -m 644 $(DIR_SRC)/config/backup/includes/watchdog \

9
make.sh
View File

@@ -25,7 +25,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.15" # Version number
CORE="77-rc1" # Core Level (Filename)
CORE="77" # Core Level (Filename)
PAKFIRE_CORE="77" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
@@ -638,9 +638,6 @@ buildipfire() {
ipfiremake libmpeg2
ipfiremake cmake
ipfiremake gnump3d
ipfiremake libsigc++
ipfiremake libtorrent
ipfiremake rtorrent
ipfiremake rsync
ipfiremake tcpwrapper
ipfiremake libevent
@@ -799,6 +796,7 @@ buildipfire() {
ipfiremake wavemon
ipfiremake iptraf-ng
ipfiremake iotop
ipfiremake stunnel
}
buildinstaller() {
@@ -842,7 +840,8 @@ buildpackages() {
ipfiremake cdrom
# Check if there is a loop device for building in virtual environments
if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
modprobe loop 2>/dev/null
if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
ipfiremake flash-images
fi

1480
src/hwdata/pci.ids
View File

File diff suppressed because it is too large Load Diff

91
src/hwdata/usb.ids
View File

@@ -9,8 +9,8 @@
# The latest version can be obtained from
# http://www.linux-usb.org/usb.ids
#
# Version: 2013.08.21
# Date: 2013-08-21 20:34:03
# Version: 2014.02.03
# Date: 2014-02-03 20:34:03
#
# Vendors, devices and interfaces. Please keep sorted.
@@ -26,10 +26,12 @@
0002 Ingram
0003 Club Mac
0004 Nebraska Furniture Mart
0011 Unknown manufacturer
7788 Flash mass storage drive
0053 Planex
5301 GW-US54ZGL 802.11bg
0079 DragonRise Inc.
0006 Generic USB Joystick
0006 PC TWIN SHOCK Gamepad
0011 Gamepad
0105 Trust International B.V.
145f NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]
@@ -37,8 +39,10 @@
0112 Card Reader
017c MLK
145f Trust Deskset
0200 TP-Link
0201 MA180 UMTS Modem
0204 Chipsbank Microelectronics Co., Ltd
6025 CBM2080 Flash drive controller
6025 CBM2080 / CBM2090 Flash drive controller
6026 CBM1180 Flash drive controller
0218 Hangzhou Worlde
0301 MIDI Port
@@ -105,6 +109,7 @@
2107 AVR Dragon
2109 STK541 ZigBee Development Board
210d XPLAIN evaluation kit (CDC ACM)
2110 AVR JTAGICE3 Debugger and Programmer
2122 XMEGA-A1 Explained evaluation kit
2310 EVK11xx evaluation board
2fe4 ATxmega32A4U DFU bootloader
@@ -191,6 +196,8 @@
0412 Printing Support
0417 LaserJet 1200 series
0423 HS-COMBO Cardreader
042a LaserJet M1132 MFP
0441 HP Prime Calculator
0504 DeskJet 885c
0505 ScanJet 2100c
0507 DVD+RW
@@ -338,7 +345,7 @@
2311 OfficeJet d series
2312 OfficeJet Pro L7700
2317 LaserJet 4350
231d 4 GB Flash Drive
231d Broadcom 2070 Bluetooth Combo
2402 PhotoSmart 7700 series
2404 Deskjet F2280 series
2405 ScanJet 4070 PhotoSmart
@@ -349,6 +356,7 @@
2504 DeskJet F4200 series
2505 ScanJet 3770
2512 OfficeJet Pro L7300
2514 4-port hub
2517 LaserJet 2410
251d Gobi 2000 Wireless Modem
2524 LP3065 30" Monitor Hub
@@ -424,6 +432,7 @@
3b11 PSC 1300 series
3b17 LaserJet M1005 MFP
3c02 PhotoSmart 7350
3c05 Scanjet Professional 1000 Mobile Scanner
3c11 PSC 1358
3c17 EWS UPD
3d02 PhotoSmart 7350~
@@ -473,6 +482,7 @@
5017 EWS UPD
5111 PhotoSmart 3200 series
5211 PhotoSmart 3300 series
5307 v165w Stick
5311 OfficeJet 6300
5312 Officejet Pro 8500A
5411 OfficeJet 4300
@@ -692,12 +702,20 @@
8028 Dev board JTAG (FT232H based)
8040 4 Port Hub
8070 7 Port Hub
8140 Vehicle Explorer Interface
8210 MGTimer - MGCC (Vic) Timing System
8370 7 Port Hub
8371 PS/2 Keyboard And Mouse
8372 FT8U100AX Serial Port
8a28 Rainforest Automation ZigBee Controller
8a98 TIAO Multi-Protocol Adapter
8b28 Alpermann+Velte TCI70
8b29 Alpermann+Velte TC60 CLS
8b2a Alpermann+Velte Rubidium Q1
8b2b Alpermann+Velte TCD
8b2c Alpermann+Velte TCC70
9133 CallerID
9135 Rotary Pub alarm
9e90 Marvell OpenRD Base/Client
9f80 Ewert Energy Systems CANdapter
a6d0 Texas Instruments XDS100v2 JTAG / BeagleBone A3
@@ -730,6 +748,7 @@
c8bc Alpermann+Velte Rubidium S1
c8bd Alpermann+Velte Rubidium T1
c8be Alpermann+Velte Rubidium D1
c8bf Alpermann+Velte TC60 RLV
cc48 Tactrix OpenPort 1.3 Mitsubishi
cc49 Tactrix OpenPort 1.3 Subaru
cc4a Tactrix OpenPort 1.3 Universal
@@ -1000,6 +1019,7 @@
4000 InkJet Color Printer
4021 Photo Printer 6800
4022 1400 Digital Photo Printer
402e 605 Photo Printer
4034 805 Photo Printer
4056 ESP 7200 Series AiO
4109 EasyShare Printer Dock Series 3
@@ -1012,6 +1032,7 @@
6004 i60
6005 i80
040b Weltrend Semiconductor
0a68 Func MS-3 gaming mouse [WT6573F MCU]
6510 Weltrend Bar Code Reader
6520 XBOX Xploder
6533 Speed-Link Competition Pro
@@ -1240,6 +1261,7 @@
4056 Live! Cam Video IM Pro
4057 Live! Cam Optia
4058 Live! Cam Optia AF
405f WebCam Vista (VF0330)
4061 Live! Cam Notebook Pro [VF0400]
4063 Live! Cam Video IM Pro
4068 Live! Cam Notebook [VF0470]
@@ -1659,6 +1681,7 @@
4a4d Flatron 915FT Plus Monitor
7001 MF-PD100 Soul Digital MP3 Player
7013 MP3 Player
70d7 Mouse Scanner LSM-150 [LG Smart Scan Mouse]
70f5 External HDD
8484 LPC-U30 Webcam II
8585 LPC-UC35 Webcam
@@ -1714,6 +1737,7 @@
b10a T.16000M Joystick
b203 360 Modena Pro Wheel
b300 Firestorm Dual Power
b303 FireStorm Dual Analog 2
b304 Firestorm Dual Power
b307 vibrating Upad
b30b Wireless VibrationPad
@@ -1771,6 +1795,7 @@
0151 Super Flash 1GB / GXT 64MB Flash Drive
0162 SiS162 usb Wireless LAN Adapter
0163 802.11 Wireless LAN Adapter
0817 SiS-184-ASUS-4352.17 touch panel
5401 Wireless Adapter RO80211GS-USB
0458 KYE Systems Corp. (Mouse Systems)
0001 Mouse
@@ -1863,6 +1888,7 @@
705c Genius iSlim 1300AF
7079 FaceCam 2025R
707f TVGo DVB-T03 [RTL2832]
7088 WideCam 1050
0459 Adobe Systems, Inc.
045a SONICblue, Inc.
07da Supra Express 56K modem
@@ -2153,6 +2179,8 @@
076d LifeCam HD-5000
0772 LifeCam Studio
0779 LifeCam HD-3000
0780 Comfort Curve Keyboard 3000
0797 Optical Mouse 200
930a ISOUSB.SYS Intel 82930 Isochronous IO Test Board
ffca Catalina
fff8 Keyboard
@@ -2227,7 +2255,7 @@
0467 AT&T Paradyne
0468 Wieson Technologies Co., Ltd
046a Cherry GmbH
0001 My3000 Keyboard
0001 Keyboard
0003 My3000 Hub
0004 CyBoard Keyboard
0005 XX33 SmartCard Reader Keyboard
@@ -2444,12 +2472,14 @@
c061 RX1500 Laser Mouse
c062 M-UAS144 [LS1 Laser Mouse]
c063 DELL Laser Mouse
c064 M110 corded optical mouse (M-B0001)
c066 G9x Laser Mouse
c068 G500 Laser Mouse
c069 M500 Laser Mouse
c06a USB Optical Mouse
c06b G700 Wireless Gaming Mouse
c06c Optical Mouse
c077 M105 Optical Mouse
c101 UltraX Media Remote
c110 Harmony 785/885 Remote
c111 Harmony 525 Remote
@@ -2460,6 +2490,7 @@
c124 Harmony 300 Remote
c125 Harmony 200 Remote
c126 Harmony Link
c12b Harmony Touch Remote
c201 WingMan Extreme Joystick with Throttle
c202 WingMan Formula
c207 WingMan Extreme Digital 3D
@@ -2489,12 +2520,18 @@
c225 G11/G15 Keyboard / G keys
c226 G15 Refresh Keyboard
c227 G15 Refresh Keyboard
c228 G19 Gaming Keyboard
c229 G19 Gaming Keyboard Macro Interface
c22a Gaming Keyboard G110
c22b Gaming Keyboard G110 G-keys
c22d G510 Gaming Keyboard
c22e G510 Gaming Keyboard onboard audio
c245 G400 Optical Mouse
c246 Gaming Mouse G300
c248 G105 Gaming Keyboard
c24a G600 Gaming Mouse
c24d G710 Gaming Keyboard
c24e G500s Laser Gaming Mouse
c281 WingMan Force
c283 WingMan Force 3D
c285 WingMan Strike Force 3D
@@ -2854,6 +2891,8 @@
0014 InTouch Module
a006 External Disk 1.5TB
a007 External Disk USB 3.0
a009 Stor.E Basics
d010 External Disk 3TB
0481 Zenith Data Systems
0482 Kyocera Corp.
000e FS-1020D Printer
@@ -2885,6 +2924,7 @@
5000 ST Micro/Ergenic ERG BT-002 Bluetooth Adapter
5001 ST Micro Bluetooth Device
5710 Joystick in FS Mode
5720 STM microSD Flash Device
5721 Hantek DDS-3X25 Arbitrary Waveform Generator
5740 STM32F407
7270 ST Micro Serial Bridge
@@ -2917,6 +2957,8 @@
9006 IT9135 BDA Afatech DVB-T HDTV Dongle
9009 Zolid HD DVD Maker
9135 Zolid Mini DVB-T Stick
9503 ITE it9503 feature-limited DVB-T transmission chip [ccHDtv]
9507 ITE it9507 full featured DVB-T transmission chip [ccHDtv]
048f Eicon Tech.
0490 United Microelectronics Corp.
0491 Capetronic
@@ -3607,6 +3649,7 @@
31e4 PowerShot SX20 IS
31e5 Digital IXUS 200 IS
31e6 PowerShot SD940 IS DIGITAL ELPH / Digital IXUS 120 IS / IXY DIGITAL 220 IS
31e7 SELPHY CP790
31ea EOS Rebel T2i / EOS 550D / EOS Kiss X4
31ee SELPHY ES40
31ef PowerShot A495
@@ -3664,8 +3707,14 @@
325c PowerShot SX500 IS
325f PowerShot SX280 HS
3260 PowerShot SX270 HS
3262 PowerShot A2600
3264 PowerShot A1400
3265 Powershot ELPH 130 IS / IXUS 140
3268 PowerShot ELPH 330 HS / IXUS 255 HS
3271 PowerShot A2500
3276 PowerShot SX170 IS
3277 PowerShot SX510 HS
327d Powershot ELPH 115 IS / IXUS 132
04aa DaeWoo Telecom, Ltd
04ab Chromatic Research
04ac Micro Audiometrics Corp.
@@ -3740,6 +3789,7 @@
0424 D3000
0425 D300S
0428 D7000
0429 D5100
042a D800 (ptp)
0f03 PD-10 Wireless Printer Adapter
4000 Coolscan LS 40 ED
@@ -3768,6 +3818,7 @@
4427 Portable CD ROM
4482 Serial Converter
4485 Serial Converter
4524 40 Character Vacuum Fluorescent Display
4525 Double sided CRT
4535 4610 Suremark Printer
4550 NVRAM (128 KB)
@@ -4109,6 +4160,7 @@
10e7 fi-5900C
10fe S500
1150 fi-6230
201d SATA 3.0 6Gbit/s Adaptor [GROOVY]
04c6 Toshiba America Electronic Components
04c7 Micro Macro Technologies
04c8 Konica Corp.
@@ -4122,6 +4174,7 @@
072c Revio KD20M
072d Revio KD410Z
04ca Lite-On Technology Corp.
004f SK-9020 keyboard
1766 HID Monitor Controls
2004 Bluetooth 4.0 [Broadcom BCM20702A0]
9304 Hub
@@ -4288,11 +4341,13 @@
1400 PS/2 keyboard + mouse controller
1503 Shortboard Lefty
1603 Keyboard
1702 Keyboard LKS02
2013 Keyboard [Das Keyboard]
2221 Keyboard
2323 Keyboard
2519 Shenzhen LogoTech 2.4GHz receiver
2832 1channel Telephone line recorder
2834 HT82A834R Audio MCU
a055 Keyboard
04da Panasonic (Matsushita)
0901 LS-120 Camera
@@ -4444,6 +4499,7 @@
5151 SCR338 Keyboard Smart Card Reader
5292 SCL011 RFID reader
5410 SCR35xx Smart Card Reader
5591 SCL3711-NFC&RW
e000 SCRx31 Reader
e001 SCR331 SmartCard Reader
e003 SPR532 PinPad SmartCard Reader
@@ -4708,6 +4764,7 @@
0760 Acer KU-0760 Keyboard
0841 HP Multimedia Keyboard
0860 2.4G Multimedia Wireless Kit
1121 Periboard 717 Mini Wireless Keyboard
a001 E-Video DC-100 Camera
a120 ORITE CCD Webcam(PC370R)
a121 ORITE CCD Webcam(PC370R)
@@ -4770,6 +4827,7 @@
b330 Asus 720p CMOS webcam
b354 UVC 1.00 device HD UVC WebCam
04f3 Elan Microelectronics Corp.
000a Touchscreen
0103 ActiveJet K-2024 Multimedia Keyboard
01a4 Wireless Keyboard
0210 Optical Mouse
@@ -5120,6 +5178,8 @@
1004 F9L1004 802.11n Surf N300 XR Wireless Adapter [Realtek RTL8192CU]
1102 F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CUS]
1103 F9L1103 N750 DB 802.11abgn 2x3:3 [Ralink RT3573]
1106 F9L1106v1 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
1109 F9L1109v1 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]
11f2 ISY Wireless Micro Adapter IWL 2000 [RTL8188CUS]
1202 F5U120-PC Parallel Printer Port
1203 F5U120-PC Serial Port
@@ -5524,6 +5584,7 @@
0440 DSC-H55
0485 MHS-PM5 HD camcorder
04cb WALKMAN NWZ-E354
06bb WALKMAN NWZ-F805
1000 Wireless Buzz! Receiver
054d Try Corp.
054e Proside Corp.
@@ -9637,8 +9698,8 @@
0001 Hard Drive Adapter (TPP)
0002 SigmaDrive Adapter (TPP)
0906 Faraday Technology Corp.
0908 ShenZhen SANZHAI Technology Co.,Ltd
2701 Spy Pen VGA
0908 Siemens AG
2701 ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA
0909 Audio-Technica Corp.
090a Trumpion Microelectronics, Inc.
1001 T33520 Flash Card Controller
@@ -12779,6 +12840,8 @@
0ff7 CHI SHING Computer Accessories Co., Ltd
0ffc Clavia DMI AB
0021 Nord Stage 2
0ffd EarlySense
ff00 OEM
0fff Aopen, Inc.
1000 Speed Tech Corp.
1001 Ritronics Components (S) Pte., Ltd
@@ -15344,6 +15407,8 @@
1b59 K.S. Terminals Inc.
1b5a Chao Zhou Kai Yuan Electric Co., Ltd.
1b65 The Hong Kong Standards and Testing Centre Ltd.
1b71 Fushicai
3002 USBTV007 Video Grabber [EasyCAP]
1b72 ATERGI TECHNOLOGY CO., LTD.
1b73 Fresco Logic
1000 xHC1 Controller
@@ -15881,6 +15946,9 @@
648b TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS]
2101 ActionStar
0201 SIIG 4-to-2 Printer Switch
2149 Advanced Silicon S.A.
211b Touchscreen Controller
2703 TS58xxA/TC56xxA [CoolTouch]
2162 Creative (?)
2031 Network Blaster Wireless Adapter
500c DE5771 Modem Blaster
@@ -15899,10 +15967,17 @@
4050 AirStick joystick
2227 SAMWOO Enterprise
3105 SKYDATA SKD-U100
2232 Silicon Motion
1005 WebCam SCB-0385N
1028 WebCam SC-03FFL11939N
1029 WebCam SC-13HDL11939N
1037 WebCam SC-03FFM12339N
2233 RadioShack Corporation
6323 USB Electronic Scale
2237 Kobo Inc.
4161 eReader White
228d 8D Technologies inc.
0001 Terminal Bike Key Reader
22a6 Pie Digital, Inc.
ffff PieKey "beta" 4GB model 4E4F41482E4F5247 (SM3251Q BB)
22b8 Motorola PCS

31
src/initscripts/init.d/dhcp
View File

@@ -9,26 +9,39 @@
. $rc_functions
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
function flush_chains() {
iptables -F DHCPGREENINPUT
iptables -F DHCPGREENOUTPUT
iptables -F DHCPBLUEINPUT
iptables -F DHCPBLUEOUTPUT
}
case "$1" in
start)
iptables -F DHCPBLUEINPUT
if [ -e /var/ipfire/dhcp/enable_green ]; then
flush_chains
if [ -n "${GREEN_DEV}" -a -e "/var/ipfire/dhcp/enable_green" ]; then
devices="${GREEN_DEV}"
iptables -A DHCPGREENINPUT -i "${GREEN_DEV}" -j DHCPINPUT
iptables -A DHCPGREENOUTPUT -o "${GREEN_DEV}" -j DHCPOUTPUT
fi
if [ -e /var/ipfire/dhcp/enable_blue ]; then
if [ -n "${BLUE_DEV}" -a -e "/var/ipfire/dhcp/enable_blue" ]; then
devices+=" ${BLUE_DEV}"
iptables -A DHCPBLUEINPUT -p tcp --source-port 68 --destination-port 67 -i ${BLUE_DEV} -j ACCEPT > /dev/null 2>&1
iptables -A DHCPBLUEINPUT -p udp --source-port 68 --destination-port 67 -i ${BLUE_DEV} -j ACCEPT > /dev/null 2>&1
fi
iptables -A DHCPBLUEINPUT -i "${BLUE_DEV}" -j DHCPINPUT
iptables -A DHCPBLUEOUTPUT -o "${BLUE_DEV}" -j DHCPOUTPUT
fi
boot_mesg "Starting DHCP Server..."
loadproc /usr/sbin/dhcpd -q ${devices}
(sleep 5 && chmod 644 /var/run/dhcpd.pid) & # Fix because silly dhcpd creates its pid with mode 640
;;
stop)
flush_chains
boot_mesg "Stopping DHCP Server..."
killproc -p /var/run/dhcpd.pid /usr/sbin/dhcpd
if [ "$(ps -A | grep " dhcpd")" != "" ] ; then

1
src/initscripts/init.d/fcron
View File

@@ -13,6 +13,7 @@
case "$1" in
start)
boot_mesg "Starting fcron..."
chown cron:cron /var/spool/cron
loadproc /usr/sbin/fcron -y
# remove -y to reenable fcron logging
;;

31
src/initscripts/init.d/firewall
View File

@@ -143,6 +143,31 @@ iptables_init() {
iptables -A ${i} -j CONNTRACK
done
# Allow DHCP
iptables -N DHCPINPUT
iptables -A DHCPINPUT -p udp --sport 68 --dport 67 -j ACCEPT
iptables -A DHCPINPUT -p tcp --sport 68 --dport 67 -j ACCEPT
iptables -N DHCPOUTPUT
iptables -A DHCPOUTPUT -p udp --sport 67 --dport 68 -j ACCEPT
iptables -A DHCPOUTPUT -p tcp --sport 67 --dport 68 -j ACCEPT
# Allow DHCP on GREEN
iptables -N DHCPGREENINPUT
iptables -N DHCPGREENOUTPUT
if [ -n "${GREEN_DEV}" ]; then
iptables -A INPUT -i "${GREEN_DEV}" -j DHCPGREENINPUT
iptables -A OUTPUT -o "${GREEN_DEV}" -j DHCPGREENOUTPUT
fi
# allow DHCP on BLUE to be turned on/off
iptables -N DHCPBLUEINPUT
iptables -N DHCPBLUEOUTPUT
if [ -n "${BLUE_DEV}" ]; then
iptables -A INPUT -i "${BLUE_DEV}" -j DHCPBLUEINPUT
iptables -A OUTPUT -o "${BLUE_DEV}" -j DHCPBLUEOUTPUT
fi
# trafic from ipsecX/TUN/TAP interfaces, before "-i GREEN_DEV" accept everything
iptables -N IPSECINPUT
iptables -N IPSECFORWARD
@@ -155,11 +180,7 @@ iptables_init() {
# localhost and ethernet.
iptables -A INPUT -i $GREEN_DEV -m conntrack --ctstate NEW -j ACCEPT ! -p icmp
# allow DHCP on BLUE to be turned on/off
iptables -N DHCPBLUEINPUT
iptables -A INPUT -j DHCPBLUEINPUT
# WIRELESS chains
iptables -N WIRELESSINPUT
iptables -A INPUT -m conntrack --ctstate NEW -j WIRELESSINPUT

11
src/initscripts/init.d/networking/red
View File

@@ -22,6 +22,7 @@
#Define some defaults
INET_VLAN=7
IPTV_VLAN=8
ATM_DEV=0
eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
if [ "$RRDLOG" == "" ]; then
@@ -170,17 +171,17 @@ case "${1}" in
if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then
PPP_NIC=nas0
DEVICE=nas0
PPP_NIC=nas${ATM_DEV}
DEVICE=nas${ATM_DEV}
boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
br2684ctl -c${ATM_DEV} -e${ENCAP} -a${ATM_DEV}.${VPI}.${VCI} >/dev/null 2>&1 &
sleep 1
# use user-defined or green mac address for nas0
if [ -n "$MAC" ]; then
ip link set dev nas0 address ${MAC}
ip link set dev nas${ATM_DEV} address ${MAC}
else
ip link set dev nas0 address $(cat /sys/class/net/green0/address)
ip link set dev nas${ATM_DEV} address $(cat /sys/class/net/green0/address)
fi
if [ "$TYPE" == "pppoeatm" ]; then

5
src/initscripts/init.d/sshd
View File

@@ -43,7 +43,10 @@ case "$1" in
(
sleep 3
pid=$(cat /var/run/sshd.pid 2>/dev/null)
[ -n "${pid}" ] && echo "-16" > "/proc/${pid}/oom_score_adj"
[ -n "${pid}" ] && [ -e "/proc/${pid}/oom_score_adj" ] && \
echo "-16" > "/proc/${pid}/oom_score_adj" || \
[ -e "/proc/${pid}/oom_adj" ] && \
echo "-16" > "/proc/${pid}/oom_adj"
) &
;;

39
src/initscripts/init.d/stunnel Normal file
View File

@@ -0,0 +1,39 @@
#!/bin/sh
########################################################################
# Begin $rc_base/init.d/stunnel
#
# Description : Provides an SSL encryption wrapper.
#
########################################################################
. /etc/sysconfig/rc
. ${rc_functions}
case "$1" in
start)
boot_mesg "Starting the Stunnel Daemon..."
loadproc /usr/bin/stunnel
;;
stop)
boot_mesg "Stopping the Stunnel Daemon..."
killproc /usr/bin/stunnel
;;
restart)
$0 stop
sleep 1
$0 start
;;
status)
statusproc /usr/bin/stunnel
;;
*)
echo "Usage: $0 {start|stop|restart|status}"
exit 1
;;
esac
# End $rc_base/init.d/stunnel

48
src/initscripts/init.d/watchdog
View File

@@ -1,44 +1,31 @@
#!/bin/sh
########################################################################
# Begin $rc_base/init.d/watchdog
#
# Description : watchdog daemon initscript
#
########################################################################
. /etc/sysconfig/rc
. ${rc_functions}
PATH=/bin:/usr/bin:/sbin:/usr/sbin
test -x /usr/sbin/watchdog || exit 0
# For configuration of the init script use the file
# /etc/sysconfig/watchdog, do not edit this init script.
# Set run_watchdog to 1 to start watchdog or 0 to disable it.
run_watchdog=0
# Specify additional watchdog options here (see manpage).
watchdog_options=""
# Specify module to load
watchdog_module="none"
[ -e /etc/sysconfig/watchdog ] && . /etc/sysconfig/watchdog
DAEMON=/usr/sbin/watchdog
WD_DAEMON=/usr/sbin/wd_keepalive
if [ -e "/etc/sysconfig/watchdog" ]; then
. /etc/sysconfig/watchdog
fi
case "${1}" in
start)
boot_mesg "Starting watchdog ..."
if [ $run_watchdog = 1 ]
then
# do we have to load a module?
[ ${watchdog_module:-none} != "none" ] && /sbin/modprobe $watchdog_module
if [ -n "${watchdog_module}" ]; then
modprobe -q "${watchdog_module}" 2>/dev/null
fi
loadproc $DAEMON $watchdog_options
fi
boot_mesg "Starting watchdog daemon..."
loadproc /usr/sbin/watchdog ${watchdog_options}
;;
stop)
boot_mesg "Stopping watchdog ..."
killproc $DAEMON
boot_mesg "Stopping watchdog daemon..."
killproc /usr/sbin/watchdog
;;
restart)
@@ -48,7 +35,7 @@ case "${1}" in
;;
status)
statusproc $DAEMON
statusproc /usr/sbin/watchdog
;;
*)
@@ -57,3 +44,4 @@ case "${1}" in
;;
esac
# End $rc_base/init.d/watchdog

2
src/install+setup/install/main.c
View File

@@ -124,8 +124,6 @@ int main(int argc, char *argv[])
}
// Load common modules
mysystem("/sbin/modprobe iso9660"); // CDROM
// mysystem("/sbin/modprobe ext2"); // Boot patition
mysystem("/sbin/modprobe vfat"); // USB key
/* German is the default */

6
src/install+setup/install/mountsource.sh
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2014 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 #
@@ -42,7 +42,7 @@ done
# scan all Partitions on block devices
for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name ram* -exec basename {} \;`
do
for DEVICEP in $(ls /dev/${DEVICE}? | sed "s/\/dev\///" 2> /dev/null);do
for DEVICEP in $(ls /dev/${DEVICE}? 2>/dev/null | sed "s/\/dev\///");do
mount /dev/${DEVICEP} /cdrom 2> /dev/null
if [ -n "$(ls /cdrom/${version}.media 2>/dev/null)" ]; then
echo -n ${DEVICEP} > /tmp/source_device
@@ -58,7 +58,7 @@ done
# scan all Partitions on raid/mmc devices
for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name ram* -exec basename {} \;`
do
for DEVICEP in $(ls /dev/${DEVICE}p? | sed "s/\/dev\///");do
for DEVICEP in $(ls /dev/${DEVICE}p? 2>/dev/null | sed "s/\/dev\///");do
mount /dev/${DEVICEP} /cdrom 2> /dev/null
if [ -n "$(ls /cdrom/${version}.media 2>/dev/null)" ]; then
echo -n ${DEVICEP} > /tmp/source_device

37
src/paks/stunnel/install.sh Normal file
View File

@@ -0,0 +1,37 @@
#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
# Create Username and group.
getent passwd stunnel >/dev/null || \
useradd -u 51 -g stunnel -d /var/lib/stunnel -s /bin/false \
-c "stunnel Daemon" stunnel
extract_files
ln -svf ../init.d/stunnel /etc/rc.d/rc3.d/S65stunnel
ln -svf ../init.d/stunnel /etc/rc.d/rc0.d/K35stunnel
ln -svf ../init.d/stunnel /etc/rc.d/rc6.d/K35stunnel
restore_backup ${NAME}
start_service --background ${NAME}

28
src/paks/stunnel/uninstall.sh Normal file
View File

@@ -0,0 +1,28 @@
#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
stop_service ${NAME}
make_backup ${NAME}
remove_files
rm -rf /etc/rc.d/rc*.d/*stunnel

26
src/paks/stunnel/update.sh Normal file
View File

@@ -0,0 +1,26 @@
#!/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 2 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) 2007 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
./install.sh

55
src/patches/fireinfo-0001-Exclude-some-more-invalid-patterns.patch
View File

@@ -1,55 +0,0 @@
From 220ffe76a48c72171d7724f7f602a2fdd8bbca6a Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 15 Feb 2014 18:37:54 +0100
Subject: [PATCH] Exclude some more invalid patterns.
---
src/fireinfo/system.py | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py
index 40ff7b0..c875f96 100644
--- a/src/fireinfo/system.py
+++ b/src/fireinfo/system.py
@@ -44,12 +44,17 @@ INVALID_ID_STRINGS = (
"Chassis", "chassis",
"Not Applicable",
"None", "empty",
+ "XXXXX",
"01010101-0101-0101-0101-010101010101",
"00020003-0004-0005-0006-000700080009",
"03000200-0400-0500-0006-000700080009",
"0000000", "00000000",
)
+INVALID_ID_STRINGS_EXACT_MATCH = (
+ "NA",
+)
+
class Singleton(type):
def __init__(cls, name, bases, dict):
super(Singleton, cls).__init__(name, bases, dict)
@@ -234,12 +239,18 @@ class System(object):
if id is None:
continue
- for i in INVALID_ID_STRINGS:
- if i in id:
+ for i in INVALID_ID_STRINGS_EXACT_MATCH:
+ if id == i:
id = None
break
if id:
+ for i in INVALID_ID_STRINGS:
+ if i in id:
+ id = None
+ break
+
+ if id:
_ids.append(id)
ids = _ids
--
1.8.3.1

144
src/patches/linux-3.10-layer7-filter.patch
View File

@@ -1514,10 +1514,10 @@ index 0000000..339631f
+}
diff --git a/net/netfilter/xt_layer7.c b/net/netfilter/xt_layer7.c
new file mode 100644
index 0000000..51bb747
index 0000000..1573e9d
--- /dev/null
+++ b/net/netfilter/xt_layer7.c
@@ -0,0 +1,625 @@
@@ -0,0 +1,665 @@
+/*
+ Kernel module to match application layer (OSI layer 7) data in connections.
+
@@ -1726,40 +1726,67 @@ index 0000000..51bb747
+
+static int can_handle(const struct sk_buff *skb)
+{
+ if(!ip_hdr(skb)) /* not IP */
+ struct iphdr iphdr_tmp;
+ struct iphdr *iphdr;
+ int offset;
+
+ if (!ip_hdr(skb))
+ return 0;
+ if(ip_hdr(skb)->protocol != IPPROTO_TCP &&
+ ip_hdr(skb)->protocol != IPPROTO_UDP &&
+ ip_hdr(skb)->protocol != IPPROTO_ICMP)
+
+ offset = ((uintptr_t)ip_hdr(skb)) - ((uintptr_t)skb->data);
+
+ iphdr = skb_header_pointer(skb, offset, sizeof(*iphdr), &iphdr_tmp);
+ if (!iphdr)
+ return 0;
+ return 1;
+
+ if (iphdr->protocol == IPPROTO_TCP ||
+ iphdr->protocol == IPPROTO_UDP ||
+ iphdr->protocol == IPPROTO_ICMP)
+ return 1;
+
+ return 0;
+}
+
+/* Returns offset the into the skb->data that the application data starts */
+static int app_data_offset(const struct sk_buff *skb)
+{
+ /* In case we are ported somewhere (ebtables?) where ip_hdr(skb)
+ isn't set, this can be gotten from 4*(skb->data[0] & 0x0f) as well. */
+ int ip_hl = 4*ip_hdr(skb)->ihl;
+ int offset;
+ struct iphdr iphdr_tmp;
+ struct iphdr *iphdr;
+ struct tcphdr tcphdr_tmp;
+ struct tcphdr *tcphdr;
+
+ if( ip_hdr(skb)->protocol == IPPROTO_TCP ) {
+ /* 12 == offset into TCP header for the header length field.
+ Can't get this with skb->h.th->doff because the tcphdr
+ struct doesn't get set when routing (this is confirmed to be
+ true in Netfilter as well as QoS.) */
+ int tcp_hl = 4*(skb->data[ip_hl + 12] >> 4);
+ if (!ip_hdr(skb))
+ return -1;
+
+ return ip_hl + tcp_hl;
+ } else if( ip_hdr(skb)->protocol == IPPROTO_UDP ) {
+ return ip_hl + 8; /* UDP header is always 8 bytes */
+ } else if( ip_hdr(skb)->protocol == IPPROTO_ICMP ) {
+ return ip_hl + 8; /* ICMP header is 8 bytes */
+ } else {
+ if (net_ratelimit())
+ printk(KERN_ERR "layer7: tried to handle unknown "
+ "protocol!\n");
+ return ip_hl + 8; /* something reasonable */
+ offset = ((uintptr_t)ip_hdr(skb)) - ((uintptr_t)skb->data);
+
+ iphdr = skb_header_pointer(skb, offset, sizeof(*iphdr), &iphdr_tmp);
+ if (!iphdr)
+ return -1;
+
+ offset += iphdr->ihl * 4;
+
+ if (iphdr->protocol == IPPROTO_TCP) {
+ tcphdr = skb_header_pointer(skb, offset, sizeof(*tcphdr),
+ &tcphdr_tmp);
+ if (!tcphdr)
+ return -1;
+
+ offset += tcphdr->doff * 4;
+
+ return offset;
+ }
+
+ if (iphdr->protocol == IPPROTO_UDP)
+ return offset + 8;
+
+ if (iphdr->protocol == IPPROTO_ICMP)
+ return offset + 8;
+
+ if (net_ratelimit())
+ pr_err(KERN_ERR "layer7: tried to handle unknown protocol!\n");
+
+ return offset + 8; /* something reasonable */
+}
+
+/* handles whether there's a match when we aren't appending data anymore */
@@ -1849,13 +1876,39 @@ index 0000000..51bb747
+ return length;
+}
+
+/* add the new app data to the buffer. Return number of bytes added. */
+static int add_data(char *target, int offset, const struct sk_buff *skb)
+{
+ int length, length_sum = 0;
+ int data_start = app_data_offset(skb);
+ int remaining = skb->len - data_start;
+ int to_copy;
+ uint8_t buf[512];
+ uint8_t *data;
+
+ while ((offset < maxdatalen - 1) && (remaining > 0)) {
+ to_copy = min_t(int, remaining, sizeof(buf));
+
+ data = skb_header_pointer(skb, data_start, to_copy, buf);
+ length = add_datastr(target, offset, data, to_copy);
+
+ remaining -= to_copy;
+ data_start += to_copy;
+ offset += length;
+ length_sum += length;
+ }
+
+ return length_sum;
+}
+
+/* add the new app data to the conntrack. Return number of bytes added. */
+static int add_data(struct nf_conn * master_conntrack,
+ char * app_data, int appdatalen)
+static int add_data_conntrack(struct nf_conn *master_conntrack,
+ const struct sk_buff *skb)
+{
+ int length;
+
+ length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
+ length = add_data(master_conntrack->layer7.app_data,
+ master_conntrack->layer7.app_data_len, skb);
+ master_conntrack->layer7.app_data_len += length;
+
+ return length;
@@ -1911,20 +1964,20 @@ index 0000000..51bb747
+static bool match(const struct sk_buff *skbin, struct xt_action_param *par)
+{
+ /* sidestep const without getting a compiler warning... */
+ struct sk_buff * skb = (struct sk_buff *)skbin;
+ struct sk_buff *skb = (struct sk_buff *)skbin;
+
+ const struct xt_layer7_info * info = par->matchinfo;
+
+ enum ip_conntrack_info master_ctinfo, ctinfo;
+ struct nf_conn *master_conntrack, *conntrack;
+ unsigned char *app_data, *tmp_data;
+ unsigned int pattern_result, appdatalen;
+ unsigned char *tmp_data;
+ unsigned int pattern_result;
+ regexp * comppattern;
+
+ /* Be paranoid/incompetent - lock the entire match function. */
+ spin_lock_bh(&l7_lock);
+
+ if(!can_handle(skb)){
+ if (!can_handle(skbin)) {
+ DPRINTK("layer7: This is some protocol I can't handle.\n");
+ spin_unlock_bh(&l7_lock);
+ return info->invert;
@@ -1933,8 +1986,9 @@ index 0000000..51bb747
+ /* Treat parent & all its children together as one connection, except
+ for the purpose of setting conntrack->layer7.app_proto in the actual
+ connection. This makes /proc/net/ip_conntrack more satisfying. */
+ if(!(conntrack = nf_ct_get(skb, &ctinfo)) ||
+ !(master_conntrack=nf_ct_get(skb,&master_ctinfo))){
+ conntrack = nf_ct_get(skbin, &ctinfo);
+ master_conntrack = nf_ct_get(skbin, &master_ctinfo);
+ if (!conntrack || !master_conntrack) {
+ DPRINTK("layer7: couldn't get conntrack.\n");
+ spin_unlock_bh(&l7_lock);
+ return info->invert;
@@ -1962,20 +2016,6 @@ index 0000000..51bb747
+ return (pattern_result ^ info->invert);
+ }
+
+ if(skb_is_nonlinear(skb)){
+ if(skb_linearize(skb) != 0){
+ if (net_ratelimit())
+ printk(KERN_ERR "layer7: failed to linearize "
+ "packet, bailing.\n");
+ spin_unlock_bh(&l7_lock);
+ return info->invert;
+ }
+ }
+
+ /* now that the skb is linearized, it's safe to set these. */
+ app_data = skb->data + app_data_offset(skb);
+ appdatalen = skb_tail_pointer(skb) - app_data;
+
+ /* the return value gets checked later, when we're ready to use it */
+ comppattern = compile_and_cache(info->pattern, info->protocol);
+
@@ -1988,7 +2028,7 @@ index 0000000..51bb747
+ }
+
+ tmp_data[0] = '\0';
+ add_datastr(tmp_data, 0, app_data, appdatalen);
+ add_data(tmp_data, 0, skbin);
+ pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
+
+ kfree(tmp_data);
@@ -2023,7 +2063,7 @@ index 0000000..51bb747
+
+ if(!skb->cb[0]){
+ int newbytes;
+ newbytes = add_data(master_conntrack, app_data, appdatalen);
+ newbytes = add_data_conntrack(master_conntrack, skb);
+
+ if(newbytes == 0) { /* didn't add any data */
+ skb->cb[0] = 1;

11
src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch Normal file
View File

@@ -0,0 +1,11 @@
diff -Naur linux-3.10.37.org/drivers/net/wireless/rt2x00/rt2800usb.c linux-3.10.37/drivers/net/wireless/rt2x00/rt2800usb.c
--- linux-3.10.37.org/drivers/net/wireless/rt2x00/rt2800usb.c 2014-04-14 15:42:31.000000000 +0200
+++ linux-3.10.37/drivers/net/wireless/rt2x00/rt2800usb.c 2014-04-25 10:25:12.796630526 +0200
@@ -1175,6 +1175,7 @@
/* Belkin */
{ USB_DEVICE(0x050d, 0x945b) },
/* D-Link */
+ { USB_DEVICE(0x2001, 0x3317) },
{ USB_DEVICE(0x2001, 0x3c17) },
/* Panasonic */
{ USB_DEVICE(0x083a, 0xb511) },

5081
src/patches/linux-3.10.39-add_libertas_uap.patch Normal file
View File

File diff suppressed because it is too large Load Diff

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/releases/ipfire-2.x/2.13-core$COREVER/"
ISO="ipfire-2.13.i586-full-core$COREVER.iso"
URL="http://download.ipfire.org/releases/ipfire-2.x/2.15-core$COREVER/"
ISO="ipfire-2.15.i586-full-core$COREVER.iso"
if [ -z $1 ]; then
echo usage: $0 backup-file