Merge branch 'master' into next

Conflicts:
	doc/language_issues.nl
	doc/language_issues.tr
This commit is contained in:
Michael Tremer
2014-05-09 01:31:43 +02:00
92 changed files with 7609 additions and 3886 deletions

View File

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

View File

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

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;

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

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';

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) {

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

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

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

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

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
#

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

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

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

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

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

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

File diff suppressed because it is too large Load Diff

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

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

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

View File

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

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

View File

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

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

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

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

File diff suppressed because it is too large Load Diff

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

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

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