]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'alfh/feature_firewalllogcountry' into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:15:49 +0000 (23:15 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:15:49 +0000 (23:15 +0100)
Conflicts:
langs/de/cgi-bin/de.pl

84 files changed:
config/cfgroot/general-functions.pl
config/cfgroot/graphs.pl
config/cron/crontab
config/etc/sysctl.conf
config/firewall/firewall-policy
config/firewall/rules.pl
config/fwhosts/customservices
config/hostapd/config
config/kernel/kernel.config.armv5tel-ipfire-multi
config/kernel/kernel.config.i586-ipfire
config/kernel/kernel.config.i586-ipfire-pae
config/menu/20-status.menu
config/rootfiles/common/apache2
config/rootfiles/common/armv5tel/dracut
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/armv5tel/linux-headers
config/rootfiles/common/armv5tel/linux-kirkwood
config/rootfiles/common/armv5tel/linux-multi
config/rootfiles/common/armv5tel/linux-rpi
config/rootfiles/common/armv5tel/u-boot
config/rootfiles/common/armv5tel/u-boot-panda [deleted file]
config/rootfiles/common/i586/initscripts
config/rootfiles/common/i586/linux
config/rootfiles/common/stage2
config/rootfiles/common/sudo
config/rootfiles/common/tzdata
config/rootfiles/core/76/exclude
config/rootfiles/core/76/filelists/beep [new symlink]
config/rootfiles/core/76/filelists/tzdata [new symlink]
config/rootfiles/core/76/filelists/wpa_supplicant [new symlink]
config/rootfiles/core/76/update.sh
config/rootfiles/packages/armv5tel/vdr_dvbapi [new file with mode: 0644]
config/rootfiles/packages/foomatic
config/rootfiles/packages/i586/vdr_dvbapi [new file with mode: 0644]
config/rootfiles/packages/linux-pae
config/rootfiles/packages/vdr_eepg [new file with mode: 0644]
doc/language_issues.de
doc/language_issues.en
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.nl
doc/language_issues.pl
doc/language_issues.ru
doc/language_issues.tr
doc/language_missings
html/cgi-bin/country.cgi
html/cgi-bin/entropy.cgi
html/cgi-bin/firewall.cgi
html/cgi-bin/fwhosts.cgi
html/cgi-bin/gpl.cgi
html/cgi-bin/index.cgi
html/cgi-bin/logs.cgi/firewalllogip.dat
html/cgi-bin/logs.cgi/firewalllogport.dat
html/cgi-bin/ovpnmain.cgi
html/cgi-bin/vpnmain.cgi
html/cgi-bin/wlanap.cgi
html/html/themes/ipfire/include/functions.pl
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
langs/tr/cgi-bin/tr.pl
lfs/apache2
lfs/beep
lfs/hostapd
lfs/initscripts
lfs/linux
lfs/openssh
lfs/samba
lfs/strongswan
lfs/sudo
lfs/tzdata
lfs/vdr
lfs/vdr_dvbapi [new file with mode: 0644]
lfs/vdr_eepg [new file with mode: 0644]
lfs/wpa_supplicant
make.sh
src/initscripts/init.d/firewall
src/initscripts/init.d/leds
src/initscripts/init.d/networking/red
src/misc-progs/openvpnctrl.c
src/patches/linux-2.6.30-no-pcspkr-modalias.patch [deleted file]
src/patches/linux-3.10-apu_leds.patch [new file with mode: 0644]
src/patches/strongswan-5.0.2_ipfire.patch
src/scripts/dialctrl.pl [deleted file]
src/scripts/setddns.pl

index 9a5e6714d612e334c96309e9c2cfa2d994ea205b..adfba5489177320e2b1528223156a620089863bf 100644 (file)
@@ -506,24 +506,46 @@ sub validipandmask
 
 sub checksubnets
 {
-       my %ccdconfhash=();                     
-       my @ccdconf=();                         
-       my $ccdname=$_[0];                      
-       my $ccdnet=$_[1];                       
+       my %ccdconfhash=();
+       my %ovpnconfhash=();
+       my %vpnconf=();
+       my %ipsecconf=();
+       my %ownnet=();
+       my %ovpnconf=();
+       my @ccdconf=();
+       my $ccdname=$_[0];
+       my $ccdnet=$_[1];
+       my $ownnet=$_[2];
        my $errormessage;
        my ($ip,$cidr)=split(/\//,$ccdnet);
        $cidr=&iporsubtocidr($cidr);
+
        #get OVPN-Subnet (dynamic range)
-       my %ovpnconf=();
        &readhash("${General::swroot}/ovpn/settings", \%ovpnconf);
        my ($ovpnip,$ovpncidr)= split (/\//,$ovpnconf{'DOVPN_SUBNET'});
        $ovpncidr=&iporsubtocidr($ovpncidr);
+
        #check if we try to use same network as ovpn server
        if ("$ip/$cidr" eq "$ovpnip/$ovpncidr") {
                        $errormessage=$errormessage.$Lang::tr{'ccd err isovpnnet'}."<br>";
                        return $errormessage;
        }
-       #check if we use a network-name/subnet that already exists
+
+       #check if we try to use same network as another ovpn N2N
+       if($ownnet ne 'ovpn'){
+               &readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ovpnconfhash);
+               foreach my $key (keys %ovpnconfhash) {
+                       if ($ovpnconfhash{$key}[3] eq 'net'){
+                               my @ovpnnet=split (/\//,$ovpnconfhash{$key}[11]);
+                               if (&IpInSubnet($ip,$ovpnnet[0],&iporsubtodec($ovpnnet[1]))){
+                                       $errormessage=$errormessage.$Lang::tr{'ccd err isovpnn2n'}." $ovpnconfhash{$key}[1] <br>";
+                                       return $errormessage;
+                               }
+                       }
+               }
+       }
+
+       #check if we use a network-name/subnet (static-ovpn) that already exists
        &readhasharray("${General::swroot}/ovpn/ccd.conf", \%ccdconfhash);
        foreach my $key (keys %ccdconfhash) {
                @ccdconf=split(/\//,$ccdconfhash{$key}[1]);
@@ -535,32 +557,45 @@ sub checksubnets
                my ($newip,$newsub) = split(/\//,$ccdnet);
                if (&IpInSubnet($newip,$ccdconf[0],&iporsubtodec($ccdconf[1]))) 
                {
-                       $errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}."<br>";
+                       $errormessage=$errormessage.$Lang::tr{'ccd err issubnet'}." $ccdconfhash{$key}[0]<br>";
                        return $errormessage;
                }
        }
+
        #check if we use a ipsec right network which is already defined
-       my %ipsecconf=();
-       &General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf);
-       foreach my $key (keys %ipsecconf){
-               if ($ipsecconf{$key}[11] ne ''){
-                       my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
-                       $ipsecsub=&iporsubtodec($ipsecsub);
-                       if($ipsecconf{$key}[1] ne $ccdname){
-                               if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){
-                                       $errormessage=$Lang::tr{'ccd err isipsecnet'}." Name:  $ipsecconf{$key}[1]";
-                                       return $errormessage;
+       if($ownnet ne 'ipsec'){
+               &General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf);
+               foreach my $key (keys %ipsecconf){
+                       if ($ipsecconf{$key}[11] ne ''){
+                               my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
+                               $ipsecsub=&iporsubtodec($ipsecsub);
+                               if($ipsecconf{$key}[1] ne $ccdname){
+                                       if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){
+                                               $errormessage=$Lang::tr{'ccd err isipsecnet'}." Name:  $ipsecconf{$key}[1]";
+                                               return $errormessage;
+                                       }
                                }
                        }
                }
        }
+
+       #check if we use the ipsec RW Network (if defined)
+       &readhash("${General::swroot}/vpn/settings", \%vpnconf);
+       if ($vpnconf{'RW_NET'} ne ''){
+               my ($ipsecrwnet,$ipsecrwsub)=split (/\//, $vpnconf{'RW_NET'});
+               if (&IpInSubnet($ip,$ipsecrwnet,&iporsubtodec($ipsecrwsub)))
+               {
+                       $errormessage=$errormessage.$Lang::tr{'ccd err isipsecrw'}."<br>";
+                       return $errormessage;
+               }
+       }
+
        #check if we use one of ipfire's networks (green,orange,blue)
-       my %ownnet=();
        &readhash("${General::swroot}/ethernet/settings", \%ownnet);
-       if (($ownnet{'GREEN_NETADDRESS'}        ne '' && $ownnet{'GREEN_NETADDRESS'}    ne '0.0.0.0') && &IpInSubnet($ownnet{'GREEN_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}
-       if (($ownnet{'ORANGE_NETADDRESS'}       ne '' && $ownnet{'ORANGE_NETADDRESS'}   ne '0.0.0.0') && &IpInSubnet($ownnet{'ORANGE_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}
-       if (($ownnet{'BLUE_NETADDRESS'}         ne '' && $ownnet{'BLUE_NETADDRESS'}     ne '0.0.0.0') && &IpInSubnet($ownnet{'BLUE_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}
-       if (($ownnet{'RED_NETADDRESS'}          ne '' && $ownnet{'RED_NETADDRESS'}              ne '0.0.0.0') && &IpInSubnet($ownnet{'RED_NETADDRESS'},$ip,&iporsubtodec($cidr))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
+       if (($ownnet{'GREEN_NETADDRESS'}        ne '' && $ownnet{'GREEN_NETADDRESS'}    ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'GREEN_NETADDRESS'},&iporsubtodec($ownnet{'GREEN_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}
+       if (($ownnet{'ORANGE_NETADDRESS'}       ne '' && $ownnet{'ORANGE_NETADDRESS'}   ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ownnet{'ORANGE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}
+       if (($ownnet{'BLUE_NETADDRESS'}         ne '' && $ownnet{'BLUE_NETADDRESS'}     ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'BLUE_NETADDRESS'},&iporsubtodec($ownnet{'BLUE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}
+       if (($ownnet{'RED_NETADDRESS'}          ne '' && $ownnet{'RED_NETADDRESS'}              ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
 }
 
 
@@ -1039,7 +1074,7 @@ sub GetIcmpDescription ($) {
     'SKIP',
     'Photur',                          #40
     'Experimental');
-    if ($index>41) {return 'unknown'} else {return @icmp_description[$index]};
+    if ($index>41) {return 'unknown'} else {return $icmp_description[$index]};
 }
 
 sub GetCoreUpdateVersion() {
index cc00c665bcb94cf0e2805053270aa9c70b15d82d..4942c98c86a92acfdcd138aadec923bf7694f33a 100644 (file)
@@ -92,8 +92,8 @@ sub makegraphbox {
        print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
        print " - ";
        print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
-       print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
        print "</center>";
+       print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
 }
 
 # Generate the CPU Graph for the current period of time for values given by
@@ -1140,7 +1140,6 @@ sub updateentropygraph {
                "-t $Lang::tr{'entropy'}",
                "-v $Lang::tr{'bit'}",
                "DEF:entropy=$mainsettings{'RRDLOG'}/collectd/localhost/entropy/entropy.rrd:entropy:AVERAGE",
-               "CDEF:entropytrend=entropy,43200,TREND",
                "LINE3:entropy#ff0000:" . sprintf("%-15s", $Lang::tr{'entropy'}),
                "VDEF:entrmin=entropy,MINIMUM",
                "VDEF:entrmax=entropy,MAXIMUM",
@@ -1148,7 +1147,6 @@ sub updateentropygraph {
                "GPRINT:entrmax:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'maximum'}),
                "GPRINT:entrmin:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'minimum'}),
                "GPRINT:entravg:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n",
-               "LINE3:entropytrend#000000",
        );
 
        RRDs::graph (@command);
index 3b70df44e262ff343729203e0acab34703960ec2..92c3a78ba74cf9267daaadd49d2bd6c5d362877b 100644 (file)
@@ -50,9 +50,6 @@ HOME=/
 %weekly  * 3-5   /var/ipfire/updatexlrator/autocheck/cron.weekly
 %monthly * 3-5 * /var/ipfire/updatexlrator/autocheck/cron.monthly
 
-# Reset Dialup Statistics
-&bootrun 0 0 1 * *     /usr/local/bin/dialctrl.pl reset
-
 # fireinfo
 %nightly,random * 23-4 /usr/bin/sendprofile >/dev/null 2>&1
 
index d6a2f75048123728f5b44b7a245d200761e67c5f..e2e3d81b032ab1877e6c76e0136b8be165b23775 100644 (file)
@@ -1,7 +1,10 @@
 net.ipv4.ip_forward = 1
 net.ipv4.ip_dynaddr = 1
+
 net.ipv4.icmp_echo_ignore_broadcasts = 1
 net.ipv4.icmp_ignore_bogus_error_responses = 1
+net.ipv4.icmp_ratelimit = 1000
+net.ipv4.icmp_ratemask = 6168
 
 net.ipv4.tcp_syncookies = 1
 net.ipv4.tcp_fin_timeout = 30
index bd1e40d35a101eea1ba5f5cb98333c118c949100..2c583c5957a121b3c58e7f3c9581711ffb182b29 100755 (executable)
@@ -52,17 +52,39 @@ case "${CONFIG_TYPE}" in
                ;;
 esac
 
+HAVE_IPSEC="true"
+HAVE_OPENVPN="true"
+
 # INPUT
+
+# IPsec INPUT
+case "${HAVE_IPSEC},${POLICY}" in
+       true,MODE1) ;;
+       true,*)
+               iptables -A POLICYIN -m policy --pol ipsec --dir in -j ACCEPT
+               ;;
+esac
+
+# OpenVPN INPUT
+# Allow direct access to the internal IP addresses of the firewall
+# from remote subnets if forward policy is allowed.
+case "${HAVE_OPENVPN},${POLICY}" in
+       true,MODE1) ;;
+       true,*)
+               iptables -A POLICYIN -i tun+ -j ACCEPT
+               ;;
+esac
+
 case "${FWPOLICY2}" in
        REJECT)
                if [ "${DROPINPUT}" = "on" ]; then
-                       iptables -A POLICYIN -m limit --limit 10/minute -j LOG --log-prefix "REJECT_INPUT"
+                       iptables -A POLICYIN -m limit --limit 10/minute -j LOG --log-prefix "REJECT_INPUT "
                fi
                iptables -A POLICYIN -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_INPUT"
                ;;
        *) # DROP
                if [ "${DROPINPUT}" = "on" ]; then
-                       iptables -A POLICYIN -m limit --limit 10/minute -j LOG --log-prefix "DROP_INPUT"
+                       iptables -A POLICYIN -m limit --limit 10/minute -j LOG --log-prefix "DROP_INPUT "
                fi
                iptables -A POLICYIN -j DROP -m comment --comment "DROP_INPUT"
                ;;
@@ -74,13 +96,13 @@ case "${POLICY}" in
                case "${FWPOLICY}" in
                        REJECT)
                                if [ "${DROPFORWARD}" = "on" ]; then
-                                       iptables -A POLICYFWD -m limit --limit 10/minute -j LOG --log-prefix "REJECT_FORWARD"
+                                       iptables -A POLICYFWD -m limit --limit 10/minute -j LOG --log-prefix "REJECT_FORWARD "
                                fi
                                iptables -A POLICYFWD -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_FORWARD"
                                ;;
                        *) # DROP
                                if [ "${DROPFORWARD}" = "on" ]; then
-                                       iptables -A POLICYFWD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD"
+                                       iptables -A POLICYFWD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD "
                                fi
                                iptables -A POLICYFWD -j DROP -m comment --comment "DROP_FORWARD"
                                ;;
@@ -107,13 +129,13 @@ case "${POLICY1}" in
                case "${FWPOLICY1}" in
                        REJECT)
                                if [ "${DROPOUTGOING}" = "on" ]; then
-                                       iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "REJECT_OUTPUT"
+                                       iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "REJECT_OUTPUT "
                                fi
                                iptables -A POLICYOUT -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_OUTPUT"
                                ;;
                        *) # DROP
                                if [ "${DROPOUTGOING}" == "on" ]; then
-                                       iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "DROP_OUTPUT"
+                                       iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "DROP_OUTPUT "
                                fi
                                iptables -A POLICYOUT -j DROP -m comment --comment "DROP_OUTPUT"
                                ;;
index 40ca8245f3ca4e57187cf8482294d730023a8ef0..50fff3f09f97f28726eed8f733000845b89342af 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 
 use strict;
-use Time::Local;
-no warnings 'uninitialized';
 
-# enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "/usr/lib/firewall/firewall-lib.pl";
+
+# Set to one to enable debugging mode.
+my $DEBUG = 0;
+
+my $IPTABLES = "iptables --wait";
+
+# iptables chains
+my $CHAIN_INPUT           = "INPUTFW";
+my $CHAIN_FORWARD         = "FORWARDFW";
+my $CHAIN_OUTPUT          = "OUTGOINGFW";
+my $CHAIN                 = $CHAIN_FORWARD;
+my $CHAIN_NAT_SOURCE      = "NAT_SOURCE";
+my $CHAIN_NAT_DESTINATION = "NAT_DESTINATION";
+my $CHAIN_MANGLE_NAT_DESTINATION_FIX = "NAT_DESTINATION";
+my @VALID_CHAINS          = ($CHAIN_INPUT, $CHAIN_FORWARD, $CHAIN_OUTPUT);
+my @ANY_ADDRESSES         = ("0.0.0.0/0.0.0.0", "0.0.0.0/0", "0/0");
+
+my @PROTOCOLS = ("tcp", "udp", "icmp", "igmp", "ah", "esp", "gre", "ipv6", "ipip");
+my @PROTOCOLS_WITH_PORTS = ("tcp", "udp");
+
+my @VALID_TARGETS = ("ACCEPT", "DROP", "REJECT");
 
 my %fwdfwsettings=();
 my %defaultNetworks=();
-my %configfwdfw=();
-my %color=();
-my %icmptypes=();
-my %ovpnSettings=();
+my %configfwdfw=();;
 my %customgrp=();
-our %sourcehash=();
-our %targethash=();
-my @timeframe=();
 my %configinputfw=();
 my %configoutgoingfw=();
 my %confignatfw=();
 my %aliases=();
-my @DPROT=();
 my @p2ps=();
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "/usr/lib/firewall/firewall-lib.pl";
 
 my $configfwdfw                = "${General::swroot}/firewall/config";
 my $configinput            = "${General::swroot}/firewall/input";
@@ -53,16 +62,6 @@ my $configoutgoing  = "${General::swroot}/firewall/outgoing";
 my $p2pfile                    = "${General::swroot}/firewall/p2protocols";
 my $configgrp          = "${General::swroot}/fwhosts/customgroups";
 my $netsettings                = "${General::swroot}/ethernet/settings";
-my $errormessage       = '';
-my $orange                     = '';
-my $green                      = '';
-my $blue                       = '';
-my ($TYPE,$PROT,$SPROT,$DPROT,$SPORT,$DPORT,$TIME,$TIMEFROM,$TIMETILL,$SRC_TGT);
-my $CHAIN                      = "FORWARDFW";
-my $conexists          = 'off';
-my $command                    = 'iptables --wait -A';
-my $dnat                       ='';
-my $snat                       ='';
 
 &General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings);
 &General::readhash("$netsettings", \%defaultNetworks);
@@ -72,60 +71,68 @@ my $snat                    ='';
 &General::readhasharray($configgrp, \%customgrp);
 &General::get_aliases(\%aliases);
 
-#check if we have an internetconnection
-open (CONN,"/var/ipfire/red/iface");
-my $con = <CONN>;
-close(CONN);
-if (-f "/var/ipfire/red/active"){
-       $conexists='on';
+my @log_limit_options = &make_log_limit_options();
+
+# MAIN
+&main();
+
+sub main {
+       # Flush all chains.
+       &flush();
+
+       # Reload firewall rules.
+       &preparerules();
+
+       # Load P2P block rules.
+       &p2pblock();
+
+       # Reload firewall policy.
+       run("/usr/sbin/firewall-policy");
 }
-open (CONN1,"/var/ipfire/red/local-ipaddress");
-my $redip = <CONN1>;
-close(CONN1);
-#################
-#    DEBUG/TEST #
-#################
-my $MODE=0;     # 0 - normal operation
-                # 1 - print configline and rules to console
-                #
-#################
-my $param=shift;
-
-if($param eq 'flush'){
-       if ($MODE eq '1'){
-               print " Flushing chains...\n";
-       }
-       &flush;
-}else{
-       if ($MODE eq '1'){
-               print " Flushing chains...\n";
-       }
-       &flush;
-       if ($MODE eq '1'){
-               print " Preparing rules...\n";
-       }
-       &preparerules;
-       if($MODE eq '0'){
-               if ($fwdfwsettings{'POLICY'} eq 'MODE1'){
-                       &p2pblock;
-                       system ("/usr/sbin/firewall-policy");
-               }elsif($fwdfwsettings{'POLICY'} eq 'MODE2'){
-                       &p2pblock;
-                       system ("/usr/sbin/firewall-policy");
-                       system ("/etc/sysconfig/firewall.local reload");
+
+sub run {
+       # Executes or prints the given shell command.
+       my $command = shift;
+
+       if ($DEBUG) {
+               print "$command\n";
+       } else {
+               system "$command";
+
+               if ($?) {
+                       print_error("ERROR: $command");
                }
        }
 }
-sub flush
-{
-       system ("iptables --wait -F FORWARDFW");
-       system ("iptables --wait -F INPUTFW");
-       system ("iptables --wait -F OUTGOINGFW");
-       system ("iptables --wait -t nat -F NAT_DESTINATION");
-       system ("iptables --wait -t nat -F NAT_SOURCE");
+
+sub print_error {
+       my $message = shift;
+
+       print STDERR "$message\n";
 }
-sub preparerules
-{
+
+sub print_rule {
+       my $hash = shift;
+
+       print "\nRULE:";
+
+       my $i = 0;
+       foreach (@$hash) {
+               printf("  %2d: %s", $i++, $_);
+       }
+       print "\n";
+}
+
+sub flush {
+       run("$IPTABLES -F $CHAIN_INPUT");
+       run("$IPTABLES -F $CHAIN_FORWARD");
+       run("$IPTABLES -F $CHAIN_OUTPUT");
+       run("$IPTABLES -t nat -F $CHAIN_NAT_SOURCE");
+       run("$IPTABLES -t nat -F $CHAIN_NAT_DESTINATION");
+       run("$IPTABLES -t mangle -F $CHAIN_MANGLE_NAT_DESTINATION_FIX");
+}
+
+sub preparerules {
        if (! -z  "${General::swroot}/firewall/config"){
                &buildrules(\%configfwdfw);
        }
@@ -136,360 +143,331 @@ sub preparerules
                &buildrules(\%configoutgoingfw);
        }
 }
-sub buildrules
-{
-       my $hash=shift;
-       my $STAG;
-       my $natip;
-       my $snatport;
-       my $fireport;
-       my $nat;
-       my $fwaccessdport;
-       my $natchain;
-       my $icmptype;
-       foreach my $key (sort {$a <=> $b} keys %$hash){
-               next if (($$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1') && $conexists eq 'off' );
-               $command="iptables --wait -A";
-               if ($$hash{$key}[28] eq 'ON'){
-                       $command='iptables --wait -t nat -A';
-                       $natip=&get_nat_ip($$hash{$key}[29],$$hash{$key}[31]);
-                       if($$hash{$key}[31] eq 'dnat'){
-                               $nat='DNAT';
-                               if ($$hash{$key}[30] =~ /\|/){
-                                       $$hash{$key}[30]=~ tr/|/,/;
-                                       $fireport='-m multiport --dport '.$$hash{$key}[30];
-                               }else{
-                                       $fireport='--dport '.$$hash{$key}[30] if ($$hash{$key}[30]>0);
-                               }
-                       }else{
-                               $nat='SNAT';
+
+sub buildrules {
+       my $hash = shift;
+
+       foreach my $key (sort {$a <=> $b} keys %$hash) {
+               # Skip disabled rules.
+               next unless ($$hash{$key}[2] eq 'ON');
+
+               if ($DEBUG) {
+                       print_rule($$hash{$key});
+               }
+
+               # Check if the target is valid.
+               my $target = $$hash{$key}[0];
+               if (!$target ~~ @VALID_TARGETS) {
+                       print_error("Invalid target '$target' for rule $key");
+                       next;
+               }
+
+               # Check if the chain is valid.
+               my $chain = $$hash{$key}[1];
+               if (!$chain ~~ @VALID_CHAINS) {
+                       print_error("Invalid chain '$chain' in rule $key");
+                       next;
+               }
+
+               # Collect all sources.
+               my @sources = &get_addresses($hash, $key, "src");
+
+               # Collect all destinations.
+               my @destinations = &get_addresses($hash, $key, "tgt");
+
+               # Check if logging should be enabled.
+               my $LOG = ($$hash{$key}[17] eq 'ON');
+
+               # Check if NAT is enabled and initialize variables, that we use for that.
+               my $NAT = ($$hash{$key}[28] eq 'ON');
+               my $NAT_MODE;
+               if ($NAT) {
+                       $NAT_MODE = uc($$hash{$key}[31]);
+               }
+
+               # Set up time constraints.
+               my @time_options = ();
+               if ($$hash{$key}[18] eq 'ON') {
+                       push(@time_options, ("-m", "time"));
+
+                       # Select all days of the week this match is active.
+                       my @weekdays = ();
+                       if ($$hash{$key}[19] ne '') {
+                               push (@weekdays, "Mon");
+                       }
+                       if ($$hash{$key}[20] ne '') {
+                               push (@weekdays, "Tue");
+                       }
+                       if ($$hash{$key}[21] ne '') {
+                               push (@weekdays, "Wed");
+                       }
+                       if ($$hash{$key}[22] ne '') {
+                               push (@weekdays, "Thu");
+                       }
+                       if ($$hash{$key}[23] ne '') {
+                               push (@weekdays, "Fri");
+                       }
+                       if ($$hash{$key}[24] ne '') {
+                               push (@weekdays, "Sat");
+                       }
+                       if ($$hash{$key}[25] ne '') {
+                               push (@weekdays, "Sun");
+                       }
+                       if (@weekdays) {
+                               push(@time_options, ("--weekdays", join(",", @weekdays)));
+                       }
+
+                       # Convert start time.
+                       my $time_start = &format_time($$hash{$key}[26]);
+                       if ($time_start) {
+                               push(@time_options, ("--timestart", $time_start));
+                       }
+
+                       # Convert end time.
+                       my $time_stop = &format_time($$hash{$key}[27]);
+                       if ($time_stop) {
+                               push(@time_options, ("--timestop", $time_stop));
                        }
                }
-               $STAG='';
-               if($$hash{$key}[2] eq 'ON'){
-                       #get source ip's
-                       if ($$hash{$key}[3] eq 'cust_grp_src'){
-                               foreach my $grp (sort {$a <=> $b} keys %customgrp){
-                                               if($customgrp{$grp}[0] eq $$hash{$key}[4]){
-                                               &get_address($customgrp{$grp}[3],$customgrp{$grp}[2],"src");
-                                       }
-                               }
-                       }else{
-                               &get_address($$hash{$key}[3],$$hash{$key}[4],"src");
+
+               # Check which protocols are used in this rule and so that we can
+               # later group rules by protocols.
+               my @protocols = &get_protocols($hash, $key);
+               if (!@protocols) {
+                       print_error("Invalid protocol configuration for rule $key");
+                       next;
+               }
+
+               foreach my $protocol (@protocols) {
+                       # Check if the given protocol is supported.
+                       if (($protocol ne "all") && (!$protocol ~~ @PROTOCOLS)) {
+                               print_error("Protocol $protocol is not supported (rule $key)");
+                               next;
                        }
-                       #get target ip's
-                       if ($$hash{$key}[5] eq 'cust_grp_tgt'){
-                               foreach my $grp (sort {$a <=> $b} keys %customgrp){
-                                       if($customgrp{$grp}[0] eq $$hash{$key}[6]){
-                                               &get_address($customgrp{$grp}[3],$customgrp{$grp}[2],"tgt");
+
+                       # Prepare protocol options (like ICMP types, ports, etc...).
+                       my @protocol_options = &get_protocol_options($hash, $key, $protocol);
+
+                       # Check if this protocol knows ports.
+                       my $protocol_has_ports = ($protocol ~~ @PROTOCOLS_WITH_PORTS);
+
+                       foreach my $source (@sources) {
+                               foreach my $destination (@destinations) {
+                                       # Skip invalid rules.
+                                       next if (!$source || !$destination || ($destination eq "none"));
+
+                                       # Sanitize source.
+                                       if ($source ~~ @ANY_ADDRESSES) {
+                                               $source = "";
                                        }
-                               }
-                       }elsif($$hash{$key}[5] eq 'ipfire' ){
-                               if($$hash{$key}[6] eq 'GREEN'){
-                                       $targethash{$key}[0]=$defaultNetworks{'GREEN_ADDRESS'};
-                               }
-                               if($$hash{$key}[6] eq 'BLUE'){
-                                       $targethash{$key}[0]=$defaultNetworks{'BLUE_ADDRESS'};
-                               }
-                               if($$hash{$key}[6] eq 'ORANGE'){
-                                       $targethash{$key}[0]=$defaultNetworks{'ORANGE_ADDRESS'};
-                               }
-                               if($$hash{$key}[6] eq 'ALL'){
-                                       $targethash{$key}[0]='0.0.0.0/0';
-                               }
-                               if($$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1'){
-                                       open(FILE, "/var/ipfire/red/local-ipaddress")or die "Couldn't open local-ipaddress";
-                                       $targethash{$key}[0]= <FILE>;
-                                       close(FILE);
-                               }else{
-                                       foreach my $alias (sort keys %aliases){
-                                               if ($$hash{$key}[6] eq $alias){
-                                                       $targethash{$key}[0]=$aliases{$alias}{'IPT'};
-                                               }
+
+                                       # Sanitize destination.
+                                       if ($destination ~~ @ANY_ADDRESSES) {
+                                               $destination = "";
                                        }
-                               }
-                       }else{
-                               &get_address($$hash{$key}[5],$$hash{$key}[6],"tgt");
-                       }
-                       ##get source prot and port
-                       $SRC_TGT='SRC';
-                       $SPORT = &get_port($hash,$key);
-                       $SRC_TGT='';
-
-                       ##get target prot and port
-                       $DPROT=&get_prot($hash,$key);
-
-                       if ($DPROT eq ''){$DPROT=' ';}
-                       @DPROT=split(",",$DPROT);
-
-                       #get time if defined
-                       if($$hash{$key}[18] eq 'ON'){
-                               my ($time1,$time2,$daylight);
-                               my $daylight=$$hash{$key}[28];
-                               $time1=&get_time($$hash{$key}[26],$daylight);
-                               $time2=&get_time($$hash{$key}[27],$daylight);
-                               if($$hash{$key}[19] ne ''){push (@timeframe,"Mon");}
-                               if($$hash{$key}[20] ne ''){push (@timeframe,"Tue");}
-                               if($$hash{$key}[21] ne ''){push (@timeframe,"Wed");}
-                               if($$hash{$key}[22] ne ''){push (@timeframe,"Thu");}
-                               if($$hash{$key}[23] ne ''){push (@timeframe,"Fri");}
-                               if($$hash{$key}[24] ne ''){push (@timeframe,"Sat");}
-                               if($$hash{$key}[25] ne ''){push (@timeframe,"Sun");}
-                               $TIME=join(",",@timeframe);
-
-                               $TIMEFROM="--timestart $time1 ";
-                               $TIMETILL="--timestop $time2 ";
-                               $TIME="-m time --weekdays $TIME $TIMEFROM $TIMETILL";
-                       }
-                       if ($MODE eq '1'){
-                               print "NR:$key ";
-                               foreach my $i (0 .. $#{$$hash{$key}}){
-                                       print "$i: $$hash{$key}[$i]  ";
-                               }
-                               print "\n";
-                               print"##################################\n";
-                               #print rules to console
-                               foreach my $DPROT (@DPROT){
-                                       $DPORT = &get_port($hash,$key,$DPROT);
-                                       if ($DPROT ne 'TCP' && $DPROT ne 'UDP' && $DPROT ne 'ICMP' ){
-                                               $DPORT='';
+
+                                       # Array with iptables arguments.
+                                       my @options = ();
+
+                                       # Append protocol.
+                                       if ($protocol ne "all") {
+                                               push(@options, ("-p", $protocol));
+                                               push(@options, @protocol_options);
                                        }
-                                       $PROT=$DPROT;
-                                       $PROT="-p $PROT" if ($PROT ne '' && $PROT ne ' ');
-                                       foreach my $a (sort keys %sourcehash){
-                                               foreach my $b (sort keys %targethash){
-                                                       if(! $sourcehash{$a}[0] || ! $targethash{$b}[0] || ($natip eq '-d ' && $$hash{$key}[28] eq 'ON') || (!$natip && $$hash{$key}[28] eq 'ON')){
-                                                               #Skip rules when no RED IP is set (DHCP,DSL)
-                                                               next;
-                                                       }
-                                                       next if ($targethash{$b}[0] eq 'none');
-                                                       $STAG='';
-                                                       if ($sourcehash{$a}[0] ne $targethash{$b}[0] && $targethash{$b}[0] ne 'none' || $sourcehash{$a}[0] eq '0.0.0.0/0.0.0.0'){
-                                                               if($DPROT ne ''){
-                                                                       if(substr($sourcehash{$a}[0], 3, 3) ne 'mac' && $sourcehash{$a}[0] ne ''){ $STAG="-s";}
-                                                                       #Process ICMP RULE
-                                                                       if(substr($DPORT, 2, 4) eq 'icmp'){
-                                                                               my @icmprule= split(",",substr($DPORT, 12,));
-                                                                               foreach (@icmprule){
-                                                                                       $icmptype="--icmp-type ";
-                                                                                       if ($_ eq "BLANK") {
-                                                                                                       $icmptype="";
-                                                                                                       $_="";
-                                                                                       }
-                                                                                       if ($$hash{$key}[17] eq 'ON'){
-                                                                                               print "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j LOG\n";
-                                                                                       }
-                                                                                               print "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j $$hash{$key}[0]\n";
-                                                                               }
-                                                                       #PROCESS DNAT RULE (Portforward)
-                                                                       }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat'){
-                                                                               $natchain='NAT_DESTINATION';
-                                                                               if ($$hash{$key}[17] eq 'ON'){
-                                                                                       print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j LOG --log-prefix 'DNAT' \n";
-                                                                               }
-                                                                               my ($ip,$sub) =split("/",$targethash{$b}[0]);
-                                                                               #Process NAT with servicegroup used
-                                                                               if ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat' && $$hash{$key}[14] eq 'cust_srvgrp'){
-                                                                                       print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to-destination $ip $DPORT\n";
-                                                                                       $fwaccessdport=$DPORT;
-                                                                               }else{
-                                                                                       print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to-destination $ip$DPORT\n";
-                                                                                       $DPORT =~ s/\-/:/g;
-                                                                                       if ($DPORT){
-                                                                                               $fwaccessdport="--dport ".substr($DPORT,1,);
-                                                                                       }elsif(! $DPORT && $$hash{$key}[30] ne ''){
-                                                                                               if ($$hash{$key}[30]=~m/|/i){
-                                                                                                       $$hash{$key}[30] =~ s/\|/,/g;
-                                                                                                       $fwaccessdport="-m multiport --dport $$hash{$key}[30]";
-                                                                                               }else{
-                                                                                                       $fwaccessdport="--dport $$hash{$key}[30]";
-                                                                                               }
-                                                                                       }
-                                                                               }
-                                                                               print "iptables --wait -A FORWARDFW $PROT $STAG $sourcehash{$a}[0] -d $ip $fwaccessdport $TIME -j $$hash{$key}[0]\n";
-                                                                               next;
-                                                                       #PROCESS SNAT RULE
-                                                                       }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'snat'){
-                                                                               $natchain='NAT_SOURCE';
-                                                                               if ($$hash{$key}[17] eq 'ON' ){
-                                                                                       print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j LOG --log-prefix 'SNAT' \n";
-                                                                               }
-                                                                               print "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $nat --to-source $natip\n";
-                                                                       }
-                                                                       #PROCESS EVERY OTHER RULE (If NOT ICMP, else the rule would be applied double)
-                                                                       if ($PROT ne '-p ICMP'){
-                                                                               if ($$hash{$key}[17] eq 'ON' && $$hash{$key}[28] ne 'ON'){
-                                                                                       print "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j LOG\n";
-                                                                               }
-                                                                               print "iptables --wait -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
-                                                                       }
-                                                                       #PROCESS Prot ICMP and type = All ICMP-Types
-                                                                       if ($PROT eq '-p ICMP' && $$hash{$key}[9] eq 'All ICMP-Types'){
-                                                                               if ($$hash{$key}[17] eq 'ON' && $$hash{$key}[28] ne 'ON'){
-                                                                                       print "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j LOG\n";
-                                                                               }
-                                                                               print "iptables --wait -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
-                                                                       }
-                                                               }
-                                                       }
-                                               }
+
+                                       # Prepare source options.
+                                       my @source_options = ();
+                                       if ($source =~ /mac/) {
+                                               push(@source_options, $source);
+                                       } elsif ($source) {
+                                               push(@source_options, ("-s", $source));
                                        }
-                                       print"\n";
-                               }
-                       }elsif($MODE eq '0'){
-                               foreach my $DPROT (@DPROT){
-                                       $DPORT = &get_port($hash,$key,$DPROT);
-                                       $PROT=$DPROT;
-                                       $PROT="-p $PROT" if ($PROT ne '' && $PROT ne ' ');
-                                       if ($DPROT ne 'TCP' && $DPROT ne'UDP' && $DPROT ne 'ICMP' ){
-                                               $DPORT='';
+
+                                       # Prepare destination options.
+                                       my @destination_options = ();
+                                       if ($destination) {
+                                               push(@destination_options, ("-d", $destination));
+                                       }
+
+                                       # Add time constraint options.
+                                       push(@options, @time_options);
+
+                                       my $firewall_is_in_source_subnet = 0;
+                                       if ($source) {
+                                               $firewall_is_in_source_subnet = &firewall_is_in_subnet($source);
                                        }
-                                       foreach my $a (sort keys %sourcehash){
-                                               foreach my $b (sort keys %targethash){
-                                                       if(! $sourcehash{$a}[0] || ! $targethash{$b}[0] || ($natip eq '-d ' && $$hash{$key}[28] eq 'ON') || (!$natip && $$hash{$key}[28] eq 'ON')){
-                                                               #Skip rules when no RED IP is set (DHCP,DSL)
-                                                               next;
+
+                                       # Process NAT rules.
+                                       if ($NAT) {
+                                               my $nat_address = &get_nat_address($$hash{$key}[29], $source);
+
+                                               # Skip NAT rules if the NAT address is unknown
+                                               # (i.e. no internet connection has been established, yet).
+                                               next unless ($nat_address);
+
+                                               # Destination NAT
+                                               if ($NAT_MODE eq "DNAT") {
+                                                       # Make port-forwardings useable from the internal networks.
+                                                       my @internal_addresses = &get_internal_firewall_ip_addresses(1);
+                                                       unless ($nat_address ~~ @internal_addresses) {
+                                                               &add_dnat_mangle_rules($nat_address, @options);
                                                        }
-                                                       next if ($targethash{$b}[0] eq 'none');
-                                                       $STAG='';
-                                                       if ($sourcehash{$a}[0] ne $targethash{$b}[0] && $targethash{$b}[0] ne 'none' || $sourcehash{$a}[0] eq '0.0.0.0/0.0.0.0'){
-                                                               if($DPROT ne ''){
-                                                                       if(substr($sourcehash{$a}[0], 3, 3) ne 'mac' && $sourcehash{$a}[0] ne ''){ $STAG="-s";}
-                                                                       #Process ICMP RULE
-                                                                       if(substr($DPORT, 2, 4) eq 'icmp'){
-                                                                               my @icmprule= split(",",substr($DPORT, 12,));
-                                                                               foreach (@icmprule){
-                                                                                       $icmptype="--icmp-type ";
-                                                                                       if ($_ eq "BLANK") {
-                                                                                                       $icmptype="";
-                                                                                                       $_="";
-                                                                                       }
-                                                                                       if ($$hash{$key}[17] eq 'ON'){
-                                                                                               system ("$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j LOG");
-                                                                                       }
-                                                                                               system ("$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $icmptype $_ $TIME -j $$hash{$key}[0]");
-                                                                               }
-                                                                       #PROCESS DNAT RULE (Portforward)
-                                                                       }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat'){
-                                                                               $natchain='NAT_DESTINATION';
-                                                                               if ($$hash{$key}[17] eq 'ON'){
-                                                                                       system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j LOG --log-prefix 'DNAT' \n";
-                                                                               }
-                                                                               my ($ip,$sub) =split("/",$targethash{$b}[0]);
-                                                                               #Process NAT with servicegroup used
-                                                                               if ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat' && $$hash{$key}[14] eq 'cust_srvgrp'){
-                                                                                       system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to-destination $ip $DPORT\n";
-                                                                                       $fwaccessdport=$DPORT;
-                                                                               }else{
-                                                                                       system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT $natip $fireport $TIME -j $nat --to-destination $ip$DPORT\n";
-                                                                                       $DPORT =~ s/\-/:/g;
-                                                                                       if ($DPORT){
-                                                                                               $fwaccessdport="--dport ".substr($DPORT,1,);
-                                                                                       }elsif(! $DPORT && $$hash{$key}[30] ne ''){
-                                                                                               if ($$hash{$key}[30]=~m/|/i){
-                                                                                                       $$hash{$key}[30] =~ s/\|/,/g;
-                                                                                                       $fwaccessdport="-m multiport --dport $$hash{$key}[30]";
-                                                                                               }else{
-                                                                                                       $fwaccessdport="--dport $$hash{$key}[30]";
-                                                                                               }
-                                                                                       }
-                                                                               }
-                                                                               system "iptables --wait -A FORWARDFW $PROT $STAG $sourcehash{$a}[0] -d $ip $fwaccessdport $TIME -j $$hash{$key}[0]\n";
-                                                                               next;
-                                                                       #PROCESS SNAT RULE
-                                                                       }elsif($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'snat'){
-                                                                               $natchain='NAT_SOURCE';
-                                                                               if ($$hash{$key}[17] eq 'ON' ){
-                                                                                       system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j LOG --log-prefix 'SNAT' \n";
-                                                                               }
-                                                                               system "$command $natchain $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $nat --to-source $natip\n";
-                                                                       }
-                                                                       #PROCESS EVERY OTHER RULE (If NOT ICMP, else the rule would be applied double)
-                                                                       if ($PROT ne '-p ICMP'){
-                                                                               if ($$hash{$key}[17] eq 'ON' && $$hash{$key}[28] ne 'ON'){
-                                                                                       system "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j LOG\n";
-                                                                               }
-                                                                               system "iptables --wait -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
-                                                                       }
-                                                                       #PROCESS Prot ICMP and type = All ICMP-Types
-                                                                       if ($PROT eq '-p ICMP' && $$hash{$key}[9] eq 'All ICMP-Types'){
-                                                                               if ($$hash{$key}[17] eq 'ON' && $$hash{$key}[28] ne 'ON'){
-                                                                                       system "$command $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j LOG\n";
-                                                                               }
-                                                                               system "iptables --wait -A $$hash{$key}[1] $PROT $STAG $sourcehash{$a}[0] $SPORT -d $targethash{$b}[0] $DPORT $TIME -j $$hash{$key}[0]\n";
-                                                                       }
+
+                                                       my @nat_options = @options;
+                                                       push(@nat_options, @source_options);
+                                                       push(@nat_options, ("-d", $nat_address));
+
+                                                       my ($dnat_address, $dnat_mask) = split("/", $destination);
+                                                       @destination_options = ("-d", $dnat_address);
+
+                                                       if ($protocol_has_ports) {
+                                                               my $dnat_port = &get_dnat_target_port($hash, $key);
+
+                                                               if ($dnat_port) {
+                                                                       $dnat_address .= ":$dnat_port";
                                                                }
                                                        }
+
+                                                       if ($LOG) {
+                                                               run("$IPTABLES -t nat -A $CHAIN_NAT_DESTINATION @nat_options @log_limit_options -j LOG --log-prefix 'DNAT '");
+                                                       }
+                                                       run("$IPTABLES -t nat -A $CHAIN_NAT_DESTINATION @nat_options -j DNAT --to-destination $dnat_address");
+
+                                               # Source NAT
+                                               } elsif ($NAT_MODE eq "SNAT") {
+                                                       my @nat_options = @options;
+
+                                                       push(@nat_options, @source_options);
+                                                       push(@nat_options, @destination_options);
+
+                                                       if ($LOG) {
+                                                               run("$IPTABLES -t nat -A $CHAIN_NAT_SOURCE @nat_options @log_limit_options -j LOG --log-prefix 'SNAT '");
+                                                       }
+                                                       run("$IPTABLES -t nat -A $CHAIN_NAT_SOURCE @nat_options -j SNAT --to-source $nat_address");
+                                               }
+                                       }
+
+                                       push(@options, @source_options);
+
+                                       if ($firewall_is_in_source_subnet && ($fwdfwsettings{"POLICY"} eq "MODE1") && ($chain eq $CHAIN_FORWARD)) {
+                                               if ($LOG && !$NAT) {
+                                                       run("$IPTABLES -A $CHAIN_INPUT @options @log_limit_options -j LOG --log-prefix '$CHAIN_INPUT '");
                                                }
+                                               run("$IPTABLES -A $CHAIN_INPUT @options -j $target");
                                        }
+
+                                       push(@options, @destination_options);
+
+                                       # Insert firewall rule.
+                                       if ($LOG && !$NAT) {
+                                               run("$IPTABLES -A $chain @options @log_limit_options -j LOG --log-prefix '$chain '");
+                                       }
+                                       run("$IPTABLES -A $chain @options -j $target");
                                }
                        }
                }
-               %sourcehash=();
-               %targethash=();
-               undef $TIME;
-               undef $TIMEFROM;
-               undef $TIMETILL;
-               undef $fireport;
        }
 }
-sub get_nat_ip
-{
-       my $val=shift;
-       my $type=shift;
-       my $result;
-       if($val eq 'RED' || $val eq 'GREEN' || $val eq 'ORANGE' || $val eq 'BLUE'){
-               $result=$defaultNetworks{$val.'_ADDRESS'};
-       }elsif($val eq 'ALL'){
-               $result='-i '.$con;
-       }elsif($val eq 'Default IP' && $type eq 'dnat'){
-               $result='-d '.$redip;
-       }elsif($val eq 'Default IP' && $type eq 'snat'){
-               $result=$redip;
-       }else{
-               foreach my $al (sort keys %aliases){
-                       if($val eq $al && $type eq 'dnat'){
-                               $result='-d '.$aliases{$al}{'IPT'};
-                       }elsif($val eq $al && $type eq 'snat'){
-                               $result=$aliases{$al}{'IPT'};
+
+sub get_external_interface() {
+       open(IFACE, "/var/ipfire/red/iface") or return "";
+       my $iface = <IFACE>;
+       close(IFACE);
+
+       return $iface;
+}
+
+sub get_external_address() {
+       open(ADDR, "/var/ipfire/red/local-ipaddress") or return "";
+       my $address = <ADDR>;
+       close(ADDR);
+
+       return $address;
+}
+
+sub get_alias {
+       my $id = shift;
+
+       foreach my $alias (sort keys %aliases) {
+               if ($id eq $alias) {
+                       return $aliases{$alias};
+               }
+       }
+}
+
+sub get_nat_address {
+       my $zone = shift;
+       my $source = shift;
+
+       # Any static address of any zone.
+       if ($zone eq "AUTO") {
+               if ($source) {
+                       my $firewall_ip = &get_internal_firewall_ip_address($source, 1);
+                       if ($firewall_ip) {
+                               return $firewall_ip;
+                       }
+
+                       $firewall_ip = &get_matching_firewall_address($source, 1);
+                       if ($firewall_ip) {
+                               return $firewall_ip;
                        }
                }
+
+               return &get_external_address();
+
+       } elsif ($zone eq "RED" || $zone eq "GREEN" || $zone eq "ORANGE" || $zone eq "BLUE") {
+               return $defaultNetworks{$zone . "_ADDRESS"};
+
+       } elsif ($zone eq "Default IP") {
+               return &get_external_address();
+
+       } else {
+               return &get_alias($zone);
        }
-       return $result;
+
+       print_error("Could not find NAT address");
 }
-sub get_time
-{
-       my $val=shift;
-       my $val1=shift;
-       my $time;
-       my $minutes;
-       my $ruletime;
-       $minutes = &utcmin($val);
-       $ruletime = $minutes + &time_get_utc($val);
-       if ($ruletime < 0){$ruletime +=1440;}
-       if ($ruletime > 1440){$ruletime -=1440;}
-       $time=sprintf "%02d:%02d", $ruletime / 60, $ruletime % 60;
-       return $time;
+
+# Formats the given timestamp into the iptables format which is "hh:mm" UTC.
+sub format_time {
+       my $val = shift;
+
+       # Convert the given time into minutes.
+       my $minutes = &time_convert_to_minutes($val);
+
+       # Move the timestamp into UTC.
+       $minutes += &time_utc_offset();
+
+       # Make sure $minutes is between 00:00 and 23:59.
+       if ($minutes < 0) {
+               $minutes += 1440;
+       }
+
+       if ($minutes > 1440) {
+               $minutes -= 1440;
+       }
+
+       # Format as hh:mm.
+       return sprintf("%02d:%02d", $minutes / 60, $minutes % 60);
 }
-sub time_get_utc
-{
-       # Calculates the UTCtime from a given time
-       my $val=shift;
-       my @localtime=localtime(time);
-       my @gmtime=gmtime(time);
-       my $diff = ($gmtime[2]*60+$gmtime[1]%60)-($localtime[2]*60+$localtime[1]%60);
-       return $diff;
+
+# Calculates the offsets in minutes from the local timezone to UTC.
+sub time_utc_offset {
+       my @localtime = localtime(time);
+       my @gmtime = gmtime(time);
+
+       return ($gmtime[2] * 60 + $gmtime[1] % 60) - ($localtime[2] * 60 + $localtime[1] % 60);
 }
-sub utcmin
-{
-       my $ruletime=shift;
-       my ($hrs,$min) = split(":",$ruletime);
-       my $newtime = $hrs*60+$min;
-       return $newtime;
+
+# Takes a timestamp like "14:00" and converts it into minutes since midnight.
+sub time_convert_to_minutes {
+       my ($hrs, $min) = split(":", shift);
+
+       return ($hrs * 60) + $min;
 }
-sub p2pblock
-{
-       my $P2PSTRING;
+
+sub p2pblock {
+       my $P2PSTRING = "";
        my $DO;
        open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile";
        @p2ps = <FILE>;
@@ -509,167 +487,420 @@ sub p2pblock
                        }
                }
        }
-       if ($MODE eq 1){
-               if($P2PSTRING){
-                       print"/sbin/iptables --wait -A FORWARDFW $CMD $P2PSTRING -j $DO\n";
+
+       if($P2PSTRING) {
+               run("$IPTABLES -A FORWARDFW $CMD $P2PSTRING -j $DO");
+       }
+}
+
+sub get_addresses {
+       my $hash = shift;
+       my $key  = shift;
+       my $type = shift;
+
+       my @addresses = ();
+       my $addr_type;
+       my $value;
+       my $group_name;
+
+       if ($type eq "src") {
+               $addr_type = $$hash{$key}[3];
+               $value = $$hash{$key}[4];
+
+       } elsif ($type eq "tgt") {
+               $addr_type = $$hash{$key}[5];
+               $value = $$hash{$key}[6];
+       }
+
+       if ($addr_type ~~ ["cust_grp_src", "cust_grp_tgt"]) {
+               foreach my $grp (sort {$a <=> $b} keys %customgrp) {
+                       if ($customgrp{$grp}[0] eq $value) {
+                               my @address = &get_address($customgrp{$grp}[3], $customgrp{$grp}[2], $type);
+
+                               if (@address) {
+                                       push(@addresses, @address);
+                               }
+                       }
                }
-       }else{
-               if($P2PSTRING){
-                       system("/sbin/iptables --wait -A FORWARDFW $CMD $P2PSTRING -j $DO");
+       } else {
+               my @address = &get_address($addr_type, $value, $type);
+
+               if (@address) {
+                       push(@addresses, @address);
                }
        }
+
+       return @addresses;
 }
-sub get_address
-{
-       my $base=shift; #source of checking ($configfwdfw{$key}[x] or groupkey
-       my $base2=shift;
-       my $type=shift; #src or tgt
-       my $hash;
-       if ($type eq 'src'){
-               $hash=\%sourcehash;
-       }else{
-               $hash=\%targethash;
-       }
-       my $key = &General::findhasharraykey($hash);
-       if($base eq 'src_addr' || $base eq 'tgt_addr' ){
-               if (&General::validmac($base2)){
-                       $$hash{$key}[0] = "-m mac --mac-source $base2";
-               }else{
-                       $$hash{$key}[0] = $base2;
+
+sub get_address {
+       my $key   = shift;
+       my $value = shift;
+       my $type  = shift;
+
+       my @ret = ();
+
+       # If the user manually typed an address, we just check if it is a MAC
+       # address. Otherwise, we assume that it is an IP address.
+       if ($key ~~ ["src_addr", "tgt_addr"]) {
+               if (&General::validmac($value)) {
+                       push(@ret, "-m mac --mac-source $value");
+               } else {
+                       push(@ret, $value);
                }
-       }elsif($base eq 'std_net_src' || $base eq 'std_net_tgt' || $base eq 'Standard Network'){
-               $$hash{$key}[0]=&fwlib::get_std_net_ip($base2,$con);
-       }elsif($base eq 'cust_net_src' || $base eq 'cust_net_tgt' || $base eq 'Custom Network'){
-               $$hash{$key}[0]=&fwlib::get_net_ip($base2);
-       }elsif($base eq 'cust_host_src' || $base eq 'cust_host_tgt' || $base eq 'Custom Host'){
-               $$hash{$key}[0]=&fwlib::get_host_ip($base2,$type);
-       }elsif($base eq 'ovpn_net_src' || $base eq 'ovpn_net_tgt' || $base eq 'OpenVPN static network'){
-               $$hash{$key}[0]=&fwlib::get_ovpn_net_ip($base2,1);
-       }elsif($base eq 'ovpn_host_src' ||$base eq 'ovpn_host_tgt' || $base eq 'OpenVPN static host'){
-               $$hash{$key}[0]=&fwlib::get_ovpn_host_ip($base2,33);
-       }elsif($base eq 'ovpn_n2n_src' ||$base eq 'ovpn_n2n_tgt' || $base eq 'OpenVPN N-2-N'){
-               $$hash{$key}[0]=&fwlib::get_ovpn_n2n_ip($base2,11);
-       }elsif($base eq 'ipsec_net_src' || $base eq 'ipsec_net_tgt' || $base eq 'IpSec Network'){
-               $$hash{$key}[0]=&fwlib::get_ipsec_net_ip($base2,11);
-       }elsif($base eq 'ipfire_src' ){
-               if($base2 eq 'GREEN'){
-                       $$hash{$key}[0]=$defaultNetworks{'GREEN_ADDRESS'};
+
+       # If a default network interface (GREEN, BLUE, etc.) is selected, we
+       # try to get the corresponding address of the network.
+       } elsif ($key ~~ ["std_net_src", "std_net_tgt", "Standard Network"]) {
+               my $external_interface = &get_external_interface();
+
+               my $network_address = &fwlib::get_std_net_ip($value, $external_interface);
+               if ($network_address) {
+                       push(@ret, $network_address);
                }
-               if($base2 eq 'BLUE'){
-                       $$hash{$key}[0]=$defaultNetworks{'BLUE_ADDRESS'};
+
+       # Custom networks.
+       } elsif ($key ~~ ["cust_net_src", "cust_net_tgt", "Custom Network"]) {
+               my $network_address = &fwlib::get_net_ip($value);
+               if ($network_address) {
+                       push(@ret, $network_address);
                }
-               if($base2 eq 'ORANGE'){
-                       $$hash{$key}[0]=$defaultNetworks{'ORANGE_ADDRESS'};
+
+       # Custom hosts.
+       } elsif ($key ~~ ["cust_host_src", "cust_host_tgt", "Custom Host"]) {
+               my $host_address = &fwlib::get_host_ip($value, $type);
+               if ($host_address) {
+                       push(@ret, $host_address);
                }
-               if($base2 eq 'ALL'){
-                       $$hash{$key}[0]='0.0.0.0/0';
+
+       # OpenVPN networks.
+       } elsif ($key ~~ ["ovpn_net_src", "ovpn_net_tgt", "OpenVPN static network"]) {
+               my $network_address = &fwlib::get_ovpn_net_ip($value, 1);
+               if ($network_address) {
+                       push(@ret, $network_address);
                }
-               if($base2 eq 'RED' || $base2 eq 'RED1'){
-                       open(FILE, "/var/ipfire/red/local-ipaddress");
-                       $$hash{$key}[0]= <FILE>;
-                       close(FILE);
-               }else{
-                       foreach my $alias (sort keys %aliases){
-                               if ($base2 eq $alias){
-                                       $$hash{$key}[0]=$aliases{$alias}{'IPT'};
-                               }
+
+       # OpenVPN hosts.
+       } elsif ($key ~~ ["ovpn_host_src", "ovpn_host_tgt", "OpenVPN static host"]) {
+               my $host_address = &fwlib::get_ovpn_host_ip($value, 33);
+               if ($host_address) {
+                       push(@ret, $host_address);
+               }
+
+       # OpenVPN N2N.
+       } elsif ($key ~~ ["ovpn_n2n_src", "ovpn_n2n_tgt", "OpenVPN N-2-N"]) {
+               my $network_address = &fwlib::get_ovpn_n2n_ip($value, 11);
+               if ($network_address) {
+                       push(@ret, $network_address);
+               }
+
+       # IPsec networks.
+       } elsif ($key ~~ ["ipsec_net_src", "ipsec_net_tgt", "IpSec Network"]) {
+               my $network_address = &fwlib::get_ipsec_net_ip($value, 11);
+               if ($network_address) {
+                       push(@ret, $network_address);
+               }
+
+       # The firewall's own IP addresses.
+       } elsif ($key ~~ ["ipfire", "ipfire_src"]) {
+               # ALL
+               if ($value eq "ALL") {
+                       push(@ret, "0/0");
+
+               # GREEN
+               } elsif ($value eq "GREEN") {
+                       push(@ret, $defaultNetworks{"GREEN_ADDRESS"});
+
+               # BLUE
+               } elsif ($value eq "BLUE") {
+                       push(@ret, $defaultNetworks{"BLUE_ADDRESS"});
+
+               # ORANGE
+               } elsif ($value eq "ORANGE") {
+                       push(@ret, $defaultNetworks{"ORANGE_ADDRESS"});
+
+               # RED
+               } elsif ($value ~~ ["RED", "RED1"]) {
+                       my $address = &get_external_address();
+                       if ($address) {
+                               push(@ret, $address);
+                       }
+
+               # Aliases
+               } else {
+                       my %alias = &get_alias($value);
+                       if (%alias) {
+                               push(@ret, $alias{"IPT"});
                        }
                }
+
+       # If nothing was selected, we assume "any".
+       } else {
+               push(@ret, "0/0");
        }
+
+       return @ret;
 }
-sub get_prot
-{
-       my $hash=shift;
-       my $key=shift;
-       #check AH,GRE,ESP or ICMP
-       if ($$hash{$key}[7] ne 'ON' && $$hash{$key}[11] ne 'ON'){
-               return "$$hash{$key}[8]";
-       }
-       if ($$hash{$key}[7] eq 'ON' || $$hash{$key}[11] eq 'ON'){
-               #check if servicegroup or service
-               if($$hash{$key}[14] eq 'cust_srv'){
-                       return &fwlib::get_srv_prot($$hash{$key}[15]);
-               }elsif($$hash{$key}[14] eq 'cust_srvgrp'){
-                       return &fwlib::get_srvgrp_prot($$hash{$key}[15]);
-               }elsif (($$hash{$key}[10] ne '' || $$hash{$key}[15] ne '') && $$hash{$key}[8] eq ''){ #when ports are used and prot set to "all"
-                       return "TCP,UDP";
-               }elsif (($$hash{$key}[10] ne '' || $$hash{$key}[15] ne '') && ($$hash{$key}[8] eq 'TCP' || $$hash{$key}[8] eq 'UDP')){ #when ports are used and prot set to "tcp" or "udp"
-                       return "$$hash{$key}[8]";
-               }elsif (($$hash{$key}[10] eq '' && $$hash{$key}[15] eq '') && $$hash{$key}[8] ne 'ICMP'){ #when ports are NOT used and prot NOT set to "ICMP"
-                       return "$$hash{$key}[8]";
-               }else{
-                       return "$$hash{$key}[8]";
+
+sub get_protocols {
+       my $hash = shift;
+       my $key = shift;
+
+       my $uses_source_ports = ($$hash{$key}[7] eq "ON");
+       my $uses_services = ($$hash{$key}[11] eq "ON");
+
+       my @protocols = ();
+
+       # Rules which don't have source ports or services (like ICMP, ESP, ...).
+       if (!$uses_source_ports && !$uses_services) {
+               push(@protocols, $$hash{$key}[8]);
+
+       # Rules which either use ports or services.
+       } elsif ($uses_source_ports || $uses_services) {
+               # Check if service group or service
+               if ($$hash{$key}[14] eq 'cust_srv') {
+                       push(@protocols, &fwlib::get_srv_prot($$hash{$key}[15]));
+
+               } elsif($$hash{$key}[14] eq 'cust_srvgrp'){
+                       my $protos = &fwlib::get_srvgrp_prot($$hash{$key}[15]);
+                       push(@protocols, split(",", $protos));
+
+               } else {
+                       # Fetch the protocol for this rule.
+                       my $protocol = lc($$hash{$key}[8]);
+
+                       # Fetch source and destination ports for this rule.
+                       my $source_ports = $$hash{$key}[10];
+                       my $destination_ports = $$hash{$key}[15];
+
+                       # Check if ports are set for protocols which do not support ports.
+                       if (!($protocol ~~ @PROTOCOLS_WITH_PORTS) && ($source_ports || $destination_ports)) {
+                               print_error("$protocol does not support ports");
+                               return ();
+                       }
+
+                       push(@protocols, $protocol);
                }
        }
-       #DNAT
-       if ($SRC_TGT eq '' && $$hash{$key}[31] eq 'dnat' && $$hash{$key}[11] eq '' && $$hash{$key}[12] ne ''){
-               return "$$hash{$key}[8]";
+
+       # Remove all empty elements
+       @protocols = map { $_ ? $_ : () } @protocols;
+
+       # If no protocol has been defined, we assume "all".
+       if (!@protocols) {
+               push(@protocols, "all");
        }
+
+       # Make all protocol names lowercase.
+       @protocols = map { lc } @protocols;
+
+       return @protocols;
 }
-sub get_port
-{
-       my $hash=shift;
-       my $key=shift;
-       my $prot=shift;
-       #Get manual defined Ports from SOURCE
-       if ($$hash{$key}[7] eq 'ON' && $SRC_TGT eq 'SRC'){
-               if ($$hash{$key}[10] ne ''){
-                       $$hash{$key}[10] =~ s/\|/,/g;
-                       if(index($$hash{$key}[10],",") > 0){
-                               return "-m multiport --sport $$hash{$key}[10] ";
-                       }else{
-                               if($$hash{$key}[28] ne 'ON' || ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'snat') ||($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'dnat')  ){
-                                       return "--sport $$hash{$key}[10] ";
-                               }else{
-                                       return ":$$hash{$key}[10]";
-                               }
-                       }
-               }
-               #Get manual ports from TARGET
-       }elsif($$hash{$key}[11] eq 'ON' && $SRC_TGT eq ''){
-               if($$hash{$key}[14] eq 'TGT_PORT'){
-                       if ($$hash{$key}[15] ne ''){
-                               $$hash{$key}[15] =~ s/\|/,/g;
-                               if(index($$hash{$key}[15],",") > 0){
-                                       return "-m multiport --dport $$hash{$key}[15] ";
-                               }else{
-                                       if($$hash{$key}[28] ne 'ON' || ($$hash{$key}[28] eq 'ON' && $$hash{$key}[31] eq 'snat') ){
-                                               return "--dport $$hash{$key}[15] ";
-                                        }else{
-                                                $$hash{$key}[15] =~ s/\:/-/g;
-                                                return ":$$hash{$key}[15]";
-                                        }
-                               }
-                       }
-               #Get ports defined in custom Service (firewall-groups)
-               }elsif($$hash{$key}[14] eq 'cust_srv'){
-                       if ($prot ne 'ICMP'){
-                               if($$hash{$key}[31] eq 'dnat' && $$hash{$key}[28] eq 'ON'){
-                                       my $ports =&fwlib::get_srv_port($$hash{$key}[15],1,$prot);
-                                       $ports =~ s/\:/-/g;
-                                       return ":".$ports
-                               }else{
-                                       return "--dport ".&fwlib::get_srv_port($$hash{$key}[15],1,$prot);
-                               }
-                       }elsif($prot eq 'ICMP' && $$hash{$key}[11] eq 'ON'){        #When PROT is ICMP and "use targetport is checked, this is an icmp-service
-                               return "--icmp-type ".&fwlib::get_srv_port($$hash{$key}[15],3,$prot);
-                       }
-               #Get ports from services which are used in custom servicegroups (firewall-groups)
-               }elsif($$hash{$key}[14] eq 'cust_srvgrp'){
-                       if      ($prot ne 'ICMP'){
-                               return &fwlib::get_srvgrp_port($$hash{$key}[15],$prot);
+
+sub get_protocol_options {
+       my $hash = shift;
+       my $key  = shift;
+       my $protocol = shift;
+       my @options = ();
+
+       # Process source ports.
+       my $use_src_ports = ($$hash{$key}[7] eq "ON");
+       my $src_ports     = $$hash{$key}[10];
+
+       if ($use_src_ports && $src_ports) {
+               push(@options, &format_ports($src_ports, "src"));
+       }
+
+       # Process destination ports.
+       my $use_dst_ports  = ($$hash{$key}[11] eq "ON");
+       my $use_dnat       = (($$hash{$key}[28] eq "ON") && ($$hash{$key}[31] eq "dnat"));
+
+       if ($use_dst_ports) {
+               my $dst_ports_mode = $$hash{$key}[14];
+               my $dst_ports      = $$hash{$key}[15];
+
+               if (($dst_ports_mode eq "TGT_PORT") && $dst_ports) {
+                       if ($use_dnat && $$hash{$key}[30]) {
+                               $dst_ports = $$hash{$key}[30];
                        }
-                       elsif($prot eq 'ICMP'){
-                               return &fwlib::get_srvgrp_port($$hash{$key}[15],$prot);
+                       push(@options, &format_ports($dst_ports, "dst"));
+
+               } elsif ($dst_ports_mode eq "cust_srv") {
+                       if ($protocol eq "ICMP") {
+                               push(@options, ("--icmp-type", &fwlib::get_srv_port($dst_ports, 3, "ICMP")));
+                       } else {
+                               $dst_ports = &fwlib::get_srv_port($dst_ports, 1, uc($protocol));
+                               push(@options, &format_ports($dst_ports, "dst"));
                        }
+
+               } elsif ($dst_ports_mode eq "cust_srvgrp") {
+                       push(@options, &fwlib::get_srvgrp_port($dst_ports, uc($protocol)));
                }
        }
-       #CHECK ICMP
-       if ($$hash{$key}[7] ne 'ON' && $$hash{$key}[11] ne 'ON' && $SRC_TGT eq ''){
-               if($$hash{$key}[9] ne '' && $$hash{$key}[9] ne 'All ICMP-Types'){
-                       return "--icmp-type $$hash{$key}[9] ";
-               }elsif($$hash{$key}[9] eq 'All ICMP-Types'){
-                       return;
+
+       # Check if a single ICMP type is selected.
+       if (!$use_src_ports && !$use_dst_ports && $protocol eq "icmp") {
+               my $icmp_type = $$hash{$key}[9];
+
+               if (($icmp_type ne "All ICMP-Types") && $icmp_type) {
+                       push(@options, ("--icmp-type", $icmp_type));
                }
        }
+
+       return @options;
+}
+
+sub format_ports {
+       my $ports = shift;
+       my $type = shift;
+
+       my $arg;
+       if ($type eq "src") {
+               $arg = "--sport";
+       } elsif ($type eq "dst") {
+               $arg = "--dport";
+       }
+
+       my @options = ();
+
+       if ($ports =~ /\|/) {
+               $ports =~ s/\|/,/g;
+               push(@options, ("-m", "multiport"));
+       }
+
+       if ($ports) {
+               push(@options, ($arg, $ports));
+       }
+
+       return @options;
+}
+
+sub get_dnat_target_port {
+       my $hash = shift;
+       my $key  = shift;
+
+       if ($$hash{$key}[14] eq "TGT_PORT") {
+               my $port = $$hash{$key}[15];
+               my $external_port = $$hash{$key}[30];
+
+               if ($external_port && ($port ne $external_port)) {
+                       return $$hash{$key}[15];
+               }
+       }
+}
+
+sub add_dnat_mangle_rules {
+       my $nat_address = shift;
+       my @options = @_;
+
+       my $mark = 0;
+       foreach my $zone ("GREEN", "BLUE", "ORANGE") {
+               $mark++;
+
+               # Skip rule if not all required information exists.
+               next unless (exists $defaultNetworks{$zone . "_NETADDRESS"});
+               next unless (exists $defaultNetworks{$zone . "_NETMASK"});
+
+               my @mangle_options = @options;
+
+               my $netaddress = $defaultNetworks{$zone . "_NETADDRESS"};
+               $netaddress .= "/" . $defaultNetworks{$zone . "_NETMASK"};
+
+               push(@mangle_options, ("-s", $netaddress, "-d", $nat_address));
+               push(@mangle_options, ("-j", "MARK", "--set-mark", $mark));
+
+               run("$IPTABLES -t mangle -A $CHAIN_MANGLE_NAT_DESTINATION_FIX @mangle_options");
+       }
+}
+
+sub make_log_limit_options {
+       my @options = ("-m", "limit");
+
+       # Maybe we should get this from the configuration.
+       my $limit = 10;
+
+       # We limit log messages to $limit messages per minute.
+       push(@options, ("--limit", "$limit/min"));
+
+       # And we allow bursts of 2x $limit.
+       push(@options, ("--limit-burst", $limit * 2));
+
+       return @options;
+}
+
+sub get_internal_firewall_ip_addresses {
+       my $use_orange = shift;
+
+       my @zones = ("GREEN", "BLUE");
+       if ($use_orange) {
+               push(@zones, "ORANGE");
+       }
+
+       my @addresses = ();
+       for my $zone (@zones) {
+               next unless (exists $defaultNetworks{$zone . "_ADDRESS"});
+
+               my $zone_address = $defaultNetworks{$zone . "_ADDRESS"};
+               push(@addresses, $zone_address);
+       }
+
+       return @addresses;
+}
+
+sub get_internal_firewall_ip_address {
+       my $subnet = shift;
+       my $use_orange = shift;
+
+       my ($net_address, $net_mask) = split("/", $subnet);
+       if ((!$net_mask) || ($net_mask ~~ ["32", "255.255.255.255"])) {
+               return 0;
+       }
+
+       my @addresses = &get_internal_firewall_ip_addresses($use_orange);
+       foreach my $zone_address (@addresses) {
+               if (&General::IpInSubnet($zone_address, $net_address, $net_mask)) {
+                       return $zone_address;
+               }
+       }
+
+       return 0;
+}
+
+sub firewall_is_in_subnet {
+       my $subnet = shift;
+
+       # ORANGE is missing here, because nothing may ever access
+       # the firewall from this network.
+       my $address = &get_internal_firewall_ip_address($subnet, 0);
+
+       if ($address) {
+               return 1;
+       }
+
+       return 0;
+}
+
+sub get_matching_firewall_address {
+       my $addr = shift;
+       my $use_orange = shift;
+
+       my ($address, $netmask) = split("/", $addr);
+
+       my @zones = ("GREEN", "BLUE");
+       if ($use_orange) {
+               push(@zones, "ORANGE");
+       }
+
+       foreach my $zone (@zones) {
+               next unless (exists $defaultNetworks{$zone . "_ADDRESS"});
+
+               my $zone_subnet = $defaultNetworks{$zone . "_NETADDRESS"};
+               my $zone_mask   = $defaultNetworks{$zone . "_NETMASK"};
+
+               if (&General::IpInSubnet($address, $zone_subnet, $zone_mask)) {
+                       return $defaultNetworks{$zone . "_ADDRESS"};
+               }
+       }
+
+       return 0;
 }
index 7f9ae3a6f3950cd003d0cbcf0a718ab616e067a7..9b25a72402c4e1f8148b7c0823594abb0eefc35f 100644 (file)
@@ -28,7 +28,7 @@
 12,NetBIOS Name Service,137,TCP,BLANK,0
 15,IMAP,143,TCP,BLANK,0
 8,HTTP,80,TCP,BLANK,0
-4,Telnet,23,UDP,BLANK,0
+4,Telnet,23,TCP,BLANK,0
 34,DNS (TCP),53,TCP,,0
 19,FTPS data,989,TCP,BLANK,0
 5,SMTP,25,TCP,BLANK,0
index 6158e2cdf08f9e94b4f2c399738da1fdad79847d..1cd76765a9a66cf92407d8de16e231c5a6e50597 100644 (file)
@@ -142,3 +142,10 @@ CONFIG_IEEE80211N=y
 # This can be used to reduce the size of the hostapd considerably if debugging
 # code is not needed.
 CONFIG_NO_STDOUT_DEBUG=y
+
+# IEEE 802.11ac (Very High Throughput) support
+CONFIG_IEEE80211AC=y
+
+# Enable AUTO_CHANNEL_SELECTION
+# This is needed for dfs (radar detection) channels
+CONFIG_ACS=y
index dfc746d23733e3cf1897c765f9d8e93f1ba310f3..dcd3b08f73f39de8de2d9651439d0c859ad22ca7 100644 (file)
@@ -333,7 +333,14 @@ CONFIG_ARCH_MULTIPLATFORM=y
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V6_V7=y
 # CONFIG_ARCH_MULTI_CPU_AUTO is not set
-# CONFIG_ARCH_MVEBU is not set
+CONFIG_ARCH_MVEBU=y
+
+#
+# Marvell SOC with device tree
+#
+CONFIG_MACH_ARMADA_370_XP=y
+CONFIG_MACH_ARMADA_370=y
+CONFIG_MACH_ARMADA_XP=y
 # CONFIG_ARCH_BCM is not set
 # CONFIG_GPIO_PCA953X is not set
 CONFIG_KEYBOARD_GPIO_POLLED=m
@@ -443,7 +450,7 @@ CONFIG_MACH_OMAP4_PANDA=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 # CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_PLAT_SPEAR is not set
-# CONFIG_ARCH_SUNXI is not set
+CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_U8500 is not set
@@ -460,12 +467,14 @@ CONFIG_ARCH_VIRT=y
 CONFIG_ARCH_VT8500=y
 CONFIG_ARCH_WM8850=y
 CONFIG_ARCH_ZYNQ=y
+CONFIG_PLAT_ORION=y
 CONFIG_PLAT_VERSATILE=y
 CONFIG_ARM_TIMER_SP804=y
 
 #
 # Processor Type
 #
+CONFIG_CPU_PJ4B=y
 CONFIG_CPU_V7=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
@@ -502,6 +511,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARM_NR_BANKS=8
 CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_PJ4B_ERRATA_4742=y
 CONFIG_ARM_ERRATA_430973=y
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_ARM_ERRATA_643719=y
@@ -1314,6 +1324,7 @@ CONFIG_CMA_AREAS=7
 #
 # Bus devices
 #
+CONFIG_MVEBU_MBUS=y
 CONFIG_OMAP_OCP2SCP=y
 CONFIG_OMAP_INTERCONNECT=y
 CONFIG_CONNECTOR=y
@@ -1402,6 +1413,7 @@ CONFIG_MTD_NAND_IDS=y
 CONFIG_MTD_NAND_GPMI_NAND=m
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_ALAUDA is not set
+CONFIG_MTD_NAND_ORION=y
 CONFIG_MTD_NAND_MXC=m
 # CONFIG_MTD_ONENAND is not set
 
@@ -1945,7 +1957,9 @@ CONFIG_NET_VENDOR_I825XX=y
 CONFIG_IP1000=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MV643XX_ETH=m
 CONFIG_MVMDIO=m
+CONFIG_MVNETA=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 CONFIG_SKGE_GENESIS=y
@@ -2542,8 +2556,10 @@ CONFIG_SERIAL_8250_RSA=y
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_AMBA_PL010=m
-CONFIG_SERIAL_AMBA_PL011=m
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 # CONFIG_SERIAL_MFD_HSU is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
@@ -2627,6 +2643,7 @@ CONFIG_I2C_CBUS_GPIO=m
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_IMX=m
 # CONFIG_I2C_INTEL_MID is not set
+CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_NOMADIK=y
 # CONFIG_I2C_OCORES is not set
 CONFIG_I2C_OMAP=y
@@ -2708,8 +2725,12 @@ CONFIG_PINCTRL_IMX51=y
 CONFIG_PINCTRL_IMX53=y
 CONFIG_PINCTRL_IMX6Q=y
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_SUNXI=y
 # CONFIG_PINCTRL_EXYNOS is not set
 # CONFIG_PINCTRL_EXYNOS5440 is not set
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_ARMADA_370=y
+CONFIG_PINCTRL_ARMADA_XP=y
 CONFIG_PINCTRL_WMT=y
 CONFIG_PINCTRL_WM8850=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
@@ -2727,6 +2748,7 @@ CONFIG_GPIO_GENERIC=y
 #
 CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_EM is not set
+CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_PL061=y
 # CONFIG_GPIO_RCAR is not set
@@ -2828,6 +2850,7 @@ CONFIG_CHARGER_TWL4030=y
 # CONFIG_BATTERY_GOLDFISH is not set
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_QNAP=y
 CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_AVS=y
@@ -2964,6 +2987,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_CPU_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
 CONFIG_IMX_THERMAL=m
+CONFIG_ARMADA_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
@@ -4147,6 +4171,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_EHCI_PCI=y
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_HCD_OMAP=y
+CONFIG_USB_EHCI_HCD_ORION=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
@@ -4345,6 +4370,7 @@ CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_MXC=m
 # CONFIG_MMC_TIFM_SD is not set
+CONFIG_MMC_MVSDIO=y
 # CONFIG_MMC_CB710 is not set
 # CONFIG_MMC_VIA_SDMMC is not set
 CONFIG_MMC_DW=m
@@ -4495,6 +4521,7 @@ CONFIG_RTC_DRV_OMAP=y
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_VT8500=m
+CONFIG_RTC_DRV_MV=m
 CONFIG_RTC_DRV_MXC=m
 CONFIG_RTC_DRV_SNVS=m
 
@@ -4508,8 +4535,10 @@ CONFIG_DMADEVICES=y
 #
 # DMA Devices
 #
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_AMBA_PL08X=y
 # CONFIG_DW_DMAC is not set
+CONFIG_MV_XOR=y
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
 CONFIG_TIMB_DMA=m
@@ -4687,6 +4716,9 @@ CONFIG_COMMON_CLK=y
 CONFIG_COMMON_CLK_VERSATILE=y
 CONFIG_COMMON_CLK_SI5351=m
 CONFIG_COMMON_CLK_AXI_CLKGEN=m
+CONFIG_MVEBU_CLK_CORE=y
+CONFIG_MVEBU_CLK_CPU=y
+CONFIG_MVEBU_CLK_GATING=y
 CONFIG_HWSPINLOCK=y
 
 #
@@ -4695,6 +4727,8 @@ CONFIG_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_OMAP=y
 CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
+CONFIG_ARMADA_370_XP_TIMER=y
+CONFIG_SUN4I_TIMER=y
 CONFIG_VT8500_TIMER=y
 CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_ARM_ARCH_TIMER=y
@@ -5457,7 +5491,9 @@ CONFIG_CRYPTO_USER_API=y
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+CONFIG_CRYPTO_DEV_MV_CESA=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_OMAP_SHAM=y
 CONFIG_CRYPTO_DEV_OMAP_AES=y
 CONFIG_ASYMMETRIC_KEY_TYPE=m
index c7fdbd1c741ef359278d3031e404d52c66bf9601..9ec9523b7ab45e6bd542331862903eebc3306e7c 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.30-ipfire Kernel Configuration
+# Linux/x86 3.10.33 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -658,6 +658,7 @@ CONFIG_EISA_NAMES=y
 CONFIG_SCx200=m
 CONFIG_SCx200HR_TIMER=m
 # CONFIG_OLPC is not set
+CONFIG_APULED=y
 CONFIG_ALIX=y
 CONFIG_NET5501=y
 CONFIG_GEOS=y
index 14802522db0d4a54bdb8ed5052b66250e34f8b0f..5fd7ab9bf9e508adec01e2a01587cb04c41175dd 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.30-ipfire Kernel Configuration
+# Linux/x86 3.10.33 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -670,6 +670,7 @@ CONFIG_EISA_PCI_EISA=y
 CONFIG_EISA_VIRTUAL_ROOT=y
 CONFIG_EISA_NAMES=y
 # CONFIG_SCx200 is not set
+CONFIG_APULED=y
 # CONFIG_ALIX is not set
 # CONFIG_NET5501 is not set
 # CONFIG_GEOS is not set
index c0b780a0624080ea73373376626127356e99b77f..8899310aaa8cad97f950b22fdd38663ab679a9e9 100644 (file)
                                'title' => "$Lang::tr{'hardware graphs'}",
                                'enabled' => 1,
                          };
+    $substatus->{'61.entropy'} = {
+                               'caption' => "$Lang::tr{'entropy'}",
+                               'uri' => '/cgi-bin/entropy.cgi',
+                               'title' => "$Lang::tr{'entropy graphs'}",
+                               'enabled' => 1,
+                         };
     $substatus->{'71.connections'} = {
                                'caption' => $Lang::tr{'connections'},
                                'uri' => '/cgi-bin/connections.cgi',
index 2076fc30bb0bee8047dbdb643e58f74f2dc50680..092a16f8ee50ea9f63b0d76fa5fb70f6ac9542ec 100644 (file)
@@ -606,6 +606,7 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_authz_groupfile.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_host.html
 #srv/web/ipfire/manual/mod/mod_authz_host.html.en
+#srv/web/ipfire/manual/mod/mod_authz_host.html.fr
 #srv/web/ipfire/manual/mod/mod_authz_host.html.ja.utf8
 #srv/web/ipfire/manual/mod/mod_authz_host.html.ko.euc-kr
 #srv/web/ipfire/manual/mod/mod_authz_owner.html
@@ -1330,12 +1331,12 @@ usr/lib/apr-util-1/apr_dbd_sqlite3.so
 #usr/lib/libapr-1.la
 usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.4.6
+usr/lib/libapr-1.so.0.4.8
 #usr/lib/libaprutil-1.a
 #usr/lib/libaprutil-1.la
 usr/lib/libaprutil-1.so
 usr/lib/libaprutil-1.so.0
-usr/lib/libaprutil-1.so.0.4.1
+usr/lib/libaprutil-1.so.0.5.2
 #usr/lib/pkgconfig/apr-1.pc
 #usr/lib/pkgconfig/apr-util-1.pc
 #usr/sbin/ab
index ca3defcb01f66c419aa853a5952eb142b7619dab..9c41aba9a6480896071e3ff109e3ee94ead46bd0 100644 (file)
@@ -10,7 +10,6 @@ sbin/dracut-catimages
 sbin/dracut-gencmdline
 sbin/lsinitrd
 sbin/mkinitrd
-sbin/switch_root
 usr/share/dracut
 usr/share/dracut/dracut-functions
 usr/share/dracut/modules.d
@@ -55,6 +54,7 @@ usr/share/dracut/modules.d/99base/check
 usr/share/dracut/modules.d/99base/dracut-lib.sh
 usr/share/dracut/modules.d/99base/init
 usr/share/dracut/modules.d/99base/initqueue
+#usr/share/dracut/modules.d/99base/init~
 usr/share/dracut/modules.d/99base/install
 usr/share/dracut/modules.d/99base/loginit
 usr/share/dracut/modules.d/99base/parse-blacklist.sh
@@ -63,3 +63,4 @@ usr/share/dracut/modules.d/99base/parse-root-opts.sh
 #usr/share/man/man8/dracut-catimages.8
 #usr/share/man/man8/dracut-gencmdline.8
 #usr/share/man/man8/dracut.8
+sbin/switch_root
index bf4dd529ab620ebf1db7d33540587c8b45c86886..4716b9726ec325f6e568b86dc433570c854bec5c 100644 (file)
@@ -74,7 +74,6 @@ etc/rc.d/init.d/networking/red.down/10-ipsec
 etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.down/10-ovpn
 etc/rc.d/init.d/networking/red.down/20-RL-firewall
-etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
 #etc/rc.d/init.d/networking/red.up
 etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
 etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
@@ -89,7 +88,6 @@ etc/rc.d/init.d/networking/red.up/40-ipac
 etc/rc.d/init.d/networking/red.up/50-ipsec
 etc/rc.d/init.d/networking/red.up/50-ovpn
 etc/rc.d/init.d/networking/red.up/98-leds
-etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
 etc/rc.d/init.d/networking/red.up/99-fireinfo
 etc/rc.d/init.d/networking/red.up/99-pakfire-update
 etc/rc.d/init.d/networking/wpa_supplicant.exe
index 3b8dd3a70079a6d21359614aaeb2c683d4c70e16..b9040c37882b150cafb56ce83eca12005943d3ec 100644 (file)
@@ -10,6 +10,7 @@
 #usr/include/asm-generic/ioctl.h
 #usr/include/asm-generic/ioctls.h
 #usr/include/asm-generic/ipcbuf.h
+#usr/include/asm-generic/kvm_para.h
 #usr/include/asm-generic/mman-common.h
 #usr/include/asm-generic/mman.h
 #usr/include/asm-generic/msgbuf.h
@@ -34,7 +35,6 @@
 #usr/include/asm-generic/types.h
 #usr/include/asm-generic/ucontext.h
 #usr/include/asm-generic/unistd.h
-#usr/include/asm/a.out.h
 #usr/include/asm/auxvec.h
 #usr/include/asm/bitsperlong.h
 #usr/include/asm/byteorder.h
@@ -44,6 +44,8 @@
 #usr/include/asm/ioctl.h
 #usr/include/asm/ioctls.h
 #usr/include/asm/ipcbuf.h
+#usr/include/asm/kvm.h
+#usr/include/asm/kvm_para.h
 #usr/include/asm/mman.h
 #usr/include/asm/msgbuf.h
 #usr/include/asm/param.h
 #usr/include/asm/unistd.h
 #usr/include/drm
 #usr/include/drm/drm.h
+#usr/include/drm/drm_fourcc.h
 #usr/include/drm/drm_mode.h
 #usr/include/drm/drm_sarea.h
+#usr/include/drm/exynos_drm.h
 #usr/include/drm/i810_drm.h
 #usr/include/drm/i915_drm.h
 #usr/include/drm/mga_drm.h
 #usr/include/drm/nouveau_drm.h
+#usr/include/drm/qxl_drm.h
 #usr/include/drm/r128_drm.h
 #usr/include/drm/radeon_drm.h
 #usr/include/drm/savage_drm.h
 #usr/include/drm/sis_drm.h
+#usr/include/drm/tegra_drm.h
 #usr/include/drm/via_drm.h
 #usr/include/drm/vmwgfx_drm.h
 #usr/include/linux
-#usr/include/linux/a.out.h
 #usr/include/linux/acct.h
 #usr/include/linux/adb.h
 #usr/include/linux/adfs_fs.h
 #usr/include/linux/baycom.h
 #usr/include/linux/bfs_fs.h
 #usr/include/linux/binfmts.h
-#usr/include/linux/blk_types.h
 #usr/include/linux/blkpg.h
 #usr/include/linux/blktrace_api.h
 #usr/include/linux/bpqether.h
 #usr/include/linux/bsg.h
+#usr/include/linux/btrfs.h
 #usr/include/linux/byteorder
 #usr/include/linux/byteorder/big_endian.h
 #usr/include/linux/byteorder/little_endian.h
 #usr/include/linux/capi.h
 #usr/include/linux/cciss_defs.h
 #usr/include/linux/cciss_ioctl.h
-#usr/include/linux/cdk.h
 #usr/include/linux/cdrom.h
 #usr/include/linux/cgroupstats.h
 #usr/include/linux/chio.h
 #usr/include/linux/coda.h
 #usr/include/linux/coda_psdev.h
 #usr/include/linux/coff.h
-#usr/include/linux/comstats.h
 #usr/include/linux/connector.h
 #usr/include/linux/const.h
 #usr/include/linux/cramfs_fs.h
 #usr/include/linux/errqueue.h
 #usr/include/linux/ethtool.h
 #usr/include/linux/eventpoll.h
-#usr/include/linux/ext2_fs.h
 #usr/include/linux/fadvise.h
 #usr/include/linux/falloc.h
 #usr/include/linux/fanotify.h
 #usr/include/linux/futex.h
 #usr/include/linux/gameport.h
 #usr/include/linux/gen_stats.h
-#usr/include/linux/generic_serial.h
 #usr/include/linux/genetlink.h
 #usr/include/linux/gfs2_ondisk.h
 #usr/include/linux/gigaset_dev.h
 #usr/include/linux/hiddev.h
 #usr/include/linux/hidraw.h
 #usr/include/linux/hpet.h
+#usr/include/linux/hsi
+#usr/include/linux/hsi/hsi_char.h
+#usr/include/linux/hw_breakpoint.h
 #usr/include/linux/hysdn_if.h
 #usr/include/linux/i2c-dev.h
 #usr/include/linux/i2c.h
 #usr/include/linux/if_bonding.h
 #usr/include/linux/if_bridge.h
 #usr/include/linux/if_cablemodem.h
-#usr/include/linux/if_ec.h
 #usr/include/linux/if_eql.h
 #usr/include/linux/if_ether.h
 #usr/include/linux/if_fc.h
 #usr/include/linux/if_pppol2tp.h
 #usr/include/linux/if_pppox.h
 #usr/include/linux/if_slip.h
-#usr/include/linux/if_strip.h
-#usr/include/linux/if_tr.h
+#usr/include/linux/if_team.h
 #usr/include/linux/if_tun.h
 #usr/include/linux/if_tunnel.h
 #usr/include/linux/if_vlan.h
 #usr/include/linux/kernel-page-flags.h
 #usr/include/linux/kernel.h
 #usr/include/linux/kernelcapi.h
+#usr/include/linux/kexec.h
 #usr/include/linux/keyboard.h
 #usr/include/linux/keyctl.h
+#usr/include/linux/kvm.h
+#usr/include/linux/kvm_para.h
 #usr/include/linux/l2tp.h
 #usr/include/linux/limits.h
 #usr/include/linux/llc.h
 #usr/include/linux/major.h
 #usr/include/linux/map_to_7segment.h
 #usr/include/linux/matroxfb.h
+#usr/include/linux/mdio.h
 #usr/include/linux/media.h
+#usr/include/linux/mei.h
 #usr/include/linux/mempolicy.h
 #usr/include/linux/meye.h
 #usr/include/linux/mii.h
 #usr/include/linux/net.h
 #usr/include/linux/net_dropmon.h
 #usr/include/linux/net_tstamp.h
+#usr/include/linux/netconf.h
 #usr/include/linux/netdevice.h
 #usr/include/linux/netfilter
 #usr/include/linux/netfilter.h
 #usr/include/linux/netfilter/nf_conntrack_sctp.h
 #usr/include/linux/netfilter/nf_conntrack_tcp.h
 #usr/include/linux/netfilter/nf_conntrack_tuple_common.h
+#usr/include/linux/netfilter/nf_nat.h
 #usr/include/linux/netfilter/nfnetlink.h
+#usr/include/linux/netfilter/nfnetlink_acct.h
 #usr/include/linux/netfilter/nfnetlink_compat.h
 #usr/include/linux/netfilter/nfnetlink_conntrack.h
+#usr/include/linux/netfilter/nfnetlink_cthelper.h
+#usr/include/linux/netfilter/nfnetlink_cttimeout.h
 #usr/include/linux/netfilter/nfnetlink_log.h
 #usr/include/linux/netfilter/nfnetlink_queue.h
 #usr/include/linux/netfilter/x_tables.h
 #usr/include/linux/netfilter/xt_DSCP.h
 #usr/include/linux/netfilter/xt_IDLETIMER.h
 #usr/include/linux/netfilter/xt_LED.h
+#usr/include/linux/netfilter/xt_LOG.h
 #usr/include/linux/netfilter/xt_MARK.h
 #usr/include/linux/netfilter/xt_NFLOG.h
 #usr/include/linux/netfilter/xt_NFQUEUE.h
 #usr/include/linux/netfilter/xt_TEE.h
 #usr/include/linux/netfilter/xt_TPROXY.h
 #usr/include/linux/netfilter/xt_addrtype.h
+#usr/include/linux/netfilter/xt_bpf.h
 #usr/include/linux/netfilter/xt_cluster.h
 #usr/include/linux/netfilter/xt_comment.h
 #usr/include/linux/netfilter/xt_connbytes.h
+#usr/include/linux/netfilter/xt_connlabel.h
 #usr/include/linux/netfilter/xt_connlimit.h
 #usr/include/linux/netfilter/xt_connmark.h
 #usr/include/linux/netfilter/xt_conntrack.h
 #usr/include/linux/netfilter/xt_dccp.h
 #usr/include/linux/netfilter/xt_devgroup.h
 #usr/include/linux/netfilter/xt_dscp.h
+#usr/include/linux/netfilter/xt_ecn.h
 #usr/include/linux/netfilter/xt_esp.h
 #usr/include/linux/netfilter/xt_hashlimit.h
 #usr/include/linux/netfilter/xt_helper.h
 #usr/include/linux/netfilter/xt_mac.h
 #usr/include/linux/netfilter/xt_mark.h
 #usr/include/linux/netfilter/xt_multiport.h
+#usr/include/linux/netfilter/xt_nfacct.h
 #usr/include/linux/netfilter/xt_osf.h
 #usr/include/linux/netfilter/xt_owner.h
 #usr/include/linux/netfilter/xt_physdev.h
 #usr/include/linux/netfilter_decnet.h
 #usr/include/linux/netfilter_ipv4
 #usr/include/linux/netfilter_ipv4.h
-#usr/include/linux/netfilter_ipv4/ip_queue.h
 #usr/include/linux/netfilter_ipv4/ip_tables.h
 #usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
 #usr/include/linux/netfilter_ipv4/ipt_ECN.h
 #usr/include/linux/netfilter_ipv4/ipt_LOG.h
 #usr/include/linux/netfilter_ipv4/ipt_REJECT.h
-#usr/include/linux/netfilter_ipv4/ipt_SAME.h
 #usr/include/linux/netfilter_ipv4/ipt_TTL.h
 #usr/include/linux/netfilter_ipv4/ipt_ULOG.h
-#usr/include/linux/netfilter_ipv4/ipt_addrtype.h
 #usr/include/linux/netfilter_ipv4/ipt_ah.h
 #usr/include/linux/netfilter_ipv4/ipt_ecn.h
-#usr/include/linux/netfilter_ipv4/ipt_realm.h
 #usr/include/linux/netfilter_ipv4/ipt_ttl.h
-#usr/include/linux/netfilter_ipv4/nf_nat.h
 #usr/include/linux/netfilter_ipv6
 #usr/include/linux/netfilter_ipv6.h
 #usr/include/linux/netfilter_ipv6/ip6_tables.h
 #usr/include/linux/netfilter_ipv6/ip6t_HL.h
 #usr/include/linux/netfilter_ipv6/ip6t_LOG.h
+#usr/include/linux/netfilter_ipv6/ip6t_NPT.h
 #usr/include/linux/netfilter_ipv6/ip6t_REJECT.h
 #usr/include/linux/netfilter_ipv6/ip6t_ah.h
 #usr/include/linux/netfilter_ipv6/ip6t_frag.h
 #usr/include/linux/netfilter_ipv6/ip6t_opts.h
 #usr/include/linux/netfilter_ipv6/ip6t_rt.h
 #usr/include/linux/netlink.h
+#usr/include/linux/netlink_diag.h
 #usr/include/linux/netrom.h
 #usr/include/linux/nfc.h
 #usr/include/linux/nfs.h
 #usr/include/linux/nfs_mount.h
 #usr/include/linux/nfsacl.h
 #usr/include/linux/nfsd
+#usr/include/linux/nfsd/cld.h
 #usr/include/linux/nfsd/debug.h
 #usr/include/linux/nfsd/export.h
 #usr/include/linux/nfsd/nfsfh.h
 #usr/include/linux/omap3isp.h
 #usr/include/linux/omapfb.h
 #usr/include/linux/oom.h
+#usr/include/linux/openvswitch.h
+#usr/include/linux/packet_diag.h
 #usr/include/linux/param.h
 #usr/include/linux/parport.h
 #usr/include/linux/patchkey.h
 #usr/include/linux/posix_types.h
 #usr/include/linux/ppdev.h
 #usr/include/linux/ppp-comp.h
+#usr/include/linux/ppp-ioctl.h
 #usr/include/linux/ppp_defs.h
 #usr/include/linux/pps.h
 #usr/include/linux/prctl.h
 #usr/include/linux/scc.h
 #usr/include/linux/sched.h
 #usr/include/linux/screen_info.h
+#usr/include/linux/sctp.h
 #usr/include/linux/sdla.h
+#usr/include/linux/seccomp.h
 #usr/include/linux/securebits.h
 #usr/include/linux/selinux_netlink.h
 #usr/include/linux/sem.h
 #usr/include/linux/signal.h
 #usr/include/linux/signalfd.h
 #usr/include/linux/snmp.h
+#usr/include/linux/sock_diag.h
 #usr/include/linux/socket.h
 #usr/include/linux/sockios.h
 #usr/include/linux/som.h
 #usr/include/linux/swab.h
 #usr/include/linux/synclink.h
 #usr/include/linux/sysctl.h
+#usr/include/linux/sysinfo.h
 #usr/include/linux/taskstats.h
 #usr/include/linux/tc_act
 #usr/include/linux/tc_act/tc_csum.h
 #usr/include/linux/tc_ematch/tc_em_nbyte.h
 #usr/include/linux/tc_ematch/tc_em_text.h
 #usr/include/linux/tcp.h
+#usr/include/linux/tcp_metrics.h
 #usr/include/linux/telephony.h
 #usr/include/linux/termios.h
 #usr/include/linux/time.h
 #usr/include/linux/tipc_config.h
 #usr/include/linux/toshiba.h
 #usr/include/linux/tty.h
+#usr/include/linux/tty_flags.h
 #usr/include/linux/types.h
 #usr/include/linux/udf_fs_i.h
 #usr/include/linux/udp.h
+#usr/include/linux/uhid.h
 #usr/include/linux/uinput.h
 #usr/include/linux/uio.h
 #usr/include/linux/ultrasound.h
 #usr/include/linux/un.h
 #usr/include/linux/unistd.h
+#usr/include/linux/unix_diag.h
 #usr/include/linux/usb
 #usr/include/linux/usb/audio.h
 #usr/include/linux/usb/cdc.h
 #usr/include/linux/usbdevice_fs.h
 #usr/include/linux/utime.h
 #usr/include/linux/utsname.h
+#usr/include/linux/uuid.h
 #usr/include/linux/uvcvideo.h
+#usr/include/linux/v4l2-common.h
+#usr/include/linux/v4l2-controls.h
+#usr/include/linux/v4l2-dv-timings.h
 #usr/include/linux/v4l2-mediabus.h
 #usr/include/linux/v4l2-subdev.h
 #usr/include/linux/version.h
 #usr/include/linux/veth.h
+#usr/include/linux/vfio.h
 #usr/include/linux/vhost.h
 #usr/include/linux/videodev2.h
 #usr/include/linux/virtio_9p.h
 #usr/include/sound/asequencer.h
 #usr/include/sound/asound.h
 #usr/include/sound/asound_fm.h
+#usr/include/sound/compress_offload.h
+#usr/include/sound/compress_params.h
 #usr/include/sound/emu10k1.h
 #usr/include/sound/hdsp.h
 #usr/include/sound/hdspm.h
 #usr/include/sound/sb16_csp.h
 #usr/include/sound/sfnt_info.h
+#usr/include/uapi
 #usr/include/video
 #usr/include/video/edid.h
 #usr/include/video/sisfb.h
index 60374aad0989e2dec37371dbe6bc205e2dbfffe4..cb6858f77e149d2cccf21a51ab8c61ae62e4dbd8 100644 (file)
@@ -2,6 +2,31 @@ boot/System.map-KVER-ipfire-kirkwood
 #boot/System.map-ipfire-kirkwood
 boot/config-KVER-ipfire-kirkwood
 boot/dtb-KVER-ipfire-kirkwood
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-cloudbox.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-dns320.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-dns325.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-dockstar.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-dreamplug.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-goflexnet.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-guruplug-server-plus.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-ib62x0.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-iconnect.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-iomega_ix2_200.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-is2.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-km_kirkwood.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-lschlv2.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-lsxhl.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-mplcec4.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-netgear_readynas_duo_v2.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-ns2.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-ns2lite.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-ns2max.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-ns2mini.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-nsa310.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-openblocks_a6.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-topkick.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-ts219-6281.dtb
+#boot/dtb-KVER-ipfire-kirkwood/kirkwood-ts219-6282.dtb
 boot/uImage-ipfire-kirkwood
 boot/vmlinuz-KVER-ipfire-kirkwood
 etc/modprobe.d/framebuffer.conf
@@ -10,14 +35,19 @@ etc/modprobe.d/isdn.conf
 lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/build
 #lib/modules/KVER-ipfire-kirkwood/kernel
+#lib/modules/KVER-ipfire-kirkwood/kernel/arch
+#lib/modules/KVER-ipfire-kirkwood/kernel/arch/arm
+#lib/modules/KVER-ipfire-kirkwood/kernel/arch/arm/crypto
+#lib/modules/KVER-ipfire-kirkwood/kernel/arch/arm/crypto/aes-arm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/aes_generic.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/af_alg.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/algif_hash.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/algif_skcipher.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/ansi_cprng.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/anubis.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/arc4.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/asymmetric_keys
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/asymmetric_keys/asymmetric_keys.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/asymmetric_keys/public_key.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/asymmetric_keys/rsa.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/asymmetric_keys/x509_key_parser.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/async_tx
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/async_tx/async_memcpy.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/async_tx/async_pq.ko
@@ -29,18 +59,16 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/authencesn.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/blowfish_common.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/blowfish_generic.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/camellia.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast5.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast6.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cbc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/camellia_generic.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast5_generic.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast6_generic.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cast_common.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/ccm.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/crc32c.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cryptd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/crypto_user.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/ctr.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cmac.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/crypto_null.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/cts.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/deflate.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/des_generic.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/ecb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/fcrypt.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/gcm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/gf128mul.ko
@@ -49,7 +77,6 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/lrw.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/lzo.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/md4.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/md5.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/michael_mic.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/pcbc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd128.ko
@@ -58,11 +85,9 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/rmd320.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/salsa20_generic.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/seed.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/seqiv.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/serpent.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/sha1_generic.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/sha256_generic.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/serpent_generic.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/sha512_generic.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/crypto/tcrypt.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/tea.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/tgr192.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/crypto/twofish_common.ko
@@ -76,12 +101,8 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/acard-ahci.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/ahci.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/ahci_platform.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/ata_generic.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/ata_piix.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/libahci.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/libata.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_ali.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_amd.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_arasan_cf.ko
@@ -102,7 +123,6 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_it8213.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_it821x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_jmicron.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_legacy.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_marvell.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_mpiix.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_netcell.ko
@@ -112,14 +132,11 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_oldpiix.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_opti.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_optidma.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_pcmcia.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_pdc2027x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_pdc202xx_old.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_piccolo.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_radisys.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_rdc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_rz1000.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_sc1200.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_sch.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_serverworks.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_sil680.ko
@@ -128,6 +145,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_triflex.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pata_via.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/pdc_adma.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/sata_highbank.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/sata_inic162x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/sata_mv.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/sata_nv.ko
@@ -142,59 +160,38 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/sata_via.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ata/sata_vsc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/ambassador.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/atmtcp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/eni.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/firestream.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/fore_200e.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/horizon.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/idt77105.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/idt77252.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/iphase.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/lanai.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/nicstar.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/solos-pci.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/suni.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/uPD98402.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/atm/zatm.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/base
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/base/regmap
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/base/regmap/regmap-i2c.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bcma
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bcma/bcma.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/DAC960.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/aoe
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/aoe/aoe.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/cciss.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/cpqarray.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/cryptoloop.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/mg_disk.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/nbd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/osdblk.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/rbd.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/nvme.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/rsxx
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/rsxx/rsxx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/sx8.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/block/umem.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/ath3k.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/bcm203x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/bfusb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/bluecard_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/bpa10x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/bt3c_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/btmrvl.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/btmrvl_sdio.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/btsdio.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/btuart_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/btusb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/btwilink.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/dtl1_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/hci_uart.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/bluetooth/hci_vhci.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/cdrom
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/cdrom/cdrom.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/hw_random
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/hw_random/rng-core.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/hw_random/atmel-rng.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/hw_random/exynos-rng.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/hw_random/timeriomem-rng.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/ipmi
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/ipmi/ipmi_devintf.ko
@@ -203,110 +200,70 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/ipmi/ipmi_si.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/ipmi/ipmi_watchdog.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/lp.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/nvram.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/pcmcia
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/pcmcia/synclink_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/char/ppdev.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/connector
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/connector/cn.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/clk
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/clk/clk-si5351.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/crypto
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/crypto/hifn_795x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/crypto/mv_cesa.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/dma
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/dma/dmatest.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/dma/timb_dma.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/firewire
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/firewire/firewire-core.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/firewire/firewire-net.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/firewire/firewire-ohci.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/firewire/firewire-sbp2.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-adp5588.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-generic.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-it8761e.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-janz-ttl.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-max7300.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-max730x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-max732x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-adnp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-mcp23s08.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-ml-ioh.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-pca953x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-pcf857x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-rdc321x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-vx855.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-ts5500.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpio/gpio-viperboard.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/drm.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/mga
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/mga/mga.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/r128
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/r128/r128.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/savage
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/savage/savage.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/tdfx
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/tdfx/tdfx.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/ttm
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/ttm/ttm.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/via
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/via/via.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/vmwgfx
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/vmwgfx/vmwgfx.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/stub
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/stub/poulsbo.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/drm_kms_helper.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/drm_usb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/i2c
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/i2c/ch7006.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/i2c/sil164.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/i2c/tda998x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/udl
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/gpu/drm/udl/udl.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-a4tech.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-apple.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-axff.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-belkin.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-cherry.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-chicony.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-cypress.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-dr.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-elecom.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-ezkey.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-gaff.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-aureal.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-gyration.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-holtekff.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-kensington.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-keytouch.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-kye.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-lcpower.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-lenovo-tpkbd.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-logitech-dj.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-logitech.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-magicmouse.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-microsoft.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-monterey.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-multitouch.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-ntrig.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-ortek.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-petalynx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-picolcd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-pl.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-primax.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-prodikeys.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-quanta.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat-arvo.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat-common.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat-isku.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat-kone.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat-koneplus.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat-konepure.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat-kovaplus.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat-lua.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat-pyra.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat-savu.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-roccat.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-saitek.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-samsung.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-sjoy.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-sony.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-sensor-hub.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-speedlink.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-sunplus.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-tmff.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-thingm.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-tivo.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-topseed.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-twinhan.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-uclogic.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-wacom.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-waltop.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-wiimote.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-zpff.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/hid-zydacron.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/usbhid
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/usbhid/usbhid.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/i2c-hid
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hid/i2c-hid/i2c-hid.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hsi
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hsi/clients
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hsi/clients/hsi_char.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hsi/hsi.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ad7414.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ad7418.ko
@@ -318,10 +275,12 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/adm9240.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ads1015.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ads7828.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/adt7410.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/adt7411.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/adt7462.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/adt7470.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/adt7475.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/adt7x10.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/amc6821.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/asc7621.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/atxp1.ko
@@ -329,7 +288,6 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ds1621.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ds620.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/emc1403.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/emc2103.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/emc6w201.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/f71805f.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/f71882fg.ko
@@ -337,16 +295,15 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/g760a.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/gl518sm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/gl520sm.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/gpio-fan.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/hih6130.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/hwmon-vid.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/hwmon.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/i5k_amb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ibmaem.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ibmpex.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ina209.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ina2xx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/it87.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/jc42.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/lineage-pem.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/lm63.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/lm73.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/lm75.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/lm77.ko
@@ -358,6 +315,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/lm90.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/lm92.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/lm93.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/lm95234.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/lm95241.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/lm95245.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ltc4151.ko
@@ -367,9 +325,13 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/max16065.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/max1619.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/max1668.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/max197.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/max6639.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/max6642.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/max6650.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/max6697.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/mcp3021.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/nct6775.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/ntc_thermistor.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pc87360.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pc87427.ko
@@ -377,7 +339,6 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pmbus
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pmbus/adm1275.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pmbus/lm25066.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pmbus/ltc2978.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pmbus/max16064.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pmbus/max34440.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pmbus/max8688.ko
@@ -385,14 +346,12 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pmbus/pmbus_core.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pmbus/ucd9000.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pmbus/ucd9200.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/pmbus/zl6100.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/sch5627.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/sch5636.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/sch56xx-common.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/sht15.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/sht21.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/sis5595.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/smm665.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/smsc47b397.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/smsc47m1.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/hwmon/smsc47m192.ko
@@ -422,16 +381,12 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-ali15x3.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-amd756.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-amd8111.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-designware-core.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-designware-pci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-cbus-gpio.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-diolan-u2c.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-eg20t.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-gpio.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-i801.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-intel-mid.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-isch.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-nforce2.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-ocores.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-parport-light.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-parport.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-pca-platform.ko
@@ -440,59 +395,48 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-sis5595.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-sis630.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-sis96x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-stub.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-taos-evm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-tiny-usb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-via.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-viapro.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-xiic.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/busses/i2c-viperboard.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/i2c-dev.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/i2c-mux.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/i2c-smbus.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/muxes
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/muxes/gpio-i2cmux.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/muxes/pca9541.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/muxes/pca954x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ieee802154
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ieee802154/fakehard.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/i2c/i2c-stub.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/iio
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/iio/common
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/iio/common/hid-sensors
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/iio/common/hid-sensors/hid-sensor-iio-common.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/iio/common/hid-sensors/hid-sensor-trigger.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/iio/industrialio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/iio/kfifo_buf.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/ff-memless.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/input-polldev.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/adp5588-keys.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/adp5589-keys.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/gpio_keys.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/gpio_keys_polled.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/lkkbd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/lm8323.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/matrix_keypad.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/max7359_keypad.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/mcs_touchkey.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/mpr121_touchkey.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/newtonkbd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/opencores-kbd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/qt1070.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/qt2160.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/stowaway.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/sunkbd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/tca6416-keypad.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/xtkbd.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/keyboard/lm8333.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/matrix-keymap.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/88pm860x_onkey.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/ad714x-i2c.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/ad714x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/ati_remote2.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/bma150.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/cm109.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/keyspan_remote.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/pcf50633-input.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/pcf8574_keypad.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/powermate.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/pwm-beeper.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/retu-pwrbutton.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/rotary_encoder.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/uinput.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/misc/yealink.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/mouse
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/mouse/appletouch.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/mouse/bcm5974.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/mouse/cyapa.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/mouse/psmouse.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/mouse/sermouse.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/mouse/synaptics_i2c.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/mouse/synaptics_usb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/mouse/vsxxxaa.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/serio
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/serio/altera_ps2.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/serio/ps2mult.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/serio/apbps2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/serio/arc_ps2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/serio/serio_raw.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/input/sparse-keymap.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/capi
@@ -501,18 +445,11 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/capi/kernelcapi.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/divert
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/divert/dss1_divert.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/gigaset
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/gigaset/bas_gigaset.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/gigaset/gigaset.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/gigaset/ser_gigaset.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/gigaset/usb_gigaset.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/avm
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/avm/avm_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/avm/b1.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/avm/b1dma.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/avm/b1pci.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/avm/c4.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/avm/t1pci.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/eicon
@@ -521,75 +458,65 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/eicon/divacapi.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/eicon/divadidd.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/eicon/divas.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/mISDN
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/mISDN/avmfritz.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/mISDN/hfcmulti.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/mISDN/hfcpci.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/mISDN/hfcsusb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/mISDN/mISDNinfineon.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/mISDN/mISDNipac.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/mISDN/mISDNisar.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/mISDN/netjet.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/mISDN/speedfax.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hardware/mISDN/w6692.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hisax
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hisax/avma1_cs.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hisax/elsa_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hisax/hfc4s8s_l1.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hisax/hfc_usb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hisax/hisax.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hisax/hisax_fcpcipnp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hisax/hisax_isac.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hisax/hisax_st5481.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hisax/sedlbauer_cs.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hisax/teles_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hysdn
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/hysdn/hysdn.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/i4l
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/i4l/isdn.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/i4l/isdnhdlc.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/mISDN
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/mISDN/l1oip.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/mISDN/mISDN_core.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-88pm860x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-bd2802.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-gpio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-blinkm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-lm3530.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-lm3533.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-lm355x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-lm3642.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-lp3944.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-lp5521.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-lp5523.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-lp5562.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-lp55xx-common.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-lt3593.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-pca9532.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-pca955x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-netxbig.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-ns2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-ot200.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-pca9633.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-pwm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-regulator.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/ledtrig-backlight.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/ledtrig-gpio.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/ledtrig-heartbeat.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/ledtrig-netdev.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/ledtrig-timer.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/leds-tca6507.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/trigger
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/trigger/ledtrig-backlight.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/trigger/ledtrig-camera.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/trigger/ledtrig-gpio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/trigger/ledtrig-heartbeat.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/trigger/ledtrig-netdev.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/trigger/ledtrig-oneshot.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/trigger/ledtrig-timer.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/leds/trigger/ledtrig-transient.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/bcache
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/bcache/bcache.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-bio-prison.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-bufio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-cache-cleaner.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-cache-mq.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-cache.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-crypt.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-delay.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-flakey.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-log-userspace.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-log.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-mirror.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-mod.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-multipath.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-queue-length.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-raid.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-region-hash.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-round-robin.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-service-time.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-snapshot.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-thin-pool.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-zero.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/dm-verity.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/faulty.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/linear.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/md-mod.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/multipath.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/persistent-data
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/persistent-data/dm-persistent-data.ko
@@ -599,31 +526,243 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/md/raid456.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/mc44s803.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/mt20xx.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/tda18271.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/tda827x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/tda8290.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/tda9887.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/tea5761.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/tea5767.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/tuner-simple.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/tuner-types.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/tuner-xc2028.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/xc4000.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tuners/xc5000.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb/dvb-core
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/media.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/b2c2
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/b2c2/b2c2-flexcop.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/btcx-risc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/cx2341x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/cypress_firmware.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/saa7146
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/saa7146/saa7146.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/saa7146/saa7146_vv.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/siano
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/siano/smsdvb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/siano/smsmdtv.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/common/tveeprom.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/a8293.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/af9013.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/af9033.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/atbm8830.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/au8522_common.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/au8522_decoder.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/au8522_dig.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/bcm3510.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/cx22700.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/cx22702.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/cx24110.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/cx24113.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/cx24116.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/cx24123.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/cxd2820r.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/dib0070.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/dib0090.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/dib3000mb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/dib3000mc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/dib7000m.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/dib7000p.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/dib8000.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/dibx000_common.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/drxd.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/drxk.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/ds3000.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/dvb-pll.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/ec100.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/isl6405.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/isl6421.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/isl6423.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/it913x-fe.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/itd1000.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/ix2505v.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/l64781.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/lg2160.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/lgdt3305.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/lgdt330x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/lgs8gxx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/lnbp21.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/lnbp22.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/m88dc2800.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/m88ds3103.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/m88rs2000.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/mb86a16.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/mb86a20s.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/mt312.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/mt352.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/nxt200x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/nxt6000.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/or51132.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/or51211.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/rtl2830.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/rtl2832.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/s5h1409.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/s5h1411.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/s5h1420.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/s921.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/si21xx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/sp8870.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/sp887x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/stb0899.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/stb6000.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/stb6100.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/stv0288.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/stv0297.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/stv0299.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/stv0367.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/stv0900.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/stv090x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/stv6110.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/stv6110x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/tda10021.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/tda10023.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/tda10048.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/tda1004x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/tda10071.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/tda10086.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/tda18271c2dd.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/tda665x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/tda8083.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/tda8261.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/tda826x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/ts2020.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/tua6100.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/ves1820.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/ves1x93.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/zl10036.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/zl10039.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/dvb-frontends/zl10353.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/firewire
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/firewire/firedtv.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/adv7180.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/cs5345.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/cs53l32a.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/cx25840
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/cx25840/cx25840.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/m52790.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/msp3400.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/mt9v011.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/ov7670.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/saa6588.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/saa7115.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/saa7127.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/saa717x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/imx074.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/mt9m001.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/mt9m111.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/mt9t031.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/mt9t112.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/mt9v022.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/ov2640.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/ov5642.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/ov6650.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/ov772x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/ov9640.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/ov9740.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/rj54n1cb0c.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/soc_camera/tw9910.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/tda7432.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/tda9840.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/tea6415c.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/tea6420.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/tvaudio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/tvp5150.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/upd64031a.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/upd64083.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/vp27smpx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/wm8739.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/i2c/wm8775.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/b2c2
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/b2c2/b2c2-flexcop-pci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/bt8xx
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/bt8xx/bt878.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/bt8xx/bttv.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/bt8xx/dst.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/bt8xx/dst_ca.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/bt8xx/dvb-bt8xx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx18
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx18/cx18-alsa.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx18/cx18.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx23885
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx23885/altera-ci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx23885/cx23885.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx25821
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx25821/cx25821-alsa.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx25821/cx25821.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx88
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx88/cx88-alsa.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx88/cx88-blackbird.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx88/cx88-dvb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx88/cx88-vp3054-i2c.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx88/cx8800.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx88/cx8802.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/cx88/cx88xx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/dm1105
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/dm1105/dm1105.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ivtv
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ivtv/ivtv-alsa.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ivtv/ivtv.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ivtv/ivtvfb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/mantis
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/mantis/hopper.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/mantis/mantis.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/mantis/mantis_core.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ngene
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ngene/ngene.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/pluto2
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/pluto2/pluto2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/pt1
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/pt1/earth-pt1.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/saa7134
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/saa7134/saa6752hs.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/saa7134/saa7134-alsa.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/saa7134/saa7134-dvb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/saa7134/saa7134-empress.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/saa7134/saa7134.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/saa7146
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/saa7146/hexium_gemini.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/saa7146/hexium_orion.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/saa7146/mxb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/saa7164
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/saa7164/saa7164.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ttpci
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ttpci/budget-av.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ttpci/budget-ci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ttpci/budget-core.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ttpci/budget-patch.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ttpci/budget.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ttpci/dvb-ttpci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/pci/ttpci/ttpci-eeprom.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/platform
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/platform/m2m-deinterlace.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/platform/marvell-ccic
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/platform/marvell-ccic/cafe_ccic.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/platform/sh_veu.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/platform/soc_camera
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/platform/soc_camera/soc_camera.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/platform/soc_camera/soc_camera_platform.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/platform/soc_camera/soc_mediabus.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/platform/timblogiw.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/gpio-ir-recv.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/iguanair.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/imon.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-jvc-decoder.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-lirc-codec.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-mce_kbd-decoder.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-nec-decoder.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-rc5-decoder.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-rc5-sz-decoder.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-rc6-decoder.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-sanyo-decoder.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ir-sony-decoder.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-alink-dtu-m.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-anysee.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-apac-viewcomp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-asus-pc39.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-asus-ps3-100.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-ati-x10.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-avermedia-a16d.ko
@@ -647,6 +786,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-dm1105-nec.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-dvbsky.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-em-terratec.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-encore-enltv-fm53.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-encore-enltv.ko
@@ -663,13 +803,18 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-imon-mce.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-imon-pad.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-iodata-bctv7e.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-it913x-v1.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-it913x-v2.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-kaiomy.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-kworld-315u.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-kworld-pc150u.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-leadtek-y04g0051.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-lirc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-lme2510.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-manli.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-medion-x10-digitainer.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-medion-x10-or2x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-medion-x10.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-msi-digivox-ii.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-msi-digivox-iii.ko
@@ -693,6 +838,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-pv951.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-rc6-mce.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-reddo.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-snapstream-firefly.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-streamzap.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-tbs-nec.ko
@@ -702,6 +848,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-terratec-slim.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-tevii-nec.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-tivo.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-total-media-in-hand-02.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-total-media-in-hand.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-trekstor.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-tt-1500.ko
@@ -712,12 +859,186 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/keymaps/rc-winfast.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/lirc_dev.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/rc-core.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/video
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/video/ir-kbd-i2c.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/video/v4l2-common.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/video/v4l2-int-device.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/video/videodev.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/mceusb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/rc-loopback.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/redrat3.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/streamzap.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/rc/ttusbir.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/e4000.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/fc0011.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/fc0012.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/fc0013.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/fc2580.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/max2165.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt2060.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt2063.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt2131.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mt2266.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mxl5005s.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/mxl5007t.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/qt1010.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/r820t.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda18212.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tda18218.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tua9001.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/tuners/tuner_it913x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/au0828
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/au0828/au0828.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/b2c2
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/b2c2/b2c2-flexcop-usb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/cpia2
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/cpia2/cpia2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/cx231xx
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/cx231xx/cx231xx-alsa.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/cx231xx/cx231xx-dvb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/cx231xx/cx231xx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-af9015.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-af9035.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-anysee.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-au6610.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-az6007.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-ce6230.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-dvbsky.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-ec168.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-gl861.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-it913x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-lmedm04.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-mxl111sf.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-rtl28xxu.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/dvb_usb_v2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-a800.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-af9005-remote.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-af9005.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-az6027.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-cinergyT2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-cxusb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-dib0700.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-dibusb-common.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-dibusb-mb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-dibusb-mc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-digitv.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-dtt200u.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-dtv5100.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-dw2102.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-friio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-gp8psk.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-m920x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-nova-t-usb2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-opera.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-pctv452e.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-technisat-usb2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-ttusb2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-umt-010.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-vp702x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb-vp7045.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/dvb-usb/dvb-usb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/em28xx
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/em28xx/em28xx-alsa.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/em28xx/em28xx-dvb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/em28xx/em28xx-rc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/em28xx/em28xx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gl860
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gl860/gspca_gl860.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_benq.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_conex.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_cpia1.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_etoms.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_finepix.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_jeilinj.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_jl2005bcd.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_kinect.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_konica.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_main.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_mars.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_mr97310a.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_nw80x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_ov519.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_ov534.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_ov534_9.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_pac207.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_pac7302.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_pac7311.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_se401.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_sn9c2028.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_sn9c20x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_sonixb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_sonixj.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_spca1528.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_spca500.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_spca501.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_spca505.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_spca506.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_spca508.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_spca561.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_sq905.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_sq905c.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_sq930x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_stk014.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_stv0680.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_sunplus.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_t613.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_tv8532.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_vc032x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_vicam.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_xirlink_cit.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/gspca_zc3xx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/m5602
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/m5602/gspca_m5602.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/stv06xx
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/gspca/stv06xx/gspca_stv06xx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/hdpvr
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/hdpvr/hdpvr.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/pvrusb2
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/pvrusb2/pvrusb2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/pwc
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/pwc/pwc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/s2255
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/s2255/s2255drv.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/siano
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/siano/smsusb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/sn9c102
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/sn9c102/sn9c102.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/stk1160
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/stk1160/stk1160.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/stkwebcam
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/stkwebcam/stkwebcam.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/tlg2300
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/tlg2300/poseidon.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/tm6000
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/tm6000/tm6000-alsa.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/tm6000/tm6000-dvb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/tm6000/tm6000.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/ttusb-budget
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/ttusb-dec
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/ttusb-dec/ttusb_dec.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/ttusb-dec/ttusbdecfe.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/usbvision
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/usbvision/usbvision.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/uvc
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/uvc/uvcvideo.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/zr364xx
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/usb/zr364xx/zr364xx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/tuner.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/v4l2-int-device.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/v4l2-mem2mem.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf-core.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf-dma-contig.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf-dma-sg.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf-dvb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf-vmalloc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf2-core.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf2-dma-contig.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf2-memops.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/core
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/core/memstick.ko
@@ -725,6 +1046,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/host
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/host/jmb38x_ms.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/host/r592.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/host/rtsx_pci_ms.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/memstick/host/tifm_ms.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message/fusion
@@ -734,34 +1056,31 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message/fusion/mptsas.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message/fusion/mptscsih.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message/fusion/mptspi.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message/i2o
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message/i2o/i2o_block.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message/i2o/i2o_bus.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message/i2o/i2o_core.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message/i2o/i2o_proc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/message/i2o/i2o_scsi.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/htc-pasic3.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/janz-cmodio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/lm3533-core.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/lm3533-ctrlbank.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/lpc_ich.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/lpc_sch.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/pcf50633-adc.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/pcf50633-gpio.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/pcf50633.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/rdc321x-southbridge.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/retu-mfd.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/rtsx_pci.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/sm501.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/timberdale.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/tps6105x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/tps65010.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/tps6507x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/ucb1400_core.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/viperboard.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/vx855.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/wl1273-core.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mfd/wm8400-core.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/apds9802als.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/apds990x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/bh1770glc.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/bh1780gli.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/bmp085.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/c2port
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/c2port/core.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/altera-stapl
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/altera-stapl/altera-stapl.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/bmp085-i2c.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/cb710
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/cb710/cb710.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/ds1682.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/dummy-irq.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/eeprom
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/eeprom/at24.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/eeprom/eeprom.ko
@@ -769,99 +1088,52 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/eeprom/max6875.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/enclosure.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/fsa9480.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/hmc6352.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/hpilo.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/ics932s401.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/isl29003.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/isl29020.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/iwmc3200top
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/iwmc3200top/iwmc3200top.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/lis3lv02d
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/lis3lv02d/lis3lv02d.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/lis3lv02d/lis3lv02d_i2c.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/pch_phub.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/ti-st
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/ti-st/st_drv.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/tifm_7xx1.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/tifm_core.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/misc/tsl2550.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/card
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/card/mmc_block.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/card/mmc_test.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/card/sdio_uart.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/core
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/core/mmc_core.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/cb710-mmc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/dw_mmc-exynos.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/dw_mmc-pci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/dw_mmc-pltfm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/dw_mmc.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/mvsdio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/rtsx_pci_sdmmc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/sdhci-pci.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/sdhci-pltfm.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/sdhci-pxav2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/sdhci-pxav3.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/sdhci.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/sdricoh_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/tifm_sd.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/ushc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/via-sdmmc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mmc/host/vub300.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/ar7part.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/chips
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/chips/chipreg.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/lpddr
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/lpddr/lpddr_cmds.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/lpddr/qinfo_probe.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/maps
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/maps/physmap.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/mtd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/mtd_blkdevs.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/mtdblock.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/mtdchar.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/nand
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/nand/nand.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/nand/nand_ecc.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/nand/nand_ids.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/nand/orion_nand.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/nand/plat_nand.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/ofpart.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/sm_ftl.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/tests
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/tests/mtd_nandecctest.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/tests/mtd_oobtest.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/tests/mtd_pagetest.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/tests/mtd_readtest.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/tests/mtd_speedtest.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/tests/mtd_stresstest.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/tests/mtd_subpagetest.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/tests/mtd_torturetest.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/ubi
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/mtd/ubi/ubi.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/bonding
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/bonding/bonding.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/dummy.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/eql.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/3com
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/3com/3c574_cs.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/3com/3c589_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/3com/3c59x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/3com/typhoon.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/8390
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/8390/8390.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/8390/ax88796.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/8390/axnet_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/8390/ne2k-pci.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/8390/pcnet_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/adaptec
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/adaptec/starfire.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/alteon
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/alteon/acenic.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/amd
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/amd/amd8111e.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/amd/nmclan_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/amd/pcnet32.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/atheros
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/atheros/alx
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/atheros/alx/alx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/atheros/atl1c
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/atheros/atl1c/atl1c.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/atheros/atl1e
@@ -879,6 +1151,11 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/brocade
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/brocade/bna
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/brocade/bna/bna.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/cadence
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/cadence/at91_ether.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/cadence/macb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/calxeda
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/calxeda/xgmac.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/chelsio
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/chelsio/cxgb
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/chelsio/cxgb/cxgb.ko
@@ -888,6 +1165,8 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/chelsio/cxgb4/cxgb4.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/chelsio/cxgb4vf
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/cirrus
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/cirrus/cs89x0.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/cisco
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/cisco/enic
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/cisco/enic/enic.ko
@@ -896,15 +1175,12 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dec
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dec/tulip
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dec/tulip/de2104x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dec/tulip/de4x5.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dec/tulip/dmfe.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dec/tulip/tulip.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dec/tulip/uli526x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dec/tulip/winbond-840.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dec/tulip/xircom_cb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dlink
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dlink/de600.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dlink/de620.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dlink/dl2k.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dlink/sundance.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/dnet.ko
@@ -913,8 +1189,6 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/emulex/benet/be2net.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/ethoc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/fealnx.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/fujitsu
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/fujitsu/fmvj18x_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/hp
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/hp/hp100.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/icplus
@@ -936,15 +1210,10 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/jme.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/marvell
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/marvell/mv643xx_eth.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/marvell/mvmdio.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/marvell/skge.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/marvell/sky2.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/mellanox
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/mellanox/mlx4
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/micrel
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/micrel/ks8842.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/micrel/ks8851_mll.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/micrel/ksz884x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/myricom
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/myricom/myri10ge
@@ -961,9 +1230,6 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/oki-semi
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/oki-semi/pch_gbe
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/packetengines
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/packetengines/hamachi.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/packetengines/yellowfin.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/qlogic
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/qlogic/netxen
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/qlogic/netxen/netxen_nic.ko
@@ -978,8 +1244,6 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/realtek/8139cp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/realtek/8139too.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/realtek/r8169.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/seeq
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/seeq/seeq8005.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/sfc
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/sfc/sfc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/silan
@@ -990,7 +1254,6 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/smsc
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/smsc/epic100.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/smsc/smc911x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/smsc/smc91c92_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/smsc/smc91x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/smsc/smsc911x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/smsc/smsc9420.ko
@@ -1008,35 +1271,31 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/via
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/via/via-rhine.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/via/via-velocity.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/xircom
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/xircom/xirc2ps_cs.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/wiznet
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/wiznet/w5100.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ethernet/wiznet/w5300.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ifb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/imq.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/irda
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/irda/irda-usb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/irda/irtty-sir.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/irda/kingsun-sir.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/irda/ks959-sir.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/irda/ksdazzle-sir.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/irda/mcs7780.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/irda/sir-dev.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/irda/stir4200.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/irda/vlsi_ir.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/macvlan.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/macvtap.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/mdio.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/mii.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/netconsole.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/amd.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/at803x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/bcm87xx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/broadcom.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/cicada.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/davicom.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/dp83640.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/et1011c.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/icplus.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/lxt.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/marvell.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/mdio-bitbang.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/mdio-gpio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/mdio-mux-gpio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/mdio-mux-mmioreg.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/mdio-mux.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/micrel.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/national.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/phy/qsemi.ko
@@ -1056,13 +1315,14 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/ppp/pptp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/slip
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/slip/slhc.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/slip/slip.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/tun.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/asix.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/ax88179_178a.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/catc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/cdc_eem.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/cdc_ether.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/cdc_mbim.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/cdc_ncm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/cdc_subset.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/cx82310_eth.ko
@@ -1070,6 +1330,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/gl620a.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/hso.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/int51x1.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/ipheth.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/kalmia.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/kaweth.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/lg-vl600.ko
@@ -1077,6 +1338,8 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/net1080.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/pegasus.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/plusb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/qmi_wwan.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/r8152.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/rndis_host.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/rtl8150.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/usb/sierra_net.ko
@@ -1087,60 +1350,141 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/veth.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/vmxnet3
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/vmxnet3/vmxnet3.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/dlci.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/dscc4.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/farsync.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/hdlc.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/hdlc_cisco.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/hdlc_fr.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/hdlc_ppp.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/hdlc_raw.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/hdlc_raw_eth.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/lmc
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/lmc/lmc.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/pc300too.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/pci200syn.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wan/wanxl.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/vxlan.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/airo.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/airo_cs.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/adm8211.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/at76c50x-usb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ar5523
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ar5523/ar5523.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath5k
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath9k
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/carl9170
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/wil6210
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/wil6210/wil6210.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/atmel.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/atmel_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/atmel_pci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/b43
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/b43/b43.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/b43legacy
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/hostap
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/hostap/hostap.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/hostap/hostap_cs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/hostap/hostap_pci.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/hostap/hostap_plx.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ray_cs.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ipw2x00
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/iwlegacy
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/iwlegacy/iwlegacy.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas/libertas.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+#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/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
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/mwifiex/mwifiex_usb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/mwl8k.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/orinoco
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/orinoco/orinoco.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/p54
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/p54/p54common.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/p54/p54pci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/p54/p54usb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rndis_wlan.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/wl3501_cs.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00/rt2x00mmio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtl818x
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtl818x/rtl8180
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtl818x/rtl8187
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8188ee
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8188ee/rtl8188ee.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8192c
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8192ce
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8192cu
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8192de
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8192de/rtl8192de.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8192se
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8723ae
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtl8723ae/rtl8723ae.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ti
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ti/wl1251
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ti/wl1251/wl1251.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ti/wl1251/wl1251_sdio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ti/wl12xx
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ti/wl12xx/wl12xx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ti/wl18xx
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ti/wl18xx/wl18xx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ti/wlcore
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ti/wlcore/wlcore.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ti/wlcore/wlcore_sdio.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/zd1201.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/zd1211rw
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/parport
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/parport/parport.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/parport/parport_ax88796.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pci
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pci/pci-stub.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/parport/parport_pc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/parport/parport_serial.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pcmcia
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pcmcia/i82092.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pcmcia/pcmcia.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pcmcia/pcmcia_core.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pcmcia/pcmcia_rsrc.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pcmcia/pd6729.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pcmcia/yenta_socket.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pinctrl
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pinctrl/pinctrl-single.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/power
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/power/88pm860x_battery.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/power/88pm860x_charger.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/power/generic-adc-battery.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pps
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/pps/pps_core.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ptp
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ptp/ptp.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ptp/ptp_pch.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/regulator
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/regulator/fixed.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/regulator/gpio-regulator.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/regulator/lp8755.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-88pm80x.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-88pm860x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-bq32k.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-bq4802.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-cmos.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1286.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1307.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1374.ko
@@ -1148,18 +1492,19 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1553.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1672.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds1742.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds2404.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-ds3232.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-em3027.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-fm3130.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-hid-sensor-time.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-isl12022.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-isl1208.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-m41t80.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-m48t35.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-m48t59.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-m48t86.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-max6900.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-msm6242.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-pcf50633.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-pcf8523.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-pcf8563.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-pcf8583.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-rp5c01.ko
@@ -1167,7 +1512,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-rv3029c2.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-rx8025.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-rx8581.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-s35390a.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-snvs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-stk17ta8.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-v3020.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/rtc/rtc-x1205.ko
@@ -1194,6 +1539,8 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/bnx2i
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/bnx2i/bnx2i.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/ch.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/csiostor
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/csiostor/csiostor.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/cxgbi
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/cxgbi/cxgb3i
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/cxgbi/cxgb3i/cxgb3i.ko
@@ -1202,19 +1549,18 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/cxgbi/libcxgbi.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/dc395x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/device_handler
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/device_handler/scsi_dh.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/device_handler/scsi_dh_alua.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/device_handler/scsi_dh_emc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/device_handler/scsi_dh_hp_sw.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/device_handler/scsi_dh_rdac.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/dmx3191d.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/dpt_i2o.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/fcoe
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/fcoe/fcoe.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/fcoe/libfcoe.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/fdomain.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/hpsa.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/hptiop.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/imm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/initio.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/ipr.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/ips.ko
@@ -1235,77 +1581,80 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/megaraid/megaraid_sas.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/mpt2sas
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/mpt2sas/mpt2sas.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/mpt3sas
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/mpt3sas/mpt3sas.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/mvsas
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/mvsas/mvsas.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/mvumi.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/osd
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/osd/libosd.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/osd/osd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pcmcia
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pcmcia/aha152x_cs.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pcmcia/fdomain_cs.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pcmcia/nsp_cs.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pcmcia/qlogic_cs.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pcmcia/sym53c500_cs.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/osst.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pm8001
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pm8001/pm8001.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pm8001/pm80xx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/pmcraid.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/ppa.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/qla1280.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/qla2xxx
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/qla2xxx/qla2xxx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/qla4xxx
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/qla4xxx/qla4xxx.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/qlogicfas408.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/raid_class.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/scsi_mod.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/scsi_tgt.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/scsi_transport_fc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/scsi_transport_iscsi.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/scsi_transport_sas.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/scsi_transport_spi.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/scsi_transport_srp.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/scsi_wait_scan.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/sd_mod.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/ses.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/sg.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/sr_mod.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/st.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/stex.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/sym53c8xx_2
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/sym53c8xx_2/sym53c8xx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/tmscsim.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/ufs
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/ufs/ufshcd-pci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/ufs/ufshcd-pltfrm.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/scsi/ufs/ufshcd.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ssb
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/ssb/ssb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/ced1401
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/ced1401/cedusb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/et131x
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/et131x/et131x.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/phison
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/phison/phison.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/fwserial
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/fwserial/firewire-serial.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/rts5139
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/rts5139/rts5139.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/silicom
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/silicom/bpctl_mod.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/silicom/bypasslib
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/silicom/bypasslib/bypass.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/usbip
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/usbip/usbip-core.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/usbip/usbip-host.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/staging/usbip/vhci-hcd.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/thermal
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/thermal/kirkwood_thermal.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/ipwireless
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/ipwireless/ipwireless.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/cyclades.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/n_gsm.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/n_hdlc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/n_r3964.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/nozomi.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/rocket.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/8250_dw.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/altera_jtaguart.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/altera_uart.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/mfd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/pch_uart.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/serial_cs.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/timbuart.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/uartlite.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/xilinx_uartps.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/arc_uart.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/jsm
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/jsm/jsm.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/rp2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/serial/sccnxp.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/synclink_gt.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/tty/synclinkmp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_aec.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_cif.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_netx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_pci_generic.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_pdrv.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_pdrv_genirq.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uio/uio_sercos3.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/atm
@@ -1314,44 +1663,49 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/atm/ueagle-atm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/atm/usbatm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/atm/xusbatm.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/chipidea
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/chipidea/ci13xxx_imx.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/chipidea/ci13xxx_msm.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/chipidea/ci13xxx_pci.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/chipidea/ci_hdrc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/chipidea/usbmisc_imx.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/class
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/class/cdc-acm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/class/cdc-wdm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/class/usblp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/class/usbtmc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/dwc3
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/dwc3/dwc3-exynos.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/dwc3/dwc3-omap.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/dwc3/dwc3-pci.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/dwc3/dwc3.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/hwa-hc.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/isp116x-hcd.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/isp1362-hcd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/oxu210hp-hcd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/r8a66597-hcd.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/sl811-hcd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/u132-hcd.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/ssb-hcd.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/whci
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/whci/whci-hcd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/host/xhci-hcd.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/image
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/image/mdc800.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/image/microtek.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/cypress_cy7c63.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/cytherm.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/adutux.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/emi26.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/emi62.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/ezusb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/ftdi-elan.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/iowarrior.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/isight_firmware.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/sisusbvga
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/sisusbvga/sisusbvga.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/usb3503.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/usblcd.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/usbled.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/usbsevseg.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/uss720.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/misc/yurex.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/otg
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/otg/gpio_vbus.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/otg/nop-usb-xceiv.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/mon
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/mon/usbmon.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/aircable.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/ark3116.ko
@@ -1360,11 +1714,9 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/cp210x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/cypress_m8.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/digi_acceleport.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/empeg.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/f81232.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/ftdi_sio.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/funsoft.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/garmin_gps.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/hp4x.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/io_edgeport.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/io_ti.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/ipaq.ko
@@ -1372,31 +1724,27 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/ir-usb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/iuu_phoenix.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/keyspan_pda.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/kl5kusb105.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/mct_u232.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/mos7720.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/mos7840.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/moto_modem.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/opticon.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/option.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/oti6858.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/pl2303.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/qcaux.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/qcserial.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/safe_serial.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/quatech2.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/siemens_mpi.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/sierra.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/spcp8x5.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/ssu100.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/symbolserial.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/ti_usb_3410_5052.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/usb_wwan.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/usbserial.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/visor.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/vivopay-serial.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/whiteheat.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/zio.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/serial/zte_ev.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/uas.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/ums-alauda.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/ums-cypress.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/ums-datafab.ko
@@ -1410,7 +1758,6 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/ums-sddr09.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/ums-sddr55.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/ums-usbat.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/storage/usb-storage.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/wusbcore
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/wusbcore/wusb-cbaf.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/usb/wusbcore/wusb-wa.ko
@@ -1426,154 +1773,164 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uwb/whc-rc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/uwb/whci.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/arkfb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/aty
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/aty/aty128fb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/aty/atyfb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/aty/radeonfb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/backlight
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/backlight/88pm860x_bl.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/backlight/adp8860_bl.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/backlight/adp8870_bl.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/backlight/generic_bl.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/backlight/lcd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/backlight/pcf50633-backlight.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/backlight/platform_lcd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/cirrusfb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/cyber2000fb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/display
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/display/display.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/fb_ddc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/cfbcopyarea.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/cfbfillrect.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/cfbimgblt.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/fb_sys_fops.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/kyro
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/kyro/kyrofb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/macmodes.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/matrox
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/matrox/g450_pll.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/matrox/i2c-matroxfb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/matrox/matroxfb_DAC1064.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/matrox/matroxfb_Ti3026.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/matrox/matroxfb_accel.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/matrox/matroxfb_base.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/matrox/matroxfb_crtc2.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/matrox/matroxfb_g450.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/matrox/matroxfb_maven.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/matrox/matroxfb_misc.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/metronomefb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/neofb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/nvidia
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/nvidia/nvidiafb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/output.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/pm2fb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/pm3fb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/riva
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/riva/rivafb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/s3fb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/sis
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/sis/sisfb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/sm501fb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/smscufx.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/sstfb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/svgalib.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/ssd1307fb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/syscopyarea.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/sysfillrect.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/sysimgblt.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/tdfxfb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/tmiofb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/tridentfb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/uvesafb.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/vgastate.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/video/vt8623fb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/masters
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/masters/ds1wm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/masters/ds2482.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/masters/ds2490.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/masters/matrox_w1.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/masters/w1-gpio.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves/w1_bq27000.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves/w1_ds2408.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves/w1_ds2413.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves/w1_ds2423.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves/w1_ds2431.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves/w1_ds2433.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves/w1_ds2760.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves/w1_ds2780.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves/w1_ds2781.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves/w1_ds28e04.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves/w1_smem.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/slaves/w1_therm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/w1/wire.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/watchdog
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/watchdog/alim7101_wdt.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/watchdog/max63xx_wdt.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/watchdog/i6300esb.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/watchdog/orion_wdt.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/watchdog/pcwd_pci.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/watchdog/pcwd_usb.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/drivers/watchdog/retu_wdt.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/watchdog/softdog.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/drivers/watchdog/wdt_pci.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/autofs4
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/autofs4/autofs4.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/btrfs
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/btrfs/btrfs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/cachefiles
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/cachefiles/cachefiles.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/cifs
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/cifs/cifs.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/ecryptfs
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/ecryptfs/ecryptfs.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/exportfs
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/exportfs/exportfs.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/configfs
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/configfs/configfs.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/dlm
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/dlm/dlm.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/exofs
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/exofs/libore.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/fat
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/fat/fat.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/fat/msdos.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/fat/vfat.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/fscache
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/fscache/fscache.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/fuse
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/fuse/cuse.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/fuse/fuse.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/isofs
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/isofs/isofs.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/jffs2
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/jffs2/jffs2.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/jfs
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/jfs/jfs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/lockd
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/lockd/lockd.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs/blocklayout
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs/blocklayout/blocklayoutdriver.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs/nfs.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs/nfs_layout_nfsv41_files.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs/nfsv2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs/nfsv3.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs/nfsv4.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs/objlayout
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs/objlayout/objlayoutdriver.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs_common
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfs_common/nfs_acl.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfsd
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/nfsd/nfsd.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/quota
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/quota/quota_tree.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/quota/quota_v1.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/quota/quota_v2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/mac-celtic.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/mac-centeuro.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/mac-croatian.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/mac-cyrillic.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/mac-gaelic.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/mac-greek.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/mac-iceland.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/mac-inuit.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/mac-roman.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/mac-romanian.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/mac-turkish.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp1250.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp1251.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp1255.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp737.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp775.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp850.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp852.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp855.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp857.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp860.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp861.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp862.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp863.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp864.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp865.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp866.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp869.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp874.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp932.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp936.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp949.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_cp950.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_euc-jp.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_iso8859-1.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_iso8859-13.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_iso8859-14.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_iso8859-15.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_iso8859-2.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_iso8859-3.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_iso8859-4.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_iso8859-5.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_iso8859-6.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_iso8859-7.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_iso8859-9.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_koi8-r.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_koi8-ru.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_koi8-u.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/fs/nls/nls_utf8.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/reiserfs
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/reiserfs/reiserfs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/udf
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/udf/udf.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/ufs
-#lib/modules/KVER-ipfire-kirkwood/kernel/fs/ufs/ufs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/xfs
 #lib/modules/KVER-ipfire-kirkwood/kernel/fs/xfs/xfs.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/kernel
+#lib/modules/KVER-ipfire-kirkwood/kernel/kernel/trace
+#lib/modules/KVER-ipfire-kirkwood/kernel/kernel/trace/ring_buffer_benchmark.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/lib
+#lib/modules/KVER-ipfire-kirkwood/kernel/lib/asn1_decoder.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/lib/cordic.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/lib/crc-ccitt.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/lib/crc-itu-t.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/lib/crc-t10dif.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/lib/crc7.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/lib/crc8.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/lib/libcrc32c.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/lib/mpi
+#lib/modules/KVER-ipfire-kirkwood/kernel/lib/mpi/mpi.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/lib/oid_registry.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/lib/raid6
 #lib/modules/KVER-ipfire-kirkwood/kernel/lib/raid6/raid6_pq.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/lib/rbtree_test.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/lib/ts_bm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/lib/ts_fsm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/lib/ts_kmp.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/lib/zlib_deflate
+#lib/modules/KVER-ipfire-kirkwood/kernel/lib/zlib_deflate/zlib_deflate.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/802
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/802/garp.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/802/p8022.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/802/psnap.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/802/stp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/8021q
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/8021q/8021q.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/atm
@@ -1594,7 +1951,6 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bluetooth/rfcomm
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bluetooth/rfcomm/rfcomm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/bridge.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebt_802_3.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebt_among.ko
@@ -1612,64 +1968,45 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebt_redirect.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebt_snat.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebt_stp.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebt_ulog.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebt_vlan.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebtable_broute.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebtable_filter.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebtable_nat.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/bridge/netfilter/ebtables.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ceph
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ceph/libceph.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ieee802154
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ieee802154/6lowpan.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ieee802154/af_802154.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ieee802154/ieee802154.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/core
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/core/netprio_cgroup.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/ah4.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/esp4.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/gre.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/inet_diag.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/ip_gre.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/ip_tunnel.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/ip_vti.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/ipcomp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/ipip.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/arp_tables.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/arpt_mangle.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/arptable_filter.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ip_queue.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ip_tables.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ipt_CLUSTERIP.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ipt_ECN.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ipt_LOG.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ipt_MASQUERADE.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ipt_NETMAP.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ipt_REDIRECT.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ipt_REJECT.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ipt_ULOG.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ipt_ah.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ipt_ecn.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/ipt_rpfilter.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/iptable_filter.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/iptable_mangle.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/iptable_nat.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/iptable_raw.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_conntrack_ipv4.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_amanda.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_ftp.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/iptable_security.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_h323.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_irc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_ipv4.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_pptp.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_proto_dccp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_proto_gre.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_proto_sctp.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_proto_udplite.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_sip.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_snmp_basic.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/netfilter/nf_nat_tftp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/tcp_bic.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/tcp_cubic.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/tcp_diag.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/tcp_highspeed.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/tcp_htcp.ko
@@ -1682,17 +2019,21 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/tcp_westwood.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/tcp_yeah.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/tunnel4.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/udp_diag.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/xfrm4_mode_beet.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/xfrm4_mode_transport.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/xfrm4_mode_tunnel.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv4/xfrm4_tunnel.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/ah6.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/esp6.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/ip6_gre.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/ip6_tunnel.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/ipcomp6.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/mip6.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6_queue.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6_tables.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6t_LOG.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6t_MASQUERADE.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6t_NPT.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6t_REJECT.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6t_ah.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6t_eui64.ko
@@ -1700,12 +2041,14 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6t_hbh.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6t_ipv6header.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6t_mh.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6t_rpfilter.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6t_rt.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6table_filter.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6table_mangle.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6table_nat.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6table_raw.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/nf_defrag_ipv6.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/ip6table_security.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/netfilter/nf_nat_ipv6.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/sit.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/tunnel6.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/xfrm6_mode_beet.ko
@@ -1713,28 +2056,31 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/xfrm6_mode_transport.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/xfrm6_mode_tunnel.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/ipv6/xfrm6_tunnel.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/irda
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/irda/ircomm
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/irda/ircomm/ircomm-tty.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/irda/ircomm/ircomm.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/irda/irda.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/irda/irlan
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/irda/irlan/irlan.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/irda/irnet
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/irda/irnet/irnet.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/key
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/key/af_key.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/l2tp
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/l2tp/l2tp_core.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/l2tp/l2tp_eth.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/l2tp/l2tp_ip.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/l2tp/l2tp_ip6.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/l2tp/l2tp_netlink.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/l2tp/l2tp_ppp.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/llc
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/llc/llc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/mac80211
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/mac80211/mac80211.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_bitmap_ip.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_bitmap_port.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_ip.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_ipport.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_ipportip.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_net.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_netiface.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_hash_netport.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipset/ip_set_list_set.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipvs
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipvs/ip_vs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipvs/ip_vs_dh.ko
@@ -1749,7 +2095,6 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipvs/ip_vs_sh.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipvs/ip_vs_wlc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/ipvs/ip_vs_wrr.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_conntrack.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_conntrack_amanda.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_conntrack_broadcast.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_conntrack_ftp.ko
@@ -1766,33 +2111,51 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_conntrack_sip.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_conntrack_snmp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_conntrack_tftp.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_nat.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_nat_amanda.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_nat_ftp.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_nat_irc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_nat_proto_dccp.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_nat_proto_sctp.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_nat_proto_udplite.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_nat_sip.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_nat_tftp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nf_tproxy_core.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nfnetlink.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nfnetlink_acct.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nfnetlink_cthelper.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nfnetlink_cttimeout.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nfnetlink_log.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/nfnetlink_queue.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/x_tables.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_AUDIT.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CHECKSUM.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CLASSIFY.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CONNSECMARK.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_CT.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_DSCP.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_HL.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_HMARK.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_IDLETIMER.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_IMQ.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_LED.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_LOG.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_NETMAP.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_NFLOG.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_NFQUEUE.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_NOTRACK.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_RATEEST.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_REDIRECT.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_SECMARK.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_TCPMSS.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_TCPOPTSTRIP.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_TEE.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_TPROXY.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_TRACE.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_addrtype.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_bpf.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_cluster.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_comment.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_connbytes.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_connlabel.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_connlimit.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_connmark.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_conntrack.ko
@@ -1800,18 +2163,20 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_dccp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_devgroup.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_dscp.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_ecn.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_esp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_hashlimit.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_helper.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_hl.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_iprange.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_ipvs.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_layer7.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_length.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_limit.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_mac.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_mark.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_multiport.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_nat.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_nfacct.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_osf.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_owner.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_physdev.ko
@@ -1822,20 +2187,21 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_realm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_recent.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_sctp.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_set.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_socket.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_state.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_statistic.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_string.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_tcpmss.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_tcpudp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_time.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/netfilter/xt_u32.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netlink
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/netlink/netlink_diag.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/openvswitch
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/openvswitch/openvswitch.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/rfkill
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/rfkill/rfkill-regulator.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/rfkill/rfkill.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/rxrpc
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/rxrpc/af-rxrpc.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/rxrpc/rxkad.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/act_csum.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/act_gact.ko
@@ -1847,6 +2213,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/act_simple.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/act_skbedit.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/cls_basic.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/cls_cgroup.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/cls_flow.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/cls_fw.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/cls_route.ko
@@ -1855,6 +2222,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/cls_tcindex.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/cls_u32.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/em_cmp.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/em_ipset.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/em_meta.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/em_nbyte.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/em_text.ko
@@ -1862,8 +2230,10 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_atm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_cbq.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_choke.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_codel.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_drr.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_dsmark.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_fq_codel.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_gred.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_hfsc.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_htb.ko
@@ -1871,6 +2241,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_mqprio.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_multiq.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_netem.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_plug.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_prio.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_qfq.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_red.ko
@@ -1878,11 +2249,17 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_sfq.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_tbf.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_teql.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/sctp
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/sctp/sctp.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sunrpc
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sunrpc/auth_gss
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sunrpc/auth_gss/auth_rpcgss.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sunrpc/auth_gss/rpcsec_gss_krb5.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/sunrpc/sunrpc.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/unix
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/unix/unix_diag.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/vmw_vsock
+#lib/modules/KVER-ipfire-kirkwood/kernel/net/vmw_vsock/vsock.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/wireless
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/wireless/cfg80211.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/wireless/lib80211.ko
@@ -1891,7 +2268,6 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/wireless/lib80211_crypt_wep.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/xfrm
 #lib/modules/KVER-ipfire-kirkwood/kernel/net/xfrm/xfrm_ipcomp.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/net/xfrm/xfrm_user.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/ac97_bus.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/core
@@ -1908,6 +2284,7 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/core/seq/snd-seq-midi.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/core/seq/snd-seq-virmidi.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/core/seq/snd-seq.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/sound/core/snd-compress.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/core/snd-hrtimer.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/core/snd-hwdep.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/core/snd-page-alloc.ko
@@ -1934,12 +2311,10 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/firewire
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/firewire/snd-firewire-lib.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/firewire/snd-firewire-speakers.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/sound/firewire/snd-isight.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/other
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/other/snd-ak4113.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/other/snd-ak4114.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/other/snd-ak4117.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/other/snd-ak4xxx-adda.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/other/snd-pt2258.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/i2c/other/snd-tea575x-tuner.ko
@@ -1948,6 +2323,8 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/ac97
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/ac97/snd-ac97-codec.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/ali5451
+#lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/ali5451/snd-ali5451.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/au88x0
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/au88x0/snd-au8810.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/au88x0/snd-au8820.ko
@@ -2048,15 +2425,16 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/vx222/snd-vx222.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/ymfpci
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/pci/ymfpci/snd-ymfpci.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/sound/pcmcia
-#lib/modules/KVER-ipfire-kirkwood/kernel/sound/pcmcia/pdaudiocf
-#lib/modules/KVER-ipfire-kirkwood/kernel/sound/pcmcia/pdaudiocf/snd-pdaudiocf.ko
-#lib/modules/KVER-ipfire-kirkwood/kernel/sound/pcmcia/vx
-#lib/modules/KVER-ipfire-kirkwood/kernel/sound/pcmcia/vx/snd-vxpocket.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc
+#lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc/atmel
+#lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc/atmel/snd-soc-atmel-pcm.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc/codecs
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc/codecs/snd-soc-alc5623.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc/codecs/snd-soc-cs42l51.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc/dwc
+#lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc/dwc/designware_i2s.ko
+#lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc/generic
+#lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc/generic/snd-soc-simple-card.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc/kirkwood
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc/kirkwood/snd-soc-kirkwood-i2s.ko
 #lib/modules/KVER-ipfire-kirkwood/kernel/sound/soc/kirkwood/snd-soc-kirkwood.ko
@@ -2080,19 +2458,14 @@ lib/modules/KVER-ipfire-kirkwood
 #lib/modules/KVER-ipfire-kirkwood/modules.alias
 #lib/modules/KVER-ipfire-kirkwood/modules.alias.bin
 #lib/modules/KVER-ipfire-kirkwood/modules.builtin
-#lib/modules/KVER-ipfire-kirkwood/modules.ccwmap
+#lib/modules/KVER-ipfire-kirkwood/modules.builtin.bin
 #lib/modules/KVER-ipfire-kirkwood/modules.dep
 #lib/modules/KVER-ipfire-kirkwood/modules.dep.bin
-#lib/modules/KVER-ipfire-kirkwood/modules.ieee1394map
-#lib/modules/KVER-ipfire-kirkwood/modules.inputmap
-#lib/modules/KVER-ipfire-kirkwood/modules.isapnpmap
-#lib/modules/KVER-ipfire-kirkwood/modules.ofmap
+#lib/modules/KVER-ipfire-kirkwood/modules.devname
 #lib/modules/KVER-ipfire-kirkwood/modules.order
-#lib/modules/KVER-ipfire-kirkwood/modules.pcimap
-#lib/modules/KVER-ipfire-kirkwood/modules.seriomap
+#lib/modules/KVER-ipfire-kirkwood/modules.softdep
 #lib/modules/KVER-ipfire-kirkwood/modules.symbols
 #lib/modules/KVER-ipfire-kirkwood/modules.symbols.bin
-#lib/modules/KVER-ipfire-kirkwood/modules.usbmap
 #lib/modules/KVER-ipfire-kirkwood/source
 sbin/gen_init_cpio
 boot/uInit-ipfire-kirkwood
index e047c9f4aa686bb42f28c3cdd36dfe6de33fdeec..89107a3349916082f554708ebaa0ca792f751e4e 100644 (file)
@@ -11,13 +11,6 @@ boot/dtb-KVER-ipfire-multi
 #boot/dtb-KVER-ipfire-multi/armada-xp-db.dtb
 #boot/dtb-KVER-ipfire-multi/armada-xp-gp.dtb
 #boot/dtb-KVER-ipfire-multi/armada-xp-openblocks-ax3-4.dtb
-#boot/dtb-KVER-ipfire-multi/bcm11351-brt.dtb
-#boot/dtb-KVER-ipfire-multi/bcm2835-rpi-b.dtb
-#boot/dtb-KVER-ipfire-multi/ccu9540.dtb
-#boot/dtb-KVER-ipfire-multi/ecx-2000.dtb
-#boot/dtb-KVER-ipfire-multi/highbank.dtb
-#boot/dtb-KVER-ipfire-multi/hrefprev60.dtb
-#boot/dtb-KVER-ipfire-multi/hrefv60plus.dtb
 #boot/dtb-KVER-ipfire-multi/imx25-karo-tx25.dtb
 #boot/dtb-KVER-ipfire-multi/imx25-pdk.dtb
 #boot/dtb-KVER-ipfire-multi/imx27-apf27.dtb
@@ -37,11 +30,12 @@ boot/dtb-KVER-ipfire-multi
 #boot/dtb-KVER-ipfire-multi/imx6dl-sabresd.dtb
 #boot/dtb-KVER-ipfire-multi/imx6dl-wandboard.dtb
 #boot/dtb-KVER-ipfire-multi/imx6q-arm2.dtb
+#boot/dtb-KVER-ipfire-multi/imx6q-cm-fx6.dtb
 #boot/dtb-KVER-ipfire-multi/imx6q-sabreauto.dtb
 #boot/dtb-KVER-ipfire-multi/imx6q-sabrelite.dtb
 #boot/dtb-KVER-ipfire-multi/imx6q-sabresd.dtb
 #boot/dtb-KVER-ipfire-multi/imx6q-sbc6x.dtb
-#boot/dtb-KVER-ipfire-multi/marco-evb.dtb
+#boot/dtb-KVER-ipfire-multi/imx6q-wandboard.dtb
 #boot/dtb-KVER-ipfire-multi/omap2420-h4.dtb
 #boot/dtb-KVER-ipfire-multi/omap3-beagle-xm.dtb
 #boot/dtb-KVER-ipfire-multi/omap3-beagle.dtb
@@ -57,31 +51,10 @@ boot/dtb-KVER-ipfire-multi
 #boot/dtb-KVER-ipfire-multi/omap4-sdp.dtb
 #boot/dtb-KVER-ipfire-multi/omap4-var-som.dtb
 #boot/dtb-KVER-ipfire-multi/omap5-evm.dtb
-#boot/dtb-KVER-ipfire-multi/prima2-evb.dtb
-#boot/dtb-KVER-ipfire-multi/snowball.dtb
-#boot/dtb-KVER-ipfire-multi/socfpga_cyclone5.dtb
-#boot/dtb-KVER-ipfire-multi/socfpga_vt.dtb
-#boot/dtb-KVER-ipfire-multi/spear1310-evb.dtb
-#boot/dtb-KVER-ipfire-multi/spear1340-evb.dtb
 #boot/dtb-KVER-ipfire-multi/sun4i-a10-cubieboard.dtb
 #boot/dtb-KVER-ipfire-multi/sun4i-a10-hackberry.dtb
 #boot/dtb-KVER-ipfire-multi/sun4i-a10-mini-xplus.dtb
 #boot/dtb-KVER-ipfire-multi/sun5i-a13-olinuxino.dtb
-#boot/dtb-KVER-ipfire-multi/tegra114-dalmore.dtb
-#boot/dtb-KVER-ipfire-multi/tegra114-pluto.dtb
-#boot/dtb-KVER-ipfire-multi/tegra20-harmony.dtb
-#boot/dtb-KVER-ipfire-multi/tegra20-iris-512.dtb
-#boot/dtb-KVER-ipfire-multi/tegra20-medcom-wide.dtb
-#boot/dtb-KVER-ipfire-multi/tegra20-paz00.dtb
-#boot/dtb-KVER-ipfire-multi/tegra20-plutux.dtb
-#boot/dtb-KVER-ipfire-multi/tegra20-seaboard.dtb
-#boot/dtb-KVER-ipfire-multi/tegra20-tec.dtb
-#boot/dtb-KVER-ipfire-multi/tegra20-trimslice.dtb
-#boot/dtb-KVER-ipfire-multi/tegra20-ventana.dtb
-#boot/dtb-KVER-ipfire-multi/tegra20-whistler.dtb
-#boot/dtb-KVER-ipfire-multi/tegra30-beaver.dtb
-#boot/dtb-KVER-ipfire-multi/tegra30-cardhu-a02.dtb
-#boot/dtb-KVER-ipfire-multi/tegra30-cardhu-a04.dtb
 #boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca15-tc1.dtb
 #boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca15_a7.dtb
 #boot/dtb-KVER-ipfire-multi/vexpress-v2p-ca5s.dtb
@@ -94,7 +67,6 @@ boot/dtb-KVER-ipfire-multi
 #boot/dtb-KVER-ipfire-multi/zynq-zc702.dtb
 boot/vmlinuz-KVER-ipfire-multi
 boot/zImage-ipfire-multi
-boot/uInit-ipfire-multi
 lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/build
 #lib/modules/KVER-ipfire-multi/kernel
@@ -102,7 +74,11 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/arch/arm
 #lib/modules/KVER-ipfire-multi/kernel/arch/arm/crypto
 #lib/modules/KVER-ipfire-multi/kernel/arch/arm/crypto/aes-arm.ko
-#lib/modules/KVER-ipfire-multi/kernel/arch/arm/crypto/sha1-arm.ko
+#lib/modules/KVER-ipfire-multi/kernel/arch/arm/mach-imx
+#lib/modules/KVER-ipfire-multi/kernel/arch/arm/mach-imx/devices
+#lib/modules/KVER-ipfire-multi/kernel/arch/arm/mach-imx/devices/wand-rfkill.ko
+#lib/modules/KVER-ipfire-multi/kernel/arch/arm/oprofile
+#lib/modules/KVER-ipfire-multi/kernel/arch/arm/oprofile/oprofile.ko
 #lib/modules/KVER-ipfire-multi/kernel/crypto
 #lib/modules/KVER-ipfire-multi/kernel/crypto/ansi_cprng.ko
 #lib/modules/KVER-ipfire-multi/kernel/crypto/anubis.ko
@@ -151,7 +127,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/crypto/salsa20_generic.ko
 #lib/modules/KVER-ipfire-multi/kernel/crypto/seed.ko
 #lib/modules/KVER-ipfire-multi/kernel/crypto/serpent_generic.ko
-#lib/modules/KVER-ipfire-multi/kernel/crypto/sha1_generic.ko
 #lib/modules/KVER-ipfire-multi/kernel/crypto/sha512_generic.ko
 #lib/modules/KVER-ipfire-multi/kernel/crypto/tcrypt.ko
 #lib/modules/KVER-ipfire-multi/kernel/crypto/tea.ko
@@ -166,68 +141,13 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/crypto/zlib.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ata
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/acard-ahci.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/ahci_imx.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ata/ahci_platform.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/ata_generic.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_ali.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_amd.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/libahci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_arasan_cf.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_artop.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_atiixp.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_atp867x.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_cmd640.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_cmd64x.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_cs5520.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_cs5530.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_cs5536.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_cypress.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_efar.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_hpt366.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_hpt37x.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_hpt3x2n.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_hpt3x3.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_imx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_it8213.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_it821x.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_jmicron.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_marvell.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_mpiix.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_netcell.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_ninja32.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_ns87410.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_ns87415.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_of_platform.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_oldpiix.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_opti.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_optidma.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_pdc2027x.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_pdc202xx_old.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_piccolo.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_platform.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_rdc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_rz1000.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_sch.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_serverworks.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_sil680.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_sis.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_sl82c105.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_triflex.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pata_via.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/pdc_adma.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_highbank.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_inic162x.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_mv.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_nv.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_promise.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_qstor.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_sil.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_sil24.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_sis.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_svw.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_sx4.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_uli.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_via.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/ata/sata_vsc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/atm
 #lib/modules/KVER-ipfire-multi/kernel/drivers/atm/atmtcp.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/atm/eni.ko
@@ -240,16 +160,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/atm/solos-pci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/atm/suni.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/block
-#lib/modules/KVER-ipfire-multi/kernel/drivers/block/DAC960.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/block/cciss.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/block/cryptoloop.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/block/mg_disk.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/block/nvme.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/block/rsxx
-#lib/modules/KVER-ipfire-multi/kernel/drivers/block/rsxx/rsxx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/block/sx8.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/block/umem.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/block/virtio_blk.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth
 #lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/ath3k.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/bcm203x.ko
@@ -262,33 +173,28 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/btwilink.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/hci_uart.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/bluetooth/hci_vhci.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bus
-#lib/modules/KVER-ipfire-multi/kernel/drivers/bus/omap-ocp2scp.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char/hw_random
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char/hw_random/atmel-rng.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char/hw_random/exynos-rng.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char/hw_random/timeriomem-rng.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/char/hw_random/virtio-rng.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char/ipmi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char/ipmi/ipmi_devintf.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char/ipmi/ipmi_msghandler.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char/ipmi/ipmi_poweroff.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char/ipmi/ipmi_si.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/char/ipmi/ipmi_watchdog.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/char/lp.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/char/ppdev.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/clk
 #lib/modules/KVER-ipfire-multi/kernel/drivers/clk/clk-axi-clkgen.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/clk/clk-si5351.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/clk/clk-twl6040.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/cpufreq
+#lib/modules/KVER-ipfire-multi/kernel/drivers/cpufreq/imx6q-cpufreq.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/crypto
 #lib/modules/KVER-ipfire-multi/kernel/drivers/crypto/hifn_795x.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/crypto/mv_cesa.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/crypto/omap-aes.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/crypto/omap-sham.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/crypto/tegra-aes.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/dma
-#lib/modules/KVER-ipfire-multi/kernel/drivers/dma/imx-dma.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/dma/imx-sdma.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/dma/timb_dma.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/firewire
 #lib/modules/KVER-ipfire-multi/kernel/drivers/firewire/firewire-core.ko
@@ -296,16 +202,11 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/firewire/firewire-sbp2.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpio
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpio/gpio-adnp.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/gpio/gpio-mcp23s08.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpio/gpio-ts5500.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpio/gpio-twl4030.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpio/gpio-twl6040.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpio/gpio-viperboard.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpu
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/ast
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/ast/ast.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/cirrus
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/cirrus/cirrus.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/drm.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/drm_kms_helper.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/drm_usb.ko
@@ -315,32 +216,12 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/i2c/ch7006.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/i2c/sil164.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/i2c/tda998x.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/mga
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/mga/mga.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/mgag200
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/mgag200/mgag200.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/nouveau
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/nouveau/nouveau.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/omapdrm
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/omapdrm/omapdrm.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/qxl
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/qxl/qxl.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/r128
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/r128/r128.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/radeon
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/radeon/radeon.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/savage
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/savage/savage.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/tdfx
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/tdfx/tdfx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/ttm
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/ttm/ttm.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/tilcdc
+#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/tilcdc/tilcdc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/udl
 #lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/udl/udl.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/via
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/via/via.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/vmwgfx
-#lib/modules/KVER-ipfire-multi/kernel/drivers/gpu/drm/vmwgfx/vmwgfx.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hid
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hid/hid-aureal.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hid/hid-gyration.ko
@@ -411,14 +292,12 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/gl520sm.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/hih6130.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/hwmon-vid.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/i5k_amb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/ibmaem.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/ibmpex.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/ina209.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/ina2xx.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/it87.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/lineage-pem.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/lm63.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/lm73.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/lm75.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/lm77.ko
@@ -466,7 +345,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/sch56xx-common.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/sht15.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/sht21.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/sis5595.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/smsc47b397.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/smsc47m1.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/smsc47m192.ko
@@ -474,9 +352,8 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/tmp102.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/tmp401.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/tmp421.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/via686a.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/twl4030-madc-hwmon.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/vt1211.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/vt8231.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/w83627ehf.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/w83627hf.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/w83781d.ko
@@ -486,37 +363,21 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/w83795.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/w83l785ts.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/hwmon/w83l786ng.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/hwspinlock
-#lib/modules/KVER-ipfire-multi/kernel/drivers/hwspinlock/hwspinlock_core.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/hwspinlock/omap_hwspinlock.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/algos
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/algos/i2c-algo-bit.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/algos/i2c-algo-pca.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-ali1535.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-ali1563.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-ali15x3.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-amd756.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-amd8111.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-cbus-gpio.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-diolan-u2c.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-i801.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-gpio.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-imx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-isch.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-mv64xxx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-nforce2.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-parport-light.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-parport.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-pca-platform.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-piix4.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-simtec.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-sis5595.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-sis630.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-sis96x.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-tiny-usb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-versatile.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-via.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-viapro.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/busses/i2c-viperboard.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/i2c-dev.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/i2c-smbus.ko
@@ -529,14 +390,13 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/iio/industrialio.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/iio/kfifo_buf.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input
+#lib/modules/KVER-ipfire-multi/kernel/drivers/input/ff-memless.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/input-polldev.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/keyboard
-#lib/modules/KVER-ipfire-multi/kernel/drivers/input/keyboard/gpio_keys.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/keyboard/gpio_keys_polled.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/keyboard/imx_keypad.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/keyboard/lm8333.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/keyboard/omap4-keypad.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/input/keyboard/tegra-kbc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/keyboard/twl4030_keypad.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/matrix-keymap.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc
@@ -544,15 +404,17 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/cm109.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/keyspan_remote.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/powermate.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/pwm-beeper.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/retu-pwrbutton.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/rotary_encoder.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/twl4030-pwrbutton.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/twl4030-vibra.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/uinput.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/yealink.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/mouse
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/mouse/appletouch.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/mouse/bcm5974.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/mouse/cyapa.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/input/mouse/gpio_mouse.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/mouse/psmouse.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/mouse/sermouse.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/mouse/synaptics_i2c.ko
@@ -572,50 +434,17 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/capi/kernelcapi.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/divert
 #lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/divert/dss1_divert.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/gigaset
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/gigaset/gigaset.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/avm
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/avm/b1.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/avm/b1dma.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/avm/b1pci.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/avm/c4.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/avm/t1pci.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/eicon
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/eicon/diva_idi.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/eicon/diva_mnt.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/eicon/divacapi.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/eicon/divadidd.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/eicon/divas.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/mISDN
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/mISDN/avmfritz.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/mISDN/hfcmulti.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/mISDN/hfcpci.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/mISDN/hfcsusb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/mISDN/mISDNinfineon.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/mISDN/mISDNipac.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/mISDN/mISDNisar.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/mISDN/netjet.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/mISDN/speedfax.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hardware/mISDN/w6692.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hisax
 #lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hisax/hfc4s8s_l1.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hisax/hfc_usb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hisax/hisax.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hisax/hisax_fcpcipnp.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hisax/hisax_isac.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hisax/hisax_st5481.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hysdn
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/hysdn/hysdn.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/i4l
 #lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/i4l/isdn.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/i4l/isdnhdlc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/mISDN
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/mISDN/l1oip.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/mISDN/mISDN_core.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds
+#lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-bd2802.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-blinkm.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-lm3530.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-lm3533.ko
@@ -628,14 +457,17 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-lp55xx-common.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-lt3593.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-ot200.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-pca9532.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-pca955x.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-pca9633.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-pwm.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-regulator.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/leds-tca6507.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/trigger
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/trigger/ledtrig-backlight.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/trigger/ledtrig-camera.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/leds/trigger/ledtrig-default-on.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/trigger/ledtrig-gpio.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/leds/trigger/ledtrig-heartbeat.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/trigger/ledtrig-netdev.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/trigger/ledtrig-oneshot.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/leds/trigger/ledtrig-timer.ko
@@ -688,7 +520,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/au8522_decoder.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/au8522_dig.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/bcm3510.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/cx22700.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/cx22702.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/cx24110.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/cx24113.ko
@@ -770,8 +601,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/zl10036.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/zl10039.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/dvb-frontends/zl10353.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/firewire
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/firewire/firedtv.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/adv7180.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/cs5345.ko
@@ -781,7 +610,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/m52790.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/msp3400.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/mt9v011.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/ov7670.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/saa6588.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/saa7115.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/saa7127.ko
@@ -812,9 +640,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/vp27smpx.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/wm8739.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/i2c/wm8775.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/mmc
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/mmc/siano
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/mmc/siano/smssdio.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/b2c2
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/b2c2/b2c2-flexcop-pci.ko
@@ -841,6 +666,8 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/cx88/cx8800.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/cx88/cx8802.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/cx88/cx88xx.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/ddbridge
+#lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/ddbridge/ddbridge.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/dm1105
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/dm1105/dm1105.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/ivtv
@@ -878,27 +705,15 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/ttpci/dvb-ttpci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/pci/ttpci/ttpci-eeprom.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/coda.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/davinci
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/davinci/dm644x_ccdc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/davinci/vpfe_capture.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/davinci/vpss.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/m2m-deinterlace.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/marvell-ccic
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/marvell-ccic/cafe_ccic.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/omap
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/omap/omap-vout.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/sh_veu.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/soc_camera
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/soc_camera/mx3_camera.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/soc_camera/sh_mobile_csi2.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/soc_camera/soc_camera.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/soc_camera/soc_camera_platform.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/soc_camera/soc_mediabus.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/platform/timblogiw.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/ati_remote.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/gpio-ir-recv.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/iguanair.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/rc/imon.ko
@@ -1139,7 +954,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/gspca/gspca_stv0680.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/gspca/gspca_sunplus.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/gspca/gspca_t613.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/gspca/gspca_topro.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/gspca/gspca_tv8532.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/gspca/gspca_vc032x.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/gspca/gspca_vicam.ko
@@ -1171,11 +985,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/tm6000/tm6000-alsa.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/tm6000/tm6000-dvb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/tm6000/tm6000.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/ttusb-budget
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/ttusb-dec
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/ttusb-dec/ttusb_dec.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/ttusb-dec/ttusbdecfe.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/usbvision
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/usbvision/usbvision.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/usb/uvc
@@ -1186,8 +995,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/tuner.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/v4l2-int-device.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/v4l2-mem2mem.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-core.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-dma-contig.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-dma-sg.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-dvb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf-vmalloc.ko
@@ -1195,53 +1002,21 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf2-dma-contig.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf2-memops.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/memory
-#lib/modules/KVER-ipfire-multi/kernel/drivers/memory/emif.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/memstick
 #lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/core
 #lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/core/memstick.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/core/mspro_block.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/host
-#lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/host/jmb38x_ms.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/host/r592.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/host/rtsx_pci_ms.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/memstick/host/tifm_ms.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/fusion
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/fusion/mptbase.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/fusion/mptctl.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/fusion/mptfc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/fusion/mptsas.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/fusion/mptscsih.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/fusion/mptspi.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/i2o
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/i2o/i2o_block.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/i2o/i2o_bus.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/i2o/i2o_core.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/i2o/i2o_proc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/message/i2o/i2o_scsi.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mfd
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/88pm800.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/88pm805.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/88pm80x.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/lm3533-core.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/lm3533-ctrlbank.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/lpc_ich.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/lpc_sch.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/max8907.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/retu-mfd.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/rtsx_pci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/sm501.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/twl4030-madc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/viperboard.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/vx855.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mfd/wl1273-core.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/altera-stapl
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/altera-stapl/altera-stapl.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/bmp085-i2c.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/misc/cb710
-#lib/modules/KVER-ipfire-multi/kernel/drivers/misc/cb710/cb710.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/ds1682.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/dummy-irq.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/eeprom
@@ -1251,58 +1026,28 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/eeprom/max6875.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/enclosure.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/fsa9480.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/misc/hpilo.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/ics932s401.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/misc/pch_phub.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/ti-st
 #lib/modules/KVER-ipfire-multi/kernel/drivers/misc/ti-st/st_drv.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/misc/tifm_7xx1.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/misc/tifm_core.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mmc
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/cb710-mmc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/dw_mmc-exynos.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/dw_mmc-pci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/dw_mmc-pltfm.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/dw_mmc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/mmci.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/mvsdio.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/mxcmmc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/rtsx_pci_sdmmc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/sdhci-esdhc-imx.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/sdhci-pci.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/sdhci-pltfm.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/sdhci-pxav2.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/sdhci-pxav3.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/sdhci-sirf.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/sdhci-tegra.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/tifm_sd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/ushc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/via-sdmmc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/vub300.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mmc/host/wmt-sdmmc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mtd
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/chips
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/chips/map_ram.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/devices
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/devices/phram.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/devices/slram.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/maps
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/maps/plat-ram.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/devices/elm.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/nand
+#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/nand/gpmi-nand
+#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/nand/gpmi-nand/gpmi_nand.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/nand/mxc_nand.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/nand/orion_nand.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/sm_ftl.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/tests
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/tests/mtd_nandbiterrs.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/tests/mtd_nandecctest.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/tests/mtd_oobtest.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/tests/mtd_pagetest.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/tests/mtd_readtest.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/tests/mtd_speedtest.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/tests/mtd_stresstest.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/tests/mtd_subpagetest.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/mtd/tests/mtd_torturetest.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/bonding
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/bonding/bonding.ko
@@ -1431,6 +1176,9 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/oki-semi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/oki-semi/pch_gbe
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/packetengines
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/packetengines/hamachi.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/packetengines/yellowfin.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/qlogic
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/qlogic/netxen
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/ethernet/qlogic/netxen/netxen_nic.ko
@@ -1555,7 +1303,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/usb/usbnet.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/usb/zaurus.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/veth.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/virtio_net.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/vmxnet3
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/vmxnet3/vmxnet3.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/vxlan.ko
@@ -1566,8 +1313,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/ar5523
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/ar5523/ar5523.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/ath.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/ath5k
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/ath9k
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
@@ -1575,8 +1320,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/carl9170
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/wil6210
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/wil6210/wil6210.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/atmel.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/atmel_pci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/b43
@@ -1630,19 +1373,15 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/p54/p54common.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/p54/p54pci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/p54/p54usb.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/prism54
+#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/prism54/prism54.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rndis_wlan.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00/rt2x00mmio.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rtl818x
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/rtl818x/rtl8180
@@ -1679,57 +1418,29 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/zd1201.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/zd1211rw
 #lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/parport
+#lib/modules/KVER-ipfire-multi/kernel/drivers/parport/parport.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/power
+#lib/modules/KVER-ipfire-multi/kernel/drivers/power/88pm860x_battery.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/power/88pm860x_charger.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/power/generic-adc-battery.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/pps
 #lib/modules/KVER-ipfire-multi/kernel/drivers/pps/pps_core.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ptp
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ptp/ptp.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ptp/ptp_pch.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/pwm
+#lib/modules/KVER-ipfire-multi/kernel/drivers/pwm/pwm-imx.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/pwm/pwm-twl-led.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/pwm/pwm-twl.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/pwm/pwm-vt8500.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/regulator
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/aat2870-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/ad5398.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/anatop-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/as3711-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/da903x.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/da9052-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/da9055-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/fan53555.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/isl6271a-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/lp3971.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/lp3972.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/lp8755.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/max1586.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/max77686.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/max8649.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/max8660.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/max8907-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/max8925-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/max8952.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/max8973-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/max8997.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/max8998.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/palmas-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/rc5t583-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/s2mps11.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/s5m8767.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/tps51632-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/tps62360-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/tps65023-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/tps6507x-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/tps65090-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/tps6586x-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/tps65910-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/tps65912-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/tps80031-regulator.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/vexpress.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/wm831x-dcdc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/wm831x-isink.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/wm831x-ldo.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/wm8350-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/wm8400-regulator.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/wm8994-regulator.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc
+#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-88pm80x.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-88pm860x.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-bq32k.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-bq4802.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-ds1286.ko
@@ -1754,7 +1465,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-msm6242.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-mv.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-mxc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-omap.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-pcf8523.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-pcf8563.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-pcf8583.ko
@@ -1767,7 +1477,6 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-rx8581.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-snvs.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-stk17ta8.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-tegra.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-v3020.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-vt8500.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-x1205.ko
@@ -1785,6 +1494,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/aic94xx/aic94xx.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/arcmsr
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/arcmsr/arcmsr.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/atp870u.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/be2iscsi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/be2iscsi/be2iscsi.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/bfa
@@ -1826,12 +1536,11 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/libiscsi_tcp.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/libsas
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/libsas/libsas.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/libsrp.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/lpfc
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/lpfc/lpfc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/megaraid
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/megaraid.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/megaraid/megaraid_mbox.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/megaraid/megaraid_mm.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/megaraid/megaraid_sas.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/mpt2sas
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/mpt2sas/mpt2sas.ko
@@ -1839,6 +1548,8 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/mpt3sas/mpt3sas.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/mvsas
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/mvsas/mvsas.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/mvumi.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/nsp32.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/osd
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/osd/libosd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/osd/osd.ko
@@ -1852,6 +1563,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/qla4xxx
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/qla4xxx/qla4xxx.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/raid_class.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/scsi_debug.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/scsi_tgt.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/scsi_transport_fc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/scsi_transport_iscsi.ko
@@ -1868,44 +1580,32 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ufs/ufshcd-pci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ufs/ufshcd-pltfrm.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/ufs/ufshcd.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/scsi/virtio_scsi.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ssb
 #lib/modules/KVER-ipfire-multi/kernel/drivers/ssb/ssb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/staging
 #lib/modules/KVER-ipfire-multi/kernel/drivers/staging/ced1401
 #lib/modules/KVER-ipfire-multi/kernel/drivers/staging/ced1401/cedusb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/echo
-#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/echo/echo.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/et131x
-#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/et131x/et131x.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/fwserial
-#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/fwserial/firewire-serial.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/silicom
-#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/silicom/bpctl_mod.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/silicom/bypasslib
-#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/silicom/bypasslib/bypass.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/imx-drm
+#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/imx-drm/imxdrm.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/imx-drm/parallel-display.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/rts5139
+#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/rts5139/rts5139.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/usbip
+#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/usbip/usbip-core.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/usbip/usbip-host.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/staging/usbip/vhci-hcd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/thermal
 #lib/modules/KVER-ipfire-multi/kernel/drivers/thermal/armada_thermal.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/thermal/imx_thermal.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty
-#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/cyclades.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/n_gsm.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/n_hdlc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/n_r3964.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/nozomi.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/rocket.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/arc_uart.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/jsm
-#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/jsm/jsm.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/rp2.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/tty/serial/sccnxp.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/synclink_gt.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/tty/synclinkmp.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/uio
 #lib/modules/KVER-ipfire-multi/kernel/drivers/uio/uio.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uio/uio_aec.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uio/uio_pci_generic.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uio/uio_sercos3.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/atm
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/atm/cxacru.ko
@@ -1931,14 +1631,9 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/dwc3/dwc3.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/host
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/host/ehci-mxc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/host/ehci-orion.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/host/hwa-hc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/host/imx21-hcd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/host/isp1362-hcd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/host/sl811-hcd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/host/ssb-hcd.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/host/whci
-#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/host/whci/whci-hcd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/image
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/image/mdc800.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/image/microtek.ko
@@ -1955,19 +1650,20 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/misc/usblcd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/misc/usbled.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/misc/usbsevseg.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/misc/uss720.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/misc/yurex.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/mon
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/mon/usbmon.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy
-#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy/phy-ab8500-usb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy/phy-gpio-vbus-usb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy/phy-isp1301.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy/phy-mxs-usb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy/phy-nop.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy/phy-omap-control.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy/phy-omap-usb2.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy/phy-omap-usb3.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy/phy-rcar-usb.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy/phy-samsung-usb.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy/phy-samsung-usb2.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/phy/phy-samsung-usb3.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/serial
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/serial/aircable.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/serial/ark3116.ko
@@ -2020,83 +1716,26 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/storage/ums-sddr09.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/storage/ums-sddr55.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/usb/storage/ums-usbat.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/wusbcore
-#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/wusbcore/wusb-cbaf.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/wusbcore/wusb-wa.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/usb/wusbcore/wusbcore.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uwb
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uwb/hwa-rc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uwb/i1480
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uwb/i1480/dfu
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uwb/i1480/dfu/i1480-dfu-usb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uwb/i1480/i1480-est.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uwb/umc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uwb/uwb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uwb/whc-rc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/uwb/whci.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video/amba-clcd.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/arkfb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/aty
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/aty/atyfb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/auo_k1900fb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/auo_k1901fb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/auo_k190x.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video/backlight
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video/backlight/lcd.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/broadsheetfb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/carminefb.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/video/backlight/platform_lcd.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video/cfbcopyarea.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video/cfbfillrect.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video/cfbimgblt.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/cirrusfb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/console
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/console/font.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/cyber2000fb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/fb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/fb_ddc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video/fb_sys_fops.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/i740fb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/kyro
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/kyro/kyrofb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/macmodes.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/matrox
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/matrox/i2c-matroxfb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/matrox/matroxfb_DAC1064.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/matrox/matroxfb_Ti3026.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/matrox/matroxfb_accel.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/matrox/matroxfb_base.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/matrox/matroxfb_misc.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/mb862xx
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/mb862xx/mb862xxfb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/metronomefb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/mx3fb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/neofb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video/omap2
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video/omap2/displays
+#lib/modules/KVER-ipfire-multi/kernel/drivers/video/omap2/displays/panel-generic-dpi.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/video/omap2/displays/panel-picodlp.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/video/omap2/displays/panel-taal.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video/omap2/displays/panel-tfp410.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/output.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/pm2fb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/pm3fb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/riva
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/riva/rivafb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/s1d13xxxfb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/s3fb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/savage
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/savage/savagefb.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/video/omap2/omapfb
+#lib/modules/KVER-ipfire-multi/kernel/drivers/video/omap2/omapfb/omapfb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video/smscufx.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/video/ssd1307fb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/sstfb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/svgalib.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/syscopyarea.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/sysfillrect.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/sysimgblt.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/tridentfb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/udlfb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/vgastate.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/video/vt8623fb.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/virtio
-#lib/modules/KVER-ipfire-multi/kernel/drivers/virtio/virtio_balloon.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/w1
 #lib/modules/KVER-ipfire-multi/kernel/drivers/w1/masters
 #lib/modules/KVER-ipfire-multi/kernel/drivers/w1/masters/ds1wm.ko
@@ -2118,14 +1757,14 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/w1/slaves/w1_therm.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/w1/wire.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog
-#lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog/alim7101_wdt.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog/i6300esb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog/imx2_wdt.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog/pcwd_pci.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog/mpcore_wdt.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog/omap_wdt.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog/pcwd_usb.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog/retu_wdt.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog/softdog.ko
-#lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog/wdt_pci.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog/sp805_wdt.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/watchdog/twl4030_wdt.ko
 #lib/modules/KVER-ipfire-multi/kernel/fs
 #lib/modules/KVER-ipfire-multi/kernel/fs/btrfs
 #lib/modules/KVER-ipfire-multi/kernel/fs/btrfs/btrfs.ko
@@ -2225,6 +1864,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/kernel/trace/ring_buffer_benchmark.ko
 #lib/modules/KVER-ipfire-multi/kernel/lib
 #lib/modules/KVER-ipfire-multi/kernel/lib/asn1_decoder.ko
+#lib/modules/KVER-ipfire-multi/kernel/lib/bch.ko
 #lib/modules/KVER-ipfire-multi/kernel/lib/cordic.ko
 #lib/modules/KVER-ipfire-multi/kernel/lib/crc-itu-t.ko
 #lib/modules/KVER-ipfire-multi/kernel/lib/crc7.ko
@@ -2242,6 +1882,10 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/lib/zlib_deflate
 #lib/modules/KVER-ipfire-multi/kernel/lib/zlib_deflate/zlib_deflate.ko
 #lib/modules/KVER-ipfire-multi/kernel/net
+#lib/modules/KVER-ipfire-multi/kernel/net/802
+#lib/modules/KVER-ipfire-multi/kernel/net/802/garp.ko
+#lib/modules/KVER-ipfire-multi/kernel/net/8021q
+#lib/modules/KVER-ipfire-multi/kernel/net/8021q/8021q.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/atm
 #lib/modules/KVER-ipfire-multi/kernel/net/atm/atm.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/atm/br2684.ko
@@ -2509,7 +2153,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/net/openvswitch
 #lib/modules/KVER-ipfire-multi/kernel/net/openvswitch/openvswitch.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/rfkill
-#lib/modules/KVER-ipfire-multi/kernel/net/rfkill/rfkill.ko
+#lib/modules/KVER-ipfire-multi/kernel/net/rfkill/rfkill-regulator.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/sched
 #lib/modules/KVER-ipfire-multi/kernel/net/sched/act_csum.ko
 #lib/modules/KVER-ipfire-multi/kernel/net/sched/act_gact.ko
@@ -2612,13 +2256,12 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/sound/drivers/snd-aloop.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/drivers/snd-dummy.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/drivers/snd-mtpav.ko
+#lib/modules/KVER-ipfire-multi/kernel/sound/drivers/snd-mts64.ko
+#lib/modules/KVER-ipfire-multi/kernel/sound/drivers/snd-portman2x4.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/drivers/snd-serial-u16550.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/drivers/snd-virmidi.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/drivers/vx
 #lib/modules/KVER-ipfire-multi/kernel/sound/drivers/vx/snd-vx-lib.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/firewire
-#lib/modules/KVER-ipfire-multi/kernel/sound/firewire/snd-firewire-lib.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/firewire/snd-firewire-speakers.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/i2c
 #lib/modules/KVER-ipfire-multi/kernel/sound/i2c/other
 #lib/modules/KVER-ipfire-multi/kernel/sound/i2c/other/snd-ak4113.ko
@@ -2735,60 +2378,32 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/atmel
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/atmel/snd-soc-atmel-pcm.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs/snd-soc-ab8500-codec.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs/snd-soc-alc5632.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs/snd-soc-dmic.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs/snd-soc-omap-hdmi-codec.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs/snd-soc-sgtl5000.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs/snd-soc-tlv320aic23.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs/snd-soc-tlv320aic3x.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs/snd-soc-tpa6130a2.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs/snd-soc-twl4030.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs/snd-soc-twl6040.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs/snd-soc-wm8903.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/codecs/snd-soc-wm9712.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/dwc
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/dwc/designware_i2s.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/fsl
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/fsl/snd-soc-eukrea-tlv320.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/fsl/snd-soc-fsl-ssi.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/fsl/snd-soc-fsl-utils.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/fsl/snd-soc-imx-audmux.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/fsl/snd-soc-imx-pcm.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/fsl/snd-soc-imx-sgtl5000.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/fsl/snd-soc-imx-ssi.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/generic
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/generic/snd-soc-simple-card.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/omap
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/omap/snd-soc-am3517evm.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/omap/snd-soc-omap-abe-twl6040.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/omap/snd-soc-omap-dmic.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/omap/snd-soc-omap-hdmi-card.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/omap/snd-soc-omap-hdmi.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/omap/snd-soc-omap-mcbsp.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/omap/snd-soc-omap-mcpdm.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/omap/snd-soc-omap-twl4030.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/omap/snd-soc-omap.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/omap/snd-soc-omap3pandora.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/omap/snd-soc-rx51.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soc/snd-soc-core.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra/snd-soc-tegra-alc5632.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra/snd-soc-tegra-pcm.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra/snd-soc-tegra-trimslice.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra/snd-soc-tegra-utils.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra/snd-soc-tegra-wm8903.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra/snd-soc-tegra-wm9712.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra/snd-soc-tegra20-ac97.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra/snd-soc-tegra20-das.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra/snd-soc-tegra20-i2s.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra/snd-soc-tegra20-spdif.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra/snd-soc-tegra30-ahub.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/tegra/snd-soc-tegra30-i2s.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/ux500
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/ux500/snd-soc-ux500-mach-mop500.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/ux500/snd-soc-ux500-plat-dma.ko
-#lib/modules/KVER-ipfire-multi/kernel/sound/soc/ux500/snd-soc-ux500-plat-msp-i2s.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/soundcore.ko
 #lib/modules/KVER-ipfire-multi/kernel/sound/synth
 #lib/modules/KVER-ipfire-multi/kernel/sound/synth/emux
@@ -2806,17 +2421,13 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/modules.alias
 #lib/modules/KVER-ipfire-multi/modules.alias.bin
 #lib/modules/KVER-ipfire-multi/modules.builtin
-#lib/modules/KVER-ipfire-multi/modules.ccwmap
+#lib/modules/KVER-ipfire-multi/modules.builtin.bin
 #lib/modules/KVER-ipfire-multi/modules.dep
 #lib/modules/KVER-ipfire-multi/modules.dep.bin
-#lib/modules/KVER-ipfire-multi/modules.ieee1394map
-#lib/modules/KVER-ipfire-multi/modules.inputmap
-#lib/modules/KVER-ipfire-multi/modules.isapnpmap
-#lib/modules/KVER-ipfire-multi/modules.ofmap
+#lib/modules/KVER-ipfire-multi/modules.devname
 #lib/modules/KVER-ipfire-multi/modules.order
-#lib/modules/KVER-ipfire-multi/modules.pcimap
-#lib/modules/KVER-ipfire-multi/modules.seriomap
+#lib/modules/KVER-ipfire-multi/modules.softdep
 #lib/modules/KVER-ipfire-multi/modules.symbols
 #lib/modules/KVER-ipfire-multi/modules.symbols.bin
-#lib/modules/KVER-ipfire-multi/modules.usbmap
 #lib/modules/KVER-ipfire-multi/source
+boot/uInit-ipfire-multi
index 602107994e16812e20d676a33cb6ead9855ea74c..98f513e9b09bc0ae86eac7b3e8e39c9dadee3db4 100644 (file)
@@ -9,16 +9,23 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel
 #lib/modules/KVER-ipfire-rpi/kernel/arch
 #lib/modules/KVER-ipfire-rpi/kernel/arch/arm
+#lib/modules/KVER-ipfire-rpi/kernel/arch/arm/crypto
+#lib/modules/KVER-ipfire-rpi/kernel/arch/arm/crypto/aes-arm.ko
+#lib/modules/KVER-ipfire-rpi/kernel/arch/arm/crypto/sha1-arm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/arch/arm/mach-bcm2708
-#lib/modules/KVER-ipfire-rpi/kernel/arch/arm/mach-bcm2708/dmaer.ko
+#lib/modules/KVER-ipfire-rpi/kernel/arch/arm/mach-bcm2708/dmaer_master.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto
-#lib/modules/KVER-ipfire-rpi/kernel/crypto/aes_generic.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/af_alg.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/algif_hash.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/algif_skcipher.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/ansi_cprng.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/anubis.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/arc4.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/asymmetric_keys
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/asymmetric_keys/asymmetric_keys.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/asymmetric_keys/public_key.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/asymmetric_keys/rsa.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/asymmetric_keys/x509_key_parser.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/async_tx
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/async_tx/async_memcpy.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/async_tx/async_pq.ko
@@ -30,13 +37,16 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/authencesn.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/blowfish_common.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/blowfish_generic.ko
-#lib/modules/KVER-ipfire-rpi/kernel/crypto/camellia.ko
-#lib/modules/KVER-ipfire-rpi/kernel/crypto/cast5.ko
-#lib/modules/KVER-ipfire-rpi/kernel/crypto/cast6.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/camellia_generic.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/cast5_generic.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/cast6_generic.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/cast_common.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/cbc.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/ccm.ko
-#lib/modules/KVER-ipfire-rpi/kernel/crypto/crc32c.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/cmac.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/crc32.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/cryptd.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/crypto_null.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/crypto_user.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/ctr.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/cts.ko
@@ -60,9 +70,8 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/salsa20_generic.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/seed.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/seqiv.ko
-#lib/modules/KVER-ipfire-rpi/kernel/crypto/serpent.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/serpent_generic.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/sha1_generic.ko
-#lib/modules/KVER-ipfire-rpi/kernel/crypto/sha256_generic.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/sha512_generic.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/tea.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/tgr192.ko
@@ -76,18 +85,14 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/zlib.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/ata
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/ata/ahci_platform.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/ata/libahci.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/ata/libata.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/ata/pata_arasan_cf.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/ata/sata_mv.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/atm
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/atm/atmtcp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/base
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/base/regmap
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/base/regmap/regmap-i2c.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/bcma
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/bcma/bcma.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/base/regmap/regmap-mmio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/base/regmap/regmap-spi.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/block
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/block/aoe
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/block/aoe/aoe.ko
@@ -105,15 +110,11 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/bluetooth/btmrvl_sdio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/bluetooth/btsdio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/bluetooth/btusb.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/bluetooth/btwilink.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/bluetooth/hci_uart.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/bluetooth/hci_vhci.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/cdrom
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/cdrom/cdrom.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/char
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/char/hw_random
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/char/hw_random/rng-core.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/char/hw_random/timeriomem-rng.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/char/ipmi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/char/ipmi/ipmi_devintf.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/char/ipmi/ipmi_msghandler.ko
@@ -130,41 +131,46 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/dma
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/dma/dmatest.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-74x164.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-adnp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-adp5588.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-generic.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-it8761e.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-grgpio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-max7300.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-max7301.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-max730x.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-max732x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-mc33880.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-mcp23s08.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-pca953x.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-pcf857x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-rcar.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpio/gpio-ts5500.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/gpu
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/gpu/drm
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/gpu/drm/drm.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpu/drm/drm_kms_helper.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpu/drm/drm_usb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpu/drm/i2c
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpu/drm/i2c/tda998x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpu/drm/udl
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/gpu/drm/udl/udl.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-a4tech.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-apple.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-aureal.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-axff.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-belkin.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-cherry.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-chicony.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-cypress.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-dr.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-elecom.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-ezkey.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-gaff.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-gyration.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-holtek-kbd.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-holtekff.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-kensington.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-icade.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-keytouch.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-kye.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-lcpower.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-lenovo-tpkbd.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-logitech-dj.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-logitech.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-magicmouse.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-microsoft.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-monterey.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-multitouch.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-ntrig.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-ortek.ko
@@ -173,19 +179,28 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-pl.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-primax.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-prodikeys.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-quanta.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-ps3remote.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-arvo.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-common.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-isku.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-kone.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-koneplus.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-konepure.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-kovaplus.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-lua.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-pyra.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat-savu.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-roccat.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-saitek.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-samsung.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-sensor-hub.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-sjoy.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-sony.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-speedlink.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-steelseries.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-sunplus.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-thingm.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-tivo.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-tmff.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-topseed.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-twinhan.ko
@@ -195,11 +210,19 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-wiimote.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-zpff.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/hid-zydacron.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/i2c-hid
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/i2c-hid/i2c-hid.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/usbhid
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hid/usbhid/usbhid.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hsi
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hsi/clients
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hsi/clients/hsi_char.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hsi/hsi.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ad7314.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ad7414.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ad7418.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adcxx.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adm1021.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adm1025.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adm1026.ko
@@ -208,10 +231,14 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adm9240.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ads1015.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ads7828.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ads7871.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adt7310.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adt7410.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adt7411.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adt7462.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adt7470.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adt7475.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/adt7x10.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/amc6821.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/asc7621.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/atxp1.ko
@@ -228,14 +255,19 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/gl518sm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/gl520sm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/gpio-fan.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/hih6130.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/hwmon-vid.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/hwmon.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ibmaem.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ibmpex.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/iio_hwmon.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ina209.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ina2xx.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/it87.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/jc42.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lineage-pem.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm63.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm70.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm73.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm75.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm77.ko
@@ -247,18 +279,24 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm90.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm92.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm93.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm95234.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm95241.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/lm95245.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ltc4151.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ltc4215.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ltc4245.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ltc4261.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max1111.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max16065.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max1619.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max1668.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max197.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max6639.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max6642.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max6650.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/max6697.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/mcp3021.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/nct6775.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/ntc_thermistor.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/pc87360.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/hwmon/pc87427.ko
@@ -304,28 +342,33 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/algos/i2c-algo-pca.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-bcm2708.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-cbus-gpio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-designware-core.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-designware-platform.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-diolan-u2c.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-gpio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-nomadik.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-ocores.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-parport-light.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-parport.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-pca-platform.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-simtec.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-stub.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-taos-evm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-tiny-usb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/busses/i2c-xiic.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/i2c-dev.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/i2c-mux.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/i2c-smbus.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/i2c-stub.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/muxes
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/muxes/gpio-i2cmux.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/muxes/pca9541.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/muxes/pca954x.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/ieee802154
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/ieee802154/fakehard.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/muxes/i2c-mux-gpio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/muxes/i2c-mux-pca9541.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/i2c/muxes/i2c-mux-pca954x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/iio
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/iio/common
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/iio/common/hid-sensors
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/iio/common/hid-sensors/hid-sensor-iio-common.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/iio/industrialio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/ff-memless.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/input-polldev.ko
@@ -336,6 +379,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/gpio_keys_polled.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/lkkbd.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/lm8323.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/lm8333.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/matrix_keypad.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/max7359_keypad.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/mcs_touchkey.ko
@@ -344,26 +388,22 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/opencores-kbd.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/qt1070.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/qt2160.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/samsung-keypad.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/stowaway.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/sunkbd.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/tca6416-keypad.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/tca8418_keypad.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/keyboard/xtkbd.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/matrix-keymap.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/88pm860x_onkey.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/ad714x-i2c.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/ad714x.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/ati_remote2.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/bma150.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/cm109.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/keyspan_remote.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/pcf50633-input.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/pcf8574_keypad.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/powermate.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/rotary_encoder.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/yealink.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/misc/pwm-beeper.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio/altera_ps2.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio/ambakmi.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio/apbps2.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio/arc_ps2.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/serio/ps2mult.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/input/sparse-keymap.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn
@@ -395,24 +435,43 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/mISDN/mISDN_core.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/isdn/mISDN/mISDN_dsp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-88pm860x.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-bd2802.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-blinkm.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-dac124s085.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-gpio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lm3530.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lm355x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lm3642.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lp3944.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lp5521.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lp5523.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lp5562.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lp55xx-common.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-lt3593.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-ot200.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-pca9532.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-pca955x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-pca9633.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-pwm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-regulator.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/ledtrig-backlight.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/ledtrig-gpio.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/ledtrig-heartbeat.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/ledtrig-netdev.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/ledtrig-timer.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/leds-tca6507.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/trigger
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/trigger/ledtrig-backlight.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/trigger/ledtrig-camera.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/trigger/ledtrig-gpio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/trigger/ledtrig-heartbeat.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/trigger/ledtrig-netdev.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/trigger/ledtrig-oneshot.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/trigger/ledtrig-timer.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/leds/trigger/ledtrig-transient.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/md
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/md/bcache
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/md/bcache/bcache.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-bio-prison.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-bufio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-cache-cleaner.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-cache-mq.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-cache.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-crypt.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-delay.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-flakey.ko
@@ -428,6 +487,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-service-time.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-snapshot.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-thin-pool.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-verity.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/md/dm-zero.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/md/linear.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/md/md-mod.ko
@@ -440,31 +500,126 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/md/raid456.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/mc44s803.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/mt20xx.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/tda18271.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/tda827x.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/tda8290.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/tda9887.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/tea5761.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/tea5767.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/tuner-simple.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/tuner-types.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/tuner-xc2028.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/xc4000.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tuners/xc5000.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb/dvb-core
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/b2c2
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/b2c2/b2c2-flexcop.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/cx2341x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/cypress_firmware.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/siano
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/siano/smsdvb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/siano/smsmdtv.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/common/tveeprom.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-core
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-core/dvb-core.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/a8293.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/af9013.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/af9033.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/atbm8830.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/au8522_common.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/au8522_decoder.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/au8522_dig.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/bcm3510.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/cx22702.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/cx24113.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/cx24116.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/cx24123.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/cxd2820r.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/dib0070.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/dib0090.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/dib3000mb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/dib3000mc.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/dib7000m.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/dib7000p.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/dib8000.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/dibx000_common.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/drxd.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/drxk.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/ds3000.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/dvb-pll.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/ec100.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/isl6421.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/isl6423.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/it913x-fe.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/itd1000.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/ix2505v.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/lg2160.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/lgdt3305.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/lgdt330x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/lgs8gxx.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/lnbp21.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/lnbp22.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/m88ds3103.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/m88rs2000.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/mb86a20s.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/mt312.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/mt352.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/nxt200x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/nxt6000.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/rtl2830.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/rtl2832.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/s5h1409.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/s5h1411.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/s5h1420.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/s921.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/si21xx.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/stb0899.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/stb6000.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/stb6100.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/stv0288.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/stv0297.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/stv0299.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/stv0900.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/stv090x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/stv6110.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/stv6110x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/tda10023.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/tda10048.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/tda1004x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/tda10071.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/tda10086.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/tda18271c2dd.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/tda826x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/ts2020.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/zl10039.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/dvb-frontends/zl10353.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/i2c
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/i2c/cs53l32a.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/i2c/cx25840
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/i2c/cx25840/cx25840.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/i2c/ir-kbd-i2c.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/i2c/msp3400.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/i2c/mt9v011.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/i2c/saa7115.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/i2c/tvp5150.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/i2c/wm8775.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/media.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/pci
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/pci/ttpci
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/pci/ttpci/ttpci-eeprom.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/platform
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/platform/bcm2835
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/platform/bcm2835/bcm2835-v4l2.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/ati_remote.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/gpio-ir-recv.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/iguanair.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/imon.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/ir-jvc-decoder.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/ir-lirc-codec.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/ir-mce_kbd-decoder.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/ir-nec-decoder.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/ir-rc5-decoder.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/ir-rc5-sz-decoder.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/ir-rc6-decoder.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/ir-sanyo-decoder.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/ir-sony-decoder.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-alink-dtu-m.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-anysee.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-apac-viewcomp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-asus-pc39.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-asus-ps3-100.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-ati-x10.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-avermedia-a16d.ko
@@ -488,6 +643,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-dm1105-nec.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-dntv-live-dvb-t.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-dvbsky.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-em-terratec.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-encore-enltv-fm53.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-encore-enltv.ko
@@ -504,13 +660,18 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-imon-mce.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-imon-pad.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-iodata-bctv7e.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-it913x-v1.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-it913x-v2.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-kaiomy.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-kworld-315u.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-kworld-pc150u.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-leadtek-y04g0051.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-lirc.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-lme2510.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-manli.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-medion-x10-digitainer.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-medion-x10-or2x.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-medion-x10.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-msi-digivox-ii.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-msi-digivox-iii.ko
@@ -534,6 +695,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-pv951.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-rc6-mce.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-real-audio-220-32-keys.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-reddo.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-snapstream-firefly.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-streamzap.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-tbs-nec.ko
@@ -543,6 +705,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-terratec-slim.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-tevii-nec.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-tivo.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-total-media-in-hand-02.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-total-media-in-hand.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-trekstor.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-tt-1500.ko
@@ -553,37 +716,202 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/keymaps/rc-winfast.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/lirc_dev.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/mceusb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/rc-core.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/ir-kbd-i2c.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/v4l2-common.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/v4l2-int-device.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/video/videodev.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/rc-loopback.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/redrat3.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/streamzap.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/rc/ttusbir.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/e4000.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/fc0011.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/fc0012.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/fc0013.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/fc2580.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/max2165.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/mc44s803.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/mt2060.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/mt2063.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/mt20xx.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/mt2266.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/mxl5005s.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/mxl5007t.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/qt1010.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/r820t.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tda18212.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tda18218.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tda18271.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tda827x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tda8290.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tda9887.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tea5761.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tea5767.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tua9001.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tuner-simple.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tuner-types.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tuner-xc2028.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/tuner_it913x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/xc4000.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/tuners/xc5000.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/au0828
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/au0828/au0828.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/b2c2
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/b2c2/b2c2-flexcop-usb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/cpia2
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/cpia2/cpia2.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/cx231xx
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/cx231xx/cx231xx-alsa.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/cx231xx/cx231xx-dvb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/cx231xx/cx231xx.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-af9015.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-af9035.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-anysee.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-au6610.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-az6007.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-ce6230.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-dvbsky.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-ec168.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-gl861.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-it913x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-lmedm04.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-mxl111sf.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb-usb-rtl28xxu.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/dvb_usb_v2.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/mxl111sf-demod.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-a800.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-af9005-remote.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-af9005.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-az6027.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-cinergyT2.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-cxusb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-dib0700.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-dibusb-common.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-dibusb-mb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-dibusb-mc.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-digitv.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-dtt200u.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-dtv5100.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-dw2102.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-friio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-gp8psk.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-m920x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-nova-t-usb2.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-opera.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-pctv452e.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-technisat-usb2.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-ttusb2.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-umt-010.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-vp702x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb-vp7045.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/dvb-usb/dvb-usb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/em28xx
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/em28xx/em28xx-alsa.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/em28xx/em28xx-dvb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/em28xx/em28xx-rc.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/em28xx/em28xx.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gl860
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gl860/gspca_gl860.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_benq.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_conex.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_cpia1.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_etoms.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_finepix.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_jeilinj.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_jl2005bcd.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_kinect.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_konica.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_main.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_mars.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_mr97310a.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_nw80x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_ov519.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_ov534.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_ov534_9.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_pac207.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_pac7302.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_pac7311.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_se401.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_sn9c2028.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_sn9c20x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_sonixb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_sonixj.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_spca1528.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_spca500.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_spca501.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_spca505.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_spca506.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_spca508.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_spca561.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_sq905.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_sq905c.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_sq930x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_stk014.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_stv0680.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_sunplus.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_t613.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_topro.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_tv8532.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_vc032x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_vicam.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_xirlink_cit.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/gspca_zc3xx.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/m5602
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/m5602/gspca_m5602.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/stv06xx
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/gspca/stv06xx/gspca_stv06xx.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/hdpvr
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/hdpvr/hdpvr.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/pvrusb2
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/pvrusb2/pvrusb2.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/pwc
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/pwc/pwc.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/s2255
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/s2255/s2255drv.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/siano
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/siano/smsusb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/sn9c102
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/sn9c102/sn9c102.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/stk1160
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/stk1160/stk1160.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/stkwebcam
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/stkwebcam/stkwebcam.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/tlg2300
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/tlg2300/poseidon.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/tm6000
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/tm6000/tm6000-alsa.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/tm6000/tm6000-dvb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/tm6000/tm6000.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/usbvision
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/usbvision/usbvision.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/uvc
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/uvc/uvcvideo.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/zr364xx
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/usb/zr364xx/zr364xx.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/v4l2-core
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/v4l2-core/tuner.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/v4l2-core/v4l2-common.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/v4l2-core/v4l2-int-device.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/v4l2-core/videobuf-core.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/v4l2-core/videobuf-dvb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/v4l2-core/videobuf-vmalloc.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/v4l2-core/videobuf2-core.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/v4l2-core/videobuf2-memops.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/v4l2-core/videobuf2-vmalloc.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/media/v4l2-core/videodev.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/memstick
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/memstick/core
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/memstick/core/memstick.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/memstick/core/mspro_block.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/htc-pasic3.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/pcf50633-adc.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/pcf50633-gpio.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/pcf50633.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/sm501.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/tps6105x.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/tps65010.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/tps6507x.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/ucb1400_core.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/wl1273-core.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/wm8400-core.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/mfd/mfd-core.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/apds9802als.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/apds990x.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/bh1770glc.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/bh1780gli.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/bmp085.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/c2port
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/c2port/core.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/ds1682.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/dummy-irq.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/eeprom
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/eeprom/at24.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/eeprom/eeprom.ko
@@ -591,23 +919,13 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/eeprom/max6875.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/enclosure.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/fsa9480.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/hmc6352.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/ics932s401.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/isl29003.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/isl29020.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/iwmc3200top
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/iwmc3200top/iwmc3200top.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/lis3lv02d
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/lis3lv02d/lis3lv02d.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/lis3lv02d/lis3lv02d_i2c.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/ti-st
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/ti-st/st_drv.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/misc/tsl2550.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/card
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/card/mmc_test.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/card/sdio_uart.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/dw_mmc-exynos.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/dw_mmc-pltfm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/dw_mmc.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/mmci.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/sdhci-pltfm.ko
@@ -616,9 +934,9 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/ushc.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mmc/host/vub300.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/ar7part.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/chips
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/chips/chipreg.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/cmdlinepart.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/lpddr
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/lpddr/lpddr_cmds.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/lpddr/qinfo_probe.ko
@@ -627,23 +945,12 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/mtd.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/mtd_blkdevs.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/mtdblock.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/mtdchar.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/nand
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/nand/nand.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/nand/nand_ecc.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/nand/nand_ids.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/nand/plat_nand.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/ofpart.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/sm_ftl.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_nandecctest.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_oobtest.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_pagetest.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_readtest.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_speedtest.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_stresstest.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_subpagetest.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/tests/mtd_torturetest.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/ubi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/mtd/ubi/ubi.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net
@@ -656,18 +963,28 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/8390/ax88796.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/broadcom
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/broadcom/b44.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/cadence
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/cadence/at91_ether.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/cadence/macb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/calxeda
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/calxeda/xgmac.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/cirrus
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/cirrus/cs89x0.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/davicom
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/davicom/dm9000.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/dlink
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/dlink/de600.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/dlink/de620.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/dnet.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/ethoc.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/faraday
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/faraday/ftgmac100.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/faraday/ftmac100.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/marvell
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/marvell/mvmdio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/micrel
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/micrel/ks8842.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/micrel/ks8851.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/micrel/ks8851_mll.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/seeq
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/seeq/seeq8005.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/microchip
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/microchip/enc28j60.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/smsc
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/smsc/smc911x.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/smsc/smc91x.ko
@@ -675,31 +992,33 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/stmicro
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/stmicro/stmmac
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/stmicro/stmmac/stmmac.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/wiznet
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/wiznet/w5100.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ethernet/wiznet/w5300.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ieee802154
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ieee802154/fakehard.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ieee802154/fakelb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/ifb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/imq.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/irda
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/irda/irda-usb.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/irda/irtty-sir.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/irda/kingsun-sir.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/irda/ks959-sir.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/irda/ksdazzle-sir.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/irda/mcs7780.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/irda/sir-dev.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/irda/stir4200.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/macvlan.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/macvtap.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/mii.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/amd.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/at803x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/bcm87xx.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/broadcom.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/cicada.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/davicom.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/dp83640.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/et1011c.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/icplus.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/lxt.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/marvell.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/mdio-bitbang.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/mdio-gpio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/mdio-mux-gpio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/mdio-mux-mmioreg.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/mdio-mux.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/micrel.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/national.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/phy/qsemi.ko
@@ -720,12 +1039,21 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/slip
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/slip/slhc.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/slip/slip.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/team
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/team/team.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/team/team_mode_activebackup.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/team/team_mode_broadcast.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/team/team_mode_loadbalance.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/team/team_mode_random.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/team/team_mode_roundrobin.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/tun.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/asix.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/ax88179_178a.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/catc.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/cdc_eem.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/cdc_ether.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/cdc_mbim.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/cdc_ncm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/cdc_subset.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/cx82310_eth.ko
@@ -740,6 +1068,8 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/net1080.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/pegasus.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/plusb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/qmi_wwan.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/r8152.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/rndis_host.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/rtl8150.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/sierra_net.ko
@@ -748,6 +1078,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/usbnet.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/usb/zaurus.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/veth.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/vxlan.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wan
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wan/dlci.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wan/hdlc.ko
@@ -758,10 +1089,77 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wan/hdlc_raw_eth.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/at76c50x-usb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/ar5523
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/ar5523/ar5523.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/ath.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/ath6kl
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_core.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_sdio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_usb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/ath9k
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/carl9170
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/b43
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/b43/b43.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/b43legacy
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/brcm80211
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/brcm80211/brcmfmac
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/brcm80211/brcmfmac/brcmfmac.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/brcm80211/brcmsmac
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/brcm80211/brcmutil
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/brcm80211/brcmutil/brcmutil.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/hostap
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/hostap/hostap.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas/libertas.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas/libertas_spi.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+#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/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
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/mwifiex/mwifiex_usb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/p54
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/p54/p54common.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/p54/p54spi.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/p54/p54usb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rndis_wlan.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rt2x00
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rtl818x
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rtl818x/rtl8187
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rtl8192cu
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/rtl8192cu/8192cu.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ti
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ti/wl1251
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ti/wl1251/wl1251.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ti/wl1251/wl1251_sdio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ti/wl12xx
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ti/wl12xx/wl12xx.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ti/wl18xx
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ti/wl18xx/wl18xx.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ti/wlcore
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ti/wlcore/wlcore.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/ti/wlcore/wlcore_sdio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/zd1201.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/zd1211rw
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/parport
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/parport/parport.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/parport/parport_ax88796.ko
@@ -777,34 +1175,47 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-bq4802.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-cmos.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1286.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1305.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1307.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1374.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1390.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1511.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1553.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1672.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds1742.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds2404.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds3232.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-ds3234.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-em3027.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-fm3130.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-hid-sensor-time.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-isl12022.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-isl1208.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-m41t80.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-m41t93.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-m41t94.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-m48t35.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-m48t59.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-m48t86.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-max6900.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-max6902.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-msm6242.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pcf50633.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pcf2123.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pcf8523.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pcf8563.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pcf8583.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pl030.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-pl031.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-r9701.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-rp5c01.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-rs5c348.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-rs5c372.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-rv3029c2.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-rx4581.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-rx8025.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-rx8581.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-s35390a.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-snvs.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-stk17ta8.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-v3020.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/rtc/rtc-x1205.ko
@@ -835,13 +1246,25 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/scsi_transport_sas.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/scsi_transport_spi.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/scsi_transport_srp.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/scsi_wait_scan.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/ses.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/sg.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/sr_mod.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/ufs
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/ufs/ufshcd-pltfrm.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/scsi/ufs/ufshcd.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/spi
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/spi/spi-bcm2708.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/spi/spi-bitbang.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/spi/spi-gpio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/spi/spi-oc-tiny.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/spi/spi-pl022.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/ssb
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/ssb/ssb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/staging
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/echo
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/echo/echo.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/rts5139
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/rts5139/rts5139.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/usbip
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/usbip/usbip-core.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/usbip/usbip-host.ko
@@ -849,13 +1272,18 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/tty
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/n_gsm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/8250_dw.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/8250
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/8250/8250_dw.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/8250/8250_em.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/altera_jtaguart.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/altera_uart.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/arc_uart.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/sccnxp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/timbuart.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/tty/serial/xilinx_uartps.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/uio
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/uio/uio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/uio/uio_dmem_genirq.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/uio/uio_pdrv.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/uio/uio_pdrv_genirq.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb
@@ -870,41 +1298,32 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/class/cdc-wdm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/class/usblp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/class/usbtmc.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/dwc3
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/dwc3/dwc3-omap.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/dwc3/dwc3.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host/isp116x-hcd.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host/isp1362-hcd.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host/oxu210hp-hcd.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host/r8a66597-hcd.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host/sl811-hcd.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/host/u132-hcd.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/cypress_cy7c63.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/cytherm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/emi26.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/emi62.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/ezusb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/ftdi-elan.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/iowarrior.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/isight_firmware.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/usb3503.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/usblcd.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/usbled.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/usbsevseg.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/uss720.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/misc/yurex.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/otg
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/otg/gpio_vbus.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/otg/nop-usb-xceiv.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/aircable.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/ark3116.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/belkin_sa.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/ch341.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/cp210x.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/cyberjack.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/cypress_m8.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/digi_acceleport.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/empeg.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/f81232.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/ftdi_sio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/funsoft.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/garmin_gps.ko
@@ -915,17 +1334,24 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/ipw.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/ir-usb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/iuu_phoenix.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/keyspan.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/keyspan_pda.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/kl5kusb105.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/kobil_sct.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/mct_u232.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/metro-usb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/mos7720.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/mos7840.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/moto_modem.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/navman.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/omninet.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/opticon.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/option.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/oti6858.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/pl2303.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/qcaux.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/qcserial.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/quatech2.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/safe_serial.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/siemens_mpi.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/sierra.ko
@@ -938,9 +1364,11 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/visor.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/vivopay-serial.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/whiteheat.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/wishbone-serial.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/xsens_mt.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/zio.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/serial/zte_ev.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/uas.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/ums-alauda.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/ums-cypress.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/ums-datafab.ko
@@ -956,23 +1384,13 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/ums-usbat.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/usb/storage/usb-storage.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/video
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/88pm860x_bl.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/adp8860_bl.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/adp8870_bl.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/generic_bl.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/lcd.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/pcf50633-backlight.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/backlight/platform_lcd.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/video/fb_sys_fops.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/metronomefb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/video/output.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/sm501fb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/video/smscufx.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/video/syscopyarea.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/video/sysfillrect.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/video/sysimgblt.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/tmiofb.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/video/udlfb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/video/uvesafb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/masters
@@ -983,24 +1401,26 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves/w1_bq27000.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves/w1_ds2408.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves/w1_ds2413.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves/w1_ds2423.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves/w1_ds2431.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves/w1_ds2433.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves/w1_ds2760.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves/w1_ds2780.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves/w1_ds2781.ko
+#lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves/w1_ds28e04.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves/w1_smem.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/slaves/w1_therm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/w1/wire.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog/bcm2708_wdog.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog/dw_wdt.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog/max63xx_wdt.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog/pcwd_usb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog/softdog.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/watchdog/sp805_wdt.ko
 #lib/modules/KVER-ipfire-rpi/kernel/fs
 #lib/modules/KVER-ipfire-rpi/kernel/fs/autofs4
 #lib/modules/KVER-ipfire-rpi/kernel/fs/autofs4/autofs4.ko
+#lib/modules/KVER-ipfire-rpi/kernel/fs/btrfs
+#lib/modules/KVER-ipfire-rpi/kernel/fs/btrfs/btrfs.ko
 #lib/modules/KVER-ipfire-rpi/kernel/fs/cachefiles
 #lib/modules/KVER-ipfire-rpi/kernel/fs/cachefiles/cachefiles.ko
 #lib/modules/KVER-ipfire-rpi/kernel/fs/cifs
@@ -1027,6 +1447,9 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/fs/lockd/lockd.ko
 #lib/modules/KVER-ipfire-rpi/kernel/fs/nfs
 #lib/modules/KVER-ipfire-rpi/kernel/fs/nfs/nfs.ko
+#lib/modules/KVER-ipfire-rpi/kernel/fs/nfs/nfsv2.ko
+#lib/modules/KVER-ipfire-rpi/kernel/fs/nfs/nfsv3.ko
+#lib/modules/KVER-ipfire-rpi/kernel/fs/nfs/nfsv4.ko
 #lib/modules/KVER-ipfire-rpi/kernel/fs/nfs_common
 #lib/modules/KVER-ipfire-rpi/kernel/fs/nfs_common/nfs_acl.ko
 #lib/modules/KVER-ipfire-rpi/kernel/fs/nfsd
@@ -1044,6 +1467,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/fs/xfs
 #lib/modules/KVER-ipfire-rpi/kernel/fs/xfs/xfs.ko
 #lib/modules/KVER-ipfire-rpi/kernel/lib
+#lib/modules/KVER-ipfire-rpi/kernel/lib/asn1_decoder.ko
 #lib/modules/KVER-ipfire-rpi/kernel/lib/cordic.ko
 #lib/modules/KVER-ipfire-rpi/kernel/lib/crc-ccitt.ko
 #lib/modules/KVER-ipfire-rpi/kernel/lib/crc-itu-t.ko
@@ -1051,6 +1475,9 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/lib/crc7.ko
 #lib/modules/KVER-ipfire-rpi/kernel/lib/crc8.ko
 #lib/modules/KVER-ipfire-rpi/kernel/lib/libcrc32c.ko
+#lib/modules/KVER-ipfire-rpi/kernel/lib/mpi
+#lib/modules/KVER-ipfire-rpi/kernel/lib/mpi/mpi.ko
+#lib/modules/KVER-ipfire-rpi/kernel/lib/oid_registry.ko
 #lib/modules/KVER-ipfire-rpi/kernel/lib/raid6
 #lib/modules/KVER-ipfire-rpi/kernel/lib/raid6/raid6_pq.ko
 #lib/modules/KVER-ipfire-rpi/kernel/lib/ts_bm.ko
@@ -1108,6 +1535,8 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/bridge/netfilter/ebtables.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ceph
 #lib/modules/KVER-ipfire-rpi/kernel/net/ceph/libceph.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/core
+#lib/modules/KVER-ipfire-rpi/kernel/net/core/netprio_cgroup.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ieee802154
 #lib/modules/KVER-ipfire-rpi/kernel/net/ieee802154/6lowpan.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ieee802154/af_802154.ko
@@ -1118,44 +1547,35 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/gre.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/inet_diag.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/ip_gre.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/ip_tunnel.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/ip_vti.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/ipcomp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/ipip.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/arp_tables.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/arpt_mangle.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/arptable_filter.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ip_queue.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ip_tables.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_CLUSTERIP.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ECN.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_LOG.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_MASQUERADE.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_NETMAP.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_REDIRECT.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_REJECT.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ULOG.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ah.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ecn.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_rpfilter.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/iptable_filter.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/iptable_mangle.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/iptable_nat.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/iptable_raw.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/iptable_security.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_conntrack_ipv4.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_amanda.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_ftp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_h323.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_irc.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_ipv4.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_pptp.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_proto_dccp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_proto_gre.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_proto_sctp.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_proto_udplite.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_sip.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_snmp_basic.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/nf_nat_tftp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/tcp_bic.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/tcp_cubic.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/tcp_diag.ko
@@ -1170,17 +1590,17 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/tcp_westwood.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/tcp_yeah.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/tunnel4.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/udp_diag.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/xfrm4_tunnel.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/ah6.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/esp6.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/ip6_gre.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/ip6_tunnel.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/ipcomp6.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/mip6.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6_queue.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6_tables.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6t_LOG.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6t_REJECT.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6t_ah.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6t_eui64.ko
@@ -1188,10 +1608,12 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6t_hbh.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6t_ipv6header.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6t_mh.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6t_rpfilter.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6t_rt.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6table_filter.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6table_mangle.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6table_raw.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/ip6table_security.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/netfilter/nf_defrag_ipv6.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/sit.ko
@@ -1201,27 +1623,21 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/xfrm6_mode_transport.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/xfrm6_mode_tunnel.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv6/xfrm6_tunnel.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/irda
-#lib/modules/KVER-ipfire-rpi/kernel/net/irda/ircomm
-#lib/modules/KVER-ipfire-rpi/kernel/net/irda/ircomm/ircomm-tty.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/irda/ircomm/ircomm.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/irda/irda.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/irda/irlan
-#lib/modules/KVER-ipfire-rpi/kernel/net/irda/irlan/irlan.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/irda/irnet
-#lib/modules/KVER-ipfire-rpi/kernel/net/irda/irnet/irnet.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/key
 #lib/modules/KVER-ipfire-rpi/kernel/net/key/af_key.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/l2tp
 #lib/modules/KVER-ipfire-rpi/kernel/net/l2tp/l2tp_core.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/l2tp/l2tp_eth.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/l2tp/l2tp_ip.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/l2tp/l2tp_ip6.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/l2tp/l2tp_netlink.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/l2tp/l2tp_ppp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/llc
 #lib/modules/KVER-ipfire-rpi/kernel/net/llc/llc.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/mac80211
 #lib/modules/KVER-ipfire-rpi/kernel/net/mac80211/mac80211.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/mac802154
+#lib/modules/KVER-ipfire-rpi/kernel/net/mac802154/mac802154.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipvs
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipvs/ip_vs.ko
@@ -1237,7 +1653,6 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipvs/ip_vs_sh.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipvs/ip_vs_wlc.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/ipvs/ip_vs_wrr.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_conntrack.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_conntrack_amanda.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_conntrack_broadcast.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_conntrack_ftp.ko
@@ -1254,8 +1669,20 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_conntrack_sip.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_conntrack_snmp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_conntrack_tftp.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_nat.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_nat_amanda.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_nat_ftp.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_nat_irc.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_nat_proto_dccp.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_nat_proto_sctp.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_nat_proto_udplite.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_nat_sip.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_nat_tftp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nf_tproxy_core.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nfnetlink.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nfnetlink_acct.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nfnetlink_cthelper.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nfnetlink_cttimeout.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nfnetlink_log.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/nfnetlink_queue.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/x_tables.ko
@@ -1265,22 +1692,27 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_CT.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_DSCP.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_HL.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_HMARK.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_IDLETIMER.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_IMQ.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_LED.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_LOG.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_NETMAP.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_NFLOG.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_NFQUEUE.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_NOTRACK.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_RATEEST.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_REDIRECT.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_TCPMSS.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_TCPOPTSTRIP.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_TEE.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_TPROXY.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_TRACE.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_addrtype.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_bpf.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_cluster.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_comment.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_connbytes.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_connlabel.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_connlimit.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_connmark.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_conntrack.ko
@@ -1288,6 +1720,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_dccp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_devgroup.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_dscp.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_ecn.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_esp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_hashlimit.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_helper.ko
@@ -1300,6 +1733,8 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_mac.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_mark.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_multiport.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_nat.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_nfacct.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_osf.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_owner.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_physdev.ko
@@ -1318,6 +1753,10 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_tcpudp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_time.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/netfilter/xt_u32.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/netlink
+#lib/modules/KVER-ipfire-rpi/kernel/net/netlink/netlink_diag.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/openvswitch
+#lib/modules/KVER-ipfire-rpi/kernel/net/openvswitch/openvswitch.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/rfkill
 #lib/modules/KVER-ipfire-rpi/kernel/net/rfkill/rfkill-gpio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/rfkill/rfkill-regulator.ko
@@ -1336,6 +1775,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/act_simple.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/act_skbedit.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/cls_basic.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/sched/cls_cgroup.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/cls_flow.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/cls_fw.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/cls_route.ko
@@ -1351,8 +1791,10 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_atm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_cbq.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_choke.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_codel.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_drr.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_dsmark.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_fq_codel.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_gred.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_hfsc.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_htb.ko
@@ -1360,6 +1802,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_mqprio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_multiq.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_netem.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_plug.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_prio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_qfq.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_red.ko
@@ -1372,6 +1815,8 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/sunrpc/auth_gss/auth_rpcgss.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sunrpc/auth_gss/rpcsec_gss_krb5.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/sunrpc/sunrpc.ko
+#lib/modules/KVER-ipfire-rpi/kernel/net/unix
+#lib/modules/KVER-ipfire-rpi/kernel/net/unix/unix_diag.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/wireless
 #lib/modules/KVER-ipfire-rpi/kernel/net/wireless/cfg80211.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/wireless/lib80211.ko
@@ -1379,6 +1824,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/wireless/lib80211_crypt_tkip.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/wireless/lib80211_crypt_wep.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/xfrm
+#lib/modules/KVER-ipfire-rpi/kernel/net/xfrm/xfrm_algo.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/xfrm/xfrm_ipcomp.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/xfrm/xfrm_user.ko
 #lib/modules/KVER-ipfire-rpi/kernel/sound
@@ -1399,6 +1845,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/sound/core/seq/snd-seq-midi.ko
 #lib/modules/KVER-ipfire-rpi/kernel/sound/core/seq/snd-seq-virmidi.ko
 #lib/modules/KVER-ipfire-rpi/kernel/sound/core/seq/snd-seq.ko
+#lib/modules/KVER-ipfire-rpi/kernel/sound/core/snd-compress.ko
 #lib/modules/KVER-ipfire-rpi/kernel/sound/core/snd-hrtimer.ko
 #lib/modules/KVER-ipfire-rpi/kernel/sound/core/snd-hwdep.ko
 #lib/modules/KVER-ipfire-rpi/kernel/sound/core/snd-page-alloc.ko
@@ -1421,6 +1868,19 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/sound/pci/ac97
 #lib/modules/KVER-ipfire-rpi/kernel/sound/pci/ac97/snd-ac97-codec.ko
 #lib/modules/KVER-ipfire-rpi/kernel/sound/soc
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/bcm
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/bcm/snd-soc-bcm2708-i2s.ko
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/bcm/snd-soc-hifiberry-dac.ko
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/bcm/snd-soc-hifiberry-digi.ko
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/bcm/snd-soc-rpi-dac.ko
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/codecs
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/codecs/snd-soc-pcm1794a.ko
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/codecs/snd-soc-pcm5102a.ko
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/codecs/snd-soc-wm8804.ko
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/dwc
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/dwc/designware_i2s.ko
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/generic
+#lib/modules/KVER-ipfire-rpi/kernel/sound/soc/generic/snd-soc-simple-card.ko
 #lib/modules/KVER-ipfire-rpi/kernel/sound/soc/snd-soc-core.ko
 #lib/modules/KVER-ipfire-rpi/kernel/sound/soundcore.ko
 #lib/modules/KVER-ipfire-rpi/kernel/sound/usb
@@ -1435,17 +1895,12 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/modules.alias
 #lib/modules/KVER-ipfire-rpi/modules.alias.bin
 #lib/modules/KVER-ipfire-rpi/modules.builtin
-#lib/modules/KVER-ipfire-rpi/modules.ccwmap
+#lib/modules/KVER-ipfire-rpi/modules.builtin.bin
 #lib/modules/KVER-ipfire-rpi/modules.dep
 #lib/modules/KVER-ipfire-rpi/modules.dep.bin
-#lib/modules/KVER-ipfire-rpi/modules.ieee1394map
-#lib/modules/KVER-ipfire-rpi/modules.inputmap
-#lib/modules/KVER-ipfire-rpi/modules.isapnpmap
-#lib/modules/KVER-ipfire-rpi/modules.ofmap
+#lib/modules/KVER-ipfire-rpi/modules.devname
 #lib/modules/KVER-ipfire-rpi/modules.order
-#lib/modules/KVER-ipfire-rpi/modules.pcimap
-#lib/modules/KVER-ipfire-rpi/modules.seriomap
+#lib/modules/KVER-ipfire-rpi/modules.softdep
 #lib/modules/KVER-ipfire-rpi/modules.symbols
 #lib/modules/KVER-ipfire-rpi/modules.symbols.bin
-#lib/modules/KVER-ipfire-rpi/modules.usbmap
 #lib/modules/KVER-ipfire-rpi/source
index 1048dc8182a91d6e838c060d79a06b220b3d7073..b139d7e732a416475e9bf41e07a6374517ade9c6 100644 (file)
@@ -1,8 +1,12 @@
+#boot/MLO
+boot/boot.scr
+boot/boot.script
+boot/convert_bootscript
+#boot/u-boot.img
 usr/bin/mkimage
 #usr/share/u-boot
 #usr/share/u-boot/pandaboard
 #usr/share/u-boot/pandaboard/MLO
-#usr/share/u-boot/pandaboard/u-boot.bin
 #usr/share/u-boot/pandaboard/u-boot.img
 #usr/share/u-boot/wandboard_dl
 #usr/share/u-boot/wandboard_dl/u-boot.imx
diff --git a/config/rootfiles/common/armv5tel/u-boot-panda b/config/rootfiles/common/armv5tel/u-boot-panda
deleted file mode 100644 (file)
index 544d9d7..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#boot/MLO
-#boot/u-boot.bin
-boot/boot.scr
-boot/boot.script
-boot/convert_bootscript
index 3b91181d03f29fc9ff6be15fd75a6b55e69b6b2a..07a39f46350495efeb9ce8d6a3a8f0a267bc275b 100644 (file)
@@ -76,7 +76,6 @@ etc/rc.d/init.d/networking/red.down/10-ipsec
 etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.down/10-ovpn
 etc/rc.d/init.d/networking/red.down/20-RL-firewall
-etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
 #etc/rc.d/init.d/networking/red.up
 etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
 etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
@@ -91,7 +90,6 @@ etc/rc.d/init.d/networking/red.up/40-ipac
 etc/rc.d/init.d/networking/red.up/50-ipsec
 etc/rc.d/init.d/networking/red.up/50-ovpn
 etc/rc.d/init.d/networking/red.up/98-leds
-etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
 etc/rc.d/init.d/networking/red.up/99-fireinfo
 etc/rc.d/init.d/networking/red.up/99-pakfire-update
 etc/rc.d/init.d/networking/wpa_supplicant.exe
index 1a08e1795924227afd9f632a1de9209ce1c866f8..daaa17645f5b9cfc38e660d844b3257b285faf4a 100644 (file)
@@ -1963,6 +1963,8 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/kernel/drivers/staging/echo/echo.ko
 #lib/modules/KVER-ipfire/kernel/drivers/staging/et131x
 #lib/modules/KVER-ipfire/kernel/drivers/staging/et131x/et131x.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/rts5139
+#lib/modules/KVER-ipfire/kernel/drivers/staging/rts5139/rts5139.ko
 #lib/modules/KVER-ipfire/kernel/drivers/staging/slicoss
 #lib/modules/KVER-ipfire/kernel/drivers/staging/slicoss/slicoss.ko
 #lib/modules/KVER-ipfire/kernel/drivers/staging/usbip
index a2b1cfab487c46f9431acef9fd60ac52bb12819e..87649e9726b942db11496c458ac754032adf3ba7 100644 (file)
@@ -81,7 +81,6 @@ usr/local/bin/backupiso
 usr/local/bin/connscheduler
 usr/local/bin/consort.sh
 usr/local/bin/convert-ovpn
-usr/local/bin/dialctrl.pl
 usr/local/bin/hddshutdown
 usr/local/bin/httpscert
 usr/local/bin/makegraphs
index 4aa763ef79a5cae5811892f47d6fe093741389ce..c904fc337e7ba4c92d17167d6639aea1e0fc63e2 100644 (file)
@@ -1,10 +1,77 @@
 etc/sudoers
+etc/sudoers.d
 usr/bin/sudo
 usr/bin/sudoedit
-usr/lib/sudo_noexec.la
-usr/lib/sudo_noexec.so
-#usr/man/man5/sudoers.5
-#usr/man/man8/sudo.8
-#usr/man/man8/sudoedit.8
-#usr/man/man8/visudo.8
+usr/bin/sudoreplay
+#usr/include/sudo_plugin.h
+usr/lib/sudo
+usr/lib/sudo/group_file.so
+usr/lib/sudo/sudo_noexec.so
+usr/lib/sudo/sudoers.so
+usr/lib/sudo/system_group.so
 usr/sbin/visudo
+#usr/share/doc/sudo
+#usr/share/doc/sudo/CONTRIBUTORS
+#usr/share/doc/sudo/ChangeLog
+#usr/share/doc/sudo/HISTORY
+#usr/share/doc/sudo/LICENSE
+#usr/share/doc/sudo/NEWS
+#usr/share/doc/sudo/README
+#usr/share/doc/sudo/TROUBLESHOOTING
+#usr/share/doc/sudo/UPGRADE
+#usr/share/doc/sudo/sample.pam
+#usr/share/doc/sudo/sample.sudo.conf
+#usr/share/doc/sudo/sample.sudoers
+#usr/share/doc/sudo/sample.syslog.conf
+#usr/share/locale/ca/LC_MESSAGES/sudo.mo
+#usr/share/locale/cs/LC_MESSAGES/sudo.mo
+#usr/share/locale/cs/LC_MESSAGES/sudoers.mo
+#usr/share/locale/da/LC_MESSAGES/sudo.mo
+#usr/share/locale/da/LC_MESSAGES/sudoers.mo
+#usr/share/locale/de/LC_MESSAGES/sudo.mo
+#usr/share/locale/de/LC_MESSAGES/sudoers.mo
+#usr/share/locale/eo/LC_MESSAGES/sudo.mo
+#usr/share/locale/eo/LC_MESSAGES/sudoers.mo
+#usr/share/locale/es/LC_MESSAGES/sudo.mo
+#usr/share/locale/eu/LC_MESSAGES/sudo.mo
+#usr/share/locale/eu/LC_MESSAGES/sudoers.mo
+#usr/share/locale/fi/LC_MESSAGES/sudo.mo
+#usr/share/locale/fi/LC_MESSAGES/sudoers.mo
+#usr/share/locale/fr/LC_MESSAGES/sudo.mo
+#usr/share/locale/gl/LC_MESSAGES/sudo.mo
+#usr/share/locale/hr/LC_MESSAGES/sudo.mo
+#usr/share/locale/hr/LC_MESSAGES/sudoers.mo
+#usr/share/locale/it/LC_MESSAGES/sudo.mo
+#usr/share/locale/it/LC_MESSAGES/sudoers.mo
+#usr/share/locale/ja/LC_MESSAGES/sudo.mo
+#usr/share/locale/ja/LC_MESSAGES/sudoers.mo
+#usr/share/locale/lt/LC_MESSAGES/sudoers.mo
+#usr/share/locale/nl/LC_MESSAGES/sudo.mo
+#usr/share/locale/nl/LC_MESSAGES/sudoers.mo
+#usr/share/locale/pl/LC_MESSAGES/sudo.mo
+#usr/share/locale/pl/LC_MESSAGES/sudoers.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/sudo.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/sudoers.mo
+#usr/share/locale/ru/LC_MESSAGES/sudo.mo
+#usr/share/locale/sl/LC_MESSAGES/sudo.mo
+#usr/share/locale/sl/LC_MESSAGES/sudoers.mo
+#usr/share/locale/sr/LC_MESSAGES/sudo.mo
+#usr/share/locale/sr/LC_MESSAGES/sudoers.mo
+#usr/share/locale/sv/LC_MESSAGES/sudo.mo
+#usr/share/locale/sv/LC_MESSAGES/sudoers.mo
+#usr/share/locale/tr/LC_MESSAGES/sudo.mo
+#usr/share/locale/tr/LC_MESSAGES/sudoers.mo
+#usr/share/locale/uk/LC_MESSAGES/sudo.mo
+#usr/share/locale/uk/LC_MESSAGES/sudoers.mo
+#usr/share/locale/vi/LC_MESSAGES/sudo.mo
+#usr/share/locale/vi/LC_MESSAGES/sudoers.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/sudo.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/sudoers.mo
+#usr/share/man/man5/sudo.conf.5
+#usr/share/man/man5/sudoers.5
+#usr/share/man/man8/sudo.8
+#usr/share/man/man8/sudo_plugin.8
+#usr/share/man/man8/sudoedit.8
+#usr/share/man/man8/sudoreplay.8
+#usr/share/man/man8/visudo.8
+var/lib/sudo
index 7362a0f8a5c7ce023f33cb1617c3bbc1225f323c..4bb0df248efda0b3a621ff09f3e3974d016c66d1 100644 (file)
@@ -281,6 +281,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/Asia/Kashgar
 #usr/share/zoneinfo/Asia/Kathmandu
 #usr/share/zoneinfo/Asia/Katmandu
+#usr/share/zoneinfo/Asia/Khandyga
 #usr/share/zoneinfo/Asia/Kolkata
 #usr/share/zoneinfo/Asia/Krasnoyarsk
 #usr/share/zoneinfo/Asia/Kuala_Lumpur
@@ -304,9 +305,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/Asia/Qyzylorda
 #usr/share/zoneinfo/Asia/Rangoon
 #usr/share/zoneinfo/Asia/Riyadh
-#usr/share/zoneinfo/Asia/Riyadh87
-#usr/share/zoneinfo/Asia/Riyadh88
-#usr/share/zoneinfo/Asia/Riyadh89
 #usr/share/zoneinfo/Asia/Saigon
 #usr/share/zoneinfo/Asia/Sakhalin
 #usr/share/zoneinfo/Asia/Samarkand
@@ -325,6 +323,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/Asia/Ulaanbaatar
 #usr/share/zoneinfo/Asia/Ulan_Bator
 #usr/share/zoneinfo/Asia/Urumqi
+#usr/share/zoneinfo/Asia/Ust-Nera
 #usr/share/zoneinfo/Asia/Vientiane
 #usr/share/zoneinfo/Asia/Vladivostok
 #usr/share/zoneinfo/Asia/Yakutsk
@@ -440,6 +439,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/Europe/Brussels
 #usr/share/zoneinfo/Europe/Bucharest
 #usr/share/zoneinfo/Europe/Budapest
+#usr/share/zoneinfo/Europe/Busingen
 #usr/share/zoneinfo/Europe/Chisinau
 #usr/share/zoneinfo/Europe/Copenhagen
 #usr/share/zoneinfo/Europe/Dublin
@@ -524,10 +524,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/Mexico/BajaNorte
 #usr/share/zoneinfo/Mexico/BajaSur
 #usr/share/zoneinfo/Mexico/General
-#usr/share/zoneinfo/Mideast
-#usr/share/zoneinfo/Mideast/Riyadh87
-#usr/share/zoneinfo/Mideast/Riyadh88
-#usr/share/zoneinfo/Mideast/Riyadh89
 #usr/share/zoneinfo/NZ
 #usr/share/zoneinfo/NZ-CHAT
 #usr/share/zoneinfo/Navajo
@@ -886,6 +882,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Asia/Kashgar
 #usr/share/zoneinfo/posix/Asia/Kathmandu
 #usr/share/zoneinfo/posix/Asia/Katmandu
+#usr/share/zoneinfo/posix/Asia/Khandyga
 #usr/share/zoneinfo/posix/Asia/Kolkata
 #usr/share/zoneinfo/posix/Asia/Krasnoyarsk
 #usr/share/zoneinfo/posix/Asia/Kuala_Lumpur
@@ -909,9 +906,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Asia/Qyzylorda
 #usr/share/zoneinfo/posix/Asia/Rangoon
 #usr/share/zoneinfo/posix/Asia/Riyadh
-#usr/share/zoneinfo/posix/Asia/Riyadh87
-#usr/share/zoneinfo/posix/Asia/Riyadh88
-#usr/share/zoneinfo/posix/Asia/Riyadh89
 #usr/share/zoneinfo/posix/Asia/Saigon
 #usr/share/zoneinfo/posix/Asia/Sakhalin
 #usr/share/zoneinfo/posix/Asia/Samarkand
@@ -930,6 +924,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Asia/Ulaanbaatar
 #usr/share/zoneinfo/posix/Asia/Ulan_Bator
 #usr/share/zoneinfo/posix/Asia/Urumqi
+#usr/share/zoneinfo/posix/Asia/Ust-Nera
 #usr/share/zoneinfo/posix/Asia/Vientiane
 #usr/share/zoneinfo/posix/Asia/Vladivostok
 #usr/share/zoneinfo/posix/Asia/Yakutsk
@@ -1045,6 +1040,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Europe/Brussels
 #usr/share/zoneinfo/posix/Europe/Bucharest
 #usr/share/zoneinfo/posix/Europe/Budapest
+#usr/share/zoneinfo/posix/Europe/Busingen
 #usr/share/zoneinfo/posix/Europe/Chisinau
 #usr/share/zoneinfo/posix/Europe/Copenhagen
 #usr/share/zoneinfo/posix/Europe/Dublin
@@ -1093,7 +1089,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Europe/Zagreb
 #usr/share/zoneinfo/posix/Europe/Zaporozhye
 #usr/share/zoneinfo/posix/Europe/Zurich
-#usr/share/zoneinfo/posix/Factory
 #usr/share/zoneinfo/posix/GB
 #usr/share/zoneinfo/posix/GB-Eire
 #usr/share/zoneinfo/posix/GMT
@@ -1129,10 +1124,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/posix/Mexico/BajaNorte
 #usr/share/zoneinfo/posix/Mexico/BajaSur
 #usr/share/zoneinfo/posix/Mexico/General
-#usr/share/zoneinfo/posix/Mideast
-#usr/share/zoneinfo/posix/Mideast/Riyadh87
-#usr/share/zoneinfo/posix/Mideast/Riyadh88
-#usr/share/zoneinfo/posix/Mideast/Riyadh89
 #usr/share/zoneinfo/posix/NZ
 #usr/share/zoneinfo/posix/NZ-CHAT
 #usr/share/zoneinfo/posix/Navajo
@@ -1491,6 +1482,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Asia/Kashgar
 #usr/share/zoneinfo/right/Asia/Kathmandu
 #usr/share/zoneinfo/right/Asia/Katmandu
+#usr/share/zoneinfo/right/Asia/Khandyga
 #usr/share/zoneinfo/right/Asia/Kolkata
 #usr/share/zoneinfo/right/Asia/Krasnoyarsk
 #usr/share/zoneinfo/right/Asia/Kuala_Lumpur
@@ -1514,9 +1506,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Asia/Qyzylorda
 #usr/share/zoneinfo/right/Asia/Rangoon
 #usr/share/zoneinfo/right/Asia/Riyadh
-#usr/share/zoneinfo/right/Asia/Riyadh87
-#usr/share/zoneinfo/right/Asia/Riyadh88
-#usr/share/zoneinfo/right/Asia/Riyadh89
 #usr/share/zoneinfo/right/Asia/Saigon
 #usr/share/zoneinfo/right/Asia/Sakhalin
 #usr/share/zoneinfo/right/Asia/Samarkand
@@ -1535,6 +1524,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Asia/Ulaanbaatar
 #usr/share/zoneinfo/right/Asia/Ulan_Bator
 #usr/share/zoneinfo/right/Asia/Urumqi
+#usr/share/zoneinfo/right/Asia/Ust-Nera
 #usr/share/zoneinfo/right/Asia/Vientiane
 #usr/share/zoneinfo/right/Asia/Vladivostok
 #usr/share/zoneinfo/right/Asia/Yakutsk
@@ -1650,6 +1640,7 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Europe/Brussels
 #usr/share/zoneinfo/right/Europe/Bucharest
 #usr/share/zoneinfo/right/Europe/Budapest
+#usr/share/zoneinfo/right/Europe/Busingen
 #usr/share/zoneinfo/right/Europe/Chisinau
 #usr/share/zoneinfo/right/Europe/Copenhagen
 #usr/share/zoneinfo/right/Europe/Dublin
@@ -1698,7 +1689,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Europe/Zagreb
 #usr/share/zoneinfo/right/Europe/Zaporozhye
 #usr/share/zoneinfo/right/Europe/Zurich
-#usr/share/zoneinfo/right/Factory
 #usr/share/zoneinfo/right/GB
 #usr/share/zoneinfo/right/GB-Eire
 #usr/share/zoneinfo/right/GMT
@@ -1734,10 +1724,6 @@ usr/share/zoneinfo
 #usr/share/zoneinfo/right/Mexico/BajaNorte
 #usr/share/zoneinfo/right/Mexico/BajaSur
 #usr/share/zoneinfo/right/Mexico/General
-#usr/share/zoneinfo/right/Mideast
-#usr/share/zoneinfo/right/Mideast/Riyadh87
-#usr/share/zoneinfo/right/Mideast/Riyadh88
-#usr/share/zoneinfo/right/Mideast/Riyadh89
 #usr/share/zoneinfo/right/NZ
 #usr/share/zoneinfo/right/NZ-CHAT
 #usr/share/zoneinfo/right/Navajo
index a468d0a61f509942930fb4ddb5672cd2db61a1e9..18e9b4d2433cbceb33fa5ac82618577040e4f66e 100644 (file)
@@ -9,6 +9,7 @@ etc/shadow
 etc/ssh/ssh_config
 etc/ssh/sshd_config
 etc/ssl/openssl.cnf
+etc/sudoers
 etc/sysconfig/firewall.local
 etc/sysconfig/rc.local
 etc/udev/rules.d/30-persistent-network.rules
diff --git a/config/rootfiles/core/76/filelists/beep b/config/rootfiles/core/76/filelists/beep
new file mode 120000 (symlink)
index 0000000..6db094e
--- /dev/null
@@ -0,0 +1 @@
+../../../common/beep
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/tzdata b/config/rootfiles/core/76/filelists/tzdata
new file mode 120000 (symlink)
index 0000000..5a6e325
--- /dev/null
@@ -0,0 +1 @@
+../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/core/76/filelists/wpa_supplicant b/config/rootfiles/core/76/filelists/wpa_supplicant
new file mode 120000 (symlink)
index 0000000..1d04c03
--- /dev/null
@@ -0,0 +1 @@
+../../../common/wpa_supplicant
\ No newline at end of file
index 150045bfe0c9f1428e9c2f236a04e59343872846..a9055d320f213c09f43bc074e9e3de159a691c09 100644 (file)
@@ -110,6 +110,9 @@ add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
 add_to_backup etc/inittab
 add_to_backup etc/fstab
 add_to_backup usr/share/usb_modeswitch
+add_to_backup etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
+add_to_backup etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
+add_to_backup usr/local/bin/dialctrl.pl
 
 # Backup the files
 tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \
@@ -140,6 +143,14 @@ rm -rf /lib/modules
 
 # Remove old usb_modeswitch_data
 rm -rf /usr/share/usb_modeswitch
+# Remove old tzdata
+rm -rf /usr/share/zoneinfo
+
+# Remove dialctrl.pl script
+rm -f \
+       /etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl \
+       /etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl \
+       /usr/local/bin/dialctrl.pl
 
 #
 # Remove old udev rules.
diff --git a/config/rootfiles/packages/armv5tel/vdr_dvbapi b/config/rootfiles/packages/armv5tel/vdr_dvbapi
new file mode 100644 (file)
index 0000000..0748137
--- /dev/null
@@ -0,0 +1,3 @@
+etc/sysconfig/vdr-plugins.d/dvbapi.conf
+etc/vdr/plugins/dvbapi
+usr/lib/vdr/libvdr-dvbapi.so.2.0.0
index 933000a034d101d5b492888f03f9d3b7d30fb28c..896eb167b7d7bfe52c81a2dd0f66a73db62184ed 100644 (file)
@@ -22,8 +22,8 @@ usr/lib/perl5/site_perl/5.12.3/Foomatic/DB.pm
 usr/lib/perl5/site_perl/5.12.3/Foomatic/Defaults.pm
 usr/lib/perl5/site_perl/5.12.3/Foomatic/PPD.pm
 usr/lib/perl5/site_perl/5.12.3/Foomatic/UIElem.pm
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Foomatic
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Foomatic/.packlist
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Foomatic
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Foomatic/.packlist
 usr/sbin/foomatic-addpjloptions
 usr/sbin/foomatic-cleanupdrivers
 usr/sbin/foomatic-extract-text
diff --git a/config/rootfiles/packages/i586/vdr_dvbapi b/config/rootfiles/packages/i586/vdr_dvbapi
new file mode 100644 (file)
index 0000000..5e06c12
--- /dev/null
@@ -0,0 +1,4 @@
+etc/sysconfig/vdr-plugins.d/dvbapi.conf
+etc/vdr/plugins/dvbapi
+usr/lib/vdr/libvdr-dvbapi.so.2.0.0
+usr/lib/vdr/libvdr-dvbapi.so.2.0.0-sse
index 00677aa02dddf803cd1a27c642fff4ba800ffb46..242bc968dd4e1fb405aad14427dd52aa6241f950 100644 (file)
@@ -1963,6 +1963,8 @@ lib/modules/KVER-ipfire-pae
 #lib/modules/KVER-ipfire-pae/kernel/drivers/staging/echo/echo.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/staging/et131x
 #lib/modules/KVER-ipfire-pae/kernel/drivers/staging/et131x/et131x.ko
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/rts5139
+#lib/modules/KVER-ipfire-pae/kernel/drivers/staging/rts5139/rts5139.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/staging/slicoss
 #lib/modules/KVER-ipfire-pae/kernel/drivers/staging/slicoss/slicoss.ko
 #lib/modules/KVER-ipfire-pae/kernel/drivers/staging/usbip
diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg
new file mode 100644 (file)
index 0000000..17f7bc4
--- /dev/null
@@ -0,0 +1,2 @@
+etc/vdr/plugins/eepg
+usr/lib/vdr/libvdr-eepg.so.2.0.0
index 881d31827d2a9609eeba72fb145ef75b915a10fd..86c0dba5c56042ce5784b0bb4e4a61718627d309 100644 (file)
@@ -1,4 +1,3 @@
-WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
@@ -58,6 +57,7 @@ WARNING: translation string unused: alt vpn
 WARNING: translation string unused: and
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup config floppy
 WARNING: translation string unused: backup configuration
@@ -118,6 +118,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
@@ -134,6 +135,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -206,6 +208,8 @@ 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
@@ -349,6 +353,7 @@ WARNING: translation string unused: network time
 WARNING: translation string unused: network traffic graphs
 WARNING: translation string unused: network updated
 WARNING: translation string unused: networks settings
+WARNING: translation string unused: never
 WARNING: translation string unused: new optionsfw must boot
 WARNING: translation string unused: no alcatelusb firmware
 WARNING: translation string unused: no cfg upload
@@ -393,10 +398,11 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
-WARNING: translation string unused: ovpn
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
+WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn reneg sec
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_fragment
 WARNING: translation string unused: ovpn_mssfix
@@ -443,16 +449,12 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -526,6 +528,7 @@ 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 exit country
+WARNING: translation string unused: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -602,10 +605,15 @@ WARNING: untranslated string: addons
 WARNING: untranslated string: bytes
 WARNING: untranslated string: community rules
 WARNING: untranslated string: dead peer detection
+WARNING: untranslated string: dns servers
+WARNING: untranslated string: downlink
 WARNING: untranslated string: emerging rules
+WARNING: untranslated string: first
 WARNING: untranslated string: fwhost err hostip
+WARNING: untranslated string: last
 WARNING: untranslated string: qos add subclass
 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: uplink
index 611a0decb83ed583682e832c3e7e100762be9513..8d4a556e6f548ea7ad4c3826f653a43162dd4e2a 100644 (file)
@@ -1,4 +1,3 @@
-WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
@@ -59,6 +58,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -137,6 +137,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
@@ -155,6 +156,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -228,6 +230,8 @@ 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
@@ -374,6 +378,7 @@ WARNING: translation string unused: network time
 WARNING: translation string unused: network traffic graphs
 WARNING: translation string unused: network updated
 WARNING: translation string unused: networks settings
+WARNING: translation string unused: never
 WARNING: translation string unused: new optionsfw must boot
 WARNING: translation string unused: no alcatelusb firmware
 WARNING: translation string unused: no cfg upload
@@ -419,10 +424,11 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
-WARNING: translation string unused: ovpn
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
+WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn reneg sec
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_fragment
 WARNING: translation string unused: ovpn_mssfix
@@ -470,16 +476,12 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -558,6 +560,7 @@ 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
 WARNING: translation string unused: traffic calc time bad
@@ -633,8 +636,13 @@ WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
+WARNING: untranslated string: dns servers
+WARNING: untranslated string: downlink
+WARNING: untranslated string: first
 WARNING: untranslated string: fwhost err hostip
+WARNING: untranslated string: last
 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: uplink
index 636b05f1ef80665af2c768990eb138604bdaf5e0..2718a1aed2e6599925d53e95e4b0819a69fcbf4b 100644 (file)
@@ -54,6 +54,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -148,6 +149,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -367,7 +369,6 @@ WARNING: translation string unused: outgoing firewall p2p description
 WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
-WARNING: translation string unused: ovpn
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
@@ -418,16 +419,12 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -499,6 +496,7 @@ 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: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -553,6 +551,7 @@ WARNING: translation string unused: use dov
 WARNING: translation string unused: use ibod
 WARNING: translation string unused: view log
 WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn configuration main
 WARNING: translation string unused: vpn incompatible use of defaultroute
 WARNING: translation string unused: vpn mtu invalid
 WARNING: translation string unused: vpn on blue
@@ -593,6 +592,8 @@ WARNING: untranslated string: ccd err invalidname
 WARNING: untranslated string: ccd err invalidnet
 WARNING: untranslated string: ccd err irouteexist
 WARNING: untranslated string: ccd err isipsecnet
+WARNING: untranslated string: ccd err isipsecrw
+WARNING: untranslated string: ccd err isovpnn2n
 WARNING: untranslated string: ccd err isovpnnet
 WARNING: untranslated string: ccd err issubnet
 WARNING: untranslated string: ccd err name
@@ -615,9 +616,16 @@ WARNING: untranslated string: ccd none
 WARNING: untranslated string: ccd routes
 WARNING: untranslated string: ccd subnet
 WARNING: untranslated string: ccd used
+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: default ip
 WARNING: untranslated string: deprecated fs warn
+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
@@ -627,6 +635,7 @@ 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
@@ -637,6 +646,7 @@ WARNING: untranslated string: drop outgoing
 WARNING: untranslated string: emerging rules
 WARNING: untranslated string: encryption
 WARNING: untranslated string: entropy
+WARNING: untranslated string: entropy graphs
 WARNING: untranslated string: fireinfo ipfire version
 WARNING: untranslated string: fireinfo is disabled
 WARNING: untranslated string: fireinfo is enabled
@@ -656,6 +666,7 @@ WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
 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
@@ -679,9 +690,7 @@ 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 nosrcip
 WARNING: untranslated string: fwdfw err notgt
-WARNING: untranslated string: fwdfw err notgtip
 WARNING: untranslated string: fwdfw err prot_port
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
@@ -727,6 +736,7 @@ 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
@@ -800,7 +810,10 @@ 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: integrity
 WARNING: untranslated string: invalid input for dpd delay
 WARNING: untranslated string: invalid input for dpd timeout
@@ -814,6 +827,8 @@ WARNING: untranslated string: maximum
 WARNING: untranslated string: minimum
 WARNING: untranslated string: minute
 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 default
 WARNING: untranslated string: openvpn destination port used
@@ -827,8 +842,14 @@ WARNING: untranslated string: openvpn subnet is used
 WARNING: untranslated string: other
 WARNING: untranslated string: outgoing firewall p2p allow
 WARNING: untranslated string: outgoing firewall p2p deny
+WARNING: untranslated string: ovpn crypt options
+WARNING: untranslated string: ovpn dh
+WARNING: untranslated string: ovpn dh name
 WARNING: untranslated string: ovpn errmsg green already pushed
 WARNING: untranslated string: ovpn errmsg invalid ip or mask
+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 mtu-disc
 WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
@@ -856,10 +877,13 @@ WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: server restart
+WARNING: untranslated string: show dh
 WARNING: untranslated string: snat new source ip address
 WARNING: untranslated string: ssh
 WARNING: untranslated string: static routes
 WARNING: untranslated string: support donation
+WARNING: untranslated string: system has hwrng
+WARNING: untranslated string: system has rdrand
 WARNING: untranslated string: system information
 WARNING: untranslated string: tor
 WARNING: untranslated string: tor accounting
@@ -909,6 +933,8 @@ 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: visit us at
index 30cc1f1f788b1a234792d24c7ba840229ad5aff8..aaecb4031965839e6008a3de3780175bbb325a83 100644 (file)
@@ -54,6 +54,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -148,6 +149,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -378,7 +380,6 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
-WARNING: translation string unused: ovpn
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
@@ -429,16 +430,12 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -510,6 +507,7 @@ 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: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -566,6 +564,7 @@ WARNING: translation string unused: use dov
 WARNING: translation string unused: use ibod
 WARNING: translation string unused: view log
 WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn configuration main
 WARNING: translation string unused: vpn incompatible use of defaultroute
 WARNING: translation string unused: vpn mtu invalid
 WARNING: translation string unused: vpn on blue
@@ -603,6 +602,8 @@ WARNING: untranslated string: ccd err invalidname
 WARNING: untranslated string: ccd err invalidnet
 WARNING: untranslated string: ccd err irouteexist
 WARNING: untranslated string: ccd err isipsecnet
+WARNING: untranslated string: ccd err isipsecrw
+WARNING: untranslated string: ccd err isovpnn2n
 WARNING: untranslated string: ccd err isovpnnet
 WARNING: untranslated string: ccd err issubnet
 WARNING: untranslated string: ccd err name
@@ -625,9 +626,16 @@ WARNING: untranslated string: ccd none
 WARNING: untranslated string: ccd routes
 WARNING: untranslated string: ccd subnet
 WARNING: untranslated string: ccd used
+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: default ip
 WARNING: untranslated string: deprecated fs warn
+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 address deleted txt
 WARNING: untranslated string: dns servers
@@ -638,6 +646,7 @@ 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
@@ -648,6 +657,7 @@ WARNING: untranslated string: drop outgoing
 WARNING: untranslated string: emerging rules
 WARNING: untranslated string: encryption
 WARNING: untranslated string: entropy
+WARNING: untranslated string: entropy graphs
 WARNING: untranslated string: fireinfo ipfire version
 WARNING: untranslated string: fireinfo is disabled
 WARNING: untranslated string: fireinfo is enabled
@@ -667,6 +677,7 @@ WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
 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
@@ -690,9 +701,7 @@ 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 nosrcip
 WARNING: untranslated string: fwdfw err notgt
-WARNING: untranslated string: fwdfw err notgtip
 WARNING: untranslated string: fwdfw err prot_port
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
@@ -738,6 +747,7 @@ 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
@@ -811,7 +821,10 @@ 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: integrity
 WARNING: untranslated string: invalid input for dpd delay
 WARNING: untranslated string: invalid input for dpd timeout
@@ -825,6 +838,8 @@ WARNING: untranslated string: maximum
 WARNING: untranslated string: minimum
 WARNING: untranslated string: minute
 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: ntp common settings
 WARNING: untranslated string: ntp sync
@@ -838,6 +853,12 @@ WARNING: untranslated string: openvpn prefix openvpn subnet
 WARNING: untranslated string: openvpn prefix remote subnet
 WARNING: untranslated string: openvpn subnet is used
 WARNING: untranslated string: other
+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 mtu-disc
 WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
@@ -863,11 +884,14 @@ WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: server restart
+WARNING: untranslated string: show dh
 WARNING: untranslated string: snat new source ip address
 WARNING: untranslated string: snort working
 WARNING: untranslated string: ssh
 WARNING: untranslated string: static routes
 WARNING: untranslated string: support donation
+WARNING: untranslated string: system has hwrng
+WARNING: untranslated string: system has rdrand
 WARNING: untranslated string: system information
 WARNING: untranslated string: tor
 WARNING: untranslated string: tor accounting
@@ -917,6 +941,8 @@ 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: upload new ruleset
 WARNING: untranslated string: uptime load average
 WARNING: untranslated string: urlfilter file ext block
index e04aae3199d75eaaed261065d5dd1494123dd680..d318d7f92477776fb471efd8d36bf3bd6f8e68e5 100644 (file)
@@ -54,6 +54,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -150,6 +151,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -383,7 +385,6 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
-WARNING: translation string unused: ovpn
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
@@ -434,16 +435,12 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -515,6 +512,7 @@ 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: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -569,6 +567,7 @@ WARNING: translation string unused: use dov
 WARNING: translation string unused: use ibod
 WARNING: translation string unused: view log
 WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn configuration main
 WARNING: translation string unused: vpn incompatible use of defaultroute
 WARNING: translation string unused: vpn mtu invalid
 WARNING: translation string unused: vpn on blue
@@ -591,9 +590,18 @@ WARNING: untranslated string: advproxy errmsg proxy ports equal
 WARNING: untranslated string: advproxy proxy port transparent
 WARNING: untranslated string: bit
 WARNING: untranslated string: bytes
+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: default ip
+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
@@ -603,6 +611,7 @@ 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
@@ -612,8 +621,10 @@ 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 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
@@ -637,9 +648,7 @@ 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 nosrcip
 WARNING: untranslated string: fwdfw err notgt
-WARNING: untranslated string: fwdfw err notgtip
 WARNING: untranslated string: fwdfw err prot_port
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
@@ -685,6 +694,7 @@ 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
@@ -758,7 +768,10 @@ 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: integrity
 WARNING: untranslated string: invalid input for dpd delay
 WARNING: untranslated string: invalid input for dpd timeout
@@ -771,8 +784,16 @@ WARNING: untranslated string: mac filter
 WARNING: untranslated string: maximum
 WARNING: untranslated string: minimum
 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: 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
@@ -784,9 +805,12 @@ 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: 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
@@ -835,6 +859,8 @@ 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: wlan client
index 636b05f1ef80665af2c768990eb138604bdaf5e0..2718a1aed2e6599925d53e95e4b0819a69fcbf4b 100644 (file)
@@ -54,6 +54,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -148,6 +149,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -367,7 +369,6 @@ WARNING: translation string unused: outgoing firewall p2p description
 WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
-WARNING: translation string unused: ovpn
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
@@ -418,16 +419,12 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -499,6 +496,7 @@ 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: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -553,6 +551,7 @@ WARNING: translation string unused: use dov
 WARNING: translation string unused: use ibod
 WARNING: translation string unused: view log
 WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn configuration main
 WARNING: translation string unused: vpn incompatible use of defaultroute
 WARNING: translation string unused: vpn mtu invalid
 WARNING: translation string unused: vpn on blue
@@ -593,6 +592,8 @@ WARNING: untranslated string: ccd err invalidname
 WARNING: untranslated string: ccd err invalidnet
 WARNING: untranslated string: ccd err irouteexist
 WARNING: untranslated string: ccd err isipsecnet
+WARNING: untranslated string: ccd err isipsecrw
+WARNING: untranslated string: ccd err isovpnn2n
 WARNING: untranslated string: ccd err isovpnnet
 WARNING: untranslated string: ccd err issubnet
 WARNING: untranslated string: ccd err name
@@ -615,9 +616,16 @@ WARNING: untranslated string: ccd none
 WARNING: untranslated string: ccd routes
 WARNING: untranslated string: ccd subnet
 WARNING: untranslated string: ccd used
+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: default ip
 WARNING: untranslated string: deprecated fs warn
+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
@@ -627,6 +635,7 @@ 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
@@ -637,6 +646,7 @@ WARNING: untranslated string: drop outgoing
 WARNING: untranslated string: emerging rules
 WARNING: untranslated string: encryption
 WARNING: untranslated string: entropy
+WARNING: untranslated string: entropy graphs
 WARNING: untranslated string: fireinfo ipfire version
 WARNING: untranslated string: fireinfo is disabled
 WARNING: untranslated string: fireinfo is enabled
@@ -656,6 +666,7 @@ WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
 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
@@ -679,9 +690,7 @@ 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 nosrcip
 WARNING: untranslated string: fwdfw err notgt
-WARNING: untranslated string: fwdfw err notgtip
 WARNING: untranslated string: fwdfw err prot_port
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
@@ -727,6 +736,7 @@ 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
@@ -800,7 +810,10 @@ 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: integrity
 WARNING: untranslated string: invalid input for dpd delay
 WARNING: untranslated string: invalid input for dpd timeout
@@ -814,6 +827,8 @@ WARNING: untranslated string: maximum
 WARNING: untranslated string: minimum
 WARNING: untranslated string: minute
 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 default
 WARNING: untranslated string: openvpn destination port used
@@ -827,8 +842,14 @@ WARNING: untranslated string: openvpn subnet is used
 WARNING: untranslated string: other
 WARNING: untranslated string: outgoing firewall p2p allow
 WARNING: untranslated string: outgoing firewall p2p deny
+WARNING: untranslated string: ovpn crypt options
+WARNING: untranslated string: ovpn dh
+WARNING: untranslated string: ovpn dh name
 WARNING: untranslated string: ovpn errmsg green already pushed
 WARNING: untranslated string: ovpn errmsg invalid ip or mask
+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 mtu-disc
 WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
@@ -856,10 +877,13 @@ WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: server restart
+WARNING: untranslated string: show dh
 WARNING: untranslated string: snat new source ip address
 WARNING: untranslated string: ssh
 WARNING: untranslated string: static routes
 WARNING: untranslated string: support donation
+WARNING: untranslated string: system has hwrng
+WARNING: untranslated string: system has rdrand
 WARNING: untranslated string: system information
 WARNING: untranslated string: tor
 WARNING: untranslated string: tor accounting
@@ -909,6 +933,8 @@ 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: visit us at
index 195ffc14cbc5ba9906aafdc0a4936f34f8915fcb..be721a37a737a2b6a437b2a24fd5017a18c2391c 100644 (file)
@@ -54,6 +54,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -147,6 +148,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -372,7 +374,6 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
-WARNING: translation string unused: ovpn
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
@@ -423,16 +424,12 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -504,6 +501,7 @@ 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: total connection time
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -558,6 +556,7 @@ WARNING: translation string unused: use dov
 WARNING: translation string unused: use ibod
 WARNING: translation string unused: view log
 WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn configuration main
 WARNING: translation string unused: vpn incompatible use of defaultroute
 WARNING: translation string unused: vpn mtu invalid
 WARNING: translation string unused: vpn on blue
@@ -596,6 +595,8 @@ WARNING: untranslated string: ccd err invalidname
 WARNING: untranslated string: ccd err invalidnet
 WARNING: untranslated string: ccd err irouteexist
 WARNING: untranslated string: ccd err isipsecnet
+WARNING: untranslated string: ccd err isipsecrw
+WARNING: untranslated string: ccd err isovpnn2n
 WARNING: untranslated string: ccd err isovpnnet
 WARNING: untranslated string: ccd err issubnet
 WARNING: untranslated string: ccd err name
@@ -619,9 +620,16 @@ WARNING: untranslated string: ccd routes
 WARNING: untranslated string: ccd subnet
 WARNING: untranslated string: ccd used
 WARNING: untranslated string: community rules
+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: default ip
 WARNING: untranslated string: deprecated fs warn
+WARNING: untranslated string: details
+WARNING: untranslated string: dh
+WARNING: untranslated string: dh key warn
+WARNING: untranslated string: dh name is invalid
 WARNING: untranslated string: disk access per
 WARNING: untranslated string: dnat address
 WARNING: untranslated string: dns servers
@@ -632,6 +640,7 @@ 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
@@ -642,6 +651,7 @@ WARNING: untranslated string: drop outgoing
 WARNING: untranslated string: emerging rules
 WARNING: untranslated string: encryption
 WARNING: untranslated string: entropy
+WARNING: untranslated string: entropy graphs
 WARNING: untranslated string: extrahd because there is already a device mounted
 WARNING: untranslated string: extrahd cant umount
 WARNING: untranslated string: extrahd install or load driver
@@ -651,6 +661,7 @@ WARNING: untranslated string: extrahd to root
 WARNING: untranslated string: extrahd you cant mount
 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
@@ -674,9 +685,7 @@ 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 nosrcip
 WARNING: untranslated string: fwdfw err notgt
-WARNING: untranslated string: fwdfw err notgtip
 WARNING: untranslated string: fwdfw err prot_port
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
@@ -722,6 +731,7 @@ 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
@@ -795,7 +805,10 @@ 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: incoming traffic in bytes per second
 WARNING: untranslated string: integrity
 WARNING: untranslated string: invalid input for dpd delay
@@ -810,6 +823,8 @@ WARNING: untranslated string: maximum
 WARNING: untranslated string: minimum
 WARNING: untranslated string: minute
 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 default
 WARNING: untranslated string: openvpn destination port used
@@ -822,6 +837,12 @@ WARNING: untranslated string: openvpn prefix remote subnet
 WARNING: untranslated string: openvpn subnet is used
 WARNING: untranslated string: other
 WARNING: untranslated string: outgoing traffic in bytes per second
+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 mtu-disc
 WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
@@ -846,10 +867,13 @@ WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: server restart
+WARNING: untranslated string: show dh
 WARNING: untranslated string: snat new source ip address
 WARNING: untranslated string: ssh
 WARNING: untranslated string: static routes
 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
@@ -898,6 +922,8 @@ 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: visit us at
index 3f27ba2731ccc877013f6ec8978c19b44f1cdf52..da4e66c0b1af931466c40e548c6ccc79d5e1a656 100644 (file)
@@ -59,6 +59,7 @@ WARNING: translation string unused: and
 WARNING: translation string unused: ansi t1.483
 WARNING: translation string unused: apply
 WARNING: translation string unused: archive not exist
+WARNING: translation string unused: attemps
 WARNING: translation string unused: available updates
 WARNING: translation string unused: backup archive
 WARNING: translation string unused: backup clear archive
@@ -137,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
@@ -155,6 +157,7 @@ WARNING: translation string unused: dial user password
 WARNING: translation string unused: dial user password has been changed
 WARNING: translation string unused: dialup settings
 WARNING: translation string unused: disconnect
+WARNING: translation string unused: disconnects
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: display webinterface effects
 WARNING: translation string unused: dmz pinhole configuration
@@ -214,6 +217,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
@@ -228,6 +232,8 @@ 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
@@ -241,7 +247,6 @@ 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 addrule
 WARNING: translation string unused: fwhost attention
 WARNING: translation string unused: fwhost blue
 WARNING: translation string unused: fwhost changeremark
@@ -301,6 +306,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
@@ -419,7 +425,6 @@ WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
-WARNING: translation string unused: ovpn
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
 WARNING: translation string unused: ovpn log
@@ -470,16 +475,12 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
-WARNING: translation string unused: reserved dst port
-WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
-WARNING: translation string unused: rsvd dst port overlap
-WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -557,6 +558,7 @@ 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
 WARNING: translation string unused: traffic calc time bad
@@ -615,6 +617,7 @@ WARNING: translation string unused: use dov
 WARNING: translation string unused: use ibod
 WARNING: translation string unused: view log
 WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn configuration main
 WARNING: translation string unused: vpn incompatible use of defaultroute
 WARNING: translation string unused: vpn mtu invalid
 WARNING: translation string unused: vpn on blue
@@ -631,60 +634,39 @@ WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
-WARNING: untranslated string: addons
-WARNING: untranslated string: advproxy errmsg proxy ports equal
-WARNING: untranslated string: advproxy proxy port transparent
-WARNING: untranslated string: bit
 WARNING: untranslated string: bytes
-WARNING: untranslated string: dead peer detection
-WARNING: untranslated string: default ip
-WARNING: untranslated string: dnat address
-WARNING: untranslated string: dns servers
-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: ccd err isipsecrw
+WARNING: untranslated string: ccd err isovpnn2n
+WARNING: untranslated string: count
+WARNING: untranslated string: countries
+WARNING: untranslated string: country codes and flags
+WARNING: untranslated string: countrycode
+WARNING: untranslated string: details
+WARNING: untranslated string: dh
+WARNING: untranslated string: dh key warn
+WARNING: untranslated string: dh name is invalid
 WARNING: untranslated string: drop outgoing
-WARNING: untranslated string: encryption
-WARNING: untranslated string: entropy
-WARNING: untranslated string: firewall rules
-WARNING: untranslated string: first
-WARNING: untranslated string: fwdfw dnat extport
-WARNING: untranslated string: fwdfw dnat nochoice
-WARNING: untranslated string: fwdfw dnat porterr2
-WARNING: untranslated string: fwdfw hint mac
+WARNING: untranslated string: entropy graphs
+WARNING: untranslated string: flag
+WARNING: untranslated string: fwdfw warn1
 WARNING: untranslated string: fwhost err hostip
-WARNING: untranslated string: grouptype
-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: gen dh
+WARNING: untranslated string: generate dh key
+WARNING: untranslated string: hardware support
 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: most preferred
-WARNING: untranslated string: notice
-WARNING: untranslated string: openvpn network
-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: red1
+WARNING: untranslated string: no hardware random number generator
+WARNING: untranslated string: not a valid dh key
+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: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
-WARNING: untranslated string: snat new source ip address
-WARNING: untranslated string: ssh
-WARNING: untranslated string: support donation
-WARNING: untranslated string: tor directory port
-WARNING: untranslated string: tor errmsg invalid directory port
-WARNING: untranslated string: urlfilter redirect template
-WARNING: untranslated string: wlan clients
+WARNING: untranslated string: show dh
+WARNING: untranslated string: system has hwrng
+WARNING: untranslated string: system has rdrand
+WARNING: untranslated string: upload dh key
index 2ca9bf66588cfe3905512988e0d1af31f00b97d4..8e75f7ecb42e48cfe3fe09885f713225fc006f5d 100644 (file)
@@ -39,6 +39,8 @@
 < ccd err iroute
 < ccd err irouteexist
 < ccd err isipsecnet
+< ccd err isipsecrw
+< ccd err isovpnn2n
 < ccd err isovpnnet
 < ccd err issubnet
 < ccd err name
 < ccd routes
 < ccd subnet
 < ccd used
+< count
+< countries
+< countrycode
+< country codes and flags
 < default ip
 < deprecated fs warn
+< details
+< dh
+< dh key warn
+< dh name is invalid
 < dnat address
 < dns address deleted txt
 < dnsforward
@@ -74,7 +84,6 @@
 < dnsforward entries
 < dnsforward forward_server
 < dnsforward zone
-< dns servers
 < dpd delay
 < dpd timeout
 < drop action
@@ -84,6 +93,7 @@
 < drop outgoing
 < encryption
 < entropy
+< entropy graphs
 < fireinfo ipfire version
 < fireinfo is disabled
 < fireinfo is enabled
 < fireinfo why read more
 < fireinfo your profile id
 < firewall rules
-< first
+< flag
 < forward firewall
 < fw default drop
 < fwdfw ACCEPT
 < fwdfw use nat
 < fwdfw use srcport
 < fwdfw use srv
+< fwdfw warn1
 < fwdfw wd_fri
 < fwdfw wd_mon
 < fwdfw wd_sat
 < fw settings dropdown
 < fw settings remark
 < fw settings ruletable
+< gen dh
+< generate dh key
 < grouptype
+< hardware support
 < integrity
 < invalid input for dpd delay
 < invalid input for dpd timeout
 < ipsec
 < ipsec network
 < ipsec no connections
-< last
 < least preferred
 < lifetime
 < mac filter
 < minimum
 < minute
 < most preferred
+< never
+< no hardware random number generator
+< not a valid dh key
 < notice
 < ntp common settings
 < ntp sync
 < openvpn subnet is used
 < other
 < our donors
+< ovpn crypt options
+< ovpn dh
+< ovpn dh name
+< ovpn engines
+< ovpn generating the root and host certificates
+< ovpn ha
+< ovpn hmac
 < ovpn mgmt in root range
 < ovpn mtu-disc
 < ovpn mtu-disc and mtu not 1500
 < ovpn mtu-disc yes
 < ovpn no connections
 < ovpn port in root range
+< ovpn reneg sec
 < p2p block
 < p2p block save notice
 < proxy reports
 < qos enter bandwidths
 < red1
 < server restart
+< show dh
 < snat new source ip address
 < snort working
 < ssh
 < static routes
 < support donation
+< system has hwrng
+< system has rdrand
 < system information
 < tor
 < tor 0 = disabled
 < tor use exit nodes
 < updxlrtr sources
 < updxlrtr standard view
+< upload dh key
 < upload new ruleset
 < uptime
 < uptime load average
 < ccd err iroute
 < ccd err irouteexist
 < ccd err isipsecnet
+< ccd err isipsecrw
+< ccd err isovpnn2n
 < ccd err isovpnnet
 < ccd err issubnet
 < ccd err name
 < ccd routes
 < ccd subnet
 < ccd used
+< count
+< countries
+< countrycode
+< country codes and flags
 < default ip
 < deprecated fs warn
+< details
+< dh
+< dh key warn
+< dh name is invalid
 < dnat address
 < dnsforward
 < dnsforward add a new entry
 < dnsforward entries
 < dnsforward forward_server
 < dnsforward zone
-< dns servers
 < dpd delay
 < dpd timeout
 < drop action
 < drop outgoing
 < encryption
 < entropy
+< entropy graphs
 < fireinfo ipfire version
 < fireinfo is disabled
 < fireinfo is enabled
 < fireinfo why read more
 < fireinfo your profile id
 < firewall rules
-< first
+< flag
 < forward firewall
 < fw default drop
 < fwdfw ACCEPT
 < fwdfw use nat
 < fwdfw use srcport
 < fwdfw use srv
+< fwdfw warn1
 < fwdfw wd_fri
 < fwdfw wd_mon
 < fwdfw wd_sat
 < fw settings dropdown
 < fw settings remark
 < fw settings ruletable
+< gen dh
+< generate dh key
 < grouptype
+< hardware support
 < integrity
 < invalid input for dpd delay
 < invalid input for dpd timeout
 < ipsec
 < ipsec network
 < ipsec no connections
-< last
 < least preferred
 < lifetime
 < mac filter
 < minimum
 < minute
 < most preferred
+< never
+< no hardware random number generator
+< not a valid dh key
 < notice
 < openvpn default
 < openvpn destination port used
 < outgoing firewall p2p description 2
 < outgoing firewall p2p description 3
 < outgoing firewall view group
+< ovpn crypt options
+< ovpn dh
+< ovpn dh name
+< ovpn engines
 < ovpn errmsg green already pushed
 < ovpn errmsg invalid ip or mask
+< ovpn generating the root and host certificates
+< ovpn ha
+< ovpn hmac
 < ovpn mgmt in root range
 < ovpn mtu-disc
 < ovpn mtu-disc and mtu not 1500
 < ovpn mtu-disc yes
 < ovpn no connections
 < ovpn port in root range
+< ovpn reneg sec
 < ovpn routes push
 < ovpn routes push options
 < p2p block
 < red1
 < server restart
 < Set time on boot
+< show dh
 < snat new source ip address
 < ssh
 < static routes
 < support donation
+< system has hwrng
+< system has rdrand
 < system information
 < tor
 < tor 0 = disabled
 < tor use exit nodes
 < updxlrtr sources
 < updxlrtr standard view
+< upload dh key
 < uptime
 < uptime load average
 < urlfilter redirect template
 < ccd err iroute
 < ccd err irouteexist
 < ccd err isipsecnet
+< ccd err isipsecrw
+< ccd err isovpnn2n
 < ccd err isovpnnet
 < ccd err issubnet
 < ccd err name
 < ccd routes
 < ccd subnet
 < ccd used
+< count
+< countries
+< countrycode
+< country codes and flags
 < default ip
 < deprecated fs warn
+< details
+< dh
+< dh key warn
+< dh name is invalid
 < dnat address
 < dnsforward
 < dnsforward add a new entry
 < dnsforward entries
 < dnsforward forward_server
 < dnsforward zone
-< dns servers
 < dpd delay
 < dpd timeout
 < drop action
 < drop outgoing
 < encryption
 < entropy
+< entropy graphs
 < extrahd because there is already a device mounted
 < extrahd cant umount
 < extrahd install or load driver
 < extrahd unable to write
 < extrahd you cant mount
 < firewall rules
-< first
+< flag
 < forward firewall
 < fw default drop
 < fwdfw ACCEPT
 < fwdfw use nat
 < fwdfw use srcport
 < fwdfw use srv
+< fwdfw warn1
 < fwdfw wd_fri
 < fwdfw wd_mon
 < fwdfw wd_sat
 < fw settings dropdown
 < fw settings remark
 < fw settings ruletable
+< gen dh
+< generate dh key
 < grouptype
+< hardware support
 < integrity
 < invalid input for dpd delay
 < invalid input for dpd timeout
 < ipsec
 < ipsec network
 < ipsec no connections
-< last
 < least preferred
 < lifetime
 < mac filter
 < minimum
 < minute
 < most preferred
+< never
+< no hardware random number generator
+< not a valid dh key
 < notice
 < openvpn default
 < openvpn destination port used
 < openvpn subnet is used
 < other
 < our donors
+< ovpn crypt options
+< ovpn dh
+< ovpn dh name
+< ovpn engines
 < ovpn errmsg green already pushed
 < ovpn errmsg invalid ip or mask
+< ovpn generating the root and host certificates
+< ovpn ha
+< ovpn hmac
 < ovpn mgmt in root range
 < ovpn mtu-disc
 < ovpn mtu-disc and mtu not 1500
 < ovpn mtu-disc yes
 < ovpn no connections
 < ovpn port in root range
+< ovpn reneg sec
 < ovpn routes push
 < ovpn routes push options
 < p2p block
 < qos enter bandwidths
 < red1
 < server restart
+< show dh
 < snat new source ip address
 < ssh
 < static routes
 < support donation
+< system has hwrng
+< system has rdrand
 < tor
 < tor 0 = disabled
 < tor accounting
 < tor use exit nodes
 < updxlrtr sources
 < updxlrtr standard view
+< upload dh key
 < uptime
 < uptime load average
 < urlfilter redirect template
 < ccd err iroute
 < ccd err irouteexist
 < ccd err isipsecnet
+< ccd err isipsecrw
+< ccd err isovpnn2n
 < ccd err isovpnnet
 < ccd err issubnet
 < ccd err name
 < ccd routes
 < ccd subnet
 < ccd used
+< count
+< countries
+< countrycode
+< country codes and flags
 < day-graph
 < default ip
 < deprecated fs warn
+< details
+< dh
+< dh key warn
+< dh name is invalid
 < disk access per
 < dnat address
 < dnsforward
 < dnsforward entries
 < dnsforward forward_server
 < dnsforward zone
-< dns servers
 < dpd delay
 < dpd timeout
 < drop action
 < Edit an existing route
 < encryption
 < entropy
+< entropy graphs
 < extrahd because there is already a device mounted
 < extrahd cant umount
 < extrahd install or load driver
 < extrahd unable to write
 < extrahd you cant mount
 < firewall rules
-< first
+< flag
 < forward firewall
 < frequency
 < fw default drop
 < fwdfw use nat
 < fwdfw use srcport
 < fwdfw use srv
+< fwdfw warn1
 < fwdfw wd_fri
 < fwdfw wd_mon
 < fwdfw wd_sat
 < fw settings dropdown
 < fw settings remark
 < fw settings ruletable
+< gen dh
+< generate dh key
 < grouptype
+< hardware support
 < hour-graph
 < incoming traffic in bytes per second
 < integrity
 < ipsec
 < ipsec network
 < ipsec no connections
-< last
 < least preferred
 < lifetime
 < mac filter
 < minute
 < month-graph
 < most preferred
+< never
+< no hardware random number generator
+< not a valid dh key
 < notice
 < openvpn default
 < openvpn destination port used
 < other
 < our donors
 < outgoing traffic in bytes per second
+< ovpn crypt options
+< ovpn dh
+< ovpn dh name
+< ovpn engines
+< ovpn generating the root and host certificates
+< ovpn ha
+< ovpn hmac
 < ovpn mgmt in root range
 < ovpn mtu-disc
 < ovpn mtu-disc and mtu not 1500
 < ovpn mtu-disc yes
 < ovpn no connections
 < ovpn port in root range
+< ovpn reneg sec
 < p2p block
 < p2p block save notice
 < proxy reports
 < qos enter bandwidths
 < red1
 < server restart
+< show dh
 < snat new source ip address
 < ssh
 < static routes
 < support donation
+< system has hwrng
+< system has rdrand
 < tor
 < tor 0 = disabled
 < tor accounting
 < tor use exit nodes
 < updxlrtr sources
 < updxlrtr standard view
+< upload dh key
 < uptime
 < uptime load average
 < urlfilter redirect template
index db6c07496d6e6d8169c855d8be1d0d3dfa804358..76035fb46d76ad0c4775e300e8d4c975dcc2b36f 100644 (file)
@@ -36,18 +36,18 @@ require "${General::swroot}/header.pl";
 
 &Header::showhttpheaders();
 
-&Header::openpage('Country Codes', 1, '');
-&Header::openbigbox('100%', 'LEFT');
-
-&Header::openbox('100%', 'LEFT', 'Flags & Country Codes:');
-print "<TABLE WIDTH='100%' border='0' class='tbl'>";
-print "<tr><th width='5%'><b>Flag</b></th>";
-print "<th width='5%'><b>Code</b></th>";
-print "<th width='40%'><b>$Lang::tr{'country'}</b></th>";
-print "<th><b>&nbsp;</b></th>";
-print "<th width='5%'><b>Flag</b></th>";
-print "<th width='5%'><b>Code</b></th>";
-print "<th width='40%'><b>$Lang::tr{'country'}</b></th></tr>";
+&Header::openpage($Lang::tr{'countries'}, 1, '');
+&Header::openbigbox('100%', 'left');
+
+&Header::openbox('100%', 'left', $Lang::tr{'country codes and flags'});
+print "<table class='tbl'>";
+print "<tr><th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
+print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
+print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th>";
+print "<th>&nbsp;</th>";
+print "<th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
+print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
+print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th></tr>";
 
 @flaglist = <$flagdir/*>;
 
@@ -69,39 +69,34 @@ foreach $flag (@flaglistfiles)
        if($fcode eq 'tp') { $country = 'East Timor'; }
        if($fcode eq 'yu') { $country = 'Yugoslavia'; }
        if ($lines % 2) {
-               print "<td $col><a name='$fcode'/><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$flagcode'</td>";
+               print "<td $col><a id='$fcode'><img src='/images/flags/$fcode.png' alt='$flagcode' title='$flagcode'/></a></td>";
                print "<td $col>$flagcode</td>";
                print "<td $col>$country</td></tr>\n";
-}
-else {
-       $lines2++;
-       if($lines2 % 2) {
-               print "<tr>";
-               $col="bgcolor='${Header::table2colour}'";
-       } else {
-               print "<tr>";
-               $col="bgcolor='${Header::table1colour}'";
        }
-       print "<td $col><a name='$fcode'/><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$flagcode'</td>";
-       print "<td $col>$flagcode</td>";
-       print "<td $col>$country</td>";
-       print "<td $col>&nbsp;</td>";
+       else {
+               $lines2++;
+               if($lines2 % 2) {
+                       $col="style='background-color:${Header::table2colour};'";
+               } else {
+                       $col="style='background-color:${Header::table1colour};'";
+               }
+               print "<tr>";
+               print "<td $col><a id='$fcode'><img src='/images/flags/$fcode.png' alt='$flagcode' title='$flagcode'/></a></td>";
+               print "<td $col>$flagcode</td>";
+               print "<td $col>$country</td>";
+               print "<td $col>&nbsp;</td>";
        }
 }
 
 
-print "</TABLE>";
+print "</table>";
 &Header::closebox();
 
 &Header::closebigbox();
 
 print <<END
-<div align='center'>
-<table width='80%'>
-<tr>
-<td align='center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></td>
-</tr>
-</table>
+<div style='text-align:center'>
+<a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a>
 </div>
 END
 ; 
index 9362e78bea2e631d295a64ff6272bf2a7d847ba3..bd3de82f8ceae283cff7a8b9129c52e8cd1ab5de 100755 (executable)
@@ -48,6 +48,42 @@ if ( $querry[0] ne~ "") {
        &Graphs::makegraphbox("entropy.cgi", "day", '', 350);
        &Header::closebox();
 
+       # Check for hardware support.
+       my $message;
+       my $message_colour = $Header::colourred;
+       if (&has_hwrng()) {
+               $message = $Lang::tr{'system has hwrng'};
+               $message_colour = $Header::colourgreen;
+       } elsif (&has_rdrand()) {
+               $message = $Lang::tr{'system has rdrand'};
+               $message_colour = $Header::colourgreen;
+       } else {
+               $message = $Lang::tr{'no hardware random number generator'};
+       }
+
+       &Header::openbox('100%', 'center', $Lang::tr{'hardware support'});
+       print <<EOF;
+               <p style="color: $message_colour; text-align: center;">$message</p>
+EOF
+       &Header::closebox();
+
        &Header::closebigbox();
        &Header::closepage();
 }
+
+sub has_hwrng() {
+       return (-c "/dev/hwrng");
+}
+
+sub has_rdrand() {
+       open(FILE, "/proc/cpuinfo") or return 0;
+       my @cpuinfo = <FILE>;
+       close(FILE);
+
+       my @result = grep(/rdrand/, @cpuinfo);
+       if (@result) {
+               return 1;
+       }
+
+       return 0;
+}
index ce8d0f3f15e536d8cb6e1d7d76f73908e433bfe3..436bdafd069226e1dfb571c62c431636652bb5de 100644 (file)
 
 use strict;
 use Sort::Naturally;
+use utf8;
+use feature 'unicode_strings';
+
 no warnings 'uninitialized';
+
 # enable only the following on debugging purpose
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
@@ -194,6 +198,7 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
        $errormessage=&checksource;
        if(!$errormessage){&checktarget;}
        if(!$errormessage){&checkrule;}
+
        #check if manual ip (source) is orange network
        if ($fwdfwsettings{'grp1'} eq 'src_addr'){
                my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
@@ -223,6 +228,9 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
                                                if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
                                                        $errormessage=$Lang::tr{'fwdfw err remark'}."<br>";
                                                }
+                                               if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){
+                                                       $errormessage='';
+                                               }
                                                if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){
                                                        $fwdfwsettings{'nosave'} = 'on';
                                                }
@@ -264,6 +272,9 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
                                                if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
                                                        $errormessage=$Lang::tr{'fwdfw err remark'}."<br>";
                                                }
+                                               if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){
+                                                       $errormessage='';
+                                               }
                                                if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){
                                                        $fwdfwsettings{'nosave'} = 'on';
                                                }
@@ -307,6 +318,9 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
                                                if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && !&validremark($fwdfwsettings{'ruleremark'})){
                                                        $errormessage=$Lang::tr{'fwdfw err remark'}."<br>";
                                                }
+                                               if($fwdfwsettings{'oldruleremark'} ne $fwdfwsettings{'ruleremark'} && $fwdfwsettings{'updatefwrule'} eq 'on' && $fwdfwsettings{'ruleremark'} ne '' && &validremark($fwdfwsettings{'ruleremark'})){
+                                                       $errormessage='';
+                                               }
                                                if ($fwdfwsettings{'oldruleremark'} eq $fwdfwsettings{'ruleremark'}){
                                                        $fwdfwsettings{'nosave'} = 'on';
                                                }
@@ -498,8 +512,8 @@ sub checksource
                        return $errormessage;
                }
        }elsif($fwdfwsettings{'src_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'src_addr'} eq ''){
-               $errormessage.=$Lang::tr{'fwdfw err nosrcip'};
-               return $errormessage;
+               $fwdfwsettings{'grp1'}='std_net_src';
+               $fwdfwsettings{$fwdfwsettings{'grp1'}} = 'ALL';
        }
 
        #check empty fields
@@ -599,8 +613,8 @@ sub checktarget
                        return $errormessage;
                }
        }elsif($fwdfwsettings{'tgt_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'tgt_addr'} eq ''){
-               $errormessage.=$Lang::tr{'fwdfw err notgtip'};
-               return $errormessage;
+               $fwdfwsettings{'grp2'}='std_net_tgt';
+               $fwdfwsettings{$fwdfwsettings{'grp2'}} = 'ALL';
        }
        #check for mac in targetgroup
        if ($fwdfwsettings{'grp2'} eq 'cust_grp_tgt'){
@@ -1286,6 +1300,12 @@ sub getcolor
        my $val=shift;
        my $hash=shift;
        if($optionsfw{'SHOWCOLORS'} eq 'on'){
+               # Don't colourise MAC addresses
+               if (&General::validmac($val)) {
+                       $tdcolor = "";
+                       return;
+               }
+
                #custom Hosts
                if ($nettype eq 'cust_host_src' || $nettype eq 'cust_host_tgt'){
                        foreach my $key (sort keys %$hash){
@@ -1520,6 +1540,7 @@ sub newrule
                                $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}}                 = 'selected';
                                $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected';
                                $selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected';
+                               $selected{'dnat'}{$fwdfwsettings{'dnat'}}                               ='selected';
                        }
                }
                $fwdfwsettings{'oldgrp1a'}=$fwdfwsettings{'grp1'};
@@ -1565,7 +1586,7 @@ sub newrule
        my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
        if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;}
        my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}});
-       if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
+       if ($dcidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
        &Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});
        #------SOURCE-------------------------------------------------------
        print "<form method='post'>";
@@ -1612,25 +1633,28 @@ END
                                                </td>
 END
 
-               if (%aliases) {
-                       print <<END;
+       print <<END;
                                                <td width='25%' align='right'>$Lang::tr{'dnat address'}:</td>
                                                <td width='30%'>
                                                        <select name='dnat' style='width: 100%;'>
-                                                               <option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'default ip'} ($netsettings{'RED_ADDRESS'})</option>
+                                                               <option value='AUTO' $selected{'dnat'}{'AUTO'}>- $Lang::tr{'automatic'} -</option>
+                                                               <option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'red1'} ($redip)</option>
 END
+               if (%aliases) {
                        foreach my $alias (sort keys %aliases) {
                                print "<option value='$alias' $selected{'dnat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
                        }
-
-                       print "</select>";
-               } else {
-                       print <<END;
-                                               <td colspan="2" width='55%'>
-                                                       <input type='hidden' name='dnat' value='Default IP'>
-                                               </td>
-END
                }
+               #DNAT Dropdown
+               foreach my $network (sort keys %defaultNetworks)
+               {
+                       if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$network}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){
+                               print "<option value='$defaultNetworks{$network}{'NAME'}'";
+                               print " selected='selected'" if ($fwdfwsettings{'dnat'} eq $defaultNetworks{$network}{'NAME'});
+                               print ">$network ($defaultNetworks{$network}{'NET'})</option>";
+                       }
+               }
+               print "</select>";
                print "</tr>";
 
                #SNAT
@@ -1651,19 +1675,14 @@ END
                foreach my $alias (sort keys %aliases) {
                        print "<option value='$alias' $selected{'snat'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
                }
-
-               # XXX this is composed in a very ugly fashion
+               # SNAT Dropdown
                foreach my $network (sort keys %defaultNetworks) {
-                       next if($defaultNetworks{$network}{'NAME'} eq "IPFire");
-                       next if($defaultNetworks{$network}{'NAME'} eq "ALL");
-                       next if($defaultNetworks{$network}{'NAME'} =~ /OpenVPN/i);
-                       next if($defaultNetworks{$network}{'NAME'} =~ /IPsec/i);
-
-                       print "<option value='$defaultNetworks{$network}{'NAME'}'";
-                       print " selected='selected'" if ($fwdfwsettings{$fwdfwsettings{'nat'}} eq $defaultNetworks{$network}{'NAME'});
-                       print ">$network ($defaultNetworks{$network}{'NET'})</option>";
+                       if ($defaultNetworks{$network}{'NAME'} eq 'BLUE'||$defaultNetworks{$network}{'NAME'} eq 'GREEN' ||$defaultNetworks{$network}{'NAME'} eq 'ORANGE'){
+                               print "<option value='$defaultNetworks{$network}{'NAME'}'";
+                               print " selected='selected'" if ($fwdfwsettings{'snat'} eq $defaultNetworks{$network}{'NAME'});
+                               print ">$network ($defaultNetworks{$network}{'NET'})</option>";
+                       }
                }
-
                print <<END;
                                                        </select>
                                                </td>
@@ -2125,6 +2144,9 @@ sub saverule
                        &changerule($configfwdfw);
                        #print"6";
                }
+               $fwdfwsettings{'ruleremark'}=~ s/,/;/g;
+               utf8::decode($fwdfwsettings{'ruleremark'});
+               $fwdfwsettings{'ruleremark'}=&Header::escape($fwdfwsettings{'ruleremark'});
                if ($fwdfwsettings{'updatefwrule'} ne 'on'){
                        my $key = &General::findhasharraykey ($hash);
                        $$hash{$key}[0]  = $fwdfwsettings{'RULE_ACTION'};
@@ -2260,22 +2282,19 @@ sub saverule
 sub validremark
 {
        # Checks a hostname against RFC1035
-        my $remark = $_[0];
-
-       # Each part should be at least two characters in length
-       # but no more than 63 characters
-       if (length ($remark) < 1 || length ($remark) > 255) {
-               return 0;}
-       # Only valid characters are a-z, A-Z, 0-9 and -
-       if ($remark !~ /^[a-zäöüA-ZÖÄÜ0-9-.:;\|_()\/\s]*$/) {
-               return 0;}
-       # First character can only be a letter or a digit
-       if (substr ($remark, 0, 1) !~ /^[a-zäöüA-ZÖÄÜ0-9(]*$/) {
-               return 0;}
-       # Last character can only be a letter or a digit
-       if (substr ($remark, -1, 1) !~ /^[a-zöäüA-ZÖÄÜ0-9.:;_)]*$/) {
-               return 0;}
-       return 1;
+       my $remark = $_[0];
+
+       # Try to decode $remark into UTF-8. If this doesn't work,
+       # we assume that the string it not sane.
+       if (!utf8::decode($remark)) {
+               return 0;
+       }
+
+       # Check if the string only contains of printable characters.
+       if ($remark =~ /^[[:print:]]*$/) {
+               return 1;
+       }
+       return 0;
 }
 sub viewtablerule
 {
@@ -2355,26 +2374,18 @@ END
                                if($$hash{$key}[3] eq  'ipsec_net_src'){
                                        if(&fwlib::get_ipsec_net_ip($host,11) eq ''){
                                                $coloryellow='on';
-                                               &disable_rule($key);
-                                               $$hash{$key}[2]='';
                                        }
                                }elsif($$hash{$key}[3] eq  'ovpn_net_src'){
                                        if(&fwlib::get_ovpn_net_ip($host,1) eq ''){
                                                $coloryellow='on';
-                                               &disable_rule($key);
-                                               $$hash{$key}[2]='';
                                        }
                                }elsif($$hash{$key}[3] eq  'ovpn_n2n_src'){
                                        if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){
                                                $coloryellow='on';
-                                               &disable_rule($key);
-                                               $$hash{$key}[2]='';
                                        }
                                }elsif($$hash{$key}[3] eq  'ovpn_host_src'){
                                        if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
                                                $coloryellow='on';
-                                               &disable_rule($key);
-                                               $$hash{$key}[2]='';
                                        }
                                }
                        }
@@ -2382,26 +2393,18 @@ END
                                if($$hash{$key}[5] eq 'ipsec_net_tgt'){
                                        if(&fwlib::get_ipsec_net_ip($host,11) eq ''){
                                                $coloryellow='on';
-                                               &disable_rule($key);
-                                               $$hash{$key}[2]='';
                                        }
                                }elsif($$hash{$key}[5] eq 'ovpn_net_tgt'){
                                        if(&fwlib::get_ovpn_net_ip($host,1) eq ''){
                                                $coloryellow='on';
-                                               &disable_rule($key);
-                                               $$hash{$key}[2]='';
                                        }
                                }elsif($$hash{$key}[5] eq 'ovpn_n2n_tgt'){
                                        if(&fwlib::get_ovpn_n2n_ip($host,27) eq ''){
                                                $coloryellow='on';
-                                               &disable_rule($key);
-                                               $$hash{$key}[2]='';
                                        }
                                }elsif($$hash{$key}[5] eq 'ovpn_host_tgt'){
                                        if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
                                                $coloryellow='on';
-                                               &disable_rule($key);
-                                               $$hash{$key}[2]='';
                                        }
                                }
                        }
@@ -2409,15 +2412,11 @@ END
                        foreach my $netgroup (sort keys %customgrp){
                                if(($$hash{$key}[4] eq $customgrp{$netgroup}[0] || $$hash{$key}[6] eq $customgrp{$netgroup}[0]) && $customgrp{$netgroup}[2] eq 'none'){
                                        $coloryellow='on';
-                                       &disable_rule($key);
-                                       $$hash{$key}[2]='';
                                }
                        }
                        foreach my $srvgroup (sort keys %customservicegrp){
                                if($$hash{$key}[15] eq $customservicegrp{$srvgroup}[0] && $customservicegrp{$srvgroup}[2] eq 'none'){
                                        $coloryellow='on';
-                                       &disable_rule($key);
-                                       $$hash{$key}[2]='';
                                }
                        }
                        $$hash{'ACTIVE'}=$$hash{$key}[2];
@@ -2553,6 +2552,7 @@ END
 END
                        #Is this a DNAT rule?
                        if ($$hash{$key}[31] eq 'dnat' && $$hash{$key}[28] eq 'ON'){
+                               if ($$hash{$key}[29] eq 'Default IP'){$$hash{$key}[29]=$Lang::tr{'red1'};}
                                print "Firewall ($$hash{$key}[29])";
                                if($$hash{$key}[30] ne ''){
                                        $$hash{$key}[30]=~ tr/|/,/;
@@ -2792,14 +2792,16 @@ END
                                                <font color="$Header::colourorange">$Lang::tr{'orange'}</font>
                                                ($Lang::tr{'fwdfw pol block'})
                                        </td>
+END
+                       }
+
+                       print <<END;
                                        <td align='center'>
                                                <font color="$Header::colourgreen">$Lang::tr{'green'}</font>
                                                ($Lang::tr{'fwdfw pol block'})
                                        </td>
+                               </tr>
 END
-                       }
-
-                       print"</tr>";
                }
 
                print <<END;
index efcdfb933cc3583de9d9bdd6d6b1aeb92464b449..042fdde0c5339b1f39c7e20450d442e393ef362f 100644 (file)
@@ -21,7 +21,8 @@
 use strict;
 
 # enable only the following on debugging purpose
-use warnings;
+#use warnings;
+
 use Sort::Naturally;
 use CGI::Carp 'fatalsToBrowser';
 no warnings 'uninitialized';
@@ -48,7 +49,7 @@ my %fwfwd=();
 my %fwinp=();
 my %fwout=();
 my %ovpnsettings=();
-
+my %netsettings=();
 
 my $errormessage;
 my $hint;
@@ -80,7 +81,7 @@ unless (-e $configsrvgrp) { system("touch $configsrvgrp"); }
 &General::readhash("$configovpn", \%ovpnsettings);
 &General::readhasharray("$configipsec", \%ipsecconf);
 &General::readhash("$configipsecrw", \%ipsecsettings);
-
+&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
 &Header::getcgihash(\%fwhostsettings);
 
 &Header::showhttpheaders();
@@ -1211,12 +1212,12 @@ sub addgrp
                        print<<END;
                <table width='100%' border='0'>
                        <tr>
-                               <td width='10%'>$Lang::tr{'fwhost addgrpname'}</td>
-                               <td><form method='post'><input type='TEXT' name='grp_name' value='$fwhostsettings{'grp_name'}' size='20'></td>
+                               <td style='width:15%;'>$Lang::tr{'fwhost addgrpname'}</td>
+                               <td><form method='post'><input type='TEXT' name='grp_name' value='$fwhostsettings{'grp_name'}' size='30'></td>
                        </tr>
                        <tr>
-                               <td width='10%'>$Lang::tr{'remark'}:</td>
-                               <td ><input type='TEXT' name='remark' value='$fwhostsettings{'remark'}' style='width: 98%;'></td>
+                               <td>$Lang::tr{'remark'}:</td>
+                               <td ><input type='TEXT' name='remark' value='$fwhostsettings{'remark'}' style='width: 99%;'></td>
                        </tr>
                        <tr>
                                <td colspan='2'><br></td>
@@ -1225,17 +1226,17 @@ sub addgrp
 END
                }else{
                        print<<END;
-                       <table width='100%' border='0'><form method='post' style='display:inline'>
+                       <table width='100%' border='0'><form method='post'>
                                <tr>
-                                       <td nowrap='nowrap' width='12%'>$Lang::tr{'fwhost addgrpname'}</td>
-                                       <td width='20%'><input type='TEXT' name='grp'  value='$fwhostsettings{'grp_name'}' ></td>
+                                       <td style='width:15%;'>$Lang::tr{'fwhost addgrpname'}</td>
+                                       <td style='width:30%;'><input type='TEXT' name='grp'  value='$fwhostsettings{'grp_name'}' size='30'></td>
                                        <td><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldgrpname' value='$fwhostsettings{'oldgrpname'}'><input type='hidden' name='ACTION' value='changegrpname'></td>
                                        <td></td></form>
                                </tr>
                                <tr><form method='post' style='display:inline'>
                                        <td>$Lang::tr{'remark'}:</td>
-                                       <td colspan='2'><input type='TEXT' name='newrem' size='45' value='$fwhostsettings{'remark'}' style='width:98%'></td>
-                                       <td align='right'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldrem' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='ACTION' value='changegrpremark' ></td>
+                                       <td colspan='2' style='width:98%;'><input type='TEXT' name='newrem' value='$fwhostsettings{'remark'}' style='width:98%;'></td>
+                                       <td align='right'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='grp' value='$fwhostsettings{'grp_name'}'><input type='hidden' name='oldrem' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='ACTION' value='changegrpremark' ></td>
                                </tr>
                        </table></form>
                        <br><br>
@@ -1246,8 +1247,16 @@ END
                        <form method='post'><input type='hidden' name='remark' value='$rem'><input type='hidden' name='grp_name' value='$grp'>
                        <table width='100%' border='0'>
                        <tr><td width=50% valign='top'>
-                       <table width='100%' border='0'>
-                       <tr><td width='1%'><input type='radio' name='grp2' value='std_net' id='DEFAULT_SRC_ADR' checked></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost stdnet'}</td><td><select name='DEFAULT_SRC_ADR' style='min-width:185px;'>
+                       <table width='90%' border='0'>
+                       <tr>
+                               <td style='width:15em;'>
+                                       <label>
+                                               <input type='radio' name='grp2' value='std_net' id='DEFAULT_SRC_ADR' checked>
+                                               $Lang::tr{'fwhost stdnet'}
+                                       </label>
+                               </td>
+                               <td style='text-align:right;'>
+                                       <select name='DEFAULT_SRC_ADR' style='width:16em;'>
 END
                        foreach my $network (sort keys %defaultNetworks)
                        {
@@ -1267,14 +1276,34 @@ END
                        }
                        print"</select></td></tr>";
                        if (! -z $confignet){
-                               print"<tr><td><input type='radio' name='grp2' id='CUST_SRC_NET' value='cust_net' $checked{'grp2'}{'cust_net'}></td><td>$Lang::tr{'fwhost cust net'}:</td><td><select name='CUST_SRC_NET' style='min-width:185px;'>";
+                               print<<END;
+                               <tr>
+                                       <td>
+                                               <label>
+                                                       <input type='radio' name='grp2' id='CUST_SRC_NET' value='cust_net' $checked{'grp2'}{'cust_net'}>
+                                                       $Lang::tr{'fwhost cust net'}:
+                                               </label>
+                                       </td>
+                                       <td style='text-align:right;'>
+                                               <select name='CUST_SRC_NET' style='width:16em;'>";
+END
                                foreach my $key (sort { ncmp($customnetwork{$a}[0],$customnetwork{$b}[0]) } keys  %customnetwork) {
                                        print"<option>$customnetwork{$key}[0]</option>";
                                }
                                print"</select></td></tr>";
                        }
                        if (! -z $confighost){
-                               print"<tr><td valign='top'><input type='radio' name='grp2' id='CUST_SRC_HOST' value='cust_host' $checked{'grp2'}{'cust_host'}></td><td valign='top'>$Lang::tr{'fwhost cust addr'}:</td><td><select name='CUST_SRC_HOST' style='min-width:185px;'>";
+                               print<<END;
+                               <tr>
+                                       <td valign='top'>
+                                               <label>
+                                                       <input type='radio' name='grp2' id='CUST_SRC_HOST' value='cust_host' $checked{'grp2'}{'cust_host'}>
+                                                       $Lang::tr{'fwhost cust addr'}:
+                                               </label>
+                                       </td>
+                                       <td style='text-align:right;'>
+                                               <select name='CUST_SRC_HOST' style='width:16em;'>";
+END
                                foreach my $key (sort { ncmp($customhost{$a}[0],$customhost{$b}[0]) } keys %customhost) {
                                        print"<option>$customhost{$key}[0]</option>";
                                }
@@ -1282,10 +1311,19 @@ END
                        }
                        print"</table>";
                        #Inner table right
-                       print"</td><td valign='top'><table width='100%' border='0'>";
+                       print"</td><td align='right' style='vertical-align:top;'><table width='90%' border='0'>";
                        #OVPN networks
                        if (! -z $configccdnet){
-                               print"<td width='1%'><input type='radio' name='grp2' id='OVPN_CCD_NET' value='ovpn_net'  $checked{'grp2'}{'ovpn_net'}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ccdnet'}</td><td nowrap='nowrap' width='1%'><select name='OVPN_CCD_NET' style='min-width:185px;'>";
+                               print<<END;
+                               <td style='width:15em;'>
+                                       <label>
+                                               <input type='radio' name='grp2' id='OVPN_CCD_NET' value='ovpn_net'  $checked{'grp2'}{'ovpn_net'}>
+                                               $Lang::tr{'fwhost ccdnet'}
+                                       </label>
+                               </td>
+                               <td style='text-align:right;'>
+                                       <select name='OVPN_CCD_NET' style='width:16em;'>";
+END
                                foreach my $key (sort { ncmp($ccdnet{$a}[0],$ccdnet{$b}[0]) }  keys %ccdnet)
                                {
                                        print"<option value='$ccdnet{$key}[0]'>$ccdnet{$key}[0]</option>";
@@ -1293,39 +1331,87 @@ END
                                print"</select></td></tr>";
                        }
                        #OVPN clients
+                       my @ovpn_clients=();
                        foreach my $key (sort { ncmp($ccdhost{$a}[0],$ccdhost{$b}[0]) } keys %ccdhost)
                        {
                                if ($ccdhost{$key}[33] ne ''){
-                                       print"<td width='1%'><input type='radio' name='grp2' value='ovpn_host' $checked{'grp2'}{'ovpn_host'}></td><td nowrap='nowrap' width='16%'>$Lang::tr{'fwhost ccdhost'}</td><td nowrap='nowrap' width='1%'><select name='OVPN_CCD_HOST' style='min-width:185px;'>" if ($show eq '');
                                        $show='1';
-                                       print"<option value='$ccdhost{$key}[1]'>$ccdhost{$key}[1]</option>";
+                                       push (@ovpn_clients,$ccdhost{$key}[1]);
                                }
                        }
-                       if ($show eq '1'){$show='';print"</select></td></tr>";}
+                       if ($show eq '1'){
+                               $show='';
+                               print<<END;
+                                       <td style='width:15em;'>
+                                               <label>
+                                                       <input type='radio' name='grp2' value='ovpn_host' $checked{'grp2'}{'ovpn_host'}>
+                                                       $Lang::tr{'fwhost ccdhost'}
+                                               </label>
+                                       </td>
+                                       <td style='text-align:right;'>
+                                               <select name='OVPN_CCD_HOST' style='width:16em;'>" if ($show eq '');
+END
+                               foreach(@ovpn_clients){
+                                       print"<option value='$_'>$_</option>";
+                               }
+                               print"</select></td></tr>";
+                       }
                        #OVPN n2n networks
+                       my @OVPN_N2N=();
                        foreach my $key (sort { ncmp($ccdhost{$a}[1],$ccdhost{$b}[1]) } keys %ccdhost) {
                                if($ccdhost{$key}[3] eq 'net'){
-                                       print"<td width='1%'><input type='radio' name='grp2' id='OVPN_N2N' value='ovpn_n2n' $checked{'grp2'}{'ovpn_n2n'}></td><td valign='top'>$Lang::tr{'fwhost ovpn_n2n'}:</td><td colspan='3'><select name='OVPN_N2N' style='min-width:185px;'>" if ($show eq '');
                                        $show='1';
-                                       print"<option>$ccdhost{$key}[1]</option>";
+                                       push (@OVPN_N2N,$ccdhost{$key}[1]);
+                               }
+                       }
+                       if ($show eq '1'){
+                               $show='';
+                               print<<END;
+                                       <td style='width:15em;'>
+                                               <label>
+                                                       <input type='radio' name='grp2' id='OVPN_N2N' value='ovpn_n2n' $checked{'grp2'}{'ovpn_n2n'}>
+                                                       $Lang::tr{'fwhost ovpn_n2n'}:
+                                               </label>
+                                       </td>
+                                       <td style='text-align:right;'>
+                                               <select name='OVPN_N2N' style='width:16em;'>"
+END
+                               foreach(@OVPN_N2N){
+                                       print"<option>$_</option>";
                                }
+                               print"</select></td></tr>";
                        }
-                       if ($show eq '1'){$show='';print"</select></td></tr>";}
                        #IPsec networks
+                       my @IPSEC_N2N=();
                        foreach my $key (sort { ncmp($ipsecconf{$a}[0],$ipsecconf{$b}[0]) } keys %ipsecconf) {
                                if ($ipsecconf{$key}[3] eq 'net'){
-                                       print"<td valign='top'><input type='radio' name='grp2' id='IPSEC_NET' value='ipsec_net' $checked{'grp2'}{'ipsec_net'}></td><td valign='top'>$Lang::tr{'fwhost ipsec net'}</td><td><select name='IPSEC_NET' style='min-width:185px;'>" if ($show eq '');
                                        $show='1';
-                                       print"<option value='$ipsecconf{$key}[1]'>$ipsecconf{$key}[1]</option>";
+                                       push (@IPSEC_N2N,$ipsecconf{$key}[1]);
+                               }
+                       }
+                       if ($show eq '1'){
+                               $show='';
+                               print<<END;
+                                       <td style='width:15em;'>
+                                               <label>
+                                                       <input type='radio' name='grp2' id='IPSEC_NET' value='ipsec_net' $checked{'grp2'}{'ipsec_net'}>
+                                                       $Lang::tr{'fwhost ipsec net'}
+                                               </label>
+                                       </td>
+                                       <td style='text-align:right;'>
+                                       <select name='IPSEC_NET' style='width:16em;'>"
+END
+                               foreach(@IPSEC_N2N){
+                                       print"<option value='$_'>$_</option>";
                                }
                        }
-                       if ($show eq '1'){$show='';print"</select></td></tr>";}
+                       print"</select></td></tr>";
                        print"</table>";
                        print"</td></tr></table>";
                        print"<br><br>";
                }
                print"<table width='100%'>";
-               print"<tr><td align='right'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' /><input type='hidden' name='oldremark' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='update' value=\"$fwhostsettings{'update'}\"><input type='hidden' name='ACTION' value='savegrp' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='resetgrp'></form></td></table>";
+               print"<tr><td style='text-align:right;'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' /><input type='hidden' name='oldremark' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='update' value=\"$fwhostsettings{'update'}\"><input type='hidden' name='ACTION' value='savegrp' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='resetgrp'></form></td></table>";
        &Header::closebox();
 }
 sub addservice
@@ -1414,9 +1500,28 @@ END
                print<<END;
                <table width='100%'><form method='post' style='display:inline'>
                <tr><td width='10%'>$Lang::tr{'fwhost addgrpname'}</td><td width='20%'><input type='text' name='srvgrp' value='$fwhostsettings{'SRVGRP_NAME'}' size='14'></td><td align='left'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldsrvgrpname' value='$fwhostsettings{'oldsrvgrpname'}'><input type='hidden' name='ACTION' value='changesrvgrpname'></td><td width='3%'></td></form></tr>
-               <tr><form method='post'><td width='10%'>$Lang::tr{'remark'}:</td><td colspan='2'><input type='text' name='newsrvrem'  value='$fwhostsettings{'SRVGRP_REMARK'}' style='width:98%;'></td><td align='right'><input type='submit' value='$Lang::tr{'fwhost change'}'><input type='hidden' name='oldsrvrem' value='$fwhostsettings{'oldsrvgrpremark'}'><input type='hidden' name='ACTION' value='changesrvgrpremark' ></td></tr>
-               <tr><td colspan='4'><br></td></td></tr>
-               </table></form>
+               <tr>
+                       <form method='post'>
+                               <td width='10%'>
+                                       $Lang::tr{'remark'}:
+                               </td>
+                               <td colspan='2'>
+                                       <input type='text' name='newsrvrem'  value='$fwhostsettings{'SRVGRP_REMARK'}' style='width:98%;'>
+                               </td>
+                               <td align='right'>
+                                       <input type='submit' value='$Lang::tr{'fwhost change'}'>
+                                       <input type='hidden' name='oldsrvrem' value='$fwhostsettings{'oldsrvgrpremark'}'>
+                                       <input type='hidden' name='srvgrp' value='$fwhostsettings{'SRVGRP_NAME'}'>
+                                       <input type='hidden' name='ACTION' value='changesrvgrpremark' >
+                               </td>
+               </tr>
+               <tr>
+                               <td colspan='4'>
+                                       <br>
+                               </td>
+               </tr>
+               </table>
+                       </form>
 END
        }
        if($fwhostsettings{'updatesrvgrp'} eq 'on'){
@@ -1464,6 +1569,7 @@ sub viewtablenet
                &General::readhasharray("$fwconfigfwd", \%fwfwd);
                &General::readhasharray("$fwconfiginp", \%fwinp);
                &General::readhasharray("$fwconfigout", \%fwout);
+
                if (!keys %customnetwork) 
                { 
                        print "<center><b>$Lang::tr{'fwhost empty'}</b>"; 
@@ -1490,7 +1596,7 @@ END
                        }
                        my $colnet="$customnetwork{$key}[1]/".&General::subtocidr($customnetwork{$key}[2]);
                        my $netcount=&getnetcount($customnetwork{$key}[0]);
-                       print"<td width='20%' $col><form method='post'>$customnetwork{$key}[0]</td><td width='15%' align='center' $col>".&Header::colorize($colnet)."</td><td width='40%' $col>$customnetwork{$key}[3]</td><td align='center' $col>$netcount x</td>";
+                       print"<td width='20%' $col><form method='post'>$customnetwork{$key}[0]</td><td width='15%' align='center' $col>".&getcolor($colnet)."</td><td width='40%' $col>$customnetwork{$key}[3]</td><td align='center' $col>$netcount x</td>";
                        print<<END;
                        <td width='1%' $col><input type='image' src='/images/edit.gif' align='middle' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' />
                        <input type='hidden' name='ACTION' value='editnet'>
@@ -1516,50 +1622,79 @@ END
 sub getcolor
 {
                my $c=shift;
+               my $sip;
+               my $scidr;
+               #Check if MAC
+               if (&General::validmac($c)){ return $c;}
+
+               #Check if we got a full IP with subnet then split it
+               if($c =~ /^(.*?)\/(.*?)$/){
+                       ($sip,$scidr) = split ("/",$c);
+               }else{
+                       $sip=$c;
+               }
+
+               #Now check if IP is part of ORANGE,BLUE or GREEN
+               if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
+                       $tdcolor="<font style='color: $Header::colourorange;'>$c</font>";
+                       return $tdcolor;
+               }
+               if ( &General::IpInSubnet($sip,$netsettings{'GREEN_ADDRESS'},$netsettings{'GREEN_NETMASK'})){
+                       $tdcolor="<font style='color: $Header::colourgreen;'>$c</font>";
+                       return $tdcolor;
+               }
+               if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
+                       $tdcolor="<font style='color: $Header::colourblue;'>$c</font>";
+                       return $tdcolor;
+               }
+
                #Check if IP is part of OpenVPN N2N subnet
                foreach my $key (sort keys %ccdhost){
                        if ($ccdhost{$key}[3] eq 'net'){
                                my ($a,$b) = split("/",$ccdhost{$key}[11]);
-                               if (&General::IpInSubnet($c,$a,$b)){
-                                       $tdcolor="style='color:$Header::colourovpn ;'";
+                               if (&General::IpInSubnet($sip,$a,$b)){
+                                       $tdcolor="<font style='color:$Header::colourovpn ;'>$c</font>";
                                        return $tdcolor;
                                }
                        }
                }
+
                #Check if IP is part of OpenVPN dynamic subnet
                my ($a,$b) = split("/",$ovpnsettings{'DOVPN_SUBNET'});
-               if (&General::IpInSubnet($c,$a,$b)){
-                       $tdcolor="style='color: $Header::colourovpn;'";
+               if (&General::IpInSubnet($sip,$a,$b)){
+                       $tdcolor="<font style='color: $Header::colourovpn;'>$c</font>";
                        return $tdcolor;
                }
+
                #Check if IP is part of OpenVPN static subnet
                foreach my $key (sort keys %ccdnet){
                        my ($a,$b) = split("/",$ccdnet{$key}[1]);
                        $b =&General::iporsubtodec($b);
-                       if (&General::IpInSubnet($c,$a,$b)){
-                               $tdcolor="style='color: $Header::colourovpn;'";
+                       if (&General::IpInSubnet($sip,$a,$b)){
+                               $tdcolor="<font style='color: $Header::colourovpn;'>$c</font>";
                                return $tdcolor;
                        }
                }
+
                #Check if IP is part of IPsec RW network
                if ($ipsecsettings{'RW_NET'} ne ''){
                        my ($a,$b) = split("/",$ipsecsettings{'RW_NET'});
                        $b=&General::iporsubtodec($b);
-                       if (&General::IpInSubnet($c,$a,$b)){
-                               $tdcolor="style='color: $Header::colourvpn;'";
+                       if (&General::IpInSubnet($sip,$a,$b)){
+                               $tdcolor="<font style='color: $Header::colourvpn;'>$c</font>";
                                return $tdcolor;
                        }
                }
+
                #Check if IP is part of a IPsec N2N network
                foreach my $key (sort keys %ipsecconf){
                        my ($a,$b) = split("/",$ipsecconf{$key}[11]);
-                       if (&General::IpInSubnet($c,$a,$b)){
-                               $tdcolor="style='color: $Header::colourvpn;'";
+                       if (&General::IpInSubnet($sip,$a,$b)){
+                               $tdcolor="<font style='color: $Header::colourvpn;'>$c</font>";
                                return $tdcolor;
                        }
                }
-               $tdcolor='';
-               return $tdcolor;
+               return "$c";
 }
 sub viewtablehost
 {
@@ -1598,7 +1733,7 @@ END
                        $customhost{$key}[4]=~s/\s+//g;
                        my $hostcount=0;
                        $hostcount=&gethostcount($customhost{$key}[0]);
-                       print"<td width='20%' $col>$customhost{$key}[0]</td><td width='20%' align='center' $col ".&getcolor($ip).">".&Header::colorize($ip)."</td><td width='50%' align='left' $col>$customhost{$key}[3]</td><td align='center' $col>$hostcount x</td>";
+                       print"<td width='20%' $col>$customhost{$key}[0]</td><td width='20%' align='center' $col >".&getcolor($ip)."</td><td width='50%' align='left' $col>$customhost{$key}[3]</td><td align='center' $col>$hostcount x</td>";
                        print<<END;
                        <td width='1%' $col><form method='post'><input type='image' src='/images/edit.gif' align='middle' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' />
                        <input type='hidden' name='ACTION' value='edithost' />
@@ -1709,7 +1844,7 @@ sub viewtablegrp
                        }else{
                                my ($colip,$colsub) = split("/",$ip);
                                $ip="$colip/".&General::subtocidr($colsub) if ($colsub);
-                               print"<td align='center' $col ".&getcolor($colip).">".&Header::colorize($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>$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'}' />";
@@ -1920,7 +2055,7 @@ sub checkname
 }
 sub checkgroup
 {
-       &General::readhasharray("$configsrvgrp", \%customservicegrp );
+       &General::readhasharray("$configgrp", \%customgrp );
        my $name=shift;
        foreach my $key (keys %customservicegrp) {
                if($customservicegrp{$key}[0] eq $name){
index 5cfbebd15a995567fa1d6bebe7644adcb5001674..94187ce7a3dc7daf9b8d4ada0a60225a2f43d654 100644 (file)
@@ -29,28 +29,29 @@ require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 require "/opt/pakfire/lib/functions.pl";
 
-
-my %cgiparams;
-my $refresh;
-
+# If the license has already been accepted.
 if ( -e "/var/ipfire/main/gpl_accepted" ) {
-       print "Status: 302 Moved Temporarily\n";
-       print "Location: index.cgi\n\n";
-       exit (0);
+       &redirect();
 }
-&Header::showhttpheaders();
 
+my %cgiparams;
 $cgiparams{'ACTION'} = '';
+
 &Header::getcgihash(\%cgiparams);
 
-&Header::openpage($Lang::tr{'main page'}, 1, $refresh);
-&Header::openbigbox('', 'center');
+# Check if the license agreement has been accepted.
+if ($cgiparams{'ACTION'} eq "$Lang::tr{'yes'}" && $cgiparams{'gpl_accepted'} eq '1') {
+       open(FILE, ">/var/ipfire/main/gpl_accepted");
+       close(FILE);
 
-# licence agreement
-if ($cgiparams{'ACTION'} eq $Lang::tr{'yes'} && $cgiparams{'gpl_accepted'} eq '1') {
-       system('touch /var/ipfire/main/gpl_accepted');
+       &redirect();
 }
 
+&Header::showhttpheaders();
+
+&Header::openpage($Lang::tr{'main page'}, 1);
+&Header::openbigbox('', 'center');
+
 &Header::openbox('100%', 'left', $Lang::tr{'gpl license agreement'});
 print <<END;
        $Lang::tr{'gpl please read carefully the general public license and accept it below'}.
@@ -80,3 +81,9 @@ END
 &Header::closebox();
 &Header::closebigbox();
 &Header::closepage();
+
+sub redirect {
+       print "Status: 302 Moved Temporarily\n";
+       print "Location: index.cgi\n\n";
+       exit (0);
+}
index c5ccae809e88bd9dc4a1c204621b4593c38ad449..53adeacce8c9d852a99fc79629157eb53531b0a7 100644 (file)
@@ -228,8 +228,6 @@ END
 
 #Dial profiles
 if ( $netsettings{'RED_TYPE'} ne "STATIC" && $netsettings{'RED_TYPE'} ne "DHCP" ){
-       # The dialctrl.pl script outputs html
-       print `/usr/local/bin/dialctrl.pl show`;
        if ( ( $pppsettings{'VALID'} eq 'yes' ) || ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} =~ /^(DHCP|STATIC)$/ ) ) {
                print <<END;
                <br/>
@@ -358,7 +356,7 @@ if (($confighash{'ENABLED'} eq "on") ||
        $ovpnip="$ovpnip/$sub";
 print <<END;
        <tr>
-               <td style='width:25%; text-align:center; background-color:$Header::colourvpn;'>
+               <td style='width:25%; text-align:center; background-color:$Header::colourovpn;'>
                        <a href='/cgi-bin/ovpnmain.cgi' style='color:white'><b>OpenVPN</b></a>
                </td>
                <td style='width:30%; text-align:center;'>$ovpnip</td>
@@ -372,7 +370,7 @@ print"</table>";
 #Check if there are any vpns configured (ipsec and openvpn)
 &General::readhasharray("${General::swroot}/vpn/config", \%vpnconfig);
 foreach my $key (sort { ncmp($vpnconfig{$a}[1],$vpnconfig{$b}[1]) } keys %vpnconfig) {
-       if ($vpnconfig{$key}[0] eq 'on'){
+       if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host'){
                $showipsec=1;
                $showbox=1;
                last;
@@ -409,7 +407,7 @@ if ($showbox){
                </tr>
 END
                foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) {
-                       if ($vpnconfig{$key}[0] eq 'on') {
+                       if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host') {
                                $count++;
                                my ($vpnip,$vpnsub) = split("/",$vpnconfig{$key}[11]);
                                $vpnsub=&General::iporsubtocidr($vpnsub);
@@ -420,8 +418,8 @@ END
                                        $col = $color{'color20'};
                                }
                                print "<tr>";
-                               print "<td style='text-align:left; color:white; background-color:$Header::colourovpn;'>$vpnconfig{$key}[1]</td>";
-                               print "<td style='text-align:left; background-color:$col'>$vpnip</td>";
+                               print "<td style='text-align:left; color:white; background-color:$Header::colourvpn;'>$vpnconfig{$key}[1]</td>";
+                               print "<td style='text-align:center; background-color:$col'>$vpnip</td>";
 
                                my $activecolor = $Header::colourred;
                                my $activestatus = $Lang::tr{'capsclosed'};
index e4e845198be965c6399e246d45aaa5124d5a1e81..07bcc77f813bdfd2ed17988103c717584dd37c23 100644 (file)
@@ -397,9 +397,9 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
         print FILE $myimage->png;
         close(FILE);
         #####################################################
-        print "<table align='center'><tr><td>";
+        print "<div style='text-align:center'>";
         print "<img src='/graphs/fwlog-ip$imagerandom.png'>";
-        print "</td></tr></table>";
+        print "</div>";
 }
 
 print <<END
@@ -408,7 +408,7 @@ print <<END
 <th width='10%' align='center' class='boldbase'></th>
 <th width='30%' align='center' class='boldbase'><b>$Lang::tr{'ip address'}</b></th>
 <th width='10%' align='center' class='boldbase'><b>$Lang::tr{'country'}</b></th>
-<th width='10%' align='center' class='boldbase'><b>Count</b></th>
+<th width='10%' align='center' class='boldbase'><b>$Lang::tr{'count'}</b></th>
 <th width='30%' align='center' class='boldbase'><b>$Lang::tr{'percentage'}</b></th>
 </tr>
 END
@@ -439,10 +439,10 @@ for($s=0;$s<$lines;$s++)
   my $fcode = lc($ccode);
   
   $color++;
-  print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='details'></form></td>";
+  print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
   print "<td align='center' $col><a href='/cgi-bin/ipinfo.cgi?ip=$key[$s]'>$key[$s]</a></td>";
   if ( $fcode ne "" ){
-    print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></td>";}
+    print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode' title='$ccode'></a></td>";}
   else {
     print "<td align='center' $col></td>";}
     print "<td align='center' $col>$value[$s]</td>";
index 9f7ce3a11375e1fe1ab67e557e18789062503f27..5b0db62314df237f3db248040b7e14815e722caa 100644 (file)
@@ -400,17 +400,17 @@ if ($showpie != 2 && $pienumber <= 50 && $pienumber != 0) {
         print FILE $myimage->png;
         close(FILE);
         #####################################################
-        print "<table align='center'><tr><td>";
+        print "<div style='text-align:center'>";
         print "<img src='/graphs/fwlog-port$imagerandom.png'>";
-        print "</td></tr></table>";
+        print "</div>";
 }
 
 print <<END
-<table width='100%' CLASS='tbl'>
+<table width='100%' class='tbl'>
 <tr>
 <th width='10%' align='center' class='boldbase'></th>
 <th width='33%' align='center' class='boldbase'><b>$Lang::tr{'port'}</b></th>
-<th width='33%' align='center' class='boldbase'><b>count</b></th>
+<th width='33%' align='center' class='boldbase'><b>$Lang::tr{'count'}</b></th>
 <th width='33%' align='center' class='boldbase'><b>$Lang::tr{'percentage'}</b></th>
 </tr>
 END
@@ -437,7 +437,7 @@ for($s=0;$s<$lines;$s++)
   print "<tr>";
 
   $color++;
-  print "<td align='center' $col><form method='post' action='showrequestfromport.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='port' value='$key[$s]'> <input type='submit' value='details'></form></td>";
+  print "<td align='center' $col><form method='post' action='showrequestfromport.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='port' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>";
   print "<td align='center' $col>$key[$s]</td>";
   print "<td align='center' $col>$value[$s]</td>";
   print "<td align='center' $col>$percent</td>";
index fa801a9ec744640283f6a10970dbe176def97138..ceb63d45669ab1799292b5b3ccb9ccffa237eba7 100644 (file)
@@ -19,7 +19,7 @@
 #                                                                             #
 ###############################################################################
 ###
-# Based on IPFireCore 55
+# Based on IPFireCore 76
 ###
 use CGI;
 use CGI qw/:standard/;
@@ -80,6 +80,8 @@ $cgiparams{'COMPRESSION'} = 'off';
 $cgiparams{'ONLY_PROPOSED'} = 'off';
 $cgiparams{'ACTION'} = '';
 $cgiparams{'CA_NAME'} = '';
+$cgiparams{'DH_NAME'} = 'dh1024.pem';
+$cgiparams{'DHLENGHT'} = '';
 $cgiparams{'DHCP_DOMAIN'} = '';
 $cgiparams{'DHCP_DNS'} = '';
 $cgiparams{'DHCP_WINS'} = '';
@@ -88,6 +90,8 @@ $cgiparams{'DCOMPLZO'} = 'off';
 $cgiparams{'MSSFIX'} = '';
 $cgiparams{'number'} = '';
 $cgiparams{'PMTU_DISCOVERY'} = '';
+$cgiparams{'DAUTH'} = '';
+$cgiparams{'DCIPHER'} = '';
 $routes_push_file = "${General::swroot}/ovpn/routes_push";
 unless (-e $routes_push_file)    { system("touch $routes_push_file"); }
 unless (-e "${General::swroot}/ovpn/ccd.conf")    { system("touch ${General::swroot}/ovpn/ccd.conf"); }
@@ -222,6 +226,51 @@ sub checkportinc
        }
 }
 
+# Darren Critchley - certain ports are reserved for IPFire
+# TCP 67,68,81,222,444
+# UDP 67,68
+# Params passed in -> port, rangeyn, protocol
+sub disallowreserved
+{
+       # port 67 and 68 same for tcp and udp, don't bother putting in an array
+       my $msg = "";
+       my @tcp_reserved = (81,222,444);
+       my $prt = $_[0]; # the port or range
+       my $ryn = $_[1]; # tells us whether or not it is a port range
+       my $prot = $_[2]; # protocol
+       my $srcdst = $_[3]; # source or destination
+       if ($ryn) { # disect port range
+               if ($srcdst eq "src") {
+                       $msg = "$Lang::tr{'rsvd src port overlap'}";
+               } else {
+                       $msg = "$Lang::tr{'rsvd dst port overlap'}";
+               }
+               my @tmprng = split(/\:/,$prt);
+               unless (67 < $tmprng[0] || 67 > $tmprng[1]) { $errormessage="$msg 67"; return; }
+               unless (68 < $tmprng[0] || 68 > $tmprng[1]) { $errormessage="$msg 68"; return; }
+               if ($prot eq "tcp") {
+                       foreach my $prange (@tcp_reserved) {
+                               unless ($prange < $tmprng[0] || $prange > $tmprng[1]) { $errormessage="$msg $prange"; return; }
+                       }
+               }
+       } else {
+               if ($srcdst eq "src") {
+                       $msg = "$Lang::tr{'reserved src port'}";
+               } else {
+                       $msg = "$Lang::tr{'reserved dst port'}";
+               }
+               if ($prt == 67) { $errormessage="$msg 67"; return; }
+               if ($prt == 68) { $errormessage="$msg 68"; return; }
+               if ($prot eq "tcp") {
+                       foreach my $prange (@tcp_reserved) {
+                               if ($prange == $prt) { $errormessage="$msg $prange"; return; }
+                       }
+               }
+       }
+       return;
+}
+
+
 sub writeserverconf {
     my %sovpnsettings = ();  
     my @temp = ();  
@@ -243,14 +292,14 @@ sub writeserverconf {
     print CONF "ifconfig-pool-persist /var/ipfire/ovpn/ovpn-leases.db 3600\n";
     print CONF "client-config-dir /var/ipfire/ovpn/ccd\n";
     print CONF "tls-server\n";
-    print CONF "ca /var/ipfire/ovpn/ca/cacert.pem\n";
-    print CONF "cert /var/ipfire/ovpn/certs/servercert.pem\n";
-    print CONF "key /var/ipfire/ovpn/certs/serverkey.pem\n";
-    print CONF "dh /var/ipfire/ovpn/ca/dh1024.pem\n";
+    print CONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n";
+    print CONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n";
+    print CONF "key ${General::swroot}/ovpn/certs/serverkey.pem\n";
+       print CONF "dh ${General::swroot}/ovpn/ca/dh1024.pem\n";
     my @tempovpnsubnet = split("\/",$sovpnsettings{'DOVPN_SUBNET'});
     print CONF "server $tempovpnsubnet[0] $tempovpnsubnet[1]\n";
     #print CONF "push \"route $netsettings{'GREEN_NETADDRESS'} $netsettings{'GREEN_NETMASK'}\"\n";
-   
+
     # Check if we are using mssfix, fragment or mtu-disc and set the corretct mtu of 1500.
     # If we doesn't use one of them, we can use the configured mtu value.
     if ($sovpnsettings{'MSSFIX'} eq 'on') 
@@ -258,8 +307,8 @@ sub writeserverconf {
     elsif ($sovpnsettings{'FRAGMENT'} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') 
        { print CONF "$sovpnsettings{'DDEVICE'}-mtu 1500\n"; }
     elsif (($sovpnsettings{'PMTU_DISCOVERY'} eq 'yes') ||
-          ($sovpnsettings{'PMTU_DISCOVERY'} eq 'maybe') ||
-          ($sovpnsettings{'PMTU_DISCOVERY'} eq 'no' ))
+       ($sovpnsettings{'PMTU_DISCOVERY'} eq 'maybe') ||
+       ($sovpnsettings{'PMTU_DISCOVERY'} eq 'no' ))
        { print CONF "$sovpnsettings{'DDEVICE'}-mtu 1500\n"; } 
     else 
        { print CONF "$sovpnsettings{'DDEVICE'}-mtu $sovpnsettings{'DMTU'}\n"; }
@@ -294,10 +343,10 @@ sub writeserverconf {
        print CONF "client-to-client\n";
     }
     if ($sovpnsettings{MSSFIX} eq 'on') {
-       print CONF "mssfix\n";
+               print CONF "mssfix\n";
     }
     if ($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') {
-       print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";   
+               print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
     }
 
     # Check if a valid operating mode has been choosen and use it.
@@ -313,6 +362,7 @@ sub writeserverconf {
     print CONF "status-version 1\n";
     print CONF "status /var/log/ovpnserver.log 30\n";
     print CONF "cipher $sovpnsettings{DCIPHER}\n";
+       print CONF "auth $sovpnsettings{DAUTH}\n";
     if ($sovpnsettings{DCOMPLZO} eq 'on') {
         print CONF "comp-lzo\n";
     }
@@ -509,7 +559,7 @@ sub getccdadresses
        my @iprange=();
        my %ccdhash=();
        &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%ccdhash);
-       $iprange[0]=$ip1.".".$ip2.".".$ip3.".".($ip4+2);
+       $iprange[0]=$ip1.".".$ip2.".".$ip3.".".2;
        for (my $i=1;$i<=$count;$i++) {
                my $tmpip=$iprange[$i-1];
                my $stepper=$i*4;
@@ -731,6 +781,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
     $vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'};
     $vpnsettings{'ROUTES_PUSH'} = $cgiparams{'ROUTES_PUSH'};
     $vpnsettings{'PMTU_DISCOVERY'} = $cgiparams{'PMTU_DISCOVERY'};
+    $vpnsettings{'DAUTH'} = $cgiparams{'DAUTH'};
     my @temp=();
     
     if ($cgiparams{'FRAGMENT'} eq '') {
@@ -925,9 +976,11 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; 
   print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n"; 
   print SERVERCONF "key ${General::swroot}/ovpn/certs/serverkey.pem\n"; 
-  print SERVERCONF "dh ${General::swroot}/ovpn/ca/dh1024.pem\n"; 
+  print SERVERCONF "dh ${General::swroot}/ovpn/ca/dh1024.pem\n";
   print SERVERCONF "# Cipher\n"; 
-  print SERVERCONF "cipher AES-256-CBC\n"; 
+  print SERVERCONF "cipher $cgiparams{'DCIPHER'}\n";
+  print SERVERCONF "# HMAC algorithm\n";
+  print SERVERCONF "auth $cgiparams{'DAUTH'}\n";
   if ($cgiparams{'COMPLZO'} eq 'on') {
    print SERVERCONF "# Enable Compression\n";
    print SERVERCONF "comp-lzo\r\n";
@@ -952,6 +1005,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
 
 if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq 'net' && $cgiparams{'SIDE'} eq 'client')
 {
+
         my @ovsubnettemp =  split(/\./,$cgiparams{'OVPN_SUBNET'});
         my $ovsubnet =  "$ovsubnettemp[0].$ovsubnettemp[1].$ovsubnettemp[2]";
         my @remsubnet =  split(/\//,$cgiparams{'REMOTE_SUBNET'});
@@ -1014,12 +1068,14 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   print CLIENTCONF "# Auth. Client\n"; 
   print CLIENTCONF "tls-client\n"; 
   print CLIENTCONF "# Cipher\n"; 
-  print CLIENTCONF "cipher AES-256-CBC\n"; 
+  print CLIENTCONF "cipher $cgiparams{'DCIPHER'}\n";
+  print CLIENTCONF "# HMAC algorithm\n";
+  print CLIENTCONF "auth $cgiparams{'DAUTH'}\n";
   print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}.p12\r\n";
   if ($cgiparams{'COMPLZO'} eq 'on') {
    print CLIENTCONF "# Enable Compression\n";
    print CLIENTCONF "comp-lzo\r\n";
-     }
+  }
   print CLIENTCONF "# Debug Level\n"; 
   print CLIENTCONF "verb 3\n"; 
   print CLIENTCONF "# Tunnel check\n"; 
@@ -1058,7 +1114,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
     
     if (! &General::validipandmask($cgiparams{'DOVPN_SUBNET'})) {
             $errormessage = $Lang::tr{'ovpn subnet is invalid'};
-       goto SETTINGS_ERROR;
+                       goto SETTINGS_ERROR;
     }
     my @tmpovpnsubnet = split("\/",$cgiparams{'DOVPN_SUBNET'});
     
@@ -1114,11 +1170,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
        $errormessage = $Lang::tr{'invalid port'};
        goto SETTINGS_ERROR;
     }
-       
-       if ($cgiparams{'DDEST_PORT'} <= 1023) {
-               $errormessage = $Lang::tr{'ovpn port in root range'};
-               goto SETTINGS_ERROR;
-       }
 
     $vpnsettings{'ENABLED_BLUE'} = $cgiparams{'ENABLED_BLUE'};
     $vpnsettings{'ENABLED_ORANGE'} =$cgiparams{'ENABLED_ORANGE'};
@@ -1144,7 +1195,7 @@ SETTINGS_ERROR:
 ###
 ### Reset all step 2
 ###
-}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reset'} && $cgiparams{'AREUSURE'} eq 'yes') {
+}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'remove x509'} && $cgiparams{'AREUSURE'} eq 'yes') {
     my $file = '';
     &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
 
@@ -1154,37 +1205,64 @@ SETTINGS_ERROR:
        }
     }
     while ($file = glob("${General::swroot}/ovpn/ca/*")) {
-       unlink $file
+               unlink $file
     }
     while ($file = glob("${General::swroot}/ovpn/certs/*")) {
-       unlink $file
+               unlink $file
     }
     while ($file = glob("${General::swroot}/ovpn/crls/*")) {
-       unlink $file
+               unlink $file
     }
-    &cleanssldatabase();
+       &cleanssldatabase();
     if (open(FILE, ">${General::swroot}/ovpn/caconfig")) {
         print FILE "";
         close FILE;
     }
-    &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
-    #&writeserverconf();
+       if (open(FILE, ">${General::swroot}/ovpn/ccdroute")) {
+               print FILE "";
+               close FILE;
+       }
+       if (open(FILE, ">${General::swroot}/ovpn/ccdroute2")) {
+               print FILE "";
+               close FILE;
+       }
+       while ($file = glob("${General::swroot}/ovpn/ccd/*")) {
+               unlink $file
+       }
+       if (open(FILE, ">${General::swroot}/ovpn/ovpn-leases.db")) {
+               print FILE "";
+               close FILE;
+       }
+       if (open(FILE, ">${General::swroot}/ovpn/ovpnconfig")) {
+               print FILE "";
+               close FILE;
+       }
+       while ($file = glob("${General::swroot}/ovpn/n2nconf/*")) {
+               system ("rm -rf $file")
+       }
 ###
 ### Reset all step 1
 ###
-}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reset'}) {
+}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'remove x509'}) {
     &Header::showhttpheaders();
-    &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
-    &Header::openbigbox('100%', 'LEFT', '', '');
-    &Header::openbox('100%', 'LEFT', $Lang::tr{'are you sure'});
-    print <<END
-       <table><form method='post'><input type='hidden' name='AREUSURE' value='yes' />
-           <tr><td align='center'>             
-               <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>: 
-               $Lang::tr{'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections'}
-           <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reset'}' />
-               <input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></td></tr>
-       </form></table>
+    &Header::openpage($Lang::tr{'ovpn'}, 1, '');
+    &Header::openbigbox('100%', 'left', '', '');
+    &Header::openbox('100%', 'left', $Lang::tr{'are you sure'});
+    print <<END;
+       <form method='post'>
+               <table width='100%'>
+                       <tr>
+                               <td align='center'>
+                               <input type='hidden' name='AREUSURE' value='yes' />
+                               <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>: 
+                               $Lang::tr{'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections'}</td>
+                       </tr>
+                       <tr>
+                               <td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'remove x509'}' />
+                               <input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></td>
+                       </tr>
+               </table>
+       </form>
 END
     ;
     &Header::closebox();
@@ -1192,6 +1270,107 @@ END
     &Header::closepage();
     exit (0);
 
+###
+### Generate DH key step 2
+###
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'generate dh key'} && $cgiparams{'AREUSURE'} eq 'yes') {
+       # Delete if old key exists
+    if (-f "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}") {
+        unlink "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}";
+       }
+       # Create Diffie Hellmann Parameter
+       system('/usr/bin/openssl', 'dhparam', '-rand', '/proc/interrupts:/proc/net/rt_cache',
+       '-out', "${General::swroot}/ovpn/ca/dh1024.pem", "$cgiparams{'DHLENGHT'}");
+       if ($?) {
+               $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
+               unlink ("${General::swroot}/ovpn/ca/dh1024.pem");
+       }
+
+###
+### Generate DH key step 1
+###
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'generate dh key'}) {
+       &Header::showhttpheaders();
+       &Header::openpage($Lang::tr{'ovpn'}, 1, '');
+       &Header::openbigbox('100%', 'LEFT', '', '');
+       &Header::openbox('100%', 'LEFT', "$Lang::tr{'gen dh'}:");
+       print <<END;
+       <table width='100%'>
+       <tr>
+               <td width='15%'> </td> <td width='15%'></td> <td width='65%'></td>
+    </tr>
+       <tr>
+               <td class='base'>$Lang::tr{'ovpn dh'}:</td>
+               <td align='center'>
+               <form method='post'><input type='hidden' name='AREUSURE' value='yes' />
+               <input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />
+                       <select name='DHLENGHT'>
+                               <option value='1024' $selected{'DHLENGHT'}{'1024'}>1024 $Lang::tr{'bit'}</option>
+                               <option value='2048' $selected{'DHLENGHT'}{'2048'}>2048 $Lang::tr{'bit'}</option>
+                               <option value='3072' $selected{'DHLENGHT'}{'3072'}>3072 $Lang::tr{'bit'}</option>
+                               <option value='4096' $selected{'DHLENGHT'}{'4096'}>4096 $Lang::tr{'bit'}</option>
+                       </select>
+               </td>
+       </tr>
+       <tr><td colspan='4'><br></td></tr>
+       </table>
+       <table width='100%'>
+       <tr>
+               <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}:</font></b>
+               $Lang::tr{'dh key warn'}
+               </td>
+       </tr>
+       <tr>
+               <td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'generate dh key'}' /></td>
+               </form>
+       </tr>
+       </table>
+
+END
+       ;
+       &Header::closebox();
+       print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>";
+       &Header::closebigbox();
+       &Header::closepage();
+       exit (0);
+
+###
+### Upload DH key
+###
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'upload dh key'}) {
+    if ($cgiparams{'DH_NAME'} !~ /dh1024.pem/) {
+        $errormessage = $Lang::tr{'dh name is invalid'};
+        goto UPLOADCA_ERROR;
+       }
+    if (ref ($cgiparams{'FH'}) ne 'Fh') {
+         $errormessage = $Lang::tr{'there was no file upload'};
+         goto UPLOADCA_ERROR;
+    }
+       # Move uploaded dh key to a temporary file
+    (my $fh, my $filename) = tempfile( );
+    if (copy ($cgiparams{'FH'}, $fh) != 1) {
+        $errormessage = $!;
+           goto UPLOADCA_ERROR;
+    }
+       my $temp = `/usr/bin/openssl dhparam -text -in $filename`;
+    if ($temp !~ /DH Parameters: \((1024|2048|3072|4096) bit\)/) {
+        $errormessage = $Lang::tr{'not a valid dh key'};
+        unlink ($filename);
+        goto UPLOADCA_ERROR;
+    } else {
+    # Delete if old key exists
+    if (-f "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}") {
+        unlink "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}";
+       }
+    move($filename, "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}");
+               if ($? ne 0) {
+                       $errormessage = "$Lang::tr{'certificate file move failed'}: $!";
+                       unlink ($filename);
+                       goto UPLOADCA_ERROR;
+               }
+    }
+
+
 ###
 ### Upload CA Certificate
 ###
@@ -1210,7 +1389,7 @@ END
 
     if ($cgiparams{'CA_NAME'} eq 'ca') {
        $errormessage = $Lang::tr{'name is invalid'};
-       goto UPLOAD_CA_ERROR;
+       goto UPLOADCA_ERROR;
     }
 
     # Check if there is no other entry with this name
@@ -1268,7 +1447,7 @@ END
 
     if ( -f "${General::swroot}/ovpn/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem") {
        &Header::showhttpheaders();
-       &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
+       &Header::openpage($Lang::tr{'ovpn'}, 1, '');
        &Header::openbigbox('100%', 'LEFT', '', $errormessage);
        &Header::openbox('100%', 'LEFT', "$Lang::tr{'ca certificate'}:");
        my $output = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem`;
@@ -1345,10 +1524,10 @@ END
        }
        if ($assignedcerts) {
            &Header::showhttpheaders();
-           &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
+           &Header::openpage($Lang::tr{'ovpn'}, 1, '');
            &Header::openbigbox('100%', 'LEFT', '', $errormessage);
            &Header::openbox('100%', 'LEFT', $Lang::tr{'are you sure'});
-           print <<END
+           print <<END;
                <table><form method='post'><input type='hidden' name='AREUSURE' value='yes' />
                       <input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />
                    <tr><td align='center'>
@@ -1380,7 +1559,7 @@ END
     $cgiparams{'ACTION'} eq $Lang::tr{'show host certificate'}) {
     my $output;
     &Header::showhttpheaders();
-    &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
+    &Header::openpage($Lang::tr{'ovpn'}, 1, '');
     &Header::openbigbox('100%', 'LEFT', '', '');
     if ($cgiparams{'ACTION'} eq $Lang::tr{'show root certificate'}) {
        &Header::openbox('100%', 'LEFT', "$Lang::tr{'root certificate'}:");
@@ -1646,7 +1825,7 @@ END
            }
        } else {        # child
            unless (exec ('/usr/bin/openssl', 'req', '-x509', '-nodes', '-rand', '/proc/interrupts:/proc/net/rt_cache',
-                       '-days', '999999', '-newkey', 'rsa:2048',
+                       '-days', '999999', '-newkey', 'rsa:4096',
                        '-keyout', "${General::swroot}/ovpn/ca/cakey.pem",
                        '-out', "${General::swroot}/ovpn/ca/cacert.pem",
                        '-config',"${General::swroot}/ovpn/openssl/ovpn.cnf")) {
@@ -1677,7 +1856,7 @@ END
            }
        } else {        # child
            unless (exec ('/usr/bin/openssl', 'req', '-nodes', '-rand', '/proc/interrupts:/proc/net/rt_cache',
-                       '-newkey', 'rsa:1024',
+                       '-newkey', 'rsa:2048',
                        '-keyout', "${General::swroot}/ovpn/certs/serverkey.pem",
                        '-out', "${General::swroot}/ovpn/certs/serverreq.pem",
                        '-extensions', 'server',
@@ -1729,8 +1908,7 @@ END
        }
        # Create Diffie Hellmann Parameter
        system('/usr/bin/openssl', 'dhparam', '-rand', '/proc/interrupts:/proc/net/rt_cache',
-              '-out', "${General::swroot}/ovpn/ca/dh1024.pem",
-              '1024' );
+              '-out', "${General::swroot}/ovpn/ca/dh1024.pem", "$cgiparams{'DHLENGHT'}");
        if ($?) {
            $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
            unlink ("${General::swroot}/ovpn/certs/serverkey.pem");
@@ -1748,7 +1926,7 @@ END
     ROOTCERT_ERROR:
     if ($cgiparams{'ACTION'} ne '') {
        &Header::showhttpheaders();
-       &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
+       &Header::openpage($Lang::tr{'ovpn'}, 1, '');
        &Header::openbigbox('100%', 'LEFT', '', '');
        if ($errormessage) {
            &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
@@ -1757,7 +1935,7 @@ END
            &Header::closebox();
        }
        &Header::openbox('100%', 'LEFT', "$Lang::tr{'generate root/host certificates'}:");
-       print <<END
+    print <<END;
        <form method='post' enctype='multipart/form-data'>
        <table width='100%' border='0' cellspacing='1' cellpadding='0'>
        <tr><td width='30%' class='base'>$Lang::tr{'organization name'}:</td>
@@ -1790,19 +1968,35 @@ END
            }
            print ">$country</option>";
        }
-       print <<END
-           </select></td>
-           <td colspan='2'>&nbsp;</td></tr>
+    print <<END;
+       </select></td>
+       <tr><td class='base'>$Lang::tr{'ovpn dh'}:</td>
+               <td class='base'><select name='DHLENGHT'>
+                               <option value='1024' $selected{'DHLENGHT'}{'1024'}>1024 $Lang::tr{'bit'}</option>
+                               <option value='2048' $selected{'DHLENGHT'}{'2048'}>2048 $Lang::tr{'bit'}</option>
+                               <option value='3072' $selected{'DHLENGHT'}{'3072'}>3072 $Lang::tr{'bit'}</option>
+                               <option value='4096' $selected{'DHLENGHT'}{'4096'}>4096 $Lang::tr{'bit'}</option>
+                       </select>
+               </td>
+       </tr>
+
        <tr><td>&nbsp;</td>
            <td><input type='submit' name='ACTION' value='$Lang::tr{'generate root/host certificates'}' /></td>
            <td>&nbsp;</td><td>&nbsp;</td></tr> 
        <tr><td class='base' colspan='4' align='left'>
            <img src='/blob.gif' valign='top' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td></tr>
-       <tr><td class='base' colspan='4' align='left'>
-           <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>: 
-           $Lang::tr{'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient'}
-       </td></tr>
-       <tr><td colspan='4' bgcolor='#000000'><img src='/images/null.gif' width='1' height='1' border='0' /></td></tr>
+       <tr><td colspan='4'><br><br></td></tr>
+       <tr><td class='base' colspan='4' align='center'>
+           <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}:</font></b>
+               $Lang::tr{'ovpn generating the root and host certificates'}
+               </td>
+       </tr>
+       <tr><td class='base' colspan='4' align='center'>
+               $Lang::tr{'dh key warn'}
+               </td>
+       </tr>
+
+       <tr><td colspan='4'><hr></td></tr>
        <tr><td class='base' nowrap='nowrap'>$Lang::tr{'upload p12 file'}:</td>
            <td nowrap='nowrap'><input type='file' name='FH' size='32'></td>
            <td colspan='2'>&nbsp;</td></tr>
@@ -1813,12 +2007,13 @@ END
            <td><input type='submit' name='ACTION' value='$Lang::tr{'upload p12 file'}' /></td>
             <td colspan='2'>&nbsp;</td></tr>
        <tr><td class='base' colspan='4' align='left'>
-           <img src='/blob.gif' valign='top' al='*' >&nbsp;$Lang::tr{'this field may be blank'}</td></tr>
+           <img src='/blob.gif' valign='top' al='*' >&nbsp;$Lang::tr{'this field may be blank'}</td>
+       </tr>
        </form></table>
 END
        ;
        &Header::closebox();
-
+       print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>";
        &Header::closebigbox();
        &Header::closepage();
         exit(0)
@@ -1951,12 +2146,14 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){
    print CLIENTCONF "# Auth. Client\n"; 
    print CLIENTCONF "tls-client\n"; 
    print CLIENTCONF "# Cipher\n"; 
-   print CLIENTCONF "cipher AES-256-CBC\n"; 
+   print CLIENTCONF "cipher $confighash{$cgiparams{'KEY'}}[40]\n";
+   print CLIENTCONF "# HMAC algorithm\n";
+   print CLIENTCONF "auth $confighash{$cgiparams{'KEY'}}[39]\n";
     if ($confighash{$cgiparams{'KEY'}}[4] eq 'cert' && -f "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12") { 
         print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12\r\n";
      $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1].p12", "$confighash{$cgiparams{'KEY'}}[1].p12") or die "Can't add file $confighash{$cgiparams{'KEY'}}[1].p12\n";
    } 
-    if ($confighash{$cgiparams{'KEY'}}[30] eq 'on') {
+   if ($confighash{$cgiparams{'KEY'}}[30] eq 'on') {
    print CLIENTCONF "# Enable Compression\n";
    print CLIENTCONF "comp-lzo\r\n";
      }
@@ -2051,6 +2248,7 @@ else
        $zip->addFile( "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem", "$confighash{$cgiparams{'KEY'}}[1]cert.pem") or die "Can't add file $confighash{$cgiparams{'KEY'}}[1]cert.pem\n";    
     }
     print CLIENTCONF "cipher $vpnsettings{DCIPHER}\r\n";
+       print CLIENTCONF "auth $vpnsettings{DAUTH}\r\n";
     if ($vpnsettings{DCOMPLZO} eq 'on') {
         print CLIENTCONF "comp-lzo\r\n";
     }
@@ -2159,7 +2357,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
     } else {
        $errormessage = $Lang::tr{'invalid key'};
     }
-
+       &General::firewall_reload();
 
 ###
 ### Download PKCS12 file
@@ -2180,7 +2378,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
 
     if ( -f "${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem") {
        &Header::showhttpheaders();
-       &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
+       &Header::openpage($Lang::tr{'ovpn'}, 1, '');
        &Header::openbigbox('100%', 'LEFT', '', '');
        &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate'}:");
        my $output = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem`;
@@ -2192,6 +2390,29 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
        &Header::closepage();
        exit(0);
     }
+
+###
+### Display Diffie-Hellman key
+###
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'show dh'}) {
+
+    if (! -e "${General::swroot}/ovpn/ca/dh1024.pem") {
+               $errormessage = $Lang::tr{'not present'};
+       } else {
+               &Header::showhttpheaders();
+               &Header::openpage($Lang::tr{'ovpn'}, 1, '');
+               &Header::openbigbox('100%', 'LEFT', '', '');
+               &Header::openbox('100%', 'LEFT', "$Lang::tr{'dh'}:");
+               my $output = `/usr/bin/openssl dhparam -text -in ${General::swroot}/ovpn/ca/dh1024.pem`;
+               $output = &Header::cleanhtml($output,"y");
+               print "<pre>$output</pre>\n";
+               &Header::closebox();
+               print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>";
+               &Header::closebigbox();
+               &Header::closepage();
+               exit(0);
+    }
+
 ###
 ### Display Certificate Revoke List
 ###
@@ -2200,7 +2421,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
 
     if ( -f "${General::swroot}/ovpn/crls/cacrl.pem") {
        &Header::showhttpheaders();
-       &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
+       &Header::openpage($Lang::tr{'ovpn'}, 1, '');
        &Header::openbigbox('100%', 'LEFT', '', '');
        &Header::openbox('100%', 'LEFT', "$Lang::tr{'crl'}:");
        my $output = `/usr/bin/openssl crl -text -noout -in ${General::swroot}/ovpn/crls/cacrl.pem`;
@@ -2231,19 +2452,22 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
 #    }
 ADV_ERROR:
     if ($cgiparams{'MAX_CLIENTS'} eq '') {
-       $cgiparams{'MAX_CLIENTS'} =  '100';     
+               $cgiparams{'MAX_CLIENTS'} =  '100';
     }
     if ($cgiparams{'KEEPALIVE_1'} eq '') {
-       $cgiparams{'KEEPALIVE_1'} =  '10';     
+               $cgiparams{'KEEPALIVE_1'} =  '10';
     }
     if ($cgiparams{'KEEPALIVE_2'} eq '') {
-       $cgiparams{'KEEPALIVE_2'} =  '60';     
+               $cgiparams{'KEEPALIVE_2'} =  '60';
     }
     if ($cgiparams{'LOG_VERB'} eq '') {
-       $cgiparams{'LOG_VERB'} =  '3';
+               $cgiparams{'LOG_VERB'} =  '3';
     }
     if ($cgiparams{'PMTU_DISCOVERY'} eq '') {
-       $cgiparams{'PMTU_DISCOVERY'} = 'off';
+               $cgiparams{'PMTU_DISCOVERY'} = 'off';
+    }
+    if ($cgiparams{'DAUTH'} eq '') {
+               $cgiparams{'DAUTH'} = 'SHA1';
     }
     $checked{'CLIENT2CLIENT'}{'off'} = '';
     $checked{'CLIENT2CLIENT'}{'on'} = '';
@@ -2251,7 +2475,6 @@ ADV_ERROR:
     $checked{'REDIRECT_GW_DEF1'}{'off'} = '';
     $checked{'REDIRECT_GW_DEF1'}{'on'} = '';
     $checked{'REDIRECT_GW_DEF1'}{$cgiparams{'REDIRECT_GW_DEF1'}} = 'CHECKED';
-    $selected{'ENGINES'}{$cgiparams{'ENGINES'}} = 'SELECTED';
     $checked{'MSSFIX'}{'off'} = '';
     $checked{'MSSFIX'}{'on'} = '';
     $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED';
@@ -2269,7 +2492,14 @@ ADV_ERROR:
     $selected{'LOG_VERB'}{'11'} = '';
     $selected{'LOG_VERB'}{'0'} = '';
     $selected{'LOG_VERB'}{$cgiparams{'LOG_VERB'}} = 'SELECTED';
-   
+    $selected{'DAUTH'}{'whirlpool'} = '';
+    $selected{'DAUTH'}{'SHA512'} = '';
+    $selected{'DAUTH'}{'SHA384'} = '';
+    $selected{'DAUTH'}{'SHA256'} = '';
+    $selected{'DAUTH'}{'ecdsa-with-SHA1'} = '';
+    $selected{'DAUTH'}{'SHA1'} = '';
+    $selected{'DAUTH'}{$cgiparams{'DAUTH'}} = 'SELECTED';
+
     &Header::showhttpheaders();
     &Header::openpage($Lang::tr{'status ovpn'}, 1, '');
     &Header::openbigbox('100%', 'LEFT', '', $errormessage);    
@@ -2280,34 +2510,34 @@ ADV_ERROR:
        &Header::closebox();
     }
     &Header::openbox('100%', 'LEFT', $Lang::tr{'advanced server'});
-    print <<END
+    print <<END;
     <form method='post' enctype='multipart/form-data'>
-    <table width='100%' border='0'>
-    <tr>
-       <td colspan='4'><b>$Lang::tr{'dhcp-options'}</b></td>
+<table width='100%' border=0>
+       <tr>
+               <td colspan='4'><b>$Lang::tr{'dhcp-options'}</b></td>
     </tr>
     <tr>
-       <td width='25%'></td> <td width='20%'> </td><td width='25%'> </td><td width='30%'></td>
+               <td width='25%'></td> <td width='20%'> </td><td width='25%'> </td><td width='30%'></td>
     </tr>      
     <tr>               
-       <td class='base'>Domain</td>
+               <td class='base'>Domain</td>
         <td><input type='TEXT' name='DHCP_DOMAIN' value='$cgiparams{'DHCP_DOMAIN'}' size='30'  /></td>
     </tr>
     <tr>       
-       <td class='base'>DNS</td>
-       <td><input type='TEXT' name='DHCP_DNS' value='$cgiparams{'DHCP_DNS'}' size='30' /></td>
+               <td class='base'>DNS</td>
+               <td><input type='TEXT' name='DHCP_DNS' value='$cgiparams{'DHCP_DNS'}' size='30' /></td>
     </tr>      
     <tr>       
-       <td class='base'>WINS</td>
-       <td><input type='TEXT' name='DHCP_WINS' value='$cgiparams{'DHCP_WINS'}' size='30' /></td>
-       </tr>
+               <td class='base'>WINS</td>
+               <td><input type='TEXT' name='DHCP_WINS' value='$cgiparams{'DHCP_WINS'}' size='30' /></td>
+       </tr>
     <tr>
-       <td colspan='4'><b>$Lang::tr{'ovpn routes push options'}</b></td>
+               <td colspan='4'><b>$Lang::tr{'ovpn routes push options'}</b></td>
     </tr>
     <tr>       
-       <td class='base'>$Lang::tr{'ovpn routes push'}</td>
-  <td colspan='2'>
-       <textarea name='ROUTES_PUSH' cols='26' rows='6' wrap='off'>
+               <td class='base'>$Lang::tr{'ovpn routes push'}</td>
+               <td colspan='2'>
+               <textarea name='ROUTES_PUSH' cols='26' rows='6' wrap='off'>
 END
 ;
 
@@ -2322,42 +2552,39 @@ print <<END;
     </tr>
 </table>
 <hr size='1'>
-    <table width='100%'>
+<table width='100%'>
     <tr>
-       <td class'base'><b>$Lang::tr{'misc-options'}</b></td>
+               <td class'base'><b>$Lang::tr{'misc-options'}</b></td>
     </tr>
     <tr>
-       <td width='20%'></td> <td width='15%'> </td><td width='15%'> </td><td width='15%'></td><td width='35%'></td>
+               <td width='20%'></td> <td width='15%'> </td><td width='15%'> </td><td width='15%'></td><td width='35%'></td>
     </tr>
     <tr>
-       <td class='base'>Client-To-Client</td>
-       <td><input type='checkbox' name='CLIENT2CLIENT' $checked{'CLIENT2CLIENT'}{'on'} /></td>
+               <td class='base'>Client-To-Client</td>
+               <td><input type='checkbox' name='CLIENT2CLIENT' $checked{'CLIENT2CLIENT'}{'on'} /></td>
     </tr>
     <tr>       
-       <td class='base'>Redirect-Gateway def1</td>
-       <td><input type='checkbox' name='REDIRECT_GW_DEF1' $checked{'REDIRECT_GW_DEF1'}{'on'} /></td>
+               <td class='base'>Redirect-Gateway def1</td>
+               <td><input type='checkbox' name='REDIRECT_GW_DEF1' $checked{'REDIRECT_GW_DEF1'}{'on'} /></td>
     </tr>
     <tr>       
         <td class='base'>Max-Clients</td>
         <td><input type='text' name='MAX_CLIENTS' value='$cgiparams{'MAX_CLIENTS'}' size='10' /></td>
     </tr>      
-       <tr>
+       <tr>
          <td class='base'>Keepalive <br />
            (ping/ping-restart)</td>
          <td><input type='TEXT' name='KEEPALIVE_1' value='$cgiparams{'KEEPALIVE_1'}' size='10' /></td>
          <td><input type='TEXT' name='KEEPALIVE_2' value='$cgiparams{'KEEPALIVE_2'}' size='10' /></td>
     </tr>
-       <tr>
+       <tr>
          <td class='base'>fragment <br></td>
          <td><input type='TEXT' name='FRAGMENT' value='$cgiparams{'FRAGMENT'}' size='10' /></td>
-        <td>$Lang::tr{'openvpn default'}: <span class="base">1300</span></td>
-      </tr>
-       <tr>
+       </tr>
+       <tr>
          <td class='base'>mssfix</td>
          <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td>
-         <td>$Lang::tr{'openvpn default'}: on</td>
-         </tr>
-
+       </tr>
        <tr>
                <td class='base'>$Lang::tr{'ovpn mtu-disc'}</td>
                <td><input type='radio' name='PMTU_DISCOVERY' value='yes' $checked{'PMTU_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'}</td>
@@ -2367,46 +2594,55 @@ print <<END;
        </tr>
 </table>
 
-<!--
 <hr size='1'>
-    <table width='100%'>
+<table width='100%'>
     <tr>
<td class'base'><b>Crypto-Engines</b></td>
              <td class'base'><b>$Lang::tr{'log-options'}</b></td>
     </tr>
     <tr>
-       <td width='15%'></td> <td width='30%'> </td><td width='25%'> </td><td width='30%'></td>
-    </tr>      
-    <tr><td class='base'>Engines:</td>        
-        <td><select name='ENGINES'><option value="none" $selected{'ENGINES'}{'none'}>none</option>
-                                   <option value="cryptodev" $selected{'ENGINES'}{'cryptodev'}>cryptodev</option>
-                                   <option value="padlock" $selected{'ENGINES'}{'padlock'}>padlock</option>
+               <td width='20%'></td> <td width='30%'> </td><td width='25%'> </td><td width='25%'></td>
+    </tr>
+
+    <tr><td class='base'>VERB</td>
+        <td><select name='LOG_VERB'>
+                               <option value='0'  $selected{'LOG_VERB'}{'0'}>0</option>
+                               <option value='1'  $selected{'LOG_VERB'}{'1'}>1</option>
+                               <option value='2'  $selected{'LOG_VERB'}{'2'}>2</option>
+                               <option value='3'  $selected{'LOG_VERB'}{'3'}>3</option>
+                               <option value='4'  $selected{'LOG_VERB'}{'4'}>4</option>
+                               <option value='5'  $selected{'LOG_VERB'}{'5'}>5</option>
+                               <option value='6'  $selected{'LOG_VERB'}{'6'}>6</option>
+                               <option value='7'  $selected{'LOG_VERB'}{'7'}>7</option>
+                               <option value='8'  $selected{'LOG_VERB'}{'8'}>8</option>
+                               <option value='9'  $selected{'LOG_VERB'}{'9'}>9</option>
+                               <option value='10' $selected{'LOG_VERB'}{'10'}>10</option>
+                               <option value='11' $selected{'LOG_VERB'}{'11'}>11</option>
                        </select>
-               </td>   
+               </td>
+       </tr>
 </table>
--->
+
 <hr size='1'>
-    <table width='100%'>
-    <tr>
-       <td class'base'><b>$Lang::tr{'log-options'}</b></td>
-    </tr>
+<table width='100%'>
     <tr>
-       <td width='15%'></td> <td width='30%'> </td><td width='25%'> </td><td width='30%'></td>
+               <td class'base'><b>$Lang::tr{'ovpn crypt options'}</b></td>
+       </tr>
+       <tr>
+               <td width='20%'></td> <td width='30%'> </td><td width='25%'> </td><td width='25%'></td>
     </tr>      
-       
-    <tr><td class='base'>VERB</td>        
-        <td><select name='LOG_VERB'><option value='1'  $selected{'LOG_VERB'}{'1'}>1</option>
-                                   <option value='2'  $selected{'LOG_VERB'}{'2'}>2</option>
-                                   <option value='3'  $selected{'LOG_VERB'}{'3'}>3</option>
-                                   <option value='4'  $selected{'LOG_VERB'}{'4'}>4</option>
-                                   <option value='5'  $selected{'LOG_VERB'}{'5'}>5</option>
-                                   <option value='6'  $selected{'LOG_VERB'}{'6'}>6</option>                                                                
-                                   <option value='7'  $selected{'LOG_VERB'}{'7'}>7</option>
-                                   <option value='8'  $selected{'LOG_VERB'}{'8'}>8</option>
-                                   <option value='9'  $selected{'LOG_VERB'}{'9'}>9</option>
-                                   <option value='10' $selected{'LOG_VERB'}{'10'}>10</option>
-                                   <option value='11' $selected{'LOG_VERB'}{'11'}>11</option>
-                                   <option value='0'  $selected{'LOG_VERB'}{'0'}>0</option></select></td>      
+    <tr><td class='base'>$Lang::tr{'ovpn ha'}</td>
+               <td><select name='DAUTH'>
+                               <option value='whirlpool'               $selected{'DAUTH'}{'whirlpool'}>Whirlpool (512 $Lang::tr{'bit'})</option>
+                               <option value='SHA512'                  $selected{'DAUTH'}{'SHA512'}>SHA2 (512 $Lang::tr{'bit'})</option>
+                               <option value='SHA384'                  $selected{'DAUTH'}{'SHA384'}>SHA2 (384 $Lang::tr{'bit'})</option>
+                               <option value='SHA256'                  $selected{'DAUTH'}{'SHA256'}>SHA2 (256 $Lang::tr{'bit'})</option>
+                               <option value='ecdsa-with-SHA1'         $selected{'DAUTH'}{'ecdsa-with-SHA1'}>ECDSA-SHA1 (160 $Lang::tr{'bit'})</option>
+                               <option value='SHA1'                    $selected{'DAUTH'}{'SHA1'}>SHA1 (160 $Lang::tr{'bit'})</option>
+                       </select>
+               </td>
+               <td>Default: <span class="base">SHA1 (160 $Lang::tr{'bit'})</span></td>
 </table><hr>
+
 END
 
 if ( -e "/var/run/openvpn.pid"){
@@ -2484,11 +2720,11 @@ if ($cgiparams{'ACTION'} eq "edit"){
        
        &Header::openbox('100%', 'LEFT', $Lang::tr{'ccd modify'});
 
-       print <<END
-    <table width='100%' border='0'>
+    print <<END;
+    <table width='100%' border=0>
     <tr><form method='post'>
        <td width='10%' nowrap='nowrap'>$Lang::tr{'ccd name'}:</td><td><input type='TEXT' name='ccdname' value='$cgiparams{'ccdname'}' /></td>
-       <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly='readonly' /></td></tr>
+       <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly /></td></tr>
        <tr><td colspan='4' align='right'><hr><input type='submit' value='$Lang::tr{'save'}' /><input type='hidden' name='ACTION' value='editsave'/>
        <input type='hidden' name='ccdname' value='$cgiparams{'ccdname'}'/><input type='submit' value='$Lang::tr{'cancel'}' />
        </td></tr>
@@ -2498,7 +2734,7 @@ END
        &Header::closebox();
 
        &Header::openbox('100%', 'LEFT',$Lang::tr{'ccd net'} );
-       print <<END
+    print <<END;
     <table width='100%' border='0'  cellpadding='0' cellspacing='1'>
     <tr>
        <td class='boldbase' align='center'><b>$Lang::tr{'ccd name'}</td><td class='boldbase' align='center'><b>$Lang::tr{'network'}</td><td class='boldbase' width='15%' align='center'><b>$Lang::tr{'ccd used'}</td><td width='3%'></td><td width='3%'></td></tr>
@@ -2528,7 +2764,7 @@ END
                print "$Lang::tr{'ccd noaddnet'}<br><hr>";
        }
        
-       print <<END
+    print <<END;
     <table width='100%' cellpadding='0' cellspacing='1'>
     <tr>
        <td class='boldbase' align='center' nowrap='nowrap' width='20%'><b>$Lang::tr{'ccd name'}</td><td class='boldbase' align='center' width='8%'><b>$Lang::tr{'network'}</td><td class='boldbase' width='8%' align='center' nowrap='nowrap'><b>$Lang::tr{'ccd used'}</td><td width='1%' align='center'></td><td width='1%' align='center'></td></tr>
@@ -2546,9 +2782,9 @@ END
                if ($count % 2){ print" <tr bgcolor='$color{'color22'}'>";}
                else{            print" <tr bgcolor='$color{'color20'}'>";}
                print"<td>$ccdconf[0]</td><td align='center'>$ccdconf[1]</td><td align='center'>$ccdhosts/".(&ccdmaxclients($ccdconf[1])+1)."</td><td>";
-print <<END
+        print <<END;
                <form method='post' />
-               <input type='image' src='/images/edit.gif' align='middle' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' />
+               <input type='image' src='/images/edit.gif' align='middle' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} />
                <input type='hidden' name='ACTION' value='edit'/>
                <input type='hidden' name='ccdname' value='$ccdconf[0]' />
                <input type='hidden' name='ccdsubnet' value='$ccdconf[1]' />
@@ -2557,7 +2793,7 @@ print <<END
                <td><input type='hidden' name='ACTION' value='kill'/>
                <input type='hidden' name='number' value='$count' />
                <input type='hidden' name='net' value='$ccdconf[0]' />
-               <input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' /></form></td></tr>
+               <input type='image' src='/images/delete.gif' align='middle' alt=$Lang::tr{'remove'} title=$Lang::tr{'remove'} /></form></td></tr>
 END
 ;
        }       
@@ -2582,7 +2818,7 @@ END
 #
 #      <td><b>$Lang::tr{'protocol'}</b></td>
 # protocol temp removed 
-    print <<END
+    print <<END;
     <table width='100%' cellpadding='2' cellspacing='0' class='tbl'>
     <tr>
        <th><b>$Lang::tr{'common name'}</b></th>
@@ -2661,7 +2897,7 @@ END
        }
        
        print "</table>";
-       print <<END
+    print <<END;
        <table width='100%' border='0' cellpadding='2' cellspacing='0'>
        <tr><td></td></tr>
        <tr><td></td></tr>
@@ -2770,13 +3006,13 @@ END
 } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'add'} && $cgiparams{'TYPE'} eq '') {
        &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings);
        &Header::showhttpheaders();
-       &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
+       &Header::openpage($Lang::tr{'ovpn'}, 1, '');
        &Header::openbigbox('100%', 'LEFT', '', '');
        &Header::openbox('100%', 'LEFT', $Lang::tr{'connection type'});
 
 if ( -s "${General::swroot}/ovpn/settings") {
 
-       print <<END
+    print <<END;
            <b>$Lang::tr{'connection type'}:</b><br />
            <table border='0' width='100%'><form method='post' ENCTYPE="multipart/form-data">
            <tr><td><input type='radio' name='TYPE' value='host' checked /></td>
@@ -2787,7 +3023,7 @@ if ( -s "${General::swroot}/ovpn/settings") {
                <td class='base'>$Lang::tr{'net to net vpn'} (Upload Client Package)</td></tr>
          <tr><td>&nbsp;</td><td class='base'><input type='file' name='FH' size='30'></td></tr>
          <tr><td>&nbsp;</td><td>Import Connection Name <img src='/blob.gif' /></td></tr>
-    <tr><td>&nbsp;</td><td class='base'><input type='text' name='n2nname' size='30'>$Lang::tr{'openvpn default'}: Client Packagename</td></tr>
+    <tr><td>&nbsp;</td><td class='base'><input type='text' name='n2nname' size='30'>Default : Client Packagename</td></tr>
          <tr><td colspan='3'><hr /></td></tr>
     <tr><td align='right' colspan='3'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr>
          <tr><td class='base' colspan='3' align='left'><img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td></tr>
@@ -2797,7 +3033,7 @@ END
        
 
 } else {
-       print <<END
+    print <<END;
                    <b>$Lang::tr{'connection type'}:</b><br />
            <table border='0' width='100%'><form method='post' ENCTYPE="multipart/form-data">
            <tr><td><input type='radio' name='TYPE' value='host' checked /></td> <td class='base'>$Lang::tr{'host to net vpn'}</td></tr>
@@ -2809,6 +3045,7 @@ END
 }
 
        &Header::closebox();
+       print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>";
        &Header::closebigbox();
        &Header::closepage();
        exit (0);
@@ -2943,8 +3180,9 @@ END
        
 my $complzoactive;
 my $mssfixactive;
+my $authactive;
 my $n2nfragment;
-my @n2nmtudisc = split(/ /, (grep { /^mtu-disc/ } @firen2nconf)[0]);;
+my @n2nmtudisc = split(/ /, (grep { /^mtu-disc/ } @firen2nconf)[0]);
 my @n2nproto2 = split(/ /, (grep { /^proto/ } @firen2nconf)[0]);
 my @n2nproto = split(/-/, $n2nproto2[1]);
 my @n2nport = split(/ /, (grep { /^port/ } @firen2nconf)[0]);
@@ -2961,6 +3199,8 @@ my @n2novpnsub =  split(/\./,$n2novpnsuball[1]);
 my @n2nremsub = split(/ /, (grep { /^route/ } @firen2nconf)[0]);
 my @n2nmgmt =  split(/ /, (grep { /^management/ } @firen2nconf)[0]);
 my @n2nlocalsub  = split(/ /, (grep { /^# remsub/ } @firen2nconf)[0]);
+my @n2ncipher = split(/ /, (grep { /^cipher/ } @firen2nconf)[0]);
+my @n2nauth = split(/ /, (grep { /^auth/ } @firen2nconf)[0]);
 
 
 ###
@@ -2980,6 +3220,8 @@ $n2nlocalsub[2] =~ s/\n|\r//g;
 $n2nfragment[1] =~ s/\n|\r//g;
 $n2nmgmt[2] =~ s/\n|\r//g;
 $n2nmtudisc[1] =~ s/\n|\r//g;
+$n2ncipher[1] =~ s/\n|\r//g;
+$n2nauth[1] =~ s/\n|\r//g;
 chomp ($complzoactive);
 chomp ($mssfixactive);
 
@@ -3016,7 +3258,7 @@ foreach my $dkey (keys %confighash) {
        }
 
 ###
-# Check im Dest Port is vaild
+# Check if Dest Port is vaild
 ###
 
 foreach my $dkey (keys %confighash) {
@@ -3033,7 +3275,7 @@ foreach my $dkey (keys %confighash) {
        
   $key = &General::findhasharraykey (\%confighash);
 
-       foreach my $i (0 .. 39) { $confighash{$key}[$i] = "";}
+       foreach my $i (0 .. 41) { $confighash{$key}[$i] = "";}
 
        $confighash{$key}[0] = 'off';
        $confighash{$key}[1] = $n2nname[0];
@@ -3055,7 +3297,8 @@ foreach my $dkey (keys %confighash) {
        $confighash{$key}[30] = $complzoactive;
        $confighash{$key}[31] = $n2ntunmtu[1];
        $confighash{$key}[38] = $n2nmtudisc[1]; 
-
+       $confighash{$key}[39] = $n2nauth[1];
+       $confighash{$key}[40] = $n2ncipher[1];
 
   &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
  
@@ -3075,7 +3318,7 @@ foreach my $dkey (keys %confighash) {
                &Header::openbox('100%', 'LEFT', 'import ipfire net2net config');
        }
        if ($errormessage eq ''){
-               print <<END             
+        print <<END;
                <!-- ipfire net2net config gui -->
                <table width='100%'>
                <tr><td width='25%'>&nbsp;</td><td width='25%'>&nbsp;</td></tr>
@@ -3084,16 +3327,18 @@ foreach my $dkey (keys %confighash) {
                <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'Act as'}</td><td><b>$confighash{$key}[6]</b></td></tr>                                                              
                <tr><td class='boldbase' nowrap='nowrap'>Remote Host </td><td><b>$confighash{$key}[10]</b></td></tr>
                <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'local subnet'}</td><td><b>$confighash{$key}[8]</b></td></tr>
-               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'remote subnet'}</td><td><b>$confighash{$key}[11]</b></td></tr>
+               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'remote subnet'}:</td><td><b>$confighash{$key}[11]</b></td></tr>
                <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn subnet'}</td><td><b>$confighash{$key}[27]</b></td></tr>
                <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td><td><b>$confighash{$key}[28]</b></td></tr>
                <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'destination port'}:</td><td><b>$confighash{$key}[29]</b></td></tr>
                <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td><td><b>$confighash{$key}[30]</b></td></tr>
-               <tr><td class='boldbase' nowrap='nowrap'>MSSFIX </td><td><b>$confighash{$key}[23]</b></td></tr>
-               <tr><td class='boldbase' nowrap='nowrap'>Fragment </td><td><b>$confighash{$key}[24]</b></td></tr>
+               <tr><td class='boldbase' nowrap='nowrap'>MSSFIX:</td><td><b>$confighash{$key}[23]</b></td></tr>
+               <tr><td class='boldbase' nowrap='nowrap'>Fragment:</td><td><b>$confighash{$key}[24]</b></td></tr>
                <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}</td><td><b>$confighash{$key}[31]</b></td></tr>
-               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn mtu-disc'}</td><td><b>$confighash{$key}[38]</b></td></tr>
-               <tr><td class='boldbase' nowrap='nowrap'>Management Port </td><td><b>$confighash{$key}[22]</b></td></tr>
+               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn mtu-disc'}:</td><td><b>$confighash{$key}[38]</b></td></tr>
+               <tr><td class='boldbase' nowrap='nowrap'>Management Port:</td><td><b>$confighash{$key}[22]</b></td></tr>
+               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn hmac'}:</td><td><b>$confighash{$key}[39]</b></td></tr>
+               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}</td><td><b>$confighash{$key}[40]</b></td></tr>
                <tr><td>&nbsp;</td><td>&nbsp;</td></tr> 
     </table>
 END
@@ -3111,7 +3356,7 @@ END
        }       
        &Header::closebigbox();
        &Header::closepage();
-       exit(0);        
+       exit(0);
 
 
 ##
@@ -3164,33 +3409,35 @@ if ($confighash{$cgiparams{'KEY'}}) {
                    $errormessage = $Lang::tr{'invalid key'};
                    goto VPNCONF_END;
                }
-               $cgiparams{'ENABLED'}                   = $confighash{$cgiparams{'KEY'}}[0];
-               $cgiparams{'NAME'}                              = $confighash{$cgiparams{'KEY'}}[1];
-               $cgiparams{'TYPE'}                              = $confighash{$cgiparams{'KEY'}}[3];
-               $cgiparams{'AUTH'}                              = $confighash{$cgiparams{'KEY'}}[4];
-               $cgiparams{'PSK'}                               = $confighash{$cgiparams{'KEY'}}[5];
-               $cgiparams{'SIDE'}                              = $confighash{$cgiparams{'KEY'}}[6];
-               $cgiparams{'LOCAL_SUBNET'}              = $confighash{$cgiparams{'KEY'}}[8];
-               $cgiparams{'REMOTE'}                    = $confighash{$cgiparams{'KEY'}}[10];
+               $cgiparams{'ENABLED'}           = $confighash{$cgiparams{'KEY'}}[0];
+               $cgiparams{'NAME'}              = $confighash{$cgiparams{'KEY'}}[1];
+               $cgiparams{'TYPE'}              = $confighash{$cgiparams{'KEY'}}[3];
+               $cgiparams{'AUTH'}              = $confighash{$cgiparams{'KEY'}}[4];
+               $cgiparams{'PSK'}               = $confighash{$cgiparams{'KEY'}}[5];
+               $cgiparams{'SIDE'}              = $confighash{$cgiparams{'KEY'}}[6];
+               $cgiparams{'LOCAL_SUBNET'}      = $confighash{$cgiparams{'KEY'}}[8];
+               $cgiparams{'REMOTE'}            = $confighash{$cgiparams{'KEY'}}[10];
                $cgiparams{'REMOTE_SUBNET'}     = $confighash{$cgiparams{'KEY'}}[11];
-               $cgiparams{'OVPN_MGMT'}                 = $confighash{$cgiparams{'KEY'}}[22];
-               $cgiparams{'MSSFIX'}                    = $confighash{$cgiparams{'KEY'}}[23];
-               $cgiparams{'FRAGMENT'}                  = $confighash{$cgiparams{'KEY'}}[24];
-               $cgiparams{'REMARK'}                    = $confighash{$cgiparams{'KEY'}}[25];
-               $cgiparams{'INTERFACE'}                 = $confighash{$cgiparams{'KEY'}}[26];
-               $cgiparams{'OVPN_SUBNET'}               = $confighash{$cgiparams{'KEY'}}[27];
-               $cgiparams{'PROTOCOL'}                  = $confighash{$cgiparams{'KEY'}}[28];
-               $cgiparams{'DEST_PORT'}                 = $confighash{$cgiparams{'KEY'}}[29];
-               $cgiparams{'COMPLZO'}                   = $confighash{$cgiparams{'KEY'}}[30];
-               $cgiparams{'MTU'}                               = $confighash{$cgiparams{'KEY'}}[31];
-               $cgiparams{'CHECK1'}                    = $confighash{$cgiparams{'KEY'}}[32];
+               $cgiparams{'OVPN_MGMT'}         = $confighash{$cgiparams{'KEY'}}[22];
+               $cgiparams{'MSSFIX'}            = $confighash{$cgiparams{'KEY'}}[23];
+               $cgiparams{'FRAGMENT'}          = $confighash{$cgiparams{'KEY'}}[24];
+               $cgiparams{'REMARK'}            = $confighash{$cgiparams{'KEY'}}[25];
+               $cgiparams{'INTERFACE'}         = $confighash{$cgiparams{'KEY'}}[26];
+               $cgiparams{'OVPN_SUBNET'}       = $confighash{$cgiparams{'KEY'}}[27];
+               $cgiparams{'PROTOCOL'}          = $confighash{$cgiparams{'KEY'}}[28];
+               $cgiparams{'DEST_PORT'}         = $confighash{$cgiparams{'KEY'}}[29];
+               $cgiparams{'COMPLZO'}           = $confighash{$cgiparams{'KEY'}}[30];
+               $cgiparams{'MTU'}               = $confighash{$cgiparams{'KEY'}}[31];
+               $cgiparams{'CHECK1'}            = $confighash{$cgiparams{'KEY'}}[32];
                $name=$cgiparams{'CHECK1'}      ;
-               $cgiparams{$name}                               = $confighash{$cgiparams{'KEY'}}[33];
-               $cgiparams{'RG'}                                = $confighash{$cgiparams{'KEY'}}[34];
-               $cgiparams{'CCD_DNS1'}                  = $confighash{$cgiparams{'KEY'}}[35];
-               $cgiparams{'CCD_DNS2'}                  = $confighash{$cgiparams{'KEY'}}[36];
-               $cgiparams{'CCD_WINS'}                  = $confighash{$cgiparams{'KEY'}}[37];
+               $cgiparams{$name}               = $confighash{$cgiparams{'KEY'}}[33];
+               $cgiparams{'RG'}                = $confighash{$cgiparams{'KEY'}}[34];
+               $cgiparams{'CCD_DNS1'}          = $confighash{$cgiparams{'KEY'}}[35];
+               $cgiparams{'CCD_DNS2'}          = $confighash{$cgiparams{'KEY'}}[36];
+               $cgiparams{'CCD_WINS'}          = $confighash{$cgiparams{'KEY'}}[37];
                $cgiparams{'PMTU_DISCOVERY'}    = $confighash{$cgiparams{'KEY'}}[38];
+               $cgiparams{'DAUTH'}             = $confighash{$cgiparams{'KEY'}}[39];
+               $cgiparams{'DCIPHER'}           = $confighash{$cgiparams{'KEY'}}[40];
        } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
        $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
        
@@ -3500,7 +3747,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
                  goto VPNCONF_ERROR;
                }
 
-       if ($cgiparams{'OVPN_MGMT'} eq  '') {
+       if ($cgiparams{'OVPN_MGMT'} eq '') {
                $cgiparams{'OVPN_MGMT'} = $cgiparams{'DEST_PORT'};              
                }
        
@@ -3509,8 +3756,13 @@ if ($cgiparams{'TYPE'} eq 'net') {
                  unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
            rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
                  goto VPNCONF_ERROR;
-               }
-   
+       }
+       #Check if remote subnet is used elsewhere
+       my ($n2nip,$n2nsub)=split("/",$cgiparams{'REMOTE_SUBNET'});
+       $warnmessage=&General::checksubnets('',$n2nip,'ovpn');
+       if ($warnmessage){
+               $warnmessage=$Lang::tr{'remote subnet'}." ($cgiparams{'REMOTE_SUBNET'}) <br>".$warnmessage;
+       }
 }
 
 #      if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) {
@@ -3722,6 +3974,8 @@ if ($cgiparams{'TYPE'} eq 'net') {
            }
            if ($cgiparams{'CERT_NAME'} !~ /^[a-zA-Z0-9 ,\.\-_]+$/) {
                $errormessage = $Lang::tr{'invalid input for name'};
+               unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
+               rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
                goto VPNCONF_ERROR;
            }
            if ($cgiparams{'CERT_EMAIL'} ne '' && (! &General::validemail($cgiparams{'CERT_EMAIL'}))) {
@@ -3794,7 +4048,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
                }
            } else {    # child
                unless (exec ('/usr/bin/openssl', 'req', '-nodes', '-rand', '/proc/interrupts:/proc/net/rt_cache',
-                       '-newkey', 'rsa:1024',
+                       '-newkey', 'rsa:2048',
                        '-keyout', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}key.pem",
                        '-out', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}req.pem",
                        '-config',"${General::swroot}/ovpn/openssl/ovpn.cnf")) {
@@ -3863,7 +4117,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
        
        if (! $key) {
            $key = &General::findhasharraykey (\%confighash);
-           foreach my $i (0 .. 38) { $confighash{$key}[$i] = "";}
+           foreach my $i (0 .. 41) { $confighash{$key}[$i] = "";}
        }
        $confighash{$key}[0]            = $cgiparams{'ENABLED'};
        $confighash{$key}[1]            = $cgiparams{'NAME'};
@@ -3882,13 +4136,13 @@ if ($cgiparams{'TYPE'} eq 'net') {
            $confighash{$key}[6]        = $cgiparams{'SIDE'};
            $confighash{$key}[11]       = $cgiparams{'REMOTE_SUBNET'};
        }
-       $confighash{$key}[8]                    = $cgiparams{'LOCAL_SUBNET'};
+       $confighash{$key}[8]            = $cgiparams{'LOCAL_SUBNET'};
        $confighash{$key}[10]           = $cgiparams{'REMOTE'};
-  if ($cgiparams{'OVPN_MGMT'} eq '') {
+       if ($cgiparams{'OVPN_MGMT'} eq '') {
        $confighash{$key}[22]           = $confighash{$key}[29];
-  } else {
+       } else {
        $confighash{$key}[22]           = $cgiparams{'OVPN_MGMT'};
-  }
+       }
        $confighash{$key}[23]           = $cgiparams{'MSSFIX'};
        $confighash{$key}[24]           = $cgiparams{'FRAGMENT'};
        $confighash{$key}[25]           = $cgiparams{'REMARK'};
@@ -3906,8 +4160,9 @@ if ($cgiparams{'TYPE'} eq 'net') {
        $confighash{$key}[35]           = $cgiparams{'CCD_DNS1'};
        $confighash{$key}[36]           = $cgiparams{'CCD_DNS2'};
        $confighash{$key}[37]           = $cgiparams{'CCD_WINS'};
-       $confighash{$key}[38]                   = $cgiparams{'PMTU_DISCOVERY'};
-
+       $confighash{$key}[38]           = $cgiparams{'PMTU_DISCOVERY'};
+       $confighash{$key}[39]           = $cgiparams{'DAUTH'};
+       $confighash{$key}[40]           = $cgiparams{'DCIPHER'};
 
        &General::writehasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
        
@@ -4017,11 +4272,12 @@ if ($cgiparams{'TYPE'} eq 'net') {
 ###    
         $cgiparams{'MSSFIX'} = 'on';
         $cgiparams{'FRAGMENT'} = '1300';
-       $cgiparams{'PMTU_DISCOVERY'} = 'off';
+        $cgiparams{'PMTU_DISCOVERY'} = 'off';
+        $cgiparams{'DAUTH'} = 'SHA1';
 ###
 # m.a.d n2n end
 ###    
-       $cgiparams{'SIDE'} = 'left';
+        $cgiparams{'SIDE'} = 'left';
        if ( ! -f "${General::swroot}/ovpn/ca/cakey.pem" ) {
            $cgiparams{'AUTH'} = 'psk';
        } elsif ( ! -f "${General::swroot}/ovpn/ca/cacert.pem") {
@@ -4082,10 +4338,35 @@ if ($cgiparams{'TYPE'} eq 'net') {
     }
     $checked{'PMTU_DISCOVERY'}{$cgiparams{'PMTU_DISCOVERY'}} = 'checked=\'checked\'';
 
+    $selected{'DAUTH'}{'whirlpool'} = '';
+    $selected{'DAUTH'}{'SHA512'} = '';
+    $selected{'DAUTH'}{'SHA384'} = '';
+    $selected{'DAUTH'}{'SHA256'} = '';
+    $selected{'DAUTH'}{'ecdsa-with-SHA1'} = '';
+    $selected{'DAUTH'}{'SHA1'} = '';
+    $selected{'DAUTH'}{$cgiparams{'DAUTH'}} = 'SELECTED';
+
+    $selected{'DCIPHER'}{'CAMELLIA-256-CBC'} = '';
+    $selected{'DCIPHER'}{'CAMELLIA-192-CBC'} = '';
+    $selected{'DCIPHER'}{'CAMELLIA-128-CBC'} = '';
+    $selected{'DCIPHER'}{'AES-256-CBC'} = '';
+    $selected{'DCIPHER'}{'AES-192-CBC'} = '';
+    $selected{'DCIPHER'}{'AES-128-CBC'} = '';
+    $selected{'DCIPHER'}{'DESX-CBC'} = '';
+    $selected{'DCIPHER'}{'SEED-CBC'} = '';
+    $selected{'DCIPHER'}{'DES-EDE3-CBC'} = '';
+    $selected{'DCIPHER'}{'DES-EDE-CBC'} = '';
+    $selected{'DCIPHER'}{'CAST5-CBC'} = '';
+    $selected{'DCIPHER'}{'BF-CBC'} = '';
+    $selected{'DCIPHER'}{'RC2-CBC'} = '';
+    $selected{'DCIPHER'}{'DES-CBC'} = '';
+    $selected{'DCIPHER'}{'RC2-64-CBC'} = '';
+    $selected{'DCIPHER'}{'RC2-40-CBC'} = '';
+    $selected{'DCIPHER'}{$cgiparams{'DCIPHER'}} = 'SELECTED';
 
     if (1) {
        &Header::showhttpheaders();
-       &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
+       &Header::openpage($Lang::tr{'ovpn'}, 1, '');
        &Header::openbigbox('100%', 'LEFT', '', $errormessage);
        if ($errormessage) {
            &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
@@ -4111,28 +4392,25 @@ if ($cgiparams{'TYPE'} eq 'net') {
 
        &Header::openbox('100%', 'LEFT', "$Lang::tr{'connection'}:");
        print "<table width='100%'  border='0'>\n";
-       
-       
-       
+
        print "<tr><td width='14%' class='boldbase'>$Lang::tr{'name'}: </td>";
        
        if ($cgiparams{'TYPE'} eq 'host') {
            if ($cgiparams{'KEY'}) {
                print "<td width='35%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' />$cgiparams{'NAME'}</td>";
            } else {
-                       
                print "<td width='35%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' maxlength='20' size='30' /></td>";
            }
 #          print "<tr><td>$Lang::tr{'interface'}</td>";
 #          print "<td><select name='INTERFACE'>";
 #          print "<option value='RED' $selected{'INTERFACE'}{'RED'}>RED</option>";
-#          if ($netsettings{'BLUE_DEV'} ne '') {
-#              print "<option value='BLUE' $selected{'INTERFACE'}{'BLUE'}>BLUE</option>";
-#          }
-#          print "<option value='GREEN' $selected{'INTERFACE'}{'GREEN'}>GREEN</option>";
-#          print "<option value='ORANGE' $selected{'INTERFACE'}{'ORANGE'}>ORANGE</option>";
-#          print "</select></td></tr>";
-#          print <<END
+#              if ($netsettings{'BLUE_DEV'} ne '') {
+#                      print "<option value='BLUE' $selected{'INTERFACE'}{'BLUE'}>BLUE</option>";
+#              }
+#              print "<option value='GREEN' $selected{'INTERFACE'}{'GREEN'}>GREEN</option>";
+#              print "<option value='ORANGE' $selected{'INTERFACE'}{'ORANGE'}>ORANGE</option>";
+#              print "</select></td></tr>";
+#              print <<END;
        } else {
            print "<input type='hidden' name='INTERFACE' value='red' />";
            if ($cgiparams{'KEY'}) {
@@ -4140,58 +4418,95 @@ if ($cgiparams{'TYPE'} eq 'net') {
            } else {
                print "<td width='25%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' maxlength='20' /></td>";
            }
-           
-           
-           
-           print <<END
+
+           print <<END;
                    <td width='25%'>&nbsp;</td>
                    <td width='25%'>&nbsp;</td></tr>
+
                <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'Act as'}</td>
                    <td><select name='SIDE'><option value='server' $selected{'SIDE'}{'server'}>$Lang::tr{'openvpn server'}</option>
                                            <option value='client' $selected{'SIDE'}{'client'}>$Lang::tr{'openvpn client'}</option></select></td>
+
                    <td class='boldbase'>$Lang::tr{'remote host/ip'}:</td>
                    <td><input type='TEXT' name='REMOTE' value='$cgiparams{'REMOTE'}' /></td></tr>
+
                <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'local subnet'}</td>
                    <td><input type='TEXT' name='LOCAL_SUBNET' value='$cgiparams{'LOCAL_SUBNET'}' /></td>
+
                    <td class='boldbase' nowrap='nowrap'>$Lang::tr{'remote subnet'}</td>
                    <td><input type='text' name='REMOTE_SUBNET' value='$cgiparams{'REMOTE_SUBNET'}' /></td></tr>
+
                <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn subnet'}</td>
-                   <td><input type='TEXT' name='OVPN_SUBNET' value='$cgiparams{'OVPN_SUBNET'}' /></td></tr>
-               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td>
-                
-     <td><select name='PROTOCOL'><option value='udp' $selected{'PROTOCOL'}{'udp'}>UDP</option>
-                                               <option value='tcp' $selected{'PROTOCOL'}{'tcp'}>TCP</option></select></td>   
-                   
-        <td class='boldbase'>$Lang::tr{'destination port'}:</td>
-                   <td><input type='TEXT' name='DEST_PORT' value='$cgiparams{'DEST_PORT'}' size='5' /></td></tr>
-               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'} &nbsp;<img src='/blob.gif'</td>
-                   <td><input type='checkbox' name='COMPLZO' $checked{'COMPLZO'}{'on'} /></td>
-                   
-                     <tr><td class='boldbase' nowrap='nowrap'>mssfix &nbsp;<img src='/blob.gif' /></td>
-                   <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td>
-        <td>$Lang::tr{'openvpn default'}: <span class="base">on</span></td>
-        
-          <tr><td class='boldbase' nowrap='nowrap'>fragment &nbsp;<img src='/blob.gif' /></td>
-                   <td><input type='TEXT' name='FRAGMENT' VALUE='$cgiparams{'FRAGMENT'}'size='5' /></td>
-                   <td>$Lang::tr{'openvpn default'}: <span class="base">1300</span></td>
-                   
-               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}&nbsp;<img src='/blob.gif' /></td>
-                   <td> <input type='TEXT' name='MTU' VALUE='$cgiparams{'MTU'}'size='5' /></td>
-        <td colspan='2'>$Lang::tr{'openvpn default'}: udp/tcp <span class="base">1500/1400</span></td>
-        
-        <tr><td class='boldbase' nowrap='nowrap'>Management Port&nbsp;<img src='/blob.gif' /></td>
-                   <td> <input type='TEXT' name='OVPN_MGMT' VALUE='$cgiparams{'OVPN_MGMT'}'size='5' /></td>
-        <td colspan='2'>$Lang::tr{'openvpn default'}: <span class="base">$Lang::tr{'destination port'}</span></td>
+                   <td><input type='TEXT' name='OVPN_SUBNET' value='$cgiparams{'OVPN_SUBNET'}' /></td>
 
-       <tr>
-               <td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn mtu-disc'}</td>
-               <td colspan='3'>
-                       <input type='radio' name='PMTU_DISCOVERY' value='yes' $checked{'PMTU_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'}
-                       <input type='radio' name='PMTU_DISCOVERY' value='maybe' $checked{'PMTU_DISCOVERY'}{'maybe'} /> $Lang::tr{'ovpn mtu-disc maybe'}
-                       <input type='radio' name='PMTU_DISCOVERY' value='no' $checked{'PMTU_DISCOVERY'}{'no'} /> $Lang::tr{'ovpn mtu-disc no'}
-                       <input type='radio' name='PMTU_DISCOVERY' value='off' $checked{'PMTU_DISCOVERY'}{'off'} /> $Lang::tr{'ovpn mtu-disc off'}
-               </td>
-       </tr>
+                       <td class='boldbase'>$Lang::tr{'destination port'}:</td>
+                       <td><input type='TEXT' name='DEST_PORT' value='$cgiparams{'DEST_PORT'}' size='5' /></td>
+
+               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'protocol'}</td>
+                       <td><select name='PROTOCOL'><option value='udp' $selected{'PROTOCOL'}{'udp'}>UDP</option>
+                                               <option value='tcp' $selected{'PROTOCOL'}{'tcp'}>TCP</option></select></td>
+
+               <td class='boldbase' nowrap='nowrap'>Management Port ($Lang::tr{'openvpn default'}: <span class="base">$Lang::tr{'destination port'}): &nbsp;<img src='/blob.gif' /></td>
+                       <td> <input type='TEXT' name='OVPN_MGMT' VALUE='$cgiparams{'OVPN_MGMT'}'size='5' /></td>
+               </tr>
+
+               <tr><td class='boldbase'>$Lang::tr{'cipher'}</td>
+                       <td><select name='DCIPHER'>
+                                       <option value='CAMELLIA-256-CBC' $selected{'DCIPHER'}{'CAMELLIA-256-CBC'}>CAMELLIA-CBC (256 $Lang::tr{'bit'})</option>
+                                       <option value='CAMELLIA-192-CBC' $selected{'DCIPHER'}{'CAMELLIA-192-CBC'}>CAMELLIA-CBC (196 $Lang::tr{'bit'})</option>
+                                       <option value='CAMELLIA-128-CBC' $selected{'DCIPHER'}{'CAMELLIA-128-CBC'}>CAMELLIA-CBC (128 $Lang::tr{'bit'})</option>
+                                       <option value='AES-256-CBC'     $selected{'DCIPHER'}{'AES-256-CBC'}>AES-CBC (256 $Lang::tr{'bit'})</option>
+                                       <option value='AES-192-CBC'     $selected{'DCIPHER'}{'AES-192-CBC'}>AES-CBC (192 $Lang::tr{'bit'})</option>
+                                       <option value='AES-128-CBC'     $selected{'DCIPHER'}{'AES-128-CBC'}>AES-CBC (128 $Lang::tr{'bit'})</option>
+                                       <option value='DES-EDE3-CBC'    $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC (192 $Lang::tr{'bit'})</option>
+                                       <option value='DESX-CBC'        $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC (192 $Lang::tr{'bit'})</option>
+                                       <option value='SEED-CBC'        $selected{'DCIPHER'}{'SEED-CBC'}>SEED-CBC (128 $Lang::tr{'bit'})</option>
+                                       <option value='DES-EDE-CBC'     $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC (128 $Lang::tr{'bit'})</option>
+                                       <option value='BF-CBC'          $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC (128 $Lang::tr{'bit'})</option>
+                                       <option value='CAST5-CBC'       $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'})</option>
+                                       <option value='RC2-CBC'         $selected{'DCIPHER'}{'RC2-CBC'}>RC2-CBC (128 $Lang::tr{'bit'})</option>
+                                       <option value='DES-CBC'         $selected{'DCIPHER'}{'DES-CBC'}>DES-CBC (64 $Lang::tr{'bit'} not recommended)</option>
+                                       <option value='RC2-64-CBC'      $selected{'DCIPHER'}{'RC2-64-CBC'}>RC2-CBC (64 $Lang::tr{'bit'} not recommended)</option>
+                                       <option value='RC2-40-CBC'      $selected{'DCIPHER'}{'RC2-40-CBC'}>RC2-CBC (40 $Lang::tr{'bit'} not recommended)</option>
+                               </select>
+                       </td>
+
+                       <td class='boldbase'>$Lang::tr{'ovpn ha'}:</td>
+                       <td><select name='DAUTH'>
+                                       <option value='whirlpool'       $selected{'DAUTH'}{'whirlpool'}>Whirlpool (512 $Lang::tr{'bit'})</option>
+                                       <option value='SHA512'          $selected{'DAUTH'}{'SHA512'}>SHA2 (512 $Lang::tr{'bit'})</option>
+                                       <option value='SHA384'          $selected{'DAUTH'}{'SHA384'}>SHA2 (384 $Lang::tr{'bit'})</option>
+                                       <option value='SHA256'          $selected{'DAUTH'}{'SHA256'}>SHA2 (256 $Lang::tr{'bit'})</option>
+                                       <option value='ecdsa-with-SHA1' $selected{'DAUTH'}{'ecdsa-with-SHA1'}>ECDSA-SHA1 (160 $Lang::tr{'bit'})</option>
+                                       <option value='SHA1'            $selected{'DAUTH'}{'SHA1'}>SHA1 (160 $Lang::tr{'bit'} Default)</option>
+                               </select>
+                       </td>
+               </tr>
+
+               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}&nbsp;<img src='/blob.gif' /></td>
+                       <td> <input type='TEXT' name='MTU' VALUE='$cgiparams{'MTU'}'size='5' /></td>
+                       <td colspan='2'>$Lang::tr{'openvpn default'}: udp/tcp <span class="base">1500/1400</span></td>
+
+               <tr><td class='boldbase' nowrap='nowrap'>fragment: &nbsp;<img src='/blob.gif' /></td>
+                       <td><input type='TEXT' name='FRAGMENT' VALUE='$cgiparams{'FRAGMENT'}'size='5' /></td>
+                       <td>$Lang::tr{'openvpn default'}: <span class="base">1300</span></td>
+
+               <tr><td class='boldbase' nowrap='nowrap'>mssfix: &nbsp;<img src='/blob.gif' /></td>
+                       <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td>
+                       <td>$Lang::tr{'openvpn default'}: <span class="base">on</span></td>
+
+        <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'} &nbsp;<img src='/blob.gif'</td>
+                       <td><input type='checkbox' name='COMPLZO' $checked{'COMPLZO'}{'on'} /></td>
+               </tr>
+
+               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn mtu-disc'}:</td>
+                       <td colspan='3'>
+                               <input type='radio' name='PMTU_DISCOVERY' value='yes' $checked{'PMTU_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'}
+                               <input type='radio' name='PMTU_DISCOVERY' value='maybe' $checked{'PMTU_DISCOVERY'}{'maybe'} /> $Lang::tr{'ovpn mtu-disc maybe'}
+                               <input type='radio' name='PMTU_DISCOVERY' value='no' $checked{'PMTU_DISCOVERY'}{'no'} /> $Lang::tr{'ovpn mtu-disc no'}
+                               <input type='radio' name='PMTU_DISCOVERY' value='off' $checked{'PMTU_DISCOVERY'}{'off'} /> $Lang::tr{'ovpn mtu-disc off'}
+                       </td>
+               </tr>
 
 END
 ;
@@ -4255,7 +4570,7 @@ if ($cgiparams{'TYPE'} eq 'host') {
  
  if ($cgiparams{'TYPE'} eq 'host') {
 
-print <<END
+    print <<END;
            <table width='100%' cellpadding='0' cellspacing='5' border='0'>
            
            <tr><td><input type='radio' name='AUTH' value='certreq' $checked{'AUTH'}{'certreq'} $cakeydisabled /></td><td class='base'>$Lang::tr{'upload a certificate request'}</td><td class='base' rowspan='2'><input type='file' name='FH' size='30' $cacrtdisabled></td></tr>
@@ -4280,7 +4595,7 @@ END
 
 } else {
 
-print <<END
+    print <<END;
            <table width='100%' cellpadding='0' cellspacing='5' border='0'>
       
            <tr><td><input type='radio' name='AUTH' value='certgen' $checked{'AUTH'}{'certgen'} $cakeydisabled /></td><td class='base'>$Lang::tr{'generate a certificate'}</td><td>&nbsp;</td></tr>
@@ -4314,7 +4629,7 @@ END
 ###
 
 if ($cgiparams{'TYPE'} eq 'host') {
-           print <<END
+    print <<END;
            </select></td></tr>
 
        <td>&nbsp;</td><td class='base'>$Lang::tr{'valid till'} (days):</td>
@@ -4322,7 +4637,7 @@ if ($cgiparams{'TYPE'} eq 'host') {
    <tr><td>&nbsp;</td>
                <td class='base'>$Lang::tr{'pkcs12 file password'}:</td>
                <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS1' value='$cgiparams{'CERT_PASS1'}' size='32' $cakeydisabled /></td></tr>
-           <tr><td>&nbsp;</td><td class='base'>$Lang::tr{'pkcs12 file password'}:<br>($Lang::tr{'confirmation'})</td>
+           <tr><td>&nbsp;</td><td class='base'>$Lang::tr{'pkcs12 file password'}:<BR>($Lang::tr{'confirmation'})</td>
                <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS2' value='$cgiparams{'CERT_PASS2'}' size='32' $cakeydisabled /></td></tr>
      <tr><td colspan='3'>&nbsp;</td></tr>
      <tr><td colspan='3'><hr /></td></tr>
@@ -4330,7 +4645,7 @@ if ($cgiparams{'TYPE'} eq 'host') {
      </table>
 END
 }else{
-           print <<END
+    print <<END;
            </select></td></tr>
    <tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
         <tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
@@ -4506,18 +4821,24 @@ END
     
 #default setzen
     if ($cgiparams{'DCIPHER'} eq '') {
-       $cgiparams{'DCIPHER'} =  'AES-256-CBC';
+               $cgiparams{'DCIPHER'} =  'AES-256-CBC';
     }
     if ($cgiparams{'DDEST_PORT'} eq '') {
-       $cgiparams{'DDEST_PORT'} =  '1194';     
+               $cgiparams{'DDEST_PORT'} =  '1194';
     }
     if ($cgiparams{'DMTU'} eq '') {
-       $cgiparams{'DMTU'} =  '1400';     
+               $cgiparams{'DMTU'} =  '1400';
+    }
+    if ($cgiparams{'MSSFIX'} eq '') {
+               $cgiparams{'MSSFIX'} = 'off';
+    }
+       if ($cgiparams{'DAUTH'} eq '') {
+               $cgiparams{'DAUTH'} = 'SHA1';
     }
     if ($cgiparams{'DOVPN_SUBNET'} eq '') {
-       $cgiparams{'DOVPN_SUBNET'} = '10.' . int(rand(256)) . '.' . int(rand(256)) . '.0/255.255.255.0';
+               $cgiparams{'DOVPN_SUBNET'} = '10.' . int(rand(256)) . '.' . int(rand(256)) . '.0/255.255.255.0';
     }
-       $checked{'ENABLED'}{'off'} = '';
+    $checked{'ENABLED'}{'off'} = '';
     $checked{'ENABLED'}{'on'} = '';
     $checked{'ENABLED'}{$cgiparams{'ENABLED'}} = 'CHECKED';
     $checked{'ENABLED_BLUE'}{'off'} = '';
@@ -4533,26 +4854,37 @@ END
     $selected{'DPROTOCOL'}{'udp'} = '';
     $selected{'DPROTOCOL'}{'tcp'} = '';
     $selected{'DPROTOCOL'}{$cgiparams{'DPROTOCOL'}} = 'SELECTED';
-    
-    $selected{'DCIPHER'}{'DES-CBC'} = '';
-    $selected{'DCIPHER'}{'DES-EDE-CBC'} = '';
+
+    $selected{'DCIPHER'}{'CAMELLIA-256-CBC'} = '';
+    $selected{'DCIPHER'}{'CAMELLIA-192-CBC'} = '';
+    $selected{'DCIPHER'}{'CAMELLIA-128-CBC'} = '';
+    $selected{'DCIPHER'}{'AES-256-CBC'} = '';
+    $selected{'DCIPHER'}{'AES-192-CBC'} = '';
+    $selected{'DCIPHER'}{'AES-128-CBC'} = '';
     $selected{'DCIPHER'}{'DES-EDE3-CBC'} = '';
     $selected{'DCIPHER'}{'DESX-CBC'} = '';
+    $selected{'DCIPHER'}{'SEED-CBC'} = '';
+    $selected{'DCIPHER'}{'DES-EDE-CBC'} = '';
+    $selected{'DCIPHER'}{'CAST5-CBC'} = '';
+    $selected{'DCIPHER'}{'BF-CBC'} = '';
     $selected{'DCIPHER'}{'RC2-CBC'} = '';
-    $selected{'DCIPHER'}{'RC2-40-CBC'} = '';
+    $selected{'DCIPHER'}{'DES-CBC'} = '';
     $selected{'DCIPHER'}{'RC2-64-CBC'} = '';
-    $selected{'DCIPHER'}{'BF-CBC'} = '';
-    $selected{'DCIPHER'}{'CAST5-CBC'} = '';    
-    $selected{'DCIPHER'}{'AES-128-CBC'} = '';
-    $selected{'DCIPHER'}{'AES-192-CBC'} = '';
-    $selected{'DCIPHER'}{'AES-256-CBC'} = '';
-    $selected{'DCIPHER'}{'CAMELLIA-128-CBC'} = '';
-    $selected{'DCIPHER'}{'CAMELLIA-192-CBC'} = '';
-    $selected{'DCIPHER'}{'CAMELLIA-256-CBC'} = '';
+    $selected{'DCIPHER'}{'RC2-40-CBC'} = '';
     $selected{'DCIPHER'}{$cgiparams{'DCIPHER'}} = 'SELECTED';
+
+    $selected{'DAUTH'}{'whirlpool'} = '';
+    $selected{'DAUTH'}{'SHA512'} = '';
+    $selected{'DAUTH'}{'SHA384'} = '';
+    $selected{'DAUTH'}{'SHA256'} = '';
+    $selected{'DAUTH'}{'ecdsa-with-SHA1'} = '';
+    $selected{'DAUTH'}{'SHA1'} = '';
+    $selected{'DAUTH'}{$cgiparams{'DAUTH'}} = 'SELECTED';
+
     $checked{'DCOMPLZO'}{'off'} = '';
     $checked{'DCOMPLZO'}{'on'} = '';
     $checked{'DCOMPLZO'}{$cgiparams{'DCOMPLZO'}} = 'CHECKED';
+
 # m.a.d
     $checked{'MSSFIX'}{'off'} = '';
     $checked{'MSSFIX'}{'on'} = '';
@@ -4569,6 +4901,16 @@ END
        &Header::closebox();
     }
 
+       if ($warnmessage) {
+               &Header::openbox('100%', 'LEFT', $Lang::tr{'warning messages'});
+               print "$warnmessage<br>";
+               print "$Lang::tr{'fwdfw warn1'}<br>";
+               &Header::closebox();
+               print"<center><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'ok'}' style='width: 5em;'></form>";
+               &Header::closepage();
+               exit 0;
+       }
+
     my $sactive = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='50%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'stopped'}</font></b></td></tr></table>";
     my $srunning = "no";
     my $activeonrun = "";
@@ -4580,8 +4922,8 @@ END
        $activeonrun = "disabled='disabled'";
     }  
     &Header::openbox('100%', 'LEFT', $Lang::tr{'global settings'});    
-       print <<END     
-    <table width='100%' border='0'>
+       print <<END;
+    <table width='100%' border=0>
     <form method='post'>
     <td width='25%'>&nbsp;</td>
     <td width='25%'>&nbsp;</td>
@@ -4600,7 +4942,7 @@ END
        print "<tr><td class='boldbase'>$Lang::tr{'ovpn on orange'}</td>";
        print "<td><input type='checkbox' name='ENABLED_ORANGE' $checked{'ENABLED_ORANGE'}{'on'} /></td>";
     }  
-    print <<END        
+    print <<END;
     <tr><td class='base' nowrap='nowrap' colspan='2'>$Lang::tr{'local vpn hostname/ip'}:<br /><input type='text' name='VPN_IP' value='$cgiparams{'VPN_IP'}' size='30' /></td>
        <td class='boldbase' nowrap='nowrap' colspan='2'>$Lang::tr{'ovpn subnet'}<br /><input type='TEXT' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}' size='30' /></td></tr>
     <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn device'}</td>
@@ -4614,26 +4956,29 @@ END
         <td><input type='TEXT' name='DDEST_PORT' value='$cgiparams{'DDEST_PORT'}' size='5' /></td></tr>
     <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}&nbsp;</td>
         <td> <input type='TEXT' name='DMTU' VALUE='$cgiparams{'DMTU'}'size='5' /></td>
+               <td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}</td>
+               <td><select name='DCIPHER'>
+                               <option value='CAMELLIA-256-CBC' $selected{'DCIPHER'}{'CAMELLIA-256-CBC'}>CAMELLIA-CBC (256 $Lang::tr{'bit'})</option>
+                               <option value='CAMELLIA-192-CBC' $selected{'DCIPHER'}{'CAMELLIA-192-CBC'}>CAMELLIA-CBC (196 $Lang::tr{'bit'})</option>
+                               <option value='CAMELLIA-128-CBC' $selected{'DCIPHER'}{'CAMELLIA-128-CBC'}>CAMELLIA-CBC (128 $Lang::tr{'bit'})</option>
+                               <option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-CBC (256 $Lang::tr{'bit'})</option>
+                               <option value='AES-192-CBC' $selected{'DCIPHER'}{'AES-192-CBC'}>AES-CBC (192 $Lang::tr{'bit'})</option>
+                               <option value='AES-128-CBC' $selected{'DCIPHER'}{'AES-128-CBC'}>AES-CBC (128 $Lang::tr{'bit'})</option>
+                               <option value='DES-EDE3-CBC' $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC (192 $Lang::tr{'bit'})</option>
+                               <option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC (192 $Lang::tr{'bit'})</option>
+                               <option value='SEED-CBC' $selected{'DCIPHER'}{'SEED-CBC'}>SEED-CBC (128 $Lang::tr{'bit'})</option>
+                               <option value='DES-EDE-CBC' $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC (128 $Lang::tr{'bit'})</option>
+                               <option value='BF-CBC' $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC (128 $Lang::tr{'bit'})</option>
+                               <option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'})</option>
+                               <option value='RC2-CBC' $selected{'DCIPHER'}{'RC2-CBC'}>RC2-CBC (128 $Lang::tr{'bit'})</option>
+                               <option value='DES-CBC' $selected{'DCIPHER'}{'DES-CBC'}>DES-CBC (64 $Lang::tr{'bit'} not recommended)</option>
+                               <option value='RC2-64-CBC' $selected{'DCIPHER'}{'RC2-64-CBC'}>RC2-CBC (64 $Lang::tr{'bit'} not recommended)</option>
+                               <option value='RC2-40-CBC' $selected{'DCIPHER'}{'RC2-40-CBC'}>RC2-CBC (40 $Lang::tr{'bit'} not recommended)</option>
+                       </select>
+               </td>
     <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td>
         <td><input type='checkbox' name='DCOMPLZO' $checked{'DCOMPLZO'}{'on'} /></td>
-        <td class='boldbase' nowrap='nowrap'>$Lang::tr{'cipher'}</td>
-        <td><select name='DCIPHER'>
-               <option value='CAMELLIA-256-CBC' $selected{'DCIPHER'}{'CAMELLIA-256-CBC'}>CAMELLIA-256-CBC</option>
-               <option value='CAMELLIA-192-CBC' $selected{'DCIPHER'}{'CAMELLIA-192-CBC'}>CAMELLIA-192-CBC</option>
-               <option value='CAMELLIA-128-CBC' $selected{'DCIPHER'}{'CAMELLIA-128-CBC'}>CAMELLIA-128-CBC</option>
-               <option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-256-CBC</option>
-               <option value='AES-192-CBC' $selected{'DCIPHER'}{'AES-192-CBC'}>AES-192-CBC</option>
-               <option value='AES-128-CBC' $selected{'DCIPHER'}{'AES-128-CBC'}>AES-128-CBC</option>
-               <option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC</option>
-               <option value='RC2-64-CBC' $selected{'DCIPHER'}{'RC2-64-CBC'}>RC2-64-CBC</option>
-               <option value='RC2-40-CBC' $selected{'DCIPHER'}{'RC2-40-CBC'}>RC2-40-CBC</option>
-               <option value='RC2-CBC' $selected{'DCIPHER'}{'RC2-CBC'}>RC2-CBC</option>
-               <option value='BF-CBC' $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC</option>
-               <option value='DES-CBC' $selected{'DCIPHER'}{'DES-CBC'}>DES-CBC</option>
-               <option value='DES-EDE-CBC' $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC</option>
-               <option value='DES-EDE3-CBC' $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC</option>
-               <option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC</option>
-       </select></td></tr>
+       </tr>
     <tr><td colspan='4'><br><br></td></tr>
 END
 ;                                 
@@ -4661,163 +5006,15 @@ END
     }
     print "</form></table>";
     &Header::closebox();
-    &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}");
-    print <<EOF#'
-    <table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
-    <tr>
-       <th width='25%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></th>
-       <th width='65%' class='boldbase' align='center'><b>$Lang::tr{'subject'}</b></th>
-       <th width='10%' class='boldbase' colspan='3' align='center'><b>$Lang::tr{'action'}</b></th>
-    </tr>
-EOF
-    ;
-    my $col1="bgcolor='$color{'color22'}'";
-       my $col2="bgcolor='$color{'color20'}'";
-    if (-f "${General::swroot}/ovpn/ca/cacert.pem") {
-       my $casubject = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/ca/cacert.pem`;
-       $casubject    =~ /Subject: (.*)[\n]/;
-       $casubject    = $1;
-       $casubject    =~ s+/Email+, E+;
-       $casubject    =~ s/ ST=/ S=/;
-       print <<END
-       <tr>
-       <td class='base' $col1>$Lang::tr{'root certificate'}</td>
-       <td class='base' $col1>$casubject</td>
-       <form method='post' name='frmrootcrta'><td width='3%' align='center' $col1>
-           <input type='hidden' name='ACTION' value='$Lang::tr{'show root certificate'}' />
-           <input type='image' name='$Lang::tr{'edit'}' src='/images/info.gif' alt='$Lang::tr{'show root certificate'}' title='$Lang::tr{'show root certificate'}' width='20' height='20' border='0' />
-       </td></form>
-       <form method='post' name='frmrootcrtb'><td width='3%' align='center' $col1>
-           <input type='image' name='$Lang::tr{'download root certificate'}' src='/images/media-floppy.png' alt='$Lang::tr{'download root certificate'}' title='$Lang::tr{'download root certificate'}' border='0' />
-           <input type='hidden' name='ACTION' value='$Lang::tr{'download root certificate'}' />
-       </td></form>
-       <td width='4%' $col1>&nbsp;</td></tr>
-END
-       ;
-    } else {
-       # display rootcert generation buttons
-       print <<END
-       <tr>
-       <td class='base' $col1>$Lang::tr{'root certificate'}:</td>
-       <td class='base' $col1>$Lang::tr{'not present'}</td>
-       <td colspan='3' $col1>&nbsp;</td></tr>
-END
-       ;
-    }
-
-    if (-f "${General::swroot}/ovpn/certs/servercert.pem") {
-       my $hostsubject = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/servercert.pem`;
-       $hostsubject    =~ /Subject: (.*)[\n]/;
-       $hostsubject    = $1;
-       $hostsubject    =~ s+/Email+, E+;
-       $hostsubject    =~ s/ ST=/ S=/;
-
-       print <<END
-       <tr>
-       <td class='base' $col2>$Lang::tr{'host certificate'}</td>
-       <td class='base' $col2>$hostsubject</td>
-       <form method='post' name='frmhostcrta'><td width='3%' align='center' $col2>
-           <input type='hidden' name='ACTION' value='$Lang::tr{'show host certificate'}' />
-           <input type='image' name='$Lang::tr{'show host certificate'}' src='/images/info.gif' alt='$Lang::tr{'show host certificate'}' title='$Lang::tr{'show host certificate'}' width='20' height='20' border='0' />
-       </td></form>
-       <form method='post' name='frmhostcrtb'><td width='3%' align='center' $col2>
-           <input type='image' name="$Lang::tr{'download host certificate'}" src='/images/media-floppy.png' alt="$Lang::tr{'download host certificate'}" title="$Lang::tr{'download host certificate'}" border='0' />
-           <input type='hidden' name='ACTION' value="$Lang::tr{'download host certificate'}" />
-       </td></form>
-       <td width='4%' $col2>&nbsp;</td></tr>
-END
-       ;
-    } else {
-       # Nothing
-       print <<END
-       <tr>
-       <td width='25%' class='base' $col2>$Lang::tr{'host certificate'}:</td>
-       <td class='base' $col2>$Lang::tr{'not present'}</td>
-       </td><td colspan='3' $col2>&nbsp;</td></tr>
-END
-       ;
-    }
 
-    if (! -f "${General::swroot}/ovpn/ca/cacert.pem") {
-        print "<tr><td colspan='5' align='center'><form method='post'>";
-       print "<input type='submit' name='ACTION' value='$Lang::tr{'generate root/host certificates'}' />";
-        print "</form></td></tr>\n";
-    }
-
-    if (keys %cahash > 0) {
-       foreach my $key (keys %cahash) {
-           if (($key + 1) % 2) {
-               print "<tr bgcolor='$color{'color20'}'>\n";
-           } else {
-               print "<tr bgcolor='$color{'color22'}'>\n";
-           }
-           print "<td class='base'>$cahash{$key}[0]</td>\n";
-           print "<td class='base'>$cahash{$key}[1]</td>\n";
-           print <<END
-           <form method='post' name='cafrm${key}a'><td align='center'>
-               <input type='image' name='$Lang::tr{'show ca certificate'}' src='/images/info.gif' alt='$Lang::tr{'show ca certificate'}' title='$Lang::tr{'show ca certificate'}' border='0' />
-               <input type='hidden' name='ACTION' value='$Lang::tr{'show ca certificate'}' />
-               <input type='hidden' name='KEY' value='$key' />
-           </td></form>
-           <form method='post' name='cafrm${key}b'><td align='center'>
-               <input type='image' name='$Lang::tr{'download ca certificate'}' src='/images/media-floppy.png' alt='$Lang::tr{'download ca certificate'}' title='$Lang::tr{'download ca certificate'}' border='0' />
-               <input type='hidden' name='ACTION' value='$Lang::tr{'download ca certificate'}' />
-               <input type='hidden' name='KEY' value='$key' />
-           </td></form>
-           <form method='post' name='cafrm${key}c'><td align='center'>
-               <input type='hidden' name='ACTION' value='$Lang::tr{'remove ca certificate'}' />
-               <input type='image'  name='$Lang::tr{'remove ca certificate'}' src='/images/delete.gif' alt='$Lang::tr{'remove ca certificate'}' title='$Lang::tr{'remove ca certificate'}' width='20' height='20' border='0' />
-               <input type='hidden' name='KEY' value='$key' />
-           </td></form></tr>
-END
-           ;
-       }
-    }
-
-    print "</table>";
-
-    # If the file contains entries, print Key to action icons
-    if ( -f "${General::swroot}/ovpn/ca/cacert.pem") {
-    print <<END
-    <table>
-    <tr>
-       <td class='boldbase'>&nbsp; <b>$Lang::tr{'legend'}:</b></td>
-       <td>&nbsp; &nbsp; <img src='/images/info.gif' alt='$Lang::tr{'show certificate'}' /></td>
-       <td class='base'>$Lang::tr{'show certificate'}</td>
-       <td>&nbsp; &nbsp; <img src='/images/media-floppy.png' alt='$Lang::tr{'download certificate'}' /></td>
-       <td class='base'>$Lang::tr{'download certificate'}</td>
-    </tr>
-    </table>
-END
-;
-    }
-    
-print <<END
-<form method='post' enctype='multipart/form-data'>
-<table width='100%' border='0'>
-<tr><td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td><td nowrap='nowrap' width='8%'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' align='left'/></td><td nowrap='nowrap' align='right'><input type='file' name='FH' size='25' /><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /></td></tr>
-<tr><td colspan='4'><br></td></tr>
-<tr align='right'><td colspan='4' align='right' width='80%'><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td></tr>
-</table>
-END
-;
-
-    &Header::closebox();
-    if ( $srunning eq "yes" ) {    
-       print "<div align='center'><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'reset'}' disabled='disabled' /></div></form>\n";    
-    }else{
-       print "<div align='center'><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'reset'}' /></div></form>\n";
-    }      
     if ( -f "${General::swroot}/ovpn/ca/cacert.pem" ) {
-
 ###
 # m.a.d net2net
 #<td width='25%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b><br /><img src='/images/null.gif' width='125' height='1' border='0' alt='L2089' /></td>
 ###
 
-    &Header::openbox('100%', 'LEFT', $Lang::tr{'Client status and controlc' });
-    print <<END
+    &Header::openbox('100%', 'LEFT', $Lang::tr{'connection status and controlc' });
+    print <<END;
 
 
     <table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
@@ -4892,7 +5089,7 @@ END
 #EXITING       -- A graceful exit is in progress.
 ####
 
-               if (($tustate[1] eq 'CONNECTED') || ($tustate[1] eq 'WAIT')) {
+               if ($tustate[1] eq 'CONNECTED') {
                        $col1="bgcolor='${Header::colourgreen}'";
                        $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
                }else {
@@ -4923,7 +5120,7 @@ END
 }
 
 
-       print <<END
+    print <<END;
        <td align='center' $col1>$active</td>
                
        <form method='post' name='frm${key}a'><td align='center' $col>
@@ -4934,7 +5131,7 @@ END
 END
        ;
        if ($confighash{$key}[4] eq 'cert') {
-           print <<END
+           print <<END;
            <form method='post' name='frm${key}b'><td align='center' $col>
                <input type='image' name='$Lang::tr{'show certificate'}' src='/images/info.gif' alt='$Lang::tr{'show certificate'}' title='$Lang::tr{'show certificate'}' border='0' />
                <input type='hidden' name='ACTION' value='$Lang::tr{'show certificate'}' />
@@ -4945,7 +5142,7 @@ END
            print "<td>&nbsp;</td>";
        }
        if ($confighash{$key}[4] eq 'cert' && -f "${General::swroot}/ovpn/certs/$confighash{$key}[1].p12") { 
-           print <<END
+           print <<END;
            <form method='post' name='frm${key}c'><td align='center' $col>
                <input type='image' name='$Lang::tr{'download pkcs12 file'}' src='/images/media-floppy.png' alt='$Lang::tr{'download pkcs12 file'}' title='$Lang::tr{'download pkcs12 file'}' border='0' />
                <input type='hidden' name='ACTION' value='$Lang::tr{'download pkcs12 file'}' />
@@ -4953,7 +5150,7 @@ END
            </td></form>
 END
        ; } elsif ($confighash{$key}[4] eq 'cert') {
-           print <<END
+           print <<END;
            <form method='post' name='frm${key}c'><td align='center' $col>
                <input type='image' name='$Lang::tr{'download certificate'}' src='/images/media-floppy.png' alt='$Lang::tr{'download certificate'}' title='$Lang::tr{'download certificate'}' border='0' />
                <input type='hidden' name='ACTION' value='$Lang::tr{'download certificate'}' />
@@ -4989,45 +5186,215 @@ END
 
     # If the config file contains entries, print Key to action icons
     if ( $id ) {
-    print <<END
+    print <<END;
     <table border='0'>
     <tr>
-       <td class='boldbase'>&nbsp; <b>$Lang::tr{'legend'}:</b></td>
-       <td>&nbsp; <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td>
-       <td class='base'>$Lang::tr{'click to disable'}</td>
-       <td>&nbsp; &nbsp; <img src='/images/info.gif' alt='$Lang::tr{'show certificate'}' /></td>
-       <td class='base'>$Lang::tr{'show certificate'}</td>
-       <td>&nbsp; &nbsp; <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
-       <td class='base'>$Lang::tr{'edit'}</td>
-       <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-       <td class='base'>$Lang::tr{'remove'}</td>
+               <td class='boldbase'>&nbsp; <b>$Lang::tr{'legend'}:</b></td>
+               <td>&nbsp; <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td>
+               <td class='base'>$Lang::tr{'click to disable'}</td>
+               <td>&nbsp; &nbsp; <img src='/images/info.gif' alt='$Lang::tr{'show certificate'}' /></td>
+               <td class='base'>$Lang::tr{'show certificate'}</td>
+               <td>&nbsp; &nbsp; <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
+               <td class='base'>$Lang::tr{'edit'}</td>
+               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
+               <td class='base'>$Lang::tr{'remove'}</td>
     </tr>
     <tr>
-       <td>&nbsp; </td>
-       <td>&nbsp; <img src='/images/off.gif' alt='?OFF' /></td>
-       <td class='base'>$Lang::tr{'click to enable'}</td>
-       <td> <img src='/images/media-floppy.png' alt='?FLOPPY' /></td>
-       <td class='base'>$Lang::tr{'download certificate'}</td>
-       <td> <img src='/images/openvpn.png' alt='?RELOAD'/></td>
-       <td class='base'>$Lang::tr{'dl client arch'}</td>
-    </tr>
+               <td>&nbsp; </td>
+               <td>&nbsp; <img src='/images/off.gif' alt='?OFF' /></td>
+               <td class='base'>$Lang::tr{'click to enable'}</td>
+               <td>&nbsp; &nbsp; <img src='/images/media-floppy.png' alt='?FLOPPY' /></td>
+               <td class='base'>$Lang::tr{'download certificate'}</td>
+               <td>&nbsp; &nbsp; <img src='/images/openvpn.png' alt='?RELOAD'/></td>
+               <td class='base'>$Lang::tr{'dl client arch'}</td>
+               </tr>
     </table><br>
 END
     ;
     }
 
-    print <<END
+    print <<END;
     <table width='100%'>
     <form method='post'>
-    <tr><td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' />
-    <input type='submit' name='ACTION' value='$Lang::tr{'ovpn con stat'}' $activeonrun /></td></tr>
+    <tr><td align='right'>
+               <input type='submit' name='ACTION' value='$Lang::tr{'add'}' />
+               <input type='submit' name='ACTION' value='$Lang::tr{'ovpn con stat'}' $activeonrun /></td>
+       </tr>
     </form>
     </table>
 END
-    ;    
-    &Header::closebox();
-}
-&Header::closepage();
+    ;
+       &Header::closebox();
+       }
+    &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}");
+    print <<END;
+    <table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
+    <tr>
+               <th width='25%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></th>
+               <th width='65%' class='boldbase' align='center'><b>$Lang::tr{'subject'}</b></th>
+               <th width='10%' class='boldbase' colspan='3' align='center'><b>$Lang::tr{'action'}</b></th>
+    </tr>
+END
+    ;
+    my $col1="bgcolor='$color{'color22'}'";
+       my $col2="bgcolor='$color{'color20'}'";
+    if (-f "${General::swroot}/ovpn/ca/cacert.pem") {
+               my $casubject = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/ca/cacert.pem`;
+               $casubject    =~ /Subject: (.*)[\n]/;
+               $casubject    = $1;
+               $casubject    =~ s+/Email+, E+;
+               $casubject    =~ s/ ST=/ S=/;
+               print <<END;
+               <tr>
+                       <td class='base' $col1>$Lang::tr{'root certificate'}</td>
+                       <td class='base' $col1>$casubject</td>
+               <form method='post' name='frmrootcrta'><td width='3%' align='center' $col1>
+                       <input type='hidden' name='ACTION' value='$Lang::tr{'show root certificate'}' />
+                       <input type='image' name='$Lang::tr{'edit'}' src='/images/info.gif' alt='$Lang::tr{'show root certificate'}' title='$Lang::tr{'show root certificate'}' width='20' height='20' border='0' />
+               </td></form>
+               <form method='post' name='frmrootcrtb'><td width='3%' align='center' $col1>
+                       <input type='image' name='$Lang::tr{'download root certificate'}' src='/images/media-floppy.png' alt='$Lang::tr{'download root certificate'}' title='$Lang::tr{'download root certificate'}' border='0' />
+                       <input type='hidden' name='ACTION' value='$Lang::tr{'download root certificate'}' />
+               </td></form>
+               <td width='4%' $col1>&nbsp;</td></tr>
+END
+               ;
+    } else {
+               # display rootcert generation buttons
+               print <<END;
+               <tr>
+                       <td class='base' $col1>$Lang::tr{'root certificate'}:</td>
+                       <td class='base' $col1>$Lang::tr{'not present'}</td>
+                       <td colspan='3' $col1>&nbsp;</td></tr>
+END
+               ;
+    }
+
+    if (-f "${General::swroot}/ovpn/certs/servercert.pem") {
+               my $hostsubject = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/servercert.pem`;
+               $hostsubject    =~ /Subject: (.*)[\n]/;
+               $hostsubject    = $1;
+               $hostsubject    =~ s+/Email+, E+;
+               $hostsubject    =~ s/ ST=/ S=/;
+
+               print <<END;
+               <tr>
+                       <td class='base' $col2>$Lang::tr{'host certificate'}</td>
+                       <td class='base' $col2>$hostsubject</td>
+               <form method='post' name='frmhostcrta'><td width='3%' align='center' $col2>
+                       <input type='hidden' name='ACTION' value='$Lang::tr{'show host certificate'}' />
+                       <input type='image' name='$Lang::tr{'show host certificate'}' src='/images/info.gif' alt='$Lang::tr{'show host certificate'}' title='$Lang::tr{'show host certificate'}' width='20' height='20' border='0' />
+               </td></form>
+               <form method='post' name='frmhostcrtb'><td width='3%' align='center' $col2>
+                       <input type='image' name="$Lang::tr{'download host certificate'}" src='/images/media-floppy.png' alt="$Lang::tr{'download host certificate'}" title="$Lang::tr{'download host certificate'}" border='0' />
+                       <input type='hidden' name='ACTION' value="$Lang::tr{'download host certificate'}" />
+               </td></form>
+               <td width='4%' $col2>&nbsp;</td></tr>
+END
+               ;
+    } else {
+               # Nothing
+               print <<END;
+               <tr>
+                       <td width='25%' class='base' $col2>$Lang::tr{'host certificate'}:</td>
+                       <td class='base' $col2>$Lang::tr{'not present'}</td>
+               </td><td colspan='3' $col2>&nbsp;</td></tr>
+END
+               ;
+    }
+
+    if (! -f "${General::swroot}/ovpn/ca/cacert.pem") {
+        print "<tr><td colspan='5' align='center'><form method='post'>";
+               print "<input type='submit' name='ACTION' value='$Lang::tr{'generate root/host certificates'}' />";
+        print "</form></td></tr>\n";
+    }
+
+    if (keys %cahash > 0) {
+               foreach my $key (keys %cahash) {
+                       if (($key + 1) % 2) {
+                               print "<tr bgcolor='$color{'color20'}'>\n";
+                       } else {
+                               print "<tr bgcolor='$color{'color22'}'>\n";
+                       }
+                       print "<td class='base'>$cahash{$key}[0]</td>\n";
+                       print "<td class='base'>$cahash{$key}[1]</td>\n";
+                       print <<END;
+                       <form method='post' name='cafrm${key}a'><td align='center'>
+                               <input type='image' name='$Lang::tr{'show ca certificate'}' src='/images/info.gif' alt='$Lang::tr{'show ca certificate'}' title='$Lang::tr{'show ca certificate'}' border='0' />
+                               <input type='hidden' name='ACTION' value='$Lang::tr{'show ca certificate'}' />
+                               <input type='hidden' name='KEY' value='$key' />
+                       </td></form>
+                       <form method='post' name='cafrm${key}b'><td align='center'>
+                               <input type='image' name='$Lang::tr{'download ca certificate'}' src='/images/media-floppy.png' alt='$Lang::tr{'download ca certificate'}' title='$Lang::tr{'download ca certificate'}' border='0' />
+                               <input type='hidden' name='ACTION' value='$Lang::tr{'download ca certificate'}' />
+                               <input type='hidden' name='KEY' value='$key' />
+                       </td></form>
+                       <form method='post' name='cafrm${key}c'><td align='center'>
+                               <input type='hidden' name='ACTION' value='$Lang::tr{'remove ca certificate'}' />
+                               <input type='image'  name='$Lang::tr{'remove ca certificate'}' src='/images/delete.gif' alt='$Lang::tr{'remove ca certificate'}' title='$Lang::tr{'remove ca certificate'}' width='20' height='20' border='0' />
+                               <input type='hidden' name='KEY' value='$key' />
+                       </td></form></tr>
+END
+                       ;
+               }
+    }
+
+    print "</table>";
+
+    # If the file contains entries, print Key to action icons
+    if ( -f "${General::swroot}/ovpn/ca/cacert.pem") {
+               print <<END;
+               <table>
+               <tr>
+                       <td class='boldbase'>&nbsp; <b>$Lang::tr{'legend'}:</b></td>
+                       <td>&nbsp; &nbsp; <img src='/images/info.gif' alt='$Lang::tr{'show certificate'}' /></td>
+                       <td class='base'>$Lang::tr{'show certificate'}</td>
+                       <td>&nbsp; &nbsp; <img src='/images/media-floppy.png' alt='$Lang::tr{'download certificate'}' /></td>
+                       <td class='base'>$Lang::tr{'download certificate'}</td>
+               </tr>
+               </table>
+END
+               ;
+    }
 
+       print <<END
+       <hr size='1'>
+       <form method='post' enctype='multipart/form-data'>
+       <table width='100%' border='0'cellspacing='1' cellpadding='0'>
+       <tr>
+               <td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td>
+               <td nowrap='nowrap'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' align='left'/></td>
+               <td nowrap='nowrap'><input type='file' name='FH' size='25' />
+               <td nowrap='nowrap' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /></td>
+       </tr>
 
+       <tr>
+               <td class='base' nowrap='nowrap'>$Lang::tr{'ovpn dh name'}:</td>
+               <td nowrap='nowrap'><input type='text' name='DH_NAME' value='$cgiparams{'DH_NAME'}' size='15' align='left'/></td>
+               <td nowrap='nowrap'><input type='file' name='FH' size='25' />
+               <td nowrap='nowrap' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'upload dh key'}' /></td>
+       </tr>
+       <tr><td colspan='4'><br></td></tr>
+       <tr>
+               <td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'generate dh key'}' /></td>
+               <td colspan='4' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'show dh'}' /></td>
+       </tr>
+
+       <tr align='right'>
+               <td colspan='4' align='right' width='80%'><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td>
+       </tr>
+       </table>
+END
+       ;
+
+    if ( $srunning eq "yes" ) {
+               print "<div align='center'><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'remove x509'}' disabled='disabled' /></div></form>\n";
+    } else {
+               print "<div align='center'><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'remove x509'}' /></div></form>\n";
+    }
+       &Header::closebox();
+END
+       ;
+
+&Header::closepage();
 
index 7e90649d89aa2c277f97b65f2b4ea4a9e038bbf6..f5ec50079a64dd9ff0f0577a3ed6e2e1cb437624 100644 (file)
@@ -1225,7 +1225,7 @@ END
     } else {
        $errormessage = $Lang::tr{'invalid key'};
     }
-
+       &General::firewall_reload();
 ###
 ### Choose between adding a host-net or net-net connection
 ###
@@ -1407,14 +1407,13 @@ END
            goto VPNCONF_ERROR;
        }
 
-#temporary disabled (BUG 10294)
-#      if ($cgiparams{'TYPE'} eq 'net'){
-#              $errormessage=&General::checksubnets($cgiparams{'NAME'},$cgiparams{'REMOTE_SUBNET'});
-#              if ($errormessage ne ''){
-#                      goto VPNCONF_ERROR;
-#              }
-#              
-#      }
+       if ($cgiparams{'TYPE'} eq 'net'){
+               $warnmessage=&General::checksubnets('',$cgiparams{'REMOTE_SUBNET'},'ipsec');
+               if ($warnmessage ne ''){
+                       $warnmessage=$Lang::tr{'remote subnet'}." ($cgiparams{'REMOTE_SUBNET'}) <br>".$warnmessage;
+               }
+       }
+
        if ($cgiparams{'AUTH'} eq 'psk') {
            if (! length($cgiparams{'PSK'}) ) {
                $errormessage = $Lang::tr{'pre-shared key is too short'};
@@ -2520,7 +2519,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
                <td>
                        <label>
                                <input type='checkbox' name='ONLY_PROPOSED' $checked{'ONLY_PROPOSED'} />
-                               IKE+ESP: $Lang::tr{'use only proposed settings'}</td>
+                               IKE+ESP: $Lang::tr{'use only proposed settings'}
                        </label>
                </td>
        </tr>
@@ -2612,6 +2611,16 @@ EOF
        &Header::closebox();
     }
 
+       if ($warnmessage) {
+               &Header::openbox('100%', 'left', $Lang::tr{'warning messages'});
+               print "$warnmessage<br>";
+               print "$Lang::tr{'fwdfw warn1'}<br>";
+               &Header::closebox();
+               print"<center><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'ok'}' style='width: 5em;'></form>";
+               &Header::closepage();
+               exit 0;
+       }
+
     &Header::openbox('100%', 'left', $Lang::tr{'global settings'});
     print <<END
     <form method='post' action='$ENV{'SCRIPT_NAME'}'>
index 79bd0251bb973ec1e3475ac21ffbf53d1614ef9b..5b2490da06c036ee7e430538e09dd11c38e43fc4 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-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        #
@@ -258,7 +258,25 @@ if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) {
        $monwlaninterface =  'mon.'.$wlanapsettings{'INTERFACE'};
 }
 
-my @channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`;
+my @channellist_cmd;
+my @channellist;
+
+if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+my $wiphy = `iw dev $wlanapsettings{'INTERFACE'} info | grep wiphy | cut -d" " -f2`;
+chomp $wiphy;
+
+@channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS)" 2>/dev/null`;
+# get available channels
+
+my @temp;
+foreach (@channellist_cmd){
+$_ =~ /(.*) \[(\d+)(.*)\]/;
+$channel = $2;chomp $channel;
+if ( $channel =~ /\d+/ ){push(@temp,$channel);}
+}
+@channellist = @temp;
+} else {
+@channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`;
 # get available channels
 
 my @temp;
@@ -267,7 +285,8 @@ $_ =~ /(.*)Channel (\d+)(.*):/;
 $channel = $2;chomp $channel;
 if ( $channel =~ /\d+/ ){push(@temp,$channel);}
 }
-my @channellist = @temp;
+@channellist = @temp;
+}
 
 my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`;
 # get available country codes
@@ -488,12 +507,12 @@ print <<END
 </table>
 END
 ;
-
+my @status;
 if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
-        $status =  `wlanconfig $wlanapsettings{'INTERFACE'} list`;
+        @status =  `wlanconfig $wlanapsettings{'INTERFACE'} list`;
 }
 if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
-        $status =  `iw dev $wlanapsettings{'INTERFACE'} station dump`;
+        @status =  `iw dev $wlanapsettings{'INTERFACE'} info && iw dev $wlanapsettings{'INTERFACE'} station dump`;
 }
 print <<END
 <br />
@@ -501,33 +520,37 @@ print <<END
 <tr><th colspan='3' bgcolor='$color{'color20'}' align='left'><strong>$Lang::tr{'wlanap wlan status'}</strong></th></tr>
 END
 ;
-foreach my $nr (@channellist_cmd){
-       my ($chan,$freq) = split(':',$nr);
-       if ($count % 2){
+
+for (my $i=0;$i<$#status;$i++){
+
+if (@status[$i]=~"^Station ") { $count++; }
+if ($count % 2){
                $col="bgcolor='$color{'color20'}'";
        }else{
                $col="bgcolor='$color{'color22'}'";
        }
-       print"<tr><td $col>$chan</td><td $col>:</td><td $col>$freq</td></tr>";
-       $count++;
+       print"<tr><td colspan='3' $col><pre>@status[$i]</pre></td></tr>";
+       if (! @status[$i]=~"^/t" ) { $count++; }
 }
-if ($count % 2){
+       $count++;
+
+foreach my $nr (@channellist_cmd){
+       if ($count % 2){
                $col="bgcolor='$color{'color20'}'";
        }else{
                $col="bgcolor='$color{'color22'}'";
        }
-if ($status){
-       print"<tr><td colspan='3' $col><pre>$status</pre></td></tr>";
+       print"<tr><td colspan='3' $col>$nr</td></tr>";
        $count++;
 }
-for (my $i=0;$i<$#txpower_cmd;$i=$i+4){
-       next if (@txpower_cmd[$i] =~ /mon/i);
+
+for (my $i=0;$i<$#txpower_cmd;$i=$i+2){
        if ($count % 2){
                $col="bgcolor='$color{'color20'}'";
        }else{
                $col="bgcolor='$color{'color22'}'";
        }
-       print "<tr><td $col>@txpower_cmd[$i]</td><td $col>@txpower_cmd[$i+1]</td><td $col>@txpower_cmd[$i+2]</td></tr>";
+       print "<tr><td $col>@txpower_cmd[$i]</td></tr>";
        $count++;
 }
 print "</table><br>";
@@ -557,6 +580,7 @@ driver=$wlanapsettings{'DRIVER_HOSTAPD'}
 interface=$wlanapsettings{'INTERFACE'}
 country_code=$wlanapsettings{'COUNTRY'}
 ieee80211d=1
+ieee80211h=1
 channel=$wlanapsettings{'CHANNEL'}
 END
 ;
index f71181e6323f27b25fd2bdc98552fd79dea7d17f..0c47cd456bbee33e732d848e2601304e22f133a8 100644 (file)
@@ -110,7 +110,7 @@ sub openpage {
        &genmenu();
 
        my $headline = "IPFire";
-       if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
+       if (($settings{'WINDOWWITHHOSTNAME'} eq 'on') || ($settings{'WINDOWWITHHOSTNAME'} eq '')) {
                $headline =  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}";
        }
 
index 11e8370a7a2b1ef73a43e78c31f1ee0520ec94bf..5288baaa3f4750158e0b0974fb2d11e2e8857392 100644 (file)
@@ -1,7 +1,7 @@
 %tr = ( 
 %tr,
 
-'Act as' => 'Konfiguriert als',
+'Act as' => 'Konfiguriert als:',
 'Add Level7 rule' => 'Level7-Regel hinzufügen',
 'Add Port Rule' => 'Port-Regel hinzufügen',
 'Add Rule' => 'Regel hinzufügen',
@@ -10,7 +10,6 @@
 'Choose Rule' => 'Wählen Sie <u>eine</u> der untenstehenden Regeln aus.',
 'Class' => 'Klasse',
 'Class was deleted' => 'wurde mit eventuell vorhandenen Unterklassen gelöscht',
-'Client status and controlc' => 'Client-Status und -Kontrolle',
 'ConnSched action' => 'Aktion:',
 'ConnSched add action' => 'Aktion hinzufügen',
 'ConnSched change profile title' => 'Wechsle zu Profil:',
 'ccd err iroute' => 'Netzadresse für Route ungültig.',
 'ccd err irouteexist' => 'Diese Route wird bereits verwendet.',
 'ccd err isipsecnet' => 'Diese Subnetzadresse wird bereits für ein IPsec-Netzwerk verwendet.',
-'ccd err isovpnnet' => 'Subnetzadresse wird für bereits für den OpenVPN-Server verwendet!',
-'ccd err issubnet' => 'Subnetzadresse wird bereits verwendet.',
+'ccd err isipsecrw' => 'Diese Subnetzadresse wird bereits für das IPsec-RW Netz verwendet.',
+'ccd err isovpnn2n' => 'Die Subnetzadresse wird für bereits für eine OpenVPN Netz-zu-Netz-Verbindung verwendet.',
+'ccd err isovpnnet' => 'Die Subnetzadresse wird für bereits für den OpenVPN-Server verwendet.',
+'ccd err issubnet' => 'Die Subnetzadresse wird bereits verwendet.',
 'ccd err name' => 'Es muss ein Name angegeben werden.',
 'ccd err nameexist' => 'Name existiert bereits.',
 'ccd err netadr' => 'Subnetzadresse ist ungültig oder Bereich zu groß.',
 'check for net traffic update' => 'Prüfe auf Net-Traffic-Updates',
 'check vpn lr' => 'Ãœberprüfen',
 'choose config' => 'Konfiguration auswählen',
-'cipher' => 'Verschlüsselung',
+'cipher' => 'Verschlüsselung:',
 'city' => 'Stadt',
 'class in use' => 'Die aktuelle Klasse wird bereits verwendet.',
 'clear cache' => 'Zwischenspeicher löschen',
 'could not open installed updates file' => 'Datei mit Update-Liste konnte nicht geöffnet werden',
 'could not open update information file' => 'Datei mit den Update-Information konnte nicht geöffnet werden. Die Update-Datei ist beschädigt.',
 'could not retrieve common name from certificate' => 'Der Gemeinsame Name (CN) konnte nicht aus dem Zertifikat gelesen werden.',
+'count' => 'Anzahl',
+'countries' => 'Länder',
 'country' => 'Land',
+'country codes and flags' => 'Länder und Länderkennungen',
+'countrycode' => 'Kennung',
 'cpu frequency per' => 'CPU-Frequenz pro',
 'cpu idle usage' => 'Leerlauf CPU-Nutzung',
 'cpu interrupt usage' => 'Interrupt CPU-Nutzung',
 'destination port numbers' => 'Zielport muß ein(e) gültige(r) Portnummer oder Portbereich sein.',
 'destination port overlaps' => 'Der Zielportbereich Ã¼berlappt einen bereits bestehenden Portbereich.',
 'detail level' => 'Detaillierungsgrad',
+'details' => 'Mehr',
 'device' => 'Gerät',
 'devices on blue' => 'Geräte auf Blau',
+'dh' => 'Diffie-Hellman Key',
+'dh key warn' => 'Keys mit 1024 und 2048 Bit können mehreren Minuten, 3072 und 4096 Bit bis zu mehreren Stunden dauern. Bitte haben sie Geduld.',
+'dh name is invalid' => 'Name ist ungültig, bitte "dh1024.pem" verwenden.',
 'dhcp advopt add' => 'DHCP Option hinzufügen',
 'dhcp advopt added' => 'DHCP Option hinzugefügt',
 'dhcp advopt blank value' => 'Wert für DHCP Option darf nicht leer sein',
 'dmz pinhole rule added' => 'Regel für DMZ-Schlupfloch hinzugefügt; Starte DMZ-Schlupfloch neu',
 'dmz pinhole rule removed' => 'Regel für DMZ-Schlupfloch entfernt; Starte DMZ-Schlupfloch neu',
 'dmzpinholes for same net not necessary' => 'DMZ-Schlupflöcher werden im gleichen Netz nicht benötigt. Wählen Sie ein anderes Quell- oder Ziel-Netz.',
-'dnat address' => 'Externe IP-Adresse',
+'dnat address' => 'Firewall-Interface',
 'dns address deleted' => 'Erfolgreich gelöscht! ',
 'dns address deleted txt' => 'DNS Server Adressen wurden erfolgreich gelöscht. Ã„nderungen werden jedoch erst nach einem Neustart oder einer Wiederverbindung Ã¼bernommen.',
 'dns address done' => 'Die DNS-Server Adressen Einstellungen werden Ã¼bernommen.',
 'dns proxy server' => 'DNS-Proxyserver',
 'dns saved' => 'Erfolgreich gespeichert!',
 'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.<br/>Um die Ã„nderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!',
-'dns server' => 'DNS-Server',
-'dns servers' => 'DNS-Server',
+'dns server' => 'DNS Server',
 'dns title' => 'Domain Name System',
 'dnsforward' => 'DNS-Weiterleitung',
 'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen',
 'donation-text' => '<strong>IPFire</strong> wird von Freiwilligen in ihrer Freizeit betrieben und auch betreut. Um dieses Projekt am Laufen zu halten, entstehen uns natürlich auch Kosten. Wenn Sie uns unterstützen wollen, würden wir uns Ã¼ber eine kleine Spende sehr freuen.',
 'dos charset' => 'DOS Charset',
 'down and up speed' => 'Geben Sie bitte hier ihre Download- bzw. Upload-Geschwindigkeit ein <br /> und klicken Sie danach auf <i>Speichern</i>.',
-'downlink' => 'Downlink',
 'downlink speed' => 'Downlink-Geschwindigkeit (kBit/sek)',
 'downlink std class' => 'Downloadstandardklasse',
 'download' => 'herunterladen',
 'enter ack class' => 'Legen Sie hier die ACK-Klasse fest <br /> und klicken Sie danach auf <i>Speichern</i>.',
 'enter data' => 'Geben Sie die Daten ein <br /> und klicken Sie danach auf <i>Speichern</i>.',
 'entropy' => 'Entropie',
+'entropy graphs' => 'Entropiegraphen',
 'err bk 1' => 'Fehler beim Erzeugen des Archivs',
 'err bk 10 password' => 'Fehler beim Datensicherungs-Passwort',
 'err bk 2 key' => 'Fehler beim Erzeugen der Schlüsseldatei',
 'firewallhits' => 'Firewalltreffer',
 'firmware' => 'Firmware',
 'firmware upload' => 'Hochladen der Firmware/Treiber',
-'first' => 'Erste',
 'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt',
 'fixed ip lease modified' => 'Feste IP-Zuordnung geändert',
 'fixed ip lease removed' => 'Feste IP-Zuordnung gelöscht',
+'flag' => 'Flagge',
 'force update' => 'Aktualisierung erzwingen',
 'force user' => 'Standardbenutzer für das UNIX Dateisystem',
 'forward firewall' => 'Firewall',
 'fwdfw use srcport' => 'Quellport:',
 'fwdfw use srv' => 'Zielport:',
 'fwdfw useless rule' => 'Diese Regel ist nicht sinnvoll.',
+'fwdfw warn1' => 'Dies kann dazu führen, dass Firewallregeln auf Netze angewendet werden, für die sie nicht gedacht sind.',
 'fwdfw wd_fri' => 'Fr',
 'fwdfw wd_mon' => 'Mo',
 'fwdfw wd_sat' => 'Sa',
 'fwhost wo subnet' => '(Ohne Subnetz)',
 'gateway' => 'Gateway',
 'gateway ip' => 'Gateway-IP',
+'gen dh' => 'Diffie-Hellman Key erzeugen',
 'gen static key' => 'Statischen Schlüssel erzeugen',
 'generate' => 'Root/Host-Zertifikate generieren',
 'generate a certificate' => 'Erzeuge ein Zertifikat:',
+'generate dh key' => 'Diffie-Hellman Key generieren',
 'generate iso' => 'ISO erstellen',
 'generate root/host certificates' => 'Erzeuge Root/Host-Zertifikate',
 'generate tripwire keys and init' => 'Tripwire Initalisierung',
 'harddisk temperature' => 'Festplattentemperatur',
 'harddisk temperature graphs' => 'HDD-Diagramme',
 'hardware graphs' => 'Hardware-Diagramme',
+'hardware support' => 'Hardware-Unterstützung',
 'hdd temperature in' => 'Festplattentemperatur in',
 'help' => 'Hilfe',
 'high' => 'Hoch',
 'lan' => 'LAN',
 'lang' => 'de',
 'languagepurpose' => 'Wählen Sie eine Sprache, in der IPFire angezeigt werden soll:',
-'last' => 'Letzte',
 'last activity' => 'Letzte Aktivität',
 'lateprompting' => 'Late prompting',
 'lease expires' => 'Zuordnung verfällt',
 'log view' => 'Log Anzeige',
 'log viewer' => 'Protokollansicht',
 'log viewing options' => 'Log Ansichts-Optionen',
-'log-options' => 'Logfile options',
+'log-options' => 'Logfile Optionen',
 'loged in at' => 'Angemeldet seit',
 'logging' => 'Logging',
 'logging server' => 'Protokollierungs-Server',
 'network traffic graphs others' => 'Netzwerk (sonstige)',
 'network updated' => 'Benutzerdefiniertes Netzwerk aktualisiert',
 'networks settings' => 'Firewall - Netzwerkeinstellungen',
+'never' => 'Nie',
 'new optionsfw later' => 'Einige Einstellungen werden erst nach einem Neustart aktiv',
 'new optionsfw must boot' => 'Sie müssen Ihren IPFire neu starten',
 'newer' => 'Neuer',
 'no eciadsl synch.bin file' => 'Keine ECI ADSL Datei synch.bin vorhanden. Bitte hochladen.',
 'no filter pass' => 'Legen Sie hier die Standardklassen fest durch die nicht-gefilterte Pakete gehen.',
 'no fritzdsl driver' => 'Kein Fritz!DSL-Treiber vorhanden. Bitte hochladen.',
+'no hardware random number generator' => 'Dieses System hat keine Entropiequelle.',
 'no information available' => 'Keine Informationen verfügbar.',
 'no log selected' => 'kein Log ausgewählt',
 'no modem selected' => 'Kein Modem ausgewählt',
 'nonetworkname' => 'Kein Netzwerkname wurde eingegeben',
 'noservicename' => 'Kein Dienstname wurde eingegeben',
 'not a valid ca certificate' => 'Kein gültiges CA Zertifikat.',
+'not a valid dh key' => 'Kein gültiger Diffie-Hellman Schlüssel. Bitte nur 1024, 2048, 3072 oder 4096 Bit im PKCS#3 Format verwenden.',
 'not enough disk space' => 'Nicht genügend Plattenplatz vorhanden',
 'not present' => '<B>Nicht</B> vorhanden',
 'not running' => 'nicht gestartet',
 'ovpn' => 'OpenVPN',
 'ovpn con stat' => 'OpenVPN Verbindungs-Statistik',
 'ovpn config' => 'OVPN-Konfiguration',
-'ovpn device' => 'OpenVPN-Gerät',
+'ovpn crypt options' => 'Kryptografieoptionen',
+'ovpn device' => 'OpenVPN-Gerät:',
+'ovpn dh' => 'Diffie-Hellman Key Länge',
+'ovpn dh name' => 'Diffie-Hellman Key Name',
 'ovpn dl' => 'OVPN-Konfiguration downloaden',
+'ovpn engines' => 'Krypto Engine',
 'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt',
 'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske',
+'ovpn generating the root and host certificates' => 'Die Erzeugung der Root- und Host-Zertifikate kann lange Zeit dauern.',
+'ovpn ha' => 'Hash Algorithmus',
+'ovpn hmac' => 'HMAC Optionen',
 'ovpn log' => 'OVPN-Log',
 'ovpn mgmt in root range' => 'Ein Port von 1024 oder höher ist erforderlich.',
 'ovpn mtu-disc' => 'Path MTU Discovery',
 'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery kann nicht gemeinsam mit mssfix oder fragment verwendet werden.',
 'ovpn mtu-disc yes' => 'Forciert',
 'ovpn no connections' => 'Keine aktiven OpenVPN Verbindungen',
-'ovpn on blue' => 'OpenVPN auf BLAU',
-'ovpn on orange' => 'OpenVPN auf ORANGE',
-'ovpn on red' => 'OpenVPN auf ROT',
+'ovpn on blue' => 'OpenVPN auf BLAU:',
+'ovpn on orange' => 'OpenVPN auf ORANGE:',
+'ovpn on red' => 'OpenVPN auf ROT:',
 'ovpn port in root range' => 'Ein Port von 1024 oder höher ist erforderlich.',
+'ovpn reneg sec' => 'Session Key Lifetime',
 'ovpn routes push' => 'Routen (eine pro Zeile) z.b. 192.168.10.0/255.255.255.0 192.168.20.0/24',
 'ovpn routes push options' => 'Route push Optionen',
-'ovpn server status' => 'OpenVPN-Server-Status',
-'ovpn subnet' => 'OpenVPN-Subnetz (z.B. 10.0.10.0/255.255.255.0)',
+'ovpn server status' => 'OpenVPN-Server-Status:',
+'ovpn subnet' => 'OpenVPN-Subnetz:',
 'ovpn subnet is invalid' => 'Das OpenVPN-Subnetz ist ungültig.',
 'ovpn subnet overlap' => 'OpenVPNSubnetz Ã¼berschneidet sich mit  ',
 'ovpn_fastio' => 'Fast-IO',
 'profile saved' => 'Profil gespeichert: ',
 'profiles' => 'Profile:',
 'proto' => 'Proto',
-'protocol' => 'Protokoll',
+'protocol' => 'Protokoll:',
 'proxy' => 'Proxy',
 'proxy access graphs' => 'Diagramme zur Proxyauslastung',
 'proxy admin password' => 'Cache Administrator Passwort',
 'resetglobals' => 'Globale Einstellungen zurücksetzen',
 'resetpolicy' => 'Policy zurücksetzen',
 'resetshares' => 'Shares zurücksetzen?',
-'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Das Zurücksetzen der VPN-Konfiguration wird die Root-CA, die Host-Zertifikate und alle weiteren Zertifikate und alle zertifikatsbasierten Verbindungen entfernen',
+'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Das Löschen des X509 wird die Root-CA, die Host-Zertifikate und alle zertifikatsbasierten Verbindungen entfernen.',
 'restart' => 'Neustart',
 'restart ovpn server' => 'OpenVPN-Server neu starten',
 'restore' => 'Wiederherstellen',
 'show ca certificate' => 'CA Zertifikat anzeigen',
 'show certificate' => 'Zertifikat anzeigen',
 'show crl' => 'Certificate Revocation List anzeigen',
+'show dh' => 'Diffie-Hellman Key anzeigen',
 'show host certificate' => 'Host-Zertifikat anzeigen',
 'show last x lines' => 'die letzten x Zeilen anzeigen',
 'show root certificate' => 'Root-Zertifikat anzeigen',
 'swap usage per' => 'Nutzung von Auslagerungsspeicher (Swap) pro',
 'system' => 'System',
 'system graphs' => 'System-Diagramme',
+'system has hwrng' => 'Dieses System hat einen Hardware-Zufallszahlengenerator.',
+'system has rdrand' => 'Dieses System unterstützt Intel(R) RDRAND.',
 'system information' => 'Systeminformationen',
 'system log viewer' => 'Betrachter der System-Logdateien',
 'system logs' => 'System-Logdateien',
 'updxlrtr weekly' => 'wöchentlich',
 'updxlrtr year' => 'einem Jahr',
 'upgrade' => 'upgrade',
-'uplink' => 'Uplink',
 'uplink speed' => 'Uplink-Geschwindigkeit (kBit/sek)',
 'uplink std class' => 'Uploadstandardklasse',
 'upload' => 'Hochladen',
 'upload a certificate' => 'Ein Zertifikat hochladen:',
 'upload a certificate request' => 'Eine Zertifikatsanfrage hochladen:',
 'upload ca certificate' => 'CA-Zertifikat hochladen',
+'upload dh key' => 'Diffie-Hellman Key hochladen',
 'upload file' => 'Datei zum hochladen',
 'upload new ruleset' => 'Neuen Regelsatz hochladen',
 'upload p12 file' => 'PKCS12-Datei hochladen',
 'vpn aggrmode' => 'IKE Aggressive Mode zugelassen. Wenn möglich, vermeiden (preshared Schlüssel wird im Klartext Ã¼bertragen)!',
 'vpn altname syntax' => 'Der Subjekt Alternativ Name ist eine durch Komma getrennte Liste von Email, DNS, URI, RID und IP Objekten. <br />Email: eine Email Adresse. Syntax Email: \'copy\' benutzt die Email Adresse aus dem Zertifikatfeld. <br />DNS: ein gültiger Domain Name.<br />URI: eine gültige URI.<br />RID: Registriertes Objekt Identifikation.<br />IP: eine IP Adresse.<br />Bitte beachten: der Zeichensatz ist eingeschränkt und die Groß-/Kleinschreibung ist entscheidend.<br />Beispiel:<br /><b>email:</b>info@ipfire.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/nach/irgendwo',
 'vpn auth-dn' => 'Peer wird identifiziert durch entweder ein IPV4_ADDR, FQDN, USER_FQDN oder DER_ASN1_DN string in Remote ID Feld',
-'vpn configuration main' => 'VPN-Konfiguration',
 'vpn delayed start' => 'Verzögerung bevor VPN gestartet wird (Sekunden)',
 'vpn delayed start help' => 'Falls notwendig, kann diese Verzögerung dazu verwendet werden, um Dynamic-DNS-Updates ordnungsgemäß anzuwenden. 60 ist ein gängiger Wert, wenn ROT (RED) eine dynamische IP Adresse ist.',
 'vpn incompatible use of defaultroute' => 'Hostname=%defaultroute nicht zulässig',
index 3f1065f49b010c387c3f0acb5c0f0eb92de4ccfc..ab85ab6e6a218af93f8ca61302f3e32a64700a77 100644 (file)
@@ -10,7 +10,6 @@
 'Choose Rule' => 'Choose <u>one</u> of the following rules.',
 'Class' => 'Class',
 'Class was deleted' => 'with potential subclasses was deleted',
-'Client status and controlc' => 'Client status and control:',
 'ConnSched action' => 'Action:',
 'ConnSched add action' => 'Add action',
 'ConnSched change profile title' => 'Change to profile:',
 'behind a proxy' => 'Behind a proxy:',
 'bewan adsl pci st' => 'TO BE REMOVED',
 'bewan adsl usb' => 'TO BE REMOVED',
-'bit' => 'Bit',
+'bit' => 'bit',
 'bitrate' => 'Bitrate',
 'bleeding rules' => 'Bleeding Edge Snort Rules',
 'blue' => 'BLUE',
 'ccd err invalidnet' => 'Invalid IP address. Format: 192.168.0.0/24 or 192.168.0.0/255.255.255.0.',
 'ccd err iroute' => 'Network address for route is invalid.',
 'ccd err irouteexist' => 'This route is already in use.',
-'ccd err isipsecnet' => 'The given subnet address already used by an IPsec network.',
-'ccd err isovpnnet' => 'Subnet address already in use for OpenVPN Server.',
+'ccd err isipsecnet' => 'The given subnet address is already used by an IPsec network.',
+'ccd err isipsecrw' => 'The given subnet address is already used by the IPsec rw network.',
+'ccd err isovpnn2n' => 'The subnet address is already in use for an OpenVPN net-to-net connection.',
+'ccd err isovpnnet' => 'The subnet address is already in use for the OpenVPN server.',
 'ccd err issubnet' => 'Subnet address already in use.',
 'ccd err name' => 'Please choose a name.',
 'ccd err nameexist' => 'Name already exists.',
 'could not open installed updates file' => 'Could not open installed updates file',
 'could not open update information file' => 'Could not open update information file.  The update file is corrupt.',
 'could not retrieve common name from certificate' => 'Could not retrieve common name from certificate.',
+'count' => 'Count',
+'countries' => 'Countries',
 'country' => 'Country',
+'country codes and flags' => 'Country Codes and Flags:',
+'countrycode' => 'Code',
 'cpu frequency per' => 'CPU frequency per',
 'cpu idle usage' => 'Idle CPU Usage',
 'cpu interrupt usage' => 'Interrupt CPU Usage',
 'destination port numbers' => 'Destination port must be a valid port number or port range.',
 'destination port overlaps' => 'Destination port range overlaps an existing port range.',
 'detail level' => 'Detail level',
+'details' => 'Details',
 'device' => 'Device',
 'devices on blue' => 'Devices on BLUE',
+'dh' => 'Diffie-Hellman Key',
+'dh key warn' => 'Keys with 1024 and 2048 bit takes up to several minutes, 3072 and 4096 bit might needs several hours. Please be patient.',
+'dh name is invalid' => 'Name ist ung\9fltig, bitte "dh1024.pem" verwenden.',
 'dhcp advopt add' => 'Add a DHCP option',
 'dhcp advopt added' => 'DHCP option added',
 'dhcp advopt blank value' => 'DHCP Option value cannot be empty.',
 'dmz pinhole rule added' => 'DMZ pinhole rule added; restarting DMZ pinhole',
 'dmz pinhole rule removed' => 'DMZ pinhole rule removed; restarting DMZ pinhole',
 'dmzpinholes for same net not necessary' => 'DMZ Pinholes are not necessary for same net. Select different source or destination net.',
-'dnat address' => 'External IP address',
+'dnat address' => 'Firewall Interface',
 'dns address deleted' => 'Successfully deleted!',
 'dns address deleted txt' => 'The DNS-Server addresses have been successfully deleted.<br />You have to reboot or reconnect that the changes have effect!',
 'dns address done' => 'The DNS-Server address settings are going to be saved.',
 'dns saved' => 'Successfully saved!',
 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
 'dns server' => 'DNS Server',
-'dns servers' => 'DNS Servers',
 'dns title' => 'Domain Name System',
 'dnsforward' => 'DNS Forwarding',
 'dnsforward add a new entry' => 'Add a new entry',
 'done' => 'Do it',
 'dos charset' => 'DOS Charset',
 'down and up speed' => 'Enter your Down- and Uplink-Speed <br /> and then press <i>Save</i>.',
-'downlink' => 'Downlink',
 'downlink speed' => 'Downlink speed (kbit/sec)',
 'downlink std class' => 'downlink standard class',
 'download' => 'download',
 'enter ack class' => 'Enter the ACK- Class <br /> and then press <i>Save</i>.',
 'enter data' => 'Enter your settings <br /> and then press <i>Save</i>.',
 'entropy' => 'Entropy',
+'entropy graphs' => 'Entropy Graphs',
 'err bk 1' => 'Error creating archive',
 'err bk 10 password' => 'Error with backup password',
 'err bk 2 key' => 'Error creating key file',
 'firewallhits' => 'firewallhits',
 'firmware' => 'Firmware',
 'firmware upload' => 'Upload Firmware/Drivers',
-'first' => 'First',
 'fixed ip lease added' => 'Fixed IP lease added',
 'fixed ip lease modified' => 'Fixed IP lease modified',
 'fixed ip lease removed' => 'Fixed IP lease removed',
+'flag' => 'Flag',
 'force update' => 'Force update',
 'force user' => 'force all new file to user',
 'forward firewall' => 'Firewall',
 'fwdfw use srcport' => 'Source port:',
 'fwdfw use srv' => 'Destination port:',
 'fwdfw useless rule' => 'This rule is useless.',
+'fwdfw warn1' => 'This might lead to firewallrules which are applied to networks for which they are not intended to be.',
 'fwdfw wd_fri' => 'Fri',
 'fwdfw wd_mon' => 'Mon',
 'fwdfw wd_sat' => 'Sat',
 'g.lite' => 'TO BE REMOVED',
 'gateway' => 'Gateway',
 'gateway ip' => 'Gateway IP',
+'gen dh' => 'Generate Diffie-Hellman key',
 'gen static key' => 'Generate a static key',
 'generate' => 'Generate root/host zertifikate',
 'generate a certificate' => 'Generate a certificate:',
+'generate dh key' => 'Generate Diffie-Hellman key',
 'generate iso' => 'Generate ISO',
 'generate root/host certificates' => 'Generate root/host certificates',
 'generate tripwire keys and init' => 'generate tripwire keys and init',
 'harddisk temperature' => 'Harddisk Temperature',
 'harddisk temperature graphs' => 'HDD Graphs',
 'hardware graphs' => 'Hardware Graphs',
+'hardware support' => 'Hardware Support',
 'hdd temperature in' => 'Harddisk temperature in',
 'help' => 'Help',
 'high' => 'High',
 'lan' => 'LAN',
 'lang' => 'en',
 'languagepurpose' => 'Select the language you wish IPFire to display in:',
-'last' => 'Last',
 'last activity' => 'Last Activity',
 'lateprompting' => 'Lateprompting',
 'lease expires' => 'Lease expires',
 'local hard disk' => 'Hard disk',
 'local master' => 'Local Master',
 'local ntp server specified but not enabled' => 'Local NTP server specified but not enabled',
-'local subnet' => 'Local Subnet:',
+'local subnet' => 'Local subnet:',
 'local subnet is invalid' => 'Local subnet is invalid.',
 'local vpn hostname/ip' => 'Local VPN Hostname/IP',
 'localkey' => 'Localkey',
 'network traffic graphs others' => 'Network (others)',
 'network updated' => 'Custom Network updated',
 'networks settings' => 'Firewall - Network settings',
+'never' => 'Never',
 'new optionsfw later' => 'Some options need a reboot to take effect',
 'new optionsfw must boot' => 'You must reboot your IPFire',
 'newer' => 'Newer',
 'no eciadsl synch.bin file' => 'No ECI ADSL synch.bin file. Please upload.',
 'no filter pass' => 'Enter the standard class for non-filtered packets.',
 'no fritzdsl driver' => 'No Fritz!DSL driver.  Please upload.',
+'no hardware random number generator' => 'This system has no source for entropy.',
 'no information available' => 'No information available.',
 'no log selected' => 'No log selected',
 'no modem selected' => 'No modem selected',
 'nonetworkname' => 'No Network Name entered',
 'noservicename' => 'No Service Name entered',
 'not a valid ca certificate' => 'Not a valid CA certificate.',
+'not a valid dh key' => 'Not a valid Diffie-Hellman key. Please use 1024, 2048, 3072 or 4096 bit in PKCS#3 format.',
 'not enough disk space' => 'Not enough disk space',
 'not present' => '<b>Not</b> present',
 'not running' => 'not running',
 'ovpn' => 'OpenVPN',
 'ovpn con stat' => 'OpenVPN Connection Statistics',
 'ovpn config' => 'OVPN-Config',
+'ovpn crypt options' => 'Cryptographic options',
 'ovpn device' => 'OpenVPN device:',
+'ovpn dh' => 'Diffie-Hellman key lenght',
+'ovpn dh name' => 'Diffie-Hellman key name',
 'ovpn dl' => 'OVPN-Config Download',
+'ovpn engines' => 'Crypto engine',
 'ovpn errmsg green already pushed' => 'Route for green network is always set',
 'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
+'ovpn generating the root and host certificates' => 'Generating the root and host certifictae can take a long time.',
+'ovpn ha' => 'Hash algorithm',
+'ovpn hmac' => 'HMAC options',
 'ovpn log' => 'OVPN-Log',
 'ovpn mgmt in root range' => 'A port number of 1024 or higher is required.',
 'ovpn mtu-disc' => 'Path MTU Discovery',
 'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery cannot be used with mssfix or fragment.',
 'ovpn mtu-disc yes' => 'Forced',
 'ovpn no connections' => 'No active OpenVPN connections',
-'ovpn on blue' => 'OpenVPN on BLUE',
-'ovpn on orange' => 'OpenVPN on ORANGE',
-'ovpn on red' => 'OpenVPN on RED',
+'ovpn on blue' => 'OpenVPN on BLUE:',
+'ovpn on orange' => 'OpenVPN on ORANGE:',
+'ovpn on red' => 'OpenVPN on RED:',
 'ovpn port in root range' => 'A port number of 1024 or higher is required.',
+'ovpn reneg sec' => 'Session key lifetime:',
 'ovpn routes push' => 'Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24',
 'ovpn routes push options' => 'Route push options',
 'ovpn server status' => 'Current OpenVPN server status:',
-'ovpn subnet' => 'OpenVPN subnet (e.g. 10.0.10.0/255.255.255.0)',
+'ovpn subnet' => 'OpenVPN subnet:',
 'ovpn subnet is invalid' => 'OpenVPN subnet is invalid.',
 'ovpn subnet overlap' => 'OpenVPN Subnet overlaps with : ',
 'ovpn_fastio' => 'Fast-IO',
 'profile saved' => 'Profile saved: ',
 'profiles' => 'Profiles:',
 'proto' => 'Proto',
-'protocol' => 'Protocol',
+'protocol' => 'Protocol:',
 'proxy' => 'Proxy',
 'proxy access graphs' => 'Proxy access graphs',
 'proxy admin password' => 'Cache administrator password',
 'resetglobals' => 'Reset global settings',
 'resetpolicy' => 'Reset policy to default',
 'resetshares' => 'Reset shares?',
-'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Resetting the VPN configuration will remove the root CA, the host certificate and all certificate based connections',
+'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Resetting the X509 remove the root CA, the host certificate and all certificate based connections.',
 'restart' => 'Restart',
 'restart ovpn server' => 'Restart OpenVPN server',
 'restore' => 'Restore',
 'show ca certificate' => 'Show CA certificate',
 'show certificate' => 'Show certificate',
 'show crl' => 'Show certificate revocation list',
+'show dh' => 'Show Diffie-Hellman key',
 'show host certificate' => 'Show host certificate',
 'show last x lines' => 'Show last x lines',
 'show lines' => 'Show lines',
 'swap usage per' => 'Swap usage per',
 'system' => 'System',
 'system graphs' => 'System Graphs',
+'system has hwrng' => 'This system has got a hardware random number generator.',
+'system has rdrand' => 'This system has got support for Intel(R) RDRAND.',
 'system information' => 'System Information',
 'system log viewer' => 'System Log Viewer',
 'system logs' => 'System Logs',
 'updxlrtr weekly' => 'weekly',
 'updxlrtr year' => 'one year',
 'upgrade' => 'upgrade',
-'uplink' => 'Uplink',
 'uplink speed' => 'Uplink speed (kbit/sec)',
 'uplink std class' => 'uplink standard class',
 'upload' => 'Upload',
 'upload a certificate' => 'Upload a certificate:',
 'upload a certificate request' => 'Upload a certificate request:',
 'upload ca certificate' => 'Upload CA certificate',
+'upload dh key' => 'Upload Diffie-Hellman key',
 'upload fcdsl.o' => 'TO BE REMOVED',
 'upload file' => 'Upload file',
 'upload new ruleset' => 'Upload new ruleset',
 'vpn aggrmode' => 'IKE aggressive mode allowed. Avoid if possible (preshared key is transmitted in clear text)!',
 'vpn altname syntax' => 'SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>e-mail:</b>ipfire@foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something',
 'vpn auth-dn' => 'Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field',
-'vpn configuration main' => 'VPN Configuration',
 'vpn delayed start' => 'Delay before launching VPN (seconds)',
 'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.',
 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',
index 6bb470a5815feb8e35aefe86e8f746c3ab91d680..0ea9593f1b2cb6d1c408e40fcf0f0726e8c0e540 100644 (file)
@@ -89,6 +89,7 @@
 'add xtaccess' => 'Harici EriÅŸim Ekle',
 'add-route' => 'Basma ek yolu',
 'added from dhcp lease list' => 'DHCP kira listeden eklendi',
+'addons' => 'Eklentiler',
 '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ı:',
 'advproxy access' => 'EriÅŸim',
 'advproxy admin mail' => 'Önbellek yönetici e-postası',
 'advproxy advanced proxy' => 'GeliÅŸmiÅŸ Vekil Sunucu',
-'advproxy advanced web proxy' => 'GeliÅŸmiÅŸ Web Vekil Sunucusu',
+'advproxy advanced web proxy' => 'GeliÅŸmiÅŸ web vekil sunucusu',
 'advproxy advanced web proxy configuration' => 'GeliÅŸmiÅŸ web vekil sunucu ayarları',
 'advproxy allowed subnets' => 'Ä°zin verilen alt aÄŸlar (her satırda bir tane)',
 'advproxy allowed web browsers' => 'Web eriÅŸimi için izin verilen istemciler',
 'advproxy errmsg password length 1' => 'Parola en az olmalıdır ',
 'advproxy errmsg password length 2' => ' karakter',
 'advproxy errmsg passwords different' => 'Parolalar eÅŸleÅŸmiyor',
+'advproxy errmsg proxy ports equal' => 'Vekil sunucu ve ÅŸeffaf baÄŸlantı noktaları eÅŸit olamaz.',
 'advproxy errmsg radius port' => 'Geçersiz RADIUS baÄŸlantı noktası numarası',
 'advproxy errmsg radius secret' => 'RADIUS paylaşılan gizli kod gerekli',
 'advproxy errmsg radius server' => 'RADIUS Sunucusu için geçersiz IP adresi',
 'advproxy on' => 'Vekil sunucu',
 'advproxy privacy' => 'Gizlilik',
 'advproxy proxy port' => 'Vekil sunucu baÄŸlantı noktası',
+'advproxy proxy port transparent' => 'Åžeffaf baÄŸlantı noktası',
 'advproxy ram cache size' => 'Bellek Ã¶nbellek boyutu (MB)',
 'advproxy redirector children' => 'Filtre iÅŸlemlerinin sayısı',
 'advproxy reset' => 'Yeniden BaÅŸlat',
 'advproxy update information' => 'Yüklenebilir güncelleÅŸtirilmiÅŸ bir sürümü vardır. Daha fazla bilgi için <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> adresini ziyaret edebilirsiniz.',
 'advproxy update notification' => 'Güncelleme bildirimi!',
 'advproxy upstream password' => 'Gönderim parolası',
-'advproxy upstream proxy' => 'Gönderim Vekili',
+'advproxy upstream proxy' => 'Gönderim vekili',
 'advproxy upstream proxy host:port' => 'Gönderim vekili (makine adı:baÄŸlantı noktası)',
 'advproxy upstream username' => 'Gönderim kullanıcı adı',
 'advproxy url filter' => 'URL filtre',
 'aliases not active' => 'KIRMIZI arabiriminiz STATÄ°K olmadıkça takma adlar aktif olmayacaktır',
 'all' => 'Tümü',
 'all interfaces' => 'Tüm Arabirimler',
-'all services' => 'Tüm Hizmetler',
+'all services' => 'Tüm hizmetler',
 'all updates installed' => 'Tüm güncellemeler kuruldu',
 'allmsg' => 'tümünü göster',
 'alt dialup' => 'Çevirmeli BaÄŸlantı',
-'alt home' => 'Ana sayfa',
+'alt home' => 'Ana Sayfa',
 'alt information' => 'Bilgi',
 'alt logs' => 'Günlükler',
 'alt ovpn' => 'OpenVPN',
 'april' => 'Nisan',
 'archive not exist' => 'Yapılandırma arÅŸivi yok',
 'are you sure' => 'Emin misiniz?',
-'arp table entries' => 'ARP Tablosu Girdileri:',
+'arp table entries' => 'ARP tablosu girdileri:',
 'artist' => 'Sanatçı',
 'attemps' => 'GiriÅŸim',
 'attention' => 'DÄ°KKAT',
 'august' => 'AÄŸustos',
-'authentication' => 'Kimlik DoÄŸrulama:',
+'authentication' => 'Kimlik doÄŸrulama:',
 'automatic' => 'Otomatik',
 'available updates' => 'Mevcut güncellemeler:',
 'average' => 'Ortalama',
 'backup to floppy' => 'Diskete yedekle',
 'backupaddon' => 'Eklenti Yedekleme',
 'backupprofile' => 'Yeniden baÄŸlanma baÅŸarısız durumda. Profile geçin',
-'backups' => 'yedekler',
+'backups' => 'Yedekler',
 'backupwarning' => 'Eklenti yedeklemesi için lütfen Ã¶nce geri yükleme yedeklemesi oluÅŸturun. Ä°ndirme zamanı verilen orjinal dosya ile devam edin.',
 'bad characters in' => 'Yablış karakterler ',
 'bad characters in script field' => 'Komut alanındaki yanlış karakterler',
 'bandwidth usage' => 'bant geniÅŸliÄŸi kullanımı (harici)',
 'bandwitherror' => 'QoS aktifken bant geniÅŸliÄŸi ayarları deÄŸiÅŸtiremezsiniz. Ä°lk Ã¶nce QoS devre dışı bırakın.<p>',
 'bandwithsettings' => 'Bant geniÅŸliÄŸi ayarları',
-'basic options' => 'Temel Seçenekler',
-'beep when ppp connects or disconnects' => 'IPFire baÄŸlanırken veya kapatılırken beep sesi Ã§Ä±kar.',
+'basic options' => 'Temel seçenekler',
+'beep when ppp connects or disconnects' => 'IPFire baÄŸlanırken veya kapatılırken ses Ã§Ä±kar.',
 'behind a proxy' => 'Bir vekil sunucu arkasında:',
 'bewan adsl pci st' => 'KALDIRILACAK',
 'bewan adsl usb' => 'KALDIRILACAK',
+'bit' => 'Bit',
 'bitrate' => 'Bit hızı',
 'bleeding rules' => 'Bleeding Edge Snort Rules',
 'blue' => 'MAVÄ°',
 'cached swap' => 'takas alanı Ã¶nbelleÄŸi',
 'calamaris available reports' => 'Mevcut raporlar',
 'calamaris byte unit' => 'Bayt birimi',
-'calamaris create report' => 'Rapor oluÅŸtur',
+'calamaris create report' => 'Rapor OluÅŸtur',
 'calamaris enable content report' => 'İçerik raporunu aktifleÅŸtir',
 'calamaris enable distribution histogram' => 'Dağıtım histogramını aktifleÅŸtir',
 'calamaris enable domain report' => 'Etki alanı raporunu aktifleÅŸtir',
 'calamaris number of requesting hosts' => 'Talep eden ana bilgisayarların sayısı',
 'calamaris performance options' => 'Performans seçenekleri',
 'calamaris proxy reports' => 'Vekil Sunucu Raporları',
-'calamaris refresh list' => 'Listeyi yenile',
+'calamaris refresh list' => 'Listeyi Yenile',
 'calamaris report interval (in minutes)' => 'Rapor aralığı (dakikada)',
 'calamaris report options' => 'Rapor seçenekleri',
 'calamaris report period' => 'Rapor süresi',
 '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',
-'ccd net' => 'Statik IP adres havuzu',
+'ccd net' => 'Statik ip adres havuzu',
 'ccd noaddnet' => 'OpenVPN sunucusu durdurulduÄŸunda sadece yeni bir statik aÄŸ ekleyebilirsiniz.',
 'ccd none' => 'Yok',
 'ccd routes' => 'Yönlendir:',
 'ccd used' => 'Kullanılan adresler',
 'cert' => 'Sertifika',
 'certificate' => 'Sertifika',
-'certificate authorities' => 'Sertifika Yetkilileri',
+'certificate authorities' => 'Sertifika yetkilileri',
 'certificate does not have a valid ca associated with it' => 'Sertifika ile iliÅŸkili geçerli bir CA yok.',
 'certificate file move failed' => 'Sertifika dosyası taşıması baÅŸarısız oldu',
 'cfg restart' => 'Bir yeniden baÅŸlatma, yapılandırma arÅŸivi geri yükledikten sonra Ã¶nerilmektedir.',
 'connection closed' => 'BaÄŸlı deÄŸil...',
 'connection debugging' => 'Hata ayıklama baÄŸlantısı',
 'connection status and controlc' => 'BaÄŸlantı durumu ve kontrol:',
-'connection tracking' => 'IPTablo BaÄŸlantı Takibi',
+'connection tracking' => 'IPTablo baÄŸlantı takibi',
 'connection type' => 'BaÄŸlantı Türü',
 'connection type is invalid' => 'Geçersiz baÄŸlantı türü.',
 'connections' => 'BaÄŸlantılar',
 'dat without key' => 'Åžifreli bir arÅŸiv anahtarı olmadan geri yüklenemez.',
 'date' => 'Tarih',
 'date not in logs' => 'Sorgulanan gün için hiçbir günlük yok',
-'day' => 'gün',
+'day' => 'Gün',
 'day after' => 'Bir gün sonra',
 'day before' => 'Bir gün Ã¶nce',
 'day-graph' => 'gün',
 'ddns hostname removed' => 'Dinamik DNS ana bilgisayar adı kaldırıldı',
 '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' => 'Devre dışı',
 'deactivate user' => 'kullanıcı devre dışı',
+'dead peer detection' => 'Sonlanmış EÅŸ Algılama',
 'debugme' => 'Henüz uygulanmadı',
 'december' => 'Aralık',
 'deep scan directories' => 'Ardışık tarama',
 'def lease time' => 'Varsayılan Kira Zamanı',
+'default ip' => 'Varsayılan IP adresi',
 'default lease time' => 'Varsayılan kira zamanı (dakika):',
 'default networks' => 'Varsayılan aÄŸlar',
 'default renewal time' => 'Varsayılan Yenileme Zamanı',
 'dhcp advopt definition' => 'Açıklama',
 'dhcp advopt definition exists' => 'Açıklama seçeneÄŸi zaten var. Bunu sadece düzenleyebilir veya kaldırabilirsiniz.',
 'dhcp advopt edit' => 'DHCP seçeneÄŸini düzenle',
-'dhcp advopt help' => 'Liste seçenekleri',
+'dhcp advopt help' => 'Liste Seçenekleri',
 'dhcp advopt list' => 'Ek DHCP seçenekleri',
 'dhcp advopt modified' => 'DHCP seçeneÄŸi düzeltildi',
 'dhcp advopt name' => 'Seçenek adı',
 'disk access per' => 'eriÅŸim başına disk',
 'disk usage' => 'Disk kullanımı',
 'display' => 'Görünüm',
-'display charset' => 'Karakterleri Göster',
+'display charset' => 'Karakterleri göster',
 'display hostname in window title' => 'Pencere baÅŸlığında ana bilgisayar adını göster',
 'display traffic at home' => 'BaÅŸlangıç sayfasının Ã¼zerinde hesaplanan trafiÄŸi göster',
 'display webinterface effects' => 'Efektleri aktifleÅŸtir',
 'dl client arch' => 'Ä°stemci paketlerini indir (zip)',
-'dmz' => 'Açık bölge',
+'dmz' => 'AÃ\87IK BÃ\96LGE',
 'dmz pinhole configuration' => 'Açık bölge yapılandırma',
 'dmz pinhole rule added' => 'Açık bölge kuralı eklendi; Açık bölge yeniden baÅŸlatılıyor',
 'dmz pinhole rule removed' => 'Açık bölge kuralı silindi; Açık bölge yeniden baÅŸlatılıyor',
 'dmzpinholes for same net not necessary' => 'Açık bölge aynı aÄŸ için gerekli deÄŸildir. Farklı kaynak veya hedef aÄŸ seçin.',
+'dnat address' => 'Harici IP adresi',
 'dns address deleted' => 'BaÅŸarıyla silindi!',
 'dns address deleted txt' => 'DNS-Sunucusu adresleri baÅŸarıyla silindi.<br />DeÄŸiÅŸikliklerin aktifleÅŸtirilmesi için yeniden baÅŸlatın!',
 'dns address done' => 'DNS-Sunucusu adresi ayarları kaydedilecektir.',
 'dns saved' => 'BaÅŸarıyla kaydedildi!',
 'dns saved txt' => 'Girilen iki DNS sunucu adresi baÅŸarılı bir ÅŸekilde kaydedildi.<br />DeÄŸiÅŸikliklerin aktifleÅŸtirielebilmesi için yeniden baÅŸlatın!',
 'dns server' => 'DNS Sunucusu',
+'dns servers' => 'DNS sunucuları',
 'dns title' => 'Etki Alanı Ad Sistemi',
-'dnsforward' => 'DNS yönlendirmesi',
+'dnsforward' => 'DNS Yönlendirmesi',
 'dnsforward add a new entry' => 'Yeni bir kayıt ekle:',
 'dnsforward configuration' => 'Ä°leri DNS yapılandırması',
 'dnsforward edit an entry' => 'Varolan bir kaydı düzenle:',
 'dnsforward forward_server' => 'Ad sunucusu',
 'dnsforward zone' => 'Bölge',
 'do not log this port list' => 'Otorumdan hemen Ã¶nce bu baÄŸlantı noktaları listesini bırak (günlük boyutunu küçültür)',
-'dod' => 'Çevirmeli BaÄŸlantı Ãœzerinden Talep',
-'dod for dns' => 'DNS için Ã§evirmeli baÄŸlantı Ã¼zerinden talep:',
+'dod' => 'Çevirmeli baÄŸlantı Ã¼zerinden talep et',
+'dod for dns' => 'DNS için Ã§evirmeli baÄŸlantı Ã¼zerinden talep et:',
 'dod not compatible with ddns' => 'Talep edilen Ã§evirmeli aÄŸ dinamik dns hizmetleri ile uyumlu deÄŸildir',
 'dod waiting' => 'Çevirmeli baÄŸlantı Ã¼zerindeki talep bekleniyor',
 'domain' => 'Etki alanı',
 'donation-link' => 'https://www.paypal.com/en_US/GB/i/btn/btn_donateCC_LG.gif',
 'donation-text' => '<strong>IPFire</strong> boÅŸ zamanlarında gönüllüer tarafından geliÅŸtirlmektedir. Bu projeyi ayakta tutmak için eÄŸer bize destek olmak isterseniz küçük bir bağıştan mutluluk duyarız.',
 'done' => 'Yap',
-'dos charset' => 'DOS Karakterleri',
+'dos charset' => 'DOS karakterleri',
 'down and up speed' => 'Gönderme hızı düştüğünde <i>Kaydet</i> düğmesine basın.',
+'downlink' => 'Ä°ndirme baÄŸlantısı',
 'downlink speed' => 'Ä°ndirme baÄŸlantı hızı (kbit/san)',
 'downlink std class' => 'Standart indirme baÄŸlantısı sınıfı',
 'download' => 'Ä°ndir',
 'download ca certificate' => 'CA sertifikası indir',
 'download certificate' => 'Sertifika indir',
 'download host certificate' => 'Ana bilgisayar belgesi indir',
-'download new ruleset' => 'Yeni kural kümesi indir',
+'download new ruleset' => 'Yeni Kural Kümesi Ä°ndir',
 'download pkcs12 file' => 'PKCS12 dosyasını indir',
 'download root certificate' => 'Root sertifikasını indir',
 'dpd action' => 'Hareketsiz eÅŸ algılama eylemi',
+'dpd delay' => 'Gecikme',
+'dpd timeout' => 'Zaman Aşımı',
 'driver' => 'Sürücü',
+'drop action' => '"EngellenmiÅŸ" biçimdeki (iletilen) güvenlik duvarının varsayılan davranışı',
+'drop action1' => '"EngellenmiÅŸ" biçimdeki (giden) güvenlik duvarının varsayılan davranışı',
+'drop action2' => 'Güvenlik duvarı (giriÅŸ) varsayılan davranışı',
+'drop forward' => 'Ä°letilen paket günlüklerini reddet',
 'drop input' => 'Günlük giriÅŸ paketlerini reddet',
 'drop newnotsyn' => 'Sync paketleri olmayan yeni günlükleri reddet',
 'drop output' => 'Günlük Ã§Ä±kış paketlerini reddet',
 'enabledtitle' => 'Aktif',
 'encapsulation' => 'Kapsülleme',
 'encrypted' => 'Åžifre',
+'encryption' => 'Åžifreleme:',
 'end address' => 'BitiÅŸ adresi:',
 'enter ack class' => 'ACK-Sınıfı girin <br />ve sonra <i>Kaydet</i> düğmesine basın.',
 'enter data' => 'Ayarları girin <br />ve sonra <i>Kaydet</i> düğmesine basın.',
+'entropy' => 'Entropy',
 'err bk 1' => 'ArÅŸiv oluÅŸturma hatası',
 'err bk 10 password' => 'Yedek parolası oluÅŸturma hatası',
 'err bk 2 key' => 'Anahtar dosyası oluÅŸturulama hatası',
 'expires' => 'BitiÅŸ tarihi',
 'export' => 'Dışarı Aktar',
 'exportkey' => 'PSK dışarı aktar',
-'external access' => 'Harici EriÅŸim',
+'external access' => 'Harici eriÅŸim',
 'external access configuration' => 'Harici eriÅŸim yapılandırması',
 'external access rule added' => 'Harici eriÅŸim kuralı eklendi. EriÅŸim denetleyicisi yeniden baÅŸlatılıyor.',
 'external access rule changed' => 'Harici eriÅŸim kuralı deÄŸiÅŸtirildi. EriÅŸim denetleyicisi yeniden baÅŸlatılıyor.',
 'extrahd' => 'Yedek Diskler',
 'extrahd because there is already a device mounted' => ', Ã§Ã¼nkü bu aygıt baÄŸlandı',
 'extrahd cant umount' => 'Ayrılamadı',
-'extrahd detected drives' => 'algılanan diskler',
+'extrahd detected drives' => 'Algılanan diskler',
 'extrahd install or load driver' => 'Aygıtınız buradaki listede yoksa sürücüsünü kurmanız veya yüklemeniz gerekir.<br /> Aygıtınızı görüyor fakat bölümlerini göremiyorsanız Ã¶nce bunları oluÅŸturmak zorundasınız.',
 'extrahd maybe the device is in use' => '. Belki aygıt kullanımda',
 'extrahd to' => '-',
 'fireinfo is disabled' => 'Güvenlik duvarı bilgisi devre dışı',
 'fireinfo is enabled' => 'Güvenlik duvarı bilgisi aktif',
 'fireinfo is submitted' => 'Profiliniz güvenlik duvarı bilgi hizmetine gönderildi.',
-'fireinfo is submitted button' => 'Hayır artık profilimi göndermek istemiyorum',
+'fireinfo is submitted button' => 'Hayır Artık Profilimi Göndermek Ä°stemiyorum',
 'fireinfo kernel version' => 'Çekirdek sürümü',
 'fireinfo not submitted' => 'Profiliniz güvenlik duvarı bilgi hizmetlerine henüz gönderilmemiÅŸtir.',
-'fireinfo not submitted button' => 'Evet profilimi ÅŸimdi gönder',
+'fireinfo not submitted button' => 'Evet Profilimi Åžimdi Gönder',
 'fireinfo pakfire version' => 'Pakfire sürümü',
 'fireinfo please enable' => 'Lütfen güvenlik duvarı bilgi hizmetini aktifleÅŸtirin.',
 'fireinfo settings' => 'Güvenlik duvarı bilgi ayarları',
 'fireinfo system version' => 'Sistem sürümü',
 'fireinfo why descr1' => 'Bu seçeneÄŸi aktifleÅŸtirmek IPFire geliÅŸimi için Ã§ok Ã¶nemlidir.',
 'fireinfo why descr2' => 'Bunun ',
-'fireinfo why enable' => 'Neden güvenlik duvarı bilgi hizmetini aktifleÅŸtirmeliy im?',
+'fireinfo why enable' => 'Neden güvenlik duvarı bilgi hizmetini aktifleÅŸtirmeliyim?',
 'fireinfo why read more' => 'nedenleri hakkında bilgi için tıklayın.',
 'fireinfo your profile id' => 'Profil kimliÄŸiniz',
 'firewall' => 'Güvenlik Duvarı',
 '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ı',
 'firewallhits' => 'güvenlik duvarı kaydı',
 'firmware' => 'Yazılım',
 'firmware upload' => 'Yazılım/Sürücü Yükle',
+'first' => 'Ä°lk',
 'fixed ip lease added' => 'Sabit IP kirası eklendi',
 'fixed ip lease modified' => 'Sabit IP kirası güncellendi',
 'fixed ip lease removed' => 'Sabit IP kirası kaldırıldı',
 'force update' => 'Zorla güncelleÅŸtir',
 'force user' => 'kullanıcıya tüm yeni dosyaları zorla',
+'forward firewall' => 'Güvenlik Duvarı',
 'forwarding rule added' => 'Yönlendirme kuralı eklendi. Yeniden baÅŸlatmayı gönder.',
 'forwarding rule removed' => 'Yönlendirme kuralı kaldırıldı. Yeniden baÅŸlatmayı gönder.',
 'forwarding rule updated' => 'Yönlendirme kuralı güncellendi. Yeniden baÅŸlatmayı gönder.',
 'from email user' => 'Gönderen e-posta kullanıcısı',
 'from warn email bad' => 'Gönderen e-posta adresi geçerli deÄŸil',
 'fw blue' => 'MAVÄ° arabirim için güvenlik duvarı seçenekleri',
-'fw default drop' => 'Güvenlik duvarı ilkesi',
+'fw default drop' => 'Güvenlik duvarı yöntemleri',
 'fw logging' => 'Güvenlik duvarı günlüğü',
-'fw settings' => 'Düvenlik duvarı ayarları',
+'fw settings' => 'Güvenlik duvarı ayarları',
 'fw settings color' => 'Kural tablosunda renkleri göster',
 'fw settings dropdown' => 'Kural oluÅŸturulan sitedeki tüm aÄŸları göster',
 'fw settings remark' => 'Kural tablosunda açıklamaları göster',
 'fwdfw REJECT' => 'REDDET',
 'fwdfw action' => 'Eylem',
 'fwdfw additional' => 'Ek ayarlar',
-'fwdfw addrule' => 'Kural Ekle/Düzenle:',
+'fwdfw addrule' => 'Kural Ekle/Düzenle::',
 'fwdfw all icmp' => 'Tüm ICMP türleri',
 'fwdfw change' => 'Güncelle',
 'fwdfw copy' => 'Kopyala',
 'fwdfw delete' => 'Sil',
 'fwdfw dnat' => 'Hedef NAT (BaÄŸlantı noktası yönlendirme)',
 'fwdfw dnat error' => 'DNAT için bir tek ana bilgisayar seçmeniz gerekir. Gruplara veya aÄŸlara izin verilmez.',
-'fwdfw dnat porterr' => 'NAT için tek bir baÄŸlantı noktası veya baÄŸlantı noktası aralığı (tcp/udp) seçmek zorundasınız',
+'fwdfw dnat extport' => 'Harici baÄŸlantı noktası kaynak NAT kurallarını kullanırken boÅŸ olmak zorundadır.',
+'fwdfw dnat nochoice' => 'Lütfen NAT bölümünden kaynak NAT veya hedef NAT seçin.',
+'fwdfw dnat porterr' => 'NAT için tek bir baÄŸlantı noktası veya baÄŸlantı noktası aralığı (tcp/udp) seçmek zorundasınız.',
+'fwdfw dnat porterr2' => 'Hiçbir hedef baÄŸlantı noktası tanımlamdan harici bir baÄŸlantı noktası (NAT) kullanamazsınız.',
 'fwdfw edit' => 'Düzenle',
 'fwdfw err nosrc' => 'Bir kaynak seçilmedi.',
 'fwdfw err nosrcip' => 'Lütfen bir kaynak IP adresi belirtin.',
 'fwdfw err notgt' => 'Bir hedef seçilmedi.',
 'fwdfw err notgtip' => 'Lütfen bir hedef IP adresi belirtin.',
 'fwdfw err prot_port' => 'Seçilen kuuralla kaynak veya hedef baÄŸlantı noktasına izin verilmez',
-'fwdfw err prot_port1' => 'TCP veya UDP kuralı için kaynak veya hedef baÄŸlantı noktası kullanırken seçmek zorunda ',
+'fwdfw err prot_port1' => 'TCP veya UDP kuralı için kaynak veya hedef baÄŸlantı noktası kullanırken seçmek zorunda',
 'fwdfw err remark' => 'Açıklama içinde geçersiz karakterler.',
 'fwdfw err ruleexists' => 'Bu kural zaten var.',
 'fwdfw err same' => 'Kaynak ve hedef aynı.',
 'fwdfw from' => 'Kimden:',
 'fwdfw hint ip1' => 'Son oluÅŸturulan kurallar hiçbir zaman eÅŸleÅŸmemelidir Ã§Ã¼nkü kaynak ve hedefin alt aÄŸları Ã§akışabilir',
 'fwdfw hint ip2' => 'Bu kuralın mantıklı olup olmadığını bir kez daha kontrol edin: ',
+'fwdfw hint mac' => 'Kod oluÅŸturma sırasında görmezden gelinecek MAC adresleri.',
 'fwdfw iface' => 'Arayüz',
 'fwdfw ipsec network' => 'IPsec aÄŸları:',
 'fwdfw log' => 'Günlük',
 'fwdfw movedown' => 'AÅŸağı taşı',
 'fwdfw moveup' => 'Yukarı taşı',
 'fwdfw natport used' => 'NAPT için verilen baÄŸlantı noktası baÅŸka bir DNAT kural tarafından zaten kullanılıyor.',
-'fwdfw newrule' => 'Yeni kural',
+'fwdfw newrule' => 'Yeni Kural',
 'fwdfw p2p txt' => 'P2P aÄŸlarına eriÅŸim izni Ver/Verme.',
 'fwdfw pol allow' => 'Ä°zin Verildi',
 'fwdfw pol block' => 'Engellendi',
 'fwdfw pol text' => 'Yerel aÄŸlardan baÄŸlantılar için varsayılan günvenlik duvarı davranışını ayarlar. Tüm yeni baÄŸlantılara izin verebilir veya varsayılan olarak engelleyebilirsiniz. Yerel aÄŸlar arasındaki baÄŸlantılar ayrıca sonraki biçimde engellenir.',
-'fwdfw pol text1' => 'Güvenlik duvarı tarafından baÅŸlatılan baÄŸlantıları için varsayılan güvenlik duvarı davranışını ayarlar.
-Dikkat! Kendinizi engelleyebilirsiniz.',
+'fwdfw pol text1' => 'Güvenlik duvarı tarafından baÅŸlatılan baÄŸlantıları için varsayılan güvenlik duvarı davranışını ayarlar. Dikkat! Kendinizi engelleyebilirsiniz.',
 'fwdfw pol title' => 'Varsayılan güvenlik duvarı davranışı',
 'fwdfw prot41' => 'IPv6 KuÅŸatması (Kural 41)',
 'fwdfw prot41 short' => 'IPv6 KuÅŸatması',
 'fwdfw red' => 'KIRMIZI',
-'fwdfw reread' => 'DeÄŸiÅŸiklikleri uygula',
+'fwdfw reread' => 'DeÄŸiÅŸiklikleri Uygula',
 'fwdfw rule action' => 'Eylem kuralı:',
 'fwdfw rule activate' => 'Kuralı etkinleÅŸtir',
 'fwdfw rulepos' => 'Kural konumu',
@@ -998,13 +1021,13 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'fwdfw sourceip' => 'Kaynak adresi (MAC/IP adresi veya ağı):',
 'fwdfw std network' => 'Standart aÄŸlar:',
 'fwdfw target' => 'Hedef',
-'fwdfw targetip' => 'Hedef adresi (MAC/IP adresi veya aÄŸ):',
+'fwdfw targetip' => 'Hedef adres (MAC/IP adresi veya ağı):',
 'fwdfw till' => 'Son zaman:',
 'fwdfw time' => 'Zaman Kısıtlamaları',
 'fwdfw timeframe' => 'Zaman kısıtlamalarını kullan',
 'fwdfw toggle' => 'EtkinleÅŸtirin veya devre dışı bırakın',
 'fwdfw togglelog' => 'Günlüğü etkinleÅŸtirin veya devre dışı bırakın',
-'fwdfw use nat' => 'AÄŸ Adresi Ã‡evirisi kullanın (NAT)',
+'fwdfw use nat' => 'AÄŸ adres dönüştürücüsünü kullanın (NAT)',
 'fwdfw use srcport' => 'Kaynak baÄŸlantı noktası:',
 'fwdfw use srv' => 'Hedef baÄŸlantı noktası:',
 'fwdfw useless rule' => 'Bu kural geçersiz.',
@@ -1020,7 +1043,6 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'fwhost addgrpname' => 'Grup adı:',
 'fwhost addhost' => 'Yeni bir ana bilgisayar ekle:',
 'fwhost addnet' => 'Yeni bir aÄŸ ekle:',
-'fwhost addrule' => 'Kural ekle/düzenle:',
 'fwhost addservice' => 'Hizmet ekle:',
 'fwhost addservicegrp' => 'Yeni bir hizmet grubu ekle:',
 'fwhost any' => 'Herhangi',
@@ -1035,7 +1057,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'fwhost cust grp' => 'AÄŸ/Ana Bilgisayar Grupları:',
 'fwhost cust net' => 'AÄŸlar:',
 'fwhost cust service' => 'Hizmetler:',
-'fwhost cust srvgrp' => 'Hizmet Grupları:',
+'fwhost cust srvgrp' => 'Hizmet grupları:',
 'fwhost deleted' => 'Silindi',
 'fwhost empty' => 'Tanımlı kurallar yok',
 'fwhost err addr' => 'Geçersiz IP adresi veya alt aÄŸ',
@@ -1076,13 +1098,13 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'fwhost ipadr' => 'IP adresi:',
 'fwhost ipsec host' => 'IPsec istemcileri:',
 'fwhost ipsec net' => 'IPsec aÄŸları:',
-'fwhost menu' => 'Güvenlik Duvarı grupları',
+'fwhost menu' => 'Güvenlik Duvarı Gurupları',
 'fwhost netaddress' => 'AÄŸ adresi',
 'fwhost newgrp' => 'AÄŸ/Ana Bilgisayar Grupları',
 'fwhost newhost' => 'Ana Bilgisayarlar',
 'fwhost newnet' => 'AÄŸlar',
 'fwhost newservice' => 'Hizmetler',
-'fwhost newservicegrp' => 'Hizmet grupları',
+'fwhost newservicegrp' => 'Hizmet Gurupları',
 'fwhost orange' => 'Turuncu',
 'fwhost ovpn_n2n' => 'AÄŸdan-AÄŸa OpenVPN',
 'fwhost port' => 'BaÄŸlantı Noktası',
@@ -1098,13 +1120,13 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'fwhost wo subnet' => '(alt aÄŸ olmadan)',
 'g.dtm' => 'KALDIRILACAK',
 'g.lite' => 'KALDIRILACAK',
-'gateway' => 'AÄŸ Geçidi',
+'gateway' => 'AÄŸ geçidi',
 'gateway ip' => 'AÄŸ Geçidi IP Adresi',
 'gen static key' => 'Statik bir anahtar oluÅŸtur',
 'generate' => 'Yönetici/Sunucu Sertifikası OluÅŸtur',
 'generate a certificate' => 'Sertifika oluÅŸtur:',
 'generate iso' => 'ISO oluÅŸtur',
-'generate root/host certificates' => 'Yönetici/Sunucu sertifikası oluÅŸtur',
+'generate root/host certificates' => 'Yönetici/Sunucu Sertifikası OluÅŸtur',
 'generate tripwire keys and init' => 'tripwire anahtarları ve init oluÅŸtur',
 'generatekeys' => 'Anahtar OluÅŸtur',
 'generatepolicy' => 'Yeni kural oluÅŸtur',
@@ -1117,10 +1139,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'gpl license agreement' => 'Lisans SözleÅŸmesi',
 'gpl please read carefully the general public license and accept it below' => 'Dikkatlice Genel Kamu Lisansını okuyup kabul edin',
 'gpl unofficial translation of the general public license v3' => 'Resmi olmayan sürüm-3 Genel Kamu Lisansı Ã§evirisi',
-'graph' => 'GrafiÄŸi',
+'graph' => 'grafiÄŸi',
 'graph per' => '-',
 'green' => 'YEŞİL',
 'green interface' => 'YeÅŸil Arabirim',
+'grouptype' => 'Gurup türü:',
 'guaranteed bandwith' => 'Garantili bant geniÅŸliÄŸi',
 'guardian alertfile' => 'Uyarı dosyası',
 'guardian configuration' => 'Koruyucu Yapılandırması',
@@ -1171,7 +1194,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'ids preprocessor' => 'IDS Ã¶niÅŸlemcisi',
 'ids rules license' => 'Sourcefire VRT Sertifikalı Kurallarından yararlanmak için kayıt olmanız gerekmektedir',
 'ids rules license1' => '.',
-'ids rules license2' => 'Lisans kabulü için siteyi ziyaret ede veya e-posta ile aktifleÅŸtirin. Sonra ',
+'ids rules license2' => 'Lisans kabulü için siteyi ziyaret edin veya e-posta ile aktifleÅŸtirin. Sonra ',
 'ids rules license3' => 'adresine gidin. Ã–nce "Kod OluÅŸtur" düğmesine basın ve sonra aÅŸağıdaki alana 40 karakterlik Onikcode kodunu kopyalayın.',
 'ids rules update' => 'Snort kuralları güncelleÅŸtirme',
 'iface' => 'Iface',
@@ -1198,11 +1221,12 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'installed' => 'Yüklenenler',
 'installed updates' => 'Yüklenen güncellemeler:',
 'instant update' => 'Hızlı Güncelle',
+'integrity' => 'Bütünlük:',
 'interface' => 'Ara birim',
 'interfaces' => 'Ara birim',
 'internet' => 'Ä°NTERNET',
 'intrusion detection' => 'Saldırı Tespiti',
-'intrusion detection system' => 'Saldırı Tespit Sistemi',
+'intrusion detection system' => 'Saldırı tespit sistemi',
 'intrusion detection system log viewer' => 'Saldırı Tespit Sistemi Günlük Görüntüleyicisi',
 'intrusion detection system rules' => 'saldırı tespit sistemi kuralları',
 'intrusion detection system2' => 'Saldırı Tespit Sistemi:',
@@ -1225,6 +1249,8 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'invalid input for dhcp dns' => 'DHCP DNS için geçersiz giriÅŸ.',
 'invalid input for dhcp domain' => 'DHCP etki alanı için geçersiz giriÅŸ.',
 'invalid input for dhcp wins' => 'DHCP WINS için geçersiz giriÅŸ.',
+'invalid input for dpd delay' => 'DPD gecikmesi için geçersiz giriÅŸ.',
+'invalid input for dpd timeout' => 'DPD zamanaşımı için geçersiz giriÅŸ.',
 'invalid input for e-mail address' => 'E-posta adresi için geçersiz giriÅŸ.',
 'invalid input for esp keylife' => 'ESP anahtar Ã¶mrü için geçersiz giriÅŸ.',
 'invalid input for hostname' => 'Ana bilgisayar adı için geçersiz giriÅŸ.',
@@ -1281,9 +1307,12 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'ipfire side is invalid' => 'Geçersiz IPFire yan listesi.',
 'ipfires hostname' => 'IPFire ana bilgisayar adı',
 'ipinfo' => 'IP bilgi',
+'ipsec' => 'IPsec',
+'ipsec network' => 'IPsec aÄŸ',
+'ipsec no connections' => 'Aktif hiçbir IPsec baÄŸlantısı yok',
 'iptable rules' => 'IPTablo kuralları',
-'iptmangles' => 'IPTablo Sıkıştırmaları',
-'iptnats' => 'IPTablo AÄŸ Adres Ã‡evrimi',
+'iptmangles' => 'IPTablo sıkıştırmaları',
+'iptnats' => 'IPTablo aÄŸ adres Ã§evrimi',
 'ipts' => 'IPTablolar',
 'isdn' => 'ISDN',
 'isdn settings' => 'Ek ISDN ayarları:',
@@ -1300,14 +1329,16 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'key stuff' => '2. Anahtarlar ve Sertifikalar',
 'keyreset' => 'Anahtarları Sıfırla',
 'keys' => 'anahtarlar',
-'lan' => 'LAN',
+'lan' => 'YEREL AÄž',
 'lang' => 'tr',
 'languagepurpose' => 'IPFire sistemini görüntülemek istediÄŸiniz dili seçin:',
 'last activity' => 'Son Etkinlik',
 'lateprompting' => 'Geç istenen',
 'lease expires' => 'Kiralama süresi',
+'least preferred' => 'az tercih edilen',
 'legend' => 'Açıklamalar',
-'length' => 'Süresi',
+'length' => 'Süre',
+'lifetime' => 'YaÅŸam süresi:',
 'line' => 'Satırı',
 'linkq' => 'baÄŸlantı kalitesi',
 'load printer' => 'Yazıcı Yükle',
@@ -1317,19 +1348,19 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'local ntp server specified but not enabled' => 'Belirtilen yerel NTP sunucusu etkin deÄŸil',
 'local subnet' => 'Yerel Alt AÄŸ:',
 'local subnet is invalid' => 'Geçersiz yerel alt aÄŸ.',
-'local vpn hostname/ip' => 'Yerel VPN Ana Bilgisayar Adı/IP',
+'local vpn hostname/ip' => 'Yerel VPN ana bilgisayar adı/ip',
 'localkey' => 'yerel Anahtar',
 'localkeyfile' => 'Yerel Anahtar Dosyası',
 'log' => 'Günlük:',
 'log enabled' => 'Günlük Aktif',
-'log level' => 'Günlük Seviyesi',
+'log level' => 'Günlük seviyesi',
 'log lines per page' => 'Sayfa başına satır',
 'log server address' => 'Syslog sunucusu:',
 'log settings' => 'Günlük Ayarları',
 'log summaries' => 'Günlük Ã¶zetleri',
 'log summary' => 'Günlük Ã–zetleri',
 'log var messages' => '/var/log/messages için ayarlar:',
-'log view' => 'Günlük Kaydı',
+'log view' => 'Günlük kaydı',
 'log viewer' => 'Günlük görüntüleyici',
 'log viewing options' => 'Günlük görüntüleme seçenekleri',
 'log-options' => 'Günlük dosya seçenekleri',
@@ -1337,7 +1368,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'logging' => 'Günlük',
 'logging server' => 'Günlük Sunucusu',
 'loginlogout' => 'GiriÅŸ/Çıkış',
-'logs' => 'günlükler',
+'logs' => 'Günlükler',
 'lookup failed' => 'Ters arama baÅŸarısız',
 'loosedirectorychecking' => 'Serbest Dizin Denetimi',
 'low' => 'Düşük',
@@ -1363,8 +1394,9 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'mac address recon' => 'Yeniden baÄŸlanmaya Ã§alışılıyor!',
 'mac address saved' => 'BaÅŸarıyla kaydedildi!',
 'mac address saved txt' => 'MAC adresi baÅŸarıyla kaydedildi. Fakat deÄŸiÅŸiklikler sadece yeniden baÅŸlattıktan sonra veya yeniden baÄŸlandıktan sonra yürürlüğe girecektir.',
-'mac address title' => 'Orta EriÅŸim Kontrolü Adresi',
+'mac address title' => 'MAC adresi atayın',
 'mac desc' => 'Burada red0 Ã¼zerindeki MAC adresini deÄŸiÅŸtirebilirsiniz. Adres onaltılık (0-9,a-f) bir tanımlama arasında olmalıdır.<br />ÖrneÄŸin: 00-01-02-0e-b8-d6 veya 00:01:02:0e:b8:d6.',
+'mac filter' => 'MAC filtre',
 'mac new' => 'Yeni MAC adresi:',
 'mac1 new' => 'Yeni MAC adresi 1 (vdsl-inet):',
 'mac2 new' => 'Yeni MAC adresi 2 (vdsl-iptv):',
@@ -1374,11 +1406,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'main page' => 'Ana sayfa',
 'manage ovpn' => '5. Tünel Yönetimi:',
 'manage printers' => 'yazıcıları yönet',
-'manage shares' => 'Paylaşım Yönetimi',
+'manage shares' => 'Paylaşım yönetimi',
 'manual' => 'El ile',
 'manual control and status' => 'El ile kontrol ve durum:',
 'manually' => 'El ile',
-'map to guest' => 'Ziyaretçi Haritası',
+'map to guest' => 'Ziyaretçi haritası',
 'march' => 'Mart',
 'marked' => 'Ä°ÅŸaretli',
 'max bandwith' => 'En fazla bant geniÅŸliÄŸi',
@@ -1391,6 +1423,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'max size' => 'En fazla nesne boyutu (KB):',
 'max throughput' => 'En fazla hacmi',
 'maximal' => 'En fazla',
+'maximum' => 'En fazla',
 'maximum retries' => 'En fazla yeniden deneme:',
 'may' => 'Mayıs',
 'mbmon display' => 'Görüntü',
@@ -1405,10 +1438,10 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'mbmon volt' => 'voltaj',
 'meaning' => 'anlam',
 'media' => 'Medya',
-'media information' => 'medya bilgisi',
+'media information' => 'Medya bilgisi',
 'medium' => 'Orta',
 'memory' => 'Bellek',
-'memory information' => 'bellek bilgisi',
+'memory information' => 'Bellek bilgisi',
 'memory usage per' => 'bellek başına kullanım - ',
 'messages logging' => '/var/log/messages için günlük ayarları',
 'method' => 'Yöntem:',
@@ -1416,6 +1449,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'min delay' => 'En az gecikme',
 'min size' => 'En az nesne boyutu (KB):',
 'minimal' => 'En az',
+'minimum' => 'En az',
 'minute' => 'dakika',
 'minutes' => 'dakika',
 'misc-options' => 'ÇeÅŸitli seçenekler',
@@ -1434,7 +1468,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'modify' => 'Düzenle',
 'modulation' => 'GeçiÅŸ',
 'monday' => 'Pazartesi',
-'month' => 'ay',
+'month' => 'Ay',
 'month-graph' => 'ay',
 'monthly firewallhits' => 'aylık güvenlik duvarı kaydı',
 'monthly start day bad' => 'Aylık baÅŸlangıç â€‹â€‹günü doÄŸru deÄŸil',
@@ -1444,6 +1478,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'monthly volume start day short' => 'Ä°lk gün',
 'months' => 'ay',
 'more' => 'daha',
+'most preferred' => 'En Ã§ok tercih edilen',
 'mount' => 'BaÄŸla',
 'mounted on' => 'BaÄŸlı',
 'mpfire' => 'IPFire için Media Player',
@@ -1469,7 +1504,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'net to net vpn' => 'AÄŸdan-AÄŸa Sanal Ã–zel AÄŸ',
 'net traffic newversion' => 'Yeni AÄŸ-Trafik sürümü var:',
 'net-traffic configuration' => 'AÄŸ-Trafik Yapılandırması',
-'netbios name' => 'Netbios Adı',
+'netbios name' => 'Netbios adı',
 'netmask' => 'AÄŸ Maskesi',
 'network' => 'AÄŸ',
 'network added' => 'Özel aÄŸ eklendi',
@@ -1513,6 +1548,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'not running' => 'çalışmıyor',
 'not set' => 'ayarlanmamış',
 'notes' => 'Notlar',
+'notice' => 'Dikkat',
 'november' => 'Kasım',
 'ntp common settings' => 'Genel ayarlar',
 'ntp configuration' => 'NTP yapılandırması',
@@ -1545,6 +1581,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'openvpn fragment allowed with udp' => 'UDP kuralı kullanırken sadece parça kullanılmasına izin verilir.',
 'openvpn log' => 'OpenVPN Günlük',
 'openvpn mssfix allowed with udp' => 'UDP kuralı kullanırken sadece "mssfix" ile kullanılmasına izin verilir.',
+'openvpn network' => 'OpenVPN aÄŸları',
 'openvpn prefix local subnet' => 'Önek gösterimi kullanımı yerel alt aÄŸ için desteklenmez. Lütfen 255.255.255.0 gibi alt aÄŸ maskeleri girin.',
 'openvpn prefix openvpn subnet' => 'Önek gösterimi kullanımı OpenVPN alt aÄŸ için desteklenmez. Lütfen 255.255.255.0 gibi alt aÄŸ maskeleri girin',
 'openvpn prefix remote subnet' => 'Önek gösterimi kullanımı uzak alt aÄŸ için desteklenmez. Lütfen 255.255.255.0 gibi alt aÄŸ maskeleri girin',
@@ -1559,10 +1596,10 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'or' => 'veya',
 'orange' => 'TURUNCU',
 'organization cant be empty' => 'KuruluÅŸ boÅŸ olamaz.',
-'organization name' => 'KuruluÅŸ Adı',
+'organization name' => 'KuruluÅŸ adı',
 'organization too long' => 'KuruluÅŸ adı Ã§ok uzun. KuruluÅŸ adı 60 karakterden Ã§ok olmamalıdır.',
 'original' => 'Orijinal',
-'os level' => 'OS Seviyesi',
+'os level' => 'OS seviyesi',
 'other' => 'DiÄŸer',
 'other countries' => 'DiÄŸer Ã¼lkelers',
 'other login script' => 'DiÄŸer oturum açma komut dosyası',
@@ -1602,6 +1639,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'ovpn errmsg green already pushed' => 'YeÅŸil aÄŸ için her zaman bir yol ayarla',
 'ovpn errmsg invalid ip or mask' => 'Geçersiz aÄŸ adresi veya alt aÄŸ maskesi',
 'ovpn log' => 'OVPN-Günlük',
+'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ı',
@@ -1609,9 +1647,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'ovpn mtu-disc off' => 'Devre dışı',
 'ovpn mtu-disc with mssfix or fragment' => 'MTU algılama mssfix veya parçası ile kullanılamaz.',
 'ovpn mtu-disc yes' => 'Zorunlu',
+'ovpn no connections' => 'Hiçbir aktif OpenVPN baÄŸlantısı yok',
 'ovpn on blue' => 'MAVÄ° Ã¼zerindeki OpenVPN',
 'ovpn on orange' => 'TURUNCU Ã¼zerindeki OpenVPN',
 'ovpn on red' => 'KIRMIZI Ã¼zerindeki OpenVPN',
+'ovpn port in root range' => '1024 ya da daha yüksek bir baÄŸlantı noktası numarası gereklidir..',
 'ovpn routes push' => 'Yollar (her satırda bir tane) Ã¶rneÄŸin 192.168.10.0/255.255.255.0 192.168.20.0/24',
 'ovpn routes push options' => 'Yol baskı seçenekleri',
 'ovpn server status' => 'Güncel OpenVPN sunucu durumu:',
@@ -1634,25 +1674,27 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'ovpn_processprioVH' => 'Çok yüksek',
 'ovpnstatus log' => 'OVPN-Durum-Günlük',
 'ovpnsys log' => 'OVPN-Durum-Günlük',
+'p2p block' => 'P2P AÄŸları',
+'p2p block save notice' => 'Yaptığınız deÄŸiÅŸiklikleri uygulamak için güvenlik duvarı kural ayarlarını lütfen yeniden yükleyin.',
 'package failed to install' => 'Paket yüklenemedi.',
 'pagerefresh' => 'Sayfa yenileniyor. Lütfen bekleyin.',
 'pakfire accept all' => 'Tüm paketleri yüklemek istiyor musunuz?',
 'pakfire ago' => 'önce yapıldı.',
-'pakfire available addons' => 'Mevcut Eklentiler:',
-'pakfire configuration' => 'Pakfire Yapılandırması',
+'pakfire available addons' => 'Mevcut eklentiler:',
+'pakfire configuration' => 'Pakfire yapılandırması',
 'pakfire core update auto' => 'Otomatik olarak Ã§ekirdek ve eklenti güncelleÅŸtirmelerini yükle:',
 'pakfire core update level' => 'Çekirdek-Güncelleme-Seviyesi',
 'pakfire health check' => 'Yansımanın ulaşılabilir olup olmadığını kontrol et (ping):',
 'pakfire install description' => 'AÅŸağıdaki listeden bir veya daha fazla Ã¶ÄŸeyi seçtikten sonra<br />eklemek için artı simgesine tıklayınız.',
 'pakfire install package' => 'AÅŸağıdaki paketleri yüklemek istediniz: ',
-'pakfire installed addons' => 'Kurulu Eklentiler:',
+'pakfire installed addons' => 'Kurulu eklentiler:',
 'pakfire last core list update' => 'Son Ã§ekirdek listesi güncellemesi',
 'pakfire last package update' => 'Son paket listesi güncellemesi',
 'pakfire last serverlist update' => 'Son sunucu listesi güncellemesi',
 'pakfire last update' => 'Son güncelleme',
 'pakfire possible dependency' => ' Yüklenemesi gereken paketlerin yüklenebilmesi için buradaki paketlere ihtiyaç duyulabilir.',
 'pakfire register' => 'Pakfire-sunucusuna kayıt:',
-'pakfire system state' => 'Sistem Durumu',
+'pakfire system state' => 'Sistem durumu',
 'pakfire uninstall description' => 'AÅŸağıdaki listeden bir veya daha fazla Ã¶ÄŸeyi seçtikten sonra<br />kaldırmak için eksi simgesine tıklayınız.',
 'pakfire uninstall package' => 'AÅŸağıdaki paketleri kaldırmak istiyorum: ',
 'pakfire update daily' => 'Günlük güncellemeleri ara:',
@@ -1704,7 +1746,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'printing' => 'Yazdırılıyor',
 'printing options' => 'yazdırma seçenekleri',
 'priority' => 'Öncelik',
-'processes' => 'iÅŸlemler',
+'processes' => 'Ä°ÅŸlemler',
 'profile' => 'Profil',
 'profile deleted' => 'Silinen profiller: ',
 'profile has errors' => 'Profil hataları',
@@ -1714,7 +1756,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'profile saved' => 'Kaydedilen profiller: ',
 'profiles' => 'Profiller:',
 'proto' => 'Kural',
-'protocol' => 'Kural: ',
+'protocol' => 'Kural ',
 'proxy' => 'Vekil sunucu',
 'proxy access graphs' => 'Vekil sunucu eriÅŸim grafiÄŸi',
 'proxy admin password' => 'Önbellek yönetici parolası',
@@ -1753,8 +1795,9 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'rebooting' => 'Yeniden BaÅŸlat',
 'rebooting ipfire' => 'IPFire\'ı Yeniden BaÅŸlat',
 'reconnect' => 'Yeniden BaÄŸlan',
-'reconnection' => 'Yeniden BaÄŸlan',
+'reconnection' => 'Yeniden baÄŸlan',
 'red' => 'Ä°nternet',
+'red1' => 'KIRMIZI',
 'references' => 'Referanslar',
 'refresh' => 'Yenile',
 'refresh index page while connected' => 'Index.cgi sayfası baÄŸlandığında yenile',
@@ -1774,7 +1817,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'removable device advice' => 'Bir aygıt takıp yenileyin. Aygıtı kullanmadan Ã¶nce seçip baÄŸlayın. Ã‡Ä±karmadan Ã¶nce de ayırın.',
 'remove' => 'Kaldır',
 'remove ca certificate' => 'CA sertifikasını kaldır',
-'remove x509' => 'x509 kaldır',
+'remove x509' => 'X509 Kaldır',
 'repeat' => 'Tekrar',
 'reportfile' => 'Dosya raporu',
 'reportlevel' => 'Seviye raporu',
@@ -1791,7 +1834,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'restart' => 'Yeniden BaÅŸlat',
 'restart ovpn server' => 'OpenVPN sunucusunu yeniden baÅŸlat',
 'restore' => 'Geri Yükle',
-'restore defaults' => 'Varsayılanı 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',
 'reverse sort' => 'Ters kronolojik sıralama',
@@ -1801,20 +1844,20 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'root user password' => 'Root parolası',
 'route subnet is invalid' => 'Alt aÄŸda geçersiz ek basma yolu',
 'router ip' => 'Yönlendirici IP adresi:',
-'routing table entries' => 'Yönlendirici Tablo Girdileri:',
+'routing table entries' => 'Yönlendirici tablo girdileri:',
 'rsvd dst port overlap' => 'IPFire için ayrılmış baÄŸlantı noktası ile Ã¶rtüşen hedef baÄŸlantı noktası aralığı:',
 'rsvd src port overlap' => 'IPFire için ayrılmış baÄŸlantı noktası ile Ã¶rtüşen kaynak baÄŸlantı noktası aralığı:',
 'rules already up to date' => 'Kurallar zaten yüklenmiÅŸ.',
 'running' => 'ÇALIÅžIYOR',
 'safe removal of umounted device' => 'BaÄŸlantısı kesilen aygıtı güvenli bir ÅŸekilde kaldırabilirsiniz',
 'samba' => 'Samba',
-'samba status' => 'Samba Durumu',
+'samba status' => 'Samba durumu',
 'saturday' => 'Cumartesi',
 'save' => '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',
+'save-adv-options' => 'GeliÅŸmiÅŸ Seçenekleri Kaydet',
 'script name' => 'Komut adı:',
 'secondary dns' => 'Ä°kincil DNS:',
 'secondary ntp server' => 'Ä°kincil NTP sunucusu',
@@ -1823,7 +1866,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'section' => 'Bölüm',
 'secure shell server' => 'Güvenli Kabuk Sunucusu',
 'security' => 'Güvenlik',
-'security options' => 'Güvenlik Seçenekleri',
+'security options' => 'Güvenlik seçenekleri',
 'select' => 'Seç',
 'select dest net' => 'Bir aÄŸ hedefi seçin.',
 'select media' => 'Ortamı seç <br />(çıkartılabilir ortam için sadece FAT desteklenir)',
@@ -1836,7 +1879,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'serial' => 'Dizi',
 'server reserved' => 'BaÄŸlantı adı sunucusu ayrılmıştır, izin verilmez.',
 'server restart' => 'OpenVPN sunucu Ã§alışırken herhangi bir deÄŸiÅŸikliÄŸi kaydetmek mümkün deÄŸildir.',
-'server string' => 'Sunucu Dizisi',
+'server string' => 'Sunucu dizisi',
 'service' => 'Hizmet',
 'service added' => 'Özel aÄŸ hizmeti eklendi',
 'service name' => 'Hizmet adı:',
@@ -1846,8 +1889,8 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'services' => 'Hizmetler',
 'services settings' => 'Güvenlik Duvarı - Hizmet Ayarları',
 'set' => 'ayar',
-'set time now' => 'Zamanı Ã…\9fimdi ayarla',
-'set time now help' => 'Herhangi bir zamanda eÅŸitleme etkinliÄŸi sırasında (hatta yinelenen bir program kullanılırken) <i>Åžimdi zamanı ayarla</i> düğmesine basın. Bir eÅŸitleme olmadan Ã¶nce beÅŸ dakika veya daha fazla beklemek zorunda olduÄŸunuzu unutmayın.',
+'set time now' => 'Zamanı Ã…\9eimdi 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',
 'shaping add options' => 'Hizmet ekle',
 'shaping list options' => 'Trafik ÅŸekillendirme hizmetleri',
@@ -1858,7 +1901,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'show areas' => 'alanları göster',
 'show ca certificate' => 'CA sertifikalarını göster',
 'show certificate' => 'Sertifika göster',
-'show crl' => 'Sertifika iptal listesini göster',
+'show crl' => 'Sertifika Ä°ptal Listesini Göster',
 'show host certificate' => 'Ana bilgisayar sertifikalarını göster',
 'show last x lines' => 'Son x satırlarını göster',
 'show lines' => 'Satırları göster',
@@ -1885,6 +1928,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'smbstop' => 'Samba\'yı durdur',
 'smtphost' => 'SMTP ana bilgisayarı',
 'smtpport' => 'SMTP baÄŸlantı noktası numarası',
+'snat new source ip address' => 'Yeni kaynak IP adresi',
 'snort hits' => 'Saldırı kuralları için toplam aktif sayı',
 'snort working' => 'Snort Ã§alışıyor ... Tüm iÅŸlemler baÅŸarıyla tamamlanana kadar bekleyin.',
 'socket options' => 'Soket seçenekleri',
@@ -1912,10 +1956,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'srcprt range overlaps' => 'Kaynak baÄŸlantı noktası aralığı Ã¶nceden tanımlanmış bir baÄŸlantı noktası ile Ã§akışıyor.',
 'srcprt within existing' => 'Kaynak baÄŸlantı noktası Ã¶nceden tanımlanmış baÄŸlantı noktası aralığı içinde.',
 'ssdmz pinholes' => 'Açık Bölge (DMZ)',
-'ssh access' => 'SSH EriÅŸimi',
+'ssh' => 'SSH',
+'ssh access' => 'SSH eriÅŸimi',
 'ssh access tip' => 'IPFire SSH varsayılan baÄŸlantı noktası olarak 222 kullanmıyor!',
 'ssh fingerprint' => 'Parmak izi',
-'ssh host keys' => 'SSH Sunucu Anahtarı',
+'ssh host keys' => 'SSH sunucu anahtarları',
 'ssh is disabled' => 'SSH devre dışı bırakıldı.  Durduruluyor.',
 'ssh is enabled' => 'SSH aktifleÅŸtirildi.  Yeniden baÅŸlatılıyor.',
 'ssh key' => 'Anahtar',
@@ -1946,7 +1991,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'static routes' => 'Statik Yollar',
 'status' => 'Durum',
 'status information' => 'Durum bilgisi',
-'status ovpn' => '4. OpenVPN Durumu / Yapılandırma:',
+'status ovpn' => 'OpenVPN',
 'std classes' => 'Standart sınıflar',
 'stop' => 'Dur',
 'stop ovpn server' => 'OpenVPN Sunucusunu Durdur',
@@ -1960,16 +2005,17 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'successfully refreshed updates list' => 'BaÅŸarıyla güncellemeler listesi yenilendi.',
 'summaries kept' => 'Günlük Ã¶zetlerini tut:',
 'sunday' => 'Pazar',
+'support donation' => 'Lütfen bağışta bulunarak IPFire projesine destek olun',
 'swap' => 'takas alanı',
 'swap usage per' => 'takas alanı kullanımı - ',
 'system' => 'Sistem',
 'system graphs' => 'Sistem Grafikleri',
-'system information' => 'Sistem bilgisi',
+'system information' => 'Sistem Bilgisi',
 'system log viewer' => 'Sistem Günlük Görüntüleyicisi',
 'system logs' => 'Sistem Günlükleri',
 'system status information' => 'Sistem Durum Bilgisi',
 'telephone not set' => 'Telefon ayarlanmamış.',
-'template' => 'Ön ayar',
+'template' => 'Ön Ayar',
 'template warning' => 'QoS kurmak için iki seçeneÄŸiniz vardır. Ä°lk olarak kaydet düğmesine basıp kendi sınıf ve kurallarınızı oluÅŸturabilirsiniz. Ä°kinci olarak ise Ã¶n ayar düğmesine basıp sınıf ve kurallar için bir ÅŸablonun kurulmasını saÄŸlayın. ',
 'test' => 'test',
 'test email could not be sent' => 'Test e-posta gönderilemedi',
@@ -2012,20 +2058,22 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'tor accounting period daily' => 'günlük',
 'tor accounting period monthly' => 'aylık',
 'tor accounting period weekly' => 'haftalık',
-'tor acls' => 'EriÅŸim Kontrolü',
+'tor acls' => 'EriÅŸim kontrolü',
 'tor allowed subnets' => 'Ä°zin verilen alt aÄŸlar (her satırda bir tane)',
 'tor bandwidth burst' => 'En büyük ayırma',
 'tor bandwidth rate' => 'En büyük oran',
-'tor bandwidth settings' => 'Bant GeniÅŸliÄŸi Ayarları',
+'tor bandwidth settings' => 'Bant geniÅŸliÄŸi ayarları',
 'tor bandwidth unlimited' => 'sınırsız',
 'tor bridge enabled' => 'Tor köprüsünü etkinleÅŸtir',
-'tor common settings' => 'Genel Ayarlar',
-'tor configuration' => 'Tor Yapılandırması',
+'tor common settings' => 'Genel ayarlar',
+'tor configuration' => 'Tor yapılandırması',
 'tor connected relays' => 'BaÄŸlı aktarımlar',
-'tor contact info' => 'Ä°letiÅŸim Bilgileri',
+'tor contact info' => 'Ä°letiÅŸim bilgileri',
 'tor daemon' => 'Artalan süreci',
-'tor enabled' => 'Tor Aktif',
+'tor directory port' => 'Dizin baÄŸlantı noktası',
+'tor enabled' => 'Tor aktif',
 'tor errmsg invalid accounting limit' => 'Geçersiz hesap sınırı',
+'tor errmsg invalid directory port' => 'Geçersiz dizin baÄŸlantı noktası',
 'tor errmsg invalid ip or mask' => 'Geçersiz IP alt ağı',
 'tor errmsg invalid node id' => 'Geçersiz düğüm kimliÄŸi (ID)',
 'tor errmsg invalid relay address' => 'Geçersiz aktarma adresi',
@@ -2034,10 +2082,10 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'tor errmsg invalid socks port' => 'Geçersiz SOCKS baÄŸlantı noktası',
 'tor exit country' => 'Ãœlçe Ã§Ä±kışı',
 'tor exit country any' => 'Herhangi bir Ã¼lke',
-'tor exit nodes' => 'Çıkış Düğümleri',
+'tor exit nodes' => 'Çıkış düğümleri',
 'tor relay address' => 'Aktarma adresleri',
-'tor relay configuration' => 'Tor Aktarma Yapılandırması',
-'tor relay enabled' => 'Tor Aktarma Aktif',
+'tor relay configuration' => 'Tor aktarma yapılandırması',
+'tor relay enabled' => 'Tor aktarma aktif',
 'tor relay external address' => 'Aktarım dış adresi',
 'tor relay fingerprint' => 'Aktarım parmak izi',
 'tor relay mode' => 'Aktarım biçimi',
@@ -2047,7 +2095,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'tor relay mode relay' => 'Sadece aktarım',
 'tor relay nickname' => 'Aktarım takma adı',
 'tor relay port' => 'Aktarım baÄŸlantı noktası',
-'tor service' => 'Tor Servisi',
+'tor service' => 'Tor servisi',
 'tor socks port' => 'SOCKS baÄŸlantı noktası',
 'tor stats' => 'Ä°statistik',
 'tor traffic limit hard' => 'Trafik sınırına ulaşıldı.',
@@ -2094,7 +2142,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'unable to contact' => 'BaÄŸlantı Kurulamadı',
 'unencrypted' => 'Åžifresiz',
 'uninstall' => 'Kaldır',
-'unix charset' => 'UNIX Karakterleri',
+'unix charset' => 'UNIX karakterleri',
 'unix group' => ' UNIX kullanıcı grubu',
 'unix password sync' => 'Unix Parola EÅŸitleme',
 'unix shell' => 'UNIX KabuÄŸu',
@@ -2173,7 +2221,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'updxlrtr total data from cache' => 'Önbellekten teslim edilen toplam veri (bayt)',
 'updxlrtr total files' => 'Önbellekteki toplam dosya',
 'updxlrtr unknown' => 'Bilinmeyen',
-'updxlrtr update accelerator' => 'Güncelleme Hızlandırıcısı',
+'updxlrtr update accelerator' => 'Güncelleme hızlandırıcısı',
 'updxlrtr update information' => 'Yüklenebilir bir güncelleÅŸtirime sürümü var. Daha fazla bilgi için <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> adresini ziyaret edin.',
 'updxlrtr update notification' => 'Güncelleme bildirimi!',
 'updxlrtr used by' => 'Kullanan',
@@ -2182,16 +2230,17 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'updxlrtr weekly' => 'haftalık',
 'updxlrtr year' => 'Bir yıl',
 'upgrade' => 'yükselt',
+'uplink' => 'Yükleme baÄŸlantısı',
 '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 request' => 'Sertifika isteÄŸi yükle:',
-'upload ca certificate' => 'CA sertifikası yükle',
+'upload ca certificate' => 'CA Sertifikası Yükle',
 'upload fcdsl.o' => 'KALDIRILACAK',
 'upload file' => 'Dosya yükle',
 'upload new ruleset' => 'Yeni kurallar yükle',
-'upload p12 file' => 'PKCS12 dosyası yükle',
+'upload p12 file' => 'PKCS12 Dosyası Yükle',
 'upload static key' => 'Statik bir anahtar yükle',
 'upload successful' => 'Yükleme baÅŸarılı.',
 'upload synch.bin' => 'synch.bin yükle',
@@ -2217,17 +2266,17 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'urlfilter assigned users' => 'Atanan kullanıcılar',
 'urlfilter automatic blacklist update' => 'Otomatik olarak kara listeyi güncelleÅŸtir',
 'urlfilter automatic update schedule' => 'Otomatik olarak güncelleÅŸtirme zamanı',
-'urlfilter back to main page' => 'Ana sayfaya geri dön',
+'urlfilter back to main page' => 'Ana Sayfaya Geri Dön',
 'urlfilter background image' => 'UrlFilter arka plan resmi',
 'urlfilter background text' => 'Engellenen sayfanın altında Ã¶zel bir arkaplan görüntüsü kullanmak için .jpg dosyası yükleme',
-'urlfilter backup' => 'Yedek dosyası oluÅŸtur',
+'urlfilter backup' => 'Yedek Dosyası OluÅŸtur',
 'urlfilter backup error' => 'Yedek dosyası oluÅŸturulamıyor',
 'urlfilter backup settings' => 'Yedek URL filtre ayarları',
 'urlfilter banned clients' => 'Yasaklanan IP adresleri',
 'urlfilter blacklist age 1' => 'Son kara liste baÅŸarıyla güncellendi',
 'urlfilter blacklist age 2' => 'gün Ã¶nce',
 'urlfilter blacklist category name' => 'Kara liste kategori adı',
-'urlfilter blacklist editor' => 'Kara liste düzenleyicisi',
+'urlfilter blacklist editor' => 'Kara Liste Düzenleyicisi',
 'urlfilter blacklist editor info' => 'Kara liste dosyanızı oluturma ve düzenleme',
 'urlfilter blacklist name' => 'Kara liste adı',
 'urlfilter blacklist update' => 'Kara listeyi güncelleÅŸtir',
@@ -2260,7 +2309,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'urlfilter custom url' => 'Özel kaynak URL adresi',
 'urlfilter custom url required' => 'Gerekli Ã¶zel kaynak URL',
 'urlfilter custom whitelist' => 'Özel beyaz liste',
-'urlfilter daily' => 'günlük',
+'urlfilter daily' => 'Günlük',
 'urlfilter disabled' => 'Kapalı',
 'urlfilter domains' => 'Etki alanı (her satırda bir tane)',
 'urlfilter dont restart urlfilter' => 'URL filtreyi yeniden baÅŸlatma',
@@ -2283,7 +2332,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'urlfilter enabled' => 'Aktif:',
 'urlfilter example' => 'ÖrneÄŸin: www.etkialani.com',
 'urlfilter example ads' => 'ÖrneÄŸin: www.etkialani.com/reklam/',
-'urlfilter export blacklist' => 'Kara listeyi dışarı aktar',
+'urlfilter export blacklist' => 'Kara Listeyi Dışarı Aktar',
 'urlfilter export error' => 'Dışarı aktarma dosyası dosyası oluÅŸturulamıyor',
 'urlfilter expressions' => 'Ä°fadeler (her satırda bir tane)',
 'urlfilter file ext block' => 'Engellenen dosya uzantısı',
@@ -2294,16 +2343,16 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'urlfilter friday' => 'Cum',
 'urlfilter from' => 'BaÅŸlangıç',
 'urlfilter hourly' => 'Saatlik',
-'urlfilter import blacklist' => 'Kara listeyi al',
+'urlfilter import blacklist' => 'Kara Listeyi Al',
 'urlfilter import text' => 'Önceden kaydedilmiÅŸ *.tar.gz uzantılı kara liste düzenleyici dosyasını yüklemek için aÅŸağıdan seçin',
-'urlfilter install blacklist' => 'Kara listeye yükle',
+'urlfilter install blacklist' => 'Kara Listeye Yükle',
 'urlfilter install information' => 'Yeni kara liste otomatik olarak oluÅŸturulup veritabanları için derlenecektir. Kara liste boyutuna baÄŸlı olarak güncelleme iÅŸlemi birkaç dakika zaman alabilir. URL filtreyi yeniden baÅŸlatmadan Ã¶nce bu görevin muhakkak bitirilmesini bekleyin.',
 'urlfilter invalid content' => 'Dosya squidGuard uyumlu kara liste deÄŸil',
 'urlfilter invalid import file' => 'Dosya geçerli URL filtre kara liste düzenleyicisi dosyası deÄŸil',
 'urlfilter invalid ip or mask error' => 'Geçersiz IP adresi veya aÄŸ maskesi',
 'urlfilter invalid restore file' => 'Bu dosya geçerli bir URL filtre yedek dosyası deÄŸil',
 'urlfilter invalid user error' => 'Geçersiz kullanıcı adı',
-'urlfilter load blacklist' => 'Kara liste dosyasını yükle',
+'urlfilter load blacklist' => 'Kara Liste Dosyasını Yükle',
 'urlfilter local file redirection' => 'Yeniden yerel dosyaya yönlendir',
 'urlfilter log' => 'urlfiltre günlükleri',
 'urlfilter log summary' => 'URL filtre kaydı için toplam sayı',
@@ -2311,13 +2360,13 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'urlfilter logs' => 'URL Filtre Günlükleri',
 'urlfilter maintenance' => 'URL filtre bakımı',
 'urlfilter manage local file repository' => 'Yerel dosya deposunu yönetin',
-'urlfilter manage repository' => 'Depoyu yönet',
+'urlfilter manage repository' => 'Depoyu Yönet',
 'urlfilter minutes' => 'dakika',
 'urlfilter mode allow' => 'Ä°zin ver',
 'urlfilter mode block' => 'Engelle',
 'urlfilter mon' => 'P',
 'urlfilter monday' => 'Pzt',
-'urlfilter monthly' => 'aylık',
+'urlfilter monthly' => 'Aylık',
 'urlfilter msg text 1' => '1. mesaj satırı',
 'urlfilter msg text 2' => '2. mesaj satırı',
 'urlfilter msg text 3' => '3. mesaj satırı',
@@ -2327,6 +2376,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'urlfilter quota restart message' => 'Not: URL filtrenin yeniden baÅŸlatılması tüm kullanıcılar için zaman sayaçlarını sıfırlar',
 'urlfilter quota time error' => 'Zaman kotası için geçersiz deÄŸer',
 'urlfilter quota user error' => 'En az bir kullanıcı adı gereklidir',
+'urlfilter redirect template' => 'Sayfa ÅŸablonuna yönlendir',
 'urlfilter redirectpage' => 'Bu URL adresine yönlendir',
 'urlfilter remove file' => 'Deposundan dosyayı kaldır',
 'urlfilter renewal' => 'Yenile',
@@ -2336,7 +2386,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'urlfilter restart' => 'URL filtreyi yeniden baÅŸlat',
 'urlfilter restart message' => 'DeÄŸiÅŸen URL filtre kurallarının aktifleÅŸtirilmesi için yeniden baÅŸlatılmalıdır',
 'urlfilter restart notification' => 'DeÄŸiÅŸen kuralları aktifleÅŸtir',
-'urlfilter restore' => 'Yedek dosyasını içeri aktar',
+'urlfilter restore' => 'Yedek Dosyasını Ä°Ã§eri Aktar',
 'urlfilter restore results' => 'Sonuçları geri yükle',
 'urlfilter restore settings' => 'URL filtre ayarlarını geri yükle',
 'urlfilter restore success' => 'URL filtre yapılandırması geri yüklendi. URL filtresi yeni ayarlarını aktifleÅŸtirmek için yeniden baÅŸlatılması gerekir.',
@@ -2345,12 +2395,12 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'urlfilter sat' => 'C',
 'urlfilter saturday' => 'Cmt',
 'urlfilter save and restart' => 'Kaydet ve Yeniden BaÅŸlat',
-'urlfilter save schedule' => 'Güncelleme ayarlarını kaydet',
+'urlfilter save schedule' => 'Güncelleme Ayarlarını Kaydet',
 'urlfilter select blacklist' => 'Mevcut kara listeyi seçin',
 'urlfilter select multi' => 'Birden Ã§ok kategori seçmek için Ctrl tuÅŸuna basın',
 'urlfilter select source' => 'Ä°ndirmek için kaynağı seçin',
-'urlfilter set time constraints' => 'Zaman kısıtlamalarını ayarla',
-'urlfilter set user quota' => 'Kullanıcı kotasını ayarla',
+'urlfilter set time constraints' => 'Zaman Kısıtlamalarını Ayarla',
+'urlfilter set user quota' => 'Kullanıcı Kotasını Ayarla',
 'urlfilter show category' => 'Engellenen sayfada kategori göster',
 'urlfilter show dnserror' => '"DNS Hatası" URL adreslerini engellemek için kullan',
 'urlfilter show ip' => 'Engellenen sayfada IP göster',
@@ -2374,12 +2424,12 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'urlfilter unfiltered clients' => 'Yasaksız IP adresleri',
 'urlfilter update information' => 'Yüklenebilir güncelleÅŸtirilmiÅŸ bir sürümü var. Daha fazla bilgi için <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> adresini ziyaret edin.',
 'urlfilter update notification' => 'Güncelleme bildirimi!',
-'urlfilter update now' => 'Åžimdi güncelle',
+'urlfilter update now' => 'Åžimdi Güncelle',
 'urlfilter update results' => 'Kara liste güncelleÅŸtirme sonuçları',
 'urlfilter update rule' => 'Güncelle',
 'urlfilter upload background' => 'Resim yükle',
-'urlfilter upload blacklist' => 'Kara liste dosyası yükle',
-'urlfilter upload file' => 'Dosya yükle',
+'urlfilter upload blacklist' => 'Kara Liste Dosyası Yükle',
+'urlfilter upload file' => 'Dosya Yükle',
 'urlfilter upload file information 1' => 'Not',
 'urlfilter upload file information 2' => 'URL filtre depo deÄŸiÅŸikliklerini aktifleÅŸtirmek için yeniden baÅŸlatılması gerekir.',
 'urlfilter upload file text' => 'Yerel depoya dosya eklemek için aÅŸağıdan bir dosya yükleyin',
@@ -2396,7 +2446,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'urlfilter wed' => 'Ç',
 'urlfilter wednesday' => 'Çar',
 'urlfilter weekday error' => 'SeçilmiÅŸ en az bir gün olmalıdır',
-'urlfilter weekly' => 'haftalık',
+'urlfilter weekly' => 'Haftalık',
 'urlfilter whitelist always allowed' => 'Yasaklı istemciler için Ã¶zel beyaz liste izini',
 'urlfilter wrong filetype' => 'Uzantısı .tar.gz olan dosya yok',
 'usb modem on acm0' => 'ACM0 Ã¼zerindeki USB Modem',
@@ -2472,11 +2522,11 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'weeks' => 'hafta',
 'wildcards' => 'Joker karakterler',
 'wins server' => 'Wins Sunucusu',
-'wins support' => 'Wins DesteÄŸi',
+'wins support' => 'Wins desteÄŸi',
 'wireless' => 'KABLOSUZ AÄž',
 'wireless config added' => 'Kablosuz aÄŸ yapılandırma eklendi',
 'wireless config changed' => 'Kablosuz aÄŸ yapılandırma deÄŸiÅŸtirildi',
-'wireless configuration' => 'Kablosuz AÄŸ ayarları',
+'wireless configuration' => 'Kablosuz aÄŸ ayarları',
 'wlan client' => 'Kablosuz istemci',
 'wlan client advanced settings' => 'GeliÅŸmiÅŸ ayarlar',
 'wlan client and' => 've',
@@ -2507,7 +2557,8 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP',
 'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP',
 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
-'wlanap access point' => 'EriÅŸim Noktası',
+'wlan clients' => 'Kablosuz istemciler',
+'wlanap access point' => 'Access Point',
 'wlanap channel' => 'Kanal',
 'wlanap country' => 'Ãœlke Kodu',
 'wlanap debugging' => 'Hata ayıklama',
@@ -2529,7 +2580,7 @@ Dikkat! Kendinizi engelleyebilirsiniz.',
 'wlanap wlan settings' => 'WLan Ayarları',
 'wlanap wlan status' => 'WLan Durumu',
 'wol wakeup' => 'Kalk',
-'workgroup' => 'Çalışma Grubu',
+'workgroup' => 'Çalışma grubu',
 'written bytes' => 'yazılan bayt',
 'xtaccess all error' => 'Bu baÄŸlantı noktası yönlendirme kaydı yapıldığında tüm harici eriÅŸim ayarlanamaz.',
 'xtaccess bad transfert' => 'Bir baÄŸlantı noktası hedef aralığı belirtirseniz, kaynak aralığı ile aynı olmalıdır!',
index 50c94a638c6752abe0a4a1719b8a1f007bf2f8f3..697fab619fa7f25dacc12f8df15313de23a73e14 100644 (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        = 2.2.23
+VER        = 2.2.26
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
 
-$(DL_FILE)_MD5 = ca133de0e4b4b15316990a97186b9993
+$(DL_FILE)_MD5 = 254eda547f8d624604e4bf403241e617
 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
 
 install : $(TARGET)
index dc0d22c4130837eb3727e0916ca0a4ff68d68da5..437677b737a606f9afbe729a00e684b548257e85 100644 (file)
--- a/lfs/beep
+++ b/lfs/beep
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.2
+VER        = 1.3
 
 THISAPP    = beep-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d541419fd7e5642952d7b48cbb40c712
+$(DL_FILE)_MD5 = 49c340ceb95dbda3f97b2daafac7892a
 
 install : $(TARGET)
 
index 9e01b06cfb9c576625c887c46a3bbeba791b2358..36343de37c18e109ee8903e1bfdf83fabbe2f06f 100644 (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        = 2.0
+VER        = 2.1
 
 THISAPP    = hostapd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 26
+PAK_VER    = 28
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ba22e639bc57aa4035d2ea8ffa9bbbee
+$(DL_FILE)_MD5 = bb9c50e87c5af6f89f387e63911effac
 
 install : $(TARGET)
 
index 28387f3499a34e9aa2bf33a16d1890ac45ceb18d..02f97431a2318186c57dbed65374451cf17141f1 100644 (file)
@@ -185,13 +185,9 @@ $(TARGET) :
                /etc/rc.d/init.d/networking/red.up/23-RS-snort
        ln -sf ../../../../../usr/local/bin/qosctrl \
                /etc/rc.d/init.d/networking/red.up/24-RS-qos
-       ln -sf ../../../../../usr/local/bin/dialctrl.pl \
-               /etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
        ln -sf ../../squid /etc/rc.d/init.d/networking/red.up/27-RS-squid
        ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
        ln -sf ../../firewall /etc/rc.d/init.d/networking/red.down/20-RL-firewall
-       ln -sf ../../../../../usr/local/bin/dialctrl.pl \
-               /etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
 
        for i in green blue orange; do \
                ln -sf any /etc/rc.d/init.d/networking/$$i; \
index fcadd69e49e3b58740eb0f8f935d891b2bcd516c..687de3634f6f6942cdb43f66d0364a3710efe618 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
 
 include Config
 
-VER        = 3.10.32
+VER        = 3.10.33
 
 RPI_PATCHES = linux-3.10.27-grsec-943b563
-GRS_PATCHES = grsecurity-2.9.1-3.10.32-ipfire1.patch.xz
+GRS_PATCHES = grsecurity-2.9.1-3.10.33-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    = 37
+PAK_VER    = 38
 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                         = 58bfaf95f4e23be2d658dab0a7fb9615
+$(DL_FILE)_MD5                         = 01865f9c129f3c7eee51e25b3781a364
 rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 8cf81f48408306d93ccee59b58af2e92
-$(GRS_PATCHES)_MD5                     = b67dbf569e3f3657dad0e64ec951e1cc
+$(GRS_PATCHES)_MD5                     = c99be0018e8bc55fb2e2b8f0ea9783d5
 
 install : $(TARGET)
 
@@ -127,9 +127,6 @@ ifneq "$(KCFG)" "-headers"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
 endif
 
-       # Disable pcspeaker autoload
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.30-no-pcspkr-modalias.patch
-
        # Remove ACPI Blacklist message
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6-silence-acpi-blacklist.patch
 
@@ -150,6 +147,9 @@ endif
        # cs5535audio spams syslog if no ac97 was present (geos router)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch
 
+       # Add PC Engines APU led support
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-apu_leds.patch
+
        # Fix uevent PHYSDEVDRIVER
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
index d651162dcaa41c69fbed1d701f18d4675fee5378..bc6fa3cade62f9622a80010933cf997fc3aa4f54 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.5p1
+VER        = 6.6p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a084e7272b8cbd25afe0f5dce4802fef
+$(DL_FILE)_MD5 = 3e9800e6bca1fbac0eea4d41baa7f239
 
 install : $(TARGET)
 
index 13110d56285fd62ecd9a9e1e28f70eca52b0b3a4..4f5375c07faca4099e9369278e1cc217f7ffde44 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -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        = 3.6.22
+VER        = 3.6.23
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 56
+PAK_VER    = 57
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 59add4bb178ebc188d857bc13a508c0b
+$(DL_FILE)_MD5 = 2f7aee1dc5d31aefcb364600915b31dc
 
 install : $(TARGET)
 
index 9ac94de7558a579bd2c71334fc333c41e7c9d32e..600a16f46324fbd6e4986e65a937119a66c175e9 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.1.2rc1
+VER        = 5.1.2
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d0508e262f2ec45ab5428bb080bc1b31
+$(DL_FILE)_MD5 = d45a2e89c624bceaf2e53c9b9cdddf83
 
 install : $(TARGET)
 
index 15463c50d2e3cbf00dda5f455449f5e7a2093bed..7c3feabb7de6f734f398c7447c2259d5bc834c33 100644 (file)
--- a/lfs/sudo
+++ b/lfs/sudo
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.6.8p12
+VER        = 1.8.10p1
 
 THISAPP    = sudo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b29893c06192df6230dd5f340f3badf5
+$(DL_FILE)_MD5 = 1d9c2bc5aaf02608343d17b9a666e8e1
 
 install : $(TARGET)
 
@@ -70,10 +70,16 @@ $(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 -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-envvar_fix-1.patch
-       cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib \
-                           --enable-noargs-shell --with-ignore-dot --with-all-insults \
-                           --enable-shell-sets-home && \
+       cd $(DIR_APP) && \
+               ./configure \
+                       --prefix=/usr \
+                       --libexecdir=/usr/lib \
+                       --with-logging=syslog \
+                       --with-logfac=authpriv \
+                       --with-env-editor \
+                       --with-ignore-dot \
+                       --with-tty-tickets \
+                       --with-passpromt="[sudo] password for %p: "
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
index edf5ff22dea4ed7565ac9a52902862f85f3bfaf7..c36b7a34f64b75720d1a5c71701b9e84191a63d9 100644 (file)
 
 include Config
 
-VER        = 2012h
-TZDATA_VER = 2012h
-TZCODE_VER = 2012h
+VER        = 2014a
+TZDATA_VER = $(VER)
+TZCODE_VER = $(VER)
 
 THISAPP    = tzdata-$(VER)
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+FILES      = africa antarctica asia australasia europe \
+       northamerica southamerica pacificnew etcetera backward
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -42,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
 tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz
 tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
 
-tzdata$(TZDATA_VER).tar.gz_MD5 = b937335e087fb85b7f8e3ce33e69184b
-tzcode$(TZCODE_VER).tar.gz_MD5 = 44b3b6c3e50240ac44f16437040a7ba2
+tzdata$(TZDATA_VER).tar.gz_MD5 = 423a11bcffc10dda578058cf1587d048
+tzcode$(TZCODE_VER).tar.gz_MD5 = 77ccbb720f0f2076f12dff6ded70eb98
 
 install : $(TARGET)
 
@@ -77,16 +80,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        tar axf $(DIR_DL)/tzdata$(TZDATA_VER).tar.gz -C $(DIR_APP)
        tar axf $(DIR_DL)/tzcode$(TZCODE_VER).tar.gz -C $(DIR_APP)
 
-       cd $(DIR_APP) && make TOPDIR=/usr ETCDIR=/tmp LIBDIR=/tmp MANDIR=/tmp \
-               TZDIR=/usr/share/zoneinfo all
-       cd $(DIR_APP) && make TOPDIR=/usr ETCDIR=/tmp LIBDIR=/tmp MANDIR=/tmp \
-               TZDIR=/usr/share/zoneinfo install
+       cd $(DIR_APP) && mkdir -pv zoneinfo/{,posix,right}
+       cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo \
+               -L /dev/null -p GMT $(FILES)
+       cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo/posix \
+               -L /dev/null $(FILES)
+       cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo/right \
+               -L /dev/null $(FILES)
 
-       -mkdir -pv /usr/share/zoneinfo
-       mv -v /usr/share/zoneinfo-posix /usr/share/zoneinfo/posix
-       mv -v /usr/share/zoneinfo-leaps /usr/share/zoneinfo/right
-       rm -vf /usr/share/zoneinfo/localtime
+       rm -rf /usr/share/zoneinfo
+       cd $(DIR_APP) && cp -prd zoneinfo /usr/share
+       cd $(DIR_APP) && install -p -m 644 zone.tab iso3166.tab \
+               /usr/share/zoneinfo
 
+       rm -vf /usr/share/zoneinfo/localtime
        cp -vf /usr/share/zoneinfo/GMT /etc/localtime
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/lfs/vdr b/lfs/vdr
index 161b04ee1e8cd3446b7d51cca0baeb9ba85bce52..52ecdd54354fe21c86f712beb4cd927d8af20e0a 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.3
+VER        = 2.0.5
 
 # VDRPLUGVER must match with APIVERSION in config.h
 # after change this update also all vdr plugins
@@ -37,7 +37,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = "vdr_streamdev"
 
@@ -63,9 +63,9 @@ MAKE_OPTIONS = \
 
 objects = $(DL_FILE)
 
-$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5  = dd8fb1642bdfa7feb0e9a8ae41e9ef2f
+$(DL_FILE)_MD5 = f58b9836a60440fde84480a2e37ee91d
 
 install : $(TARGET)
 
diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi
new file mode 100644 (file)
index 0000000..2cf34e7
--- /dev/null
@@ -0,0 +1,121 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2013  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        #
+# 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        = 1.0.6
+THISAPP    = vdr-plugin-dvbapi-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = vdr_dvbapi
+PAK_VER    = 1
+
+DEPS       = ""
+
+VDRPLUGVER = 2.0.0
+
+EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS    += $(EXTRA_FLAGS)
+CXXFLAGS  += $(EXTRA_FLAGS)
+
+CSAFLAGS     =  -O3 -fexpensive-optimizations -funroll-loops
+CSAFLAGS-sse = $(CSAFLAGS) -mmmx -msse -msse2 -msse3
+PARALLEL     = PARALLEL_64_LONG
+PARALLEL-sse = PARALLEL_128_SSE2
+
+define BUILD
+       cp -a $(DIR_APP) $(DIR_APP)-build$(1)
+       cd $(DIR_APP)-build$(1) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
+               CFLAGS="$(CFLAGS$(1))" CXXFLAGS="$(CXXFLAGS$(1))" \
+               CSAFLAGS="$(CSAFLAGS$(1))" PARALLEL="$(PARALLEL$(1))" \
+               LOCALEDIR=$$(pwd)/locale all
+
+       -mkdir -pv /etc/vdr/plugins/dvbapi
+       cd $(DIR_APP)-build$(1) && install -m 755 libvdr-dvbapi.so \
+               /usr/lib/vdr/libvdr-dvbapi.so.$(VDRPLUGVER)$(1)
+endef
+
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 6a8024b2970beba8eadc1acaa86805e7
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download : $(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# 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 axf $(DIR_DL)/$(DL_FILE)
+
+ifeq "$(MACHINE)" "i586"
+       # Build an SSE enabled version.
+       $(call BUILD,-sse)
+endif
+
+       # Build normal version.
+       $(call BUILD)
+
+       echo "#" > /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+       echo "# Command line parameters for vdr-plugin-dvbapi" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+       echo "#" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+       echo "# For more details see:" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+       echo "#   - \`vdr --help -Pdvbapi\`" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+       echo "PLUGIN_OPTIONS=\"\"" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+
+       @rm -rf $(DIR_APP)*
+       @$(POSTBUILD)
diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg
new file mode 100644 (file)
index 0000000..fddd075
--- /dev/null
@@ -0,0 +1,99 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2013  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        #
+# 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
+
+GIT_VER    = 69b47ba4bf0195fd6820beb2cf4f7c7ea31f4011
+VER        = master
+THISAPP    = vdr-plugin-eepg-$(VER)
+DL_FILE    = vdr-plugin-eepg-$(GIT_VER).tar.bz2
+
+DL_FROM    = http://projects.vdr-developer.org/git/vdr-plugin-eepg.git/snapshot
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = vdr_eepg
+PAK_VER    = 1
+
+DEPS       = ""
+
+VDRPLUGVER = 2.0.0
+
+EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS    += $(EXTRA_FLAGS)
+CXXFLAGS  += $(EXTRA_FLAGS)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5  = 0d8049949263f9a2b8deb2ae9919bc49
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download : $(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# 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 axf $(DIR_DL)/$(DL_FILE)
+
+       cd $(DIR_SRC) && mv vdr-plugin-eepg-$(GIT_VER) $(THISAPP)
+
+       cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
+               CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+               LOCALEDIR=$$(pwd)/locale all
+
+       mkdir -pv /etc/vdr/plugins/eepg
+       cd $(DIR_APP) && install -m 755 libvdr-eepg.so \
+               /usr/lib/vdr/libvdr-eepg.so.$(VDRPLUGVER)
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
index 1172e602e87e9b9ee7f5331ac7ae8541b2786df0..754bb01532b30fddd3f374188e064fc8df91a79c 100644 (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        = 2.0
+VER        = 2.1
 
 THISAPP    = wpa_supplicant-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3be2ebfdcced52e00eda0afe2889839d
+$(DL_FILE)_MD5 = e96b8db5a8171cd17a5b2012d6ad7cc7
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 50fca8f7644c5a1d65f7e209d9fcf89f87f2fa6f..61b07ffcf28338daa7e9506a32e2b0f4fae12264 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.15"                                                 # Version number
-CORE="76-beta2"                                                        # Core Level (Filename)
+CORE="76-beta3"                                                        # Core Level (Filename)
 PAKFIRE_CORE="76"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
@@ -681,6 +681,8 @@ buildipfire() {
   ipfiremake vdr_streamdev
   ipfiremake vdr_vnsiserver3
   ipfiremake vdr_epgsearch
+  ipfiremake vdr_dvbapi
+  ipfiremake vdr_eepg
   ipfiremake w_scan
   ipfiremake icecast
   ipfiremake icegenerator
index 06a714a329046879d5eeb6c0fcd08418790692ed..a67af7056486ad4e93db4786100d0a83ea80d100 100644 (file)
@@ -106,9 +106,10 @@ iptables_init() {
 
        # Block OpenVPN transfer networks
        iptables -N OVPNBLOCK
-       for i in INPUT FORWARD; do
-               iptables -A ${i} -j OVPNBLOCK
-       done
+       iptables -A INPUT   -i tun+ -j OVPNBLOCK
+       iptables -A OUTPUT  -o tun+ -j OVPNBLOCK
+       iptables -A FORWARD -i tun+ -j OVPNBLOCK
+       iptables -A FORWARD -o tun+ -j OVPNBLOCK
 
        # OpenVPN transfer network translation
        iptables -t nat -N OVPNNAT
@@ -188,16 +189,6 @@ iptables_init() {
        iptables -t nat -N NAT_SOURCE
        iptables -t nat -A POSTROUTING -j NAT_SOURCE
 
-       # RED chain, used for the red interface
-       iptables -N REDINPUT
-       iptables -A INPUT -j REDINPUT
-       iptables -N REDFORWARD
-       iptables -A FORWARD -j REDFORWARD
-       iptables -t nat -N REDNAT
-       iptables -t nat -A POSTROUTING -j REDNAT
-
-       iptables_red
-
        # Custom prerouting chains (for transparent proxy)
        iptables -t nat -N SQUID
        iptables -t nat -A PREROUTING -j SQUID
@@ -206,12 +197,53 @@ iptables_init() {
        iptables -t nat -N NAT_DESTINATION
        iptables -t nat -A PREROUTING -j NAT_DESTINATION
 
+       iptables -t mangle -N NAT_DESTINATION
+       iptables -t mangle -A PREROUTING -j NAT_DESTINATION
+
+       iptables -t nat -N NAT_DESTINATION_FIX
+       iptables -t nat -A POSTROUTING -j NAT_DESTINATION_FIX
+
+       iptables -t nat -A NAT_DESTINATION_FIX \
+               -m mark --mark 1 -j SNAT --to-source "${GREEN_ADDRESS}"
+
+       if [ -n "${BLUE_ADDRESS}" ]; then
+               iptables -t nat -A NAT_DESTINATION_FIX \
+                       -m mark --mark 2 -j SNAT --to-source "${BLUE_ADDRESS}"
+       fi
+
+       if [ -n "${ORANGE_ADDRESS}" ]; then
+               iptables -t nat -A NAT_DESTINATION_FIX \
+                       -m mark --mark 3 -j SNAT --to-source "${ORANGE_ADDRESS}"
+       fi
+
        # upnp chain for our upnp daemon
        iptables -t nat -N UPNPFW
        iptables -t nat -A PREROUTING -j UPNPFW
        iptables -N UPNPFW
        iptables -A FORWARD -m conntrack --ctstate NEW -j UPNPFW
 
+       # RED chain, used for the red interface
+       iptables -N REDINPUT
+       iptables -A INPUT -j REDINPUT
+       iptables -N REDFORWARD
+       iptables -A FORWARD -j REDFORWARD
+       iptables -t nat -N REDNAT
+       iptables -t nat -A POSTROUTING -j REDNAT
+
+       # Filter logging of incoming broadcasts.
+       iptables -N BROADCAST_FILTER
+       iptables -A INPUT -j BROADCAST_FILTER
+
+       iptables -A BROADCAST_FILTER -i "${GREEN_DEV}" -d "${GREEN_BROADCAST}" -j DROP
+
+       if [ -n "${BLUE_DEV}" -a -n "${BLUE_BROADCAST}" ]; then
+               iptables -A BROADCAST_FILTER -i "${BLUE_DEV}" -d "${BLUE_BROADCAST}" -j DROP
+       fi
+
+       if [ -n "${ORANGE_DEV}" -a -n "${ORANGE_BROADCAST}" ]; then
+               iptables -A BROADCAST_FILTER -i "${ORANGE_DEV}" -d "${ORANGE_BROADCAST}" -j DROP
+       fi
+
        # Apply OpenVPN firewall rules
        /usr/local/bin/openvpnctrl --firewall-rules
 
@@ -226,10 +258,11 @@ iptables_init() {
        iptables -N POLICYOUT
        iptables -A OUTPUT -j POLICYOUT
 
+       # Initialize firewall policies.
        /usr/sbin/firewall-policy
 
-       # read new firewall
-       /usr/local/bin/firewallctrl
+       # Install firewall rules for the red interface.
+       iptables_red
 }
 
 iptables_red() {
index 52ef2705d9385d0b75eb2ced4667765833f48d7c..d75a2e96c674a5849be6f6d657d11f838e980477 100644 (file)
@@ -65,6 +65,11 @@ case "${1}" in
                setup_netdev_trigger alix:2 ${RED_DEV} rx
                setup_netdev_trigger alix:3 ${RED_DEV} tx
 
+               # Apu LED start
+               setup_heartbeat_trigger apu:1
+               setup_netdev_trigger apu:2 ${RED_DEV} rx
+               setup_netdev_trigger apu:3 ${RED_DEV} tx
+
                # Geos LED start
                setup_heartbeat_trigger geos:1
                setup_netdev_trigger geos:2 ${RED_DEV} rx
@@ -97,6 +102,12 @@ case "${1}" in
                disable_led_trigger alix:2
                disable_led_trigger alix:3
 
+               # Apu LED stop
+               disable_led_trigger apu:1
+               enable_led apu:1
+               disable_led_trigger apu:2
+               disable_led_trigger apu:3
+
                # Geos LED stop
                disable_led_trigger geos:1
                enable_led geos:1
index 28df551038efaa9dae66e6cae0f1b8f5a7f87a81..b09737e39526a8e041fe975818283873f97ee777 100644 (file)
@@ -175,6 +175,14 @@ case "${1}" in
                                boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
                                br2684ctl -c0 -e${ENCAP} -a0.${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}
+                               else
+                                       ip link set dev nas0 address $(cat /sys/class/net/green0/address)
+                               fi
+
                                if [ "$TYPE" == "pppoeatm" ]; then
                                        TYPE="pppoe"
                                fi
index 272db0faade2dc3abb79687ad1d077c7308b4175..462ce77cce0b99019a09cc8c3df75161b5e94924 100644 (file)
@@ -365,6 +365,7 @@ ERROR:
 }
 
 void setFirewallRules(void) {
+       char command[STRING_SIZE];
        char protocol[STRING_SIZE] = "";
        char dport[STRING_SIZE] = "";
        char dovpnip[STRING_SIZE] = "";
@@ -405,11 +406,15 @@ void setFirewallRules(void) {
        if (!strcmp(enableorange, "on") && strlen(orangeif))
                addRule(OVPNINPUT, orangeif, protocol, dport);
 
+       /* Allow ICMP error messages to pass. */
+       snprintf(command, STRING_SIZE - 1, "/sbin/iptables -A %s -p icmp"
+               " -m conntrack --ctstate RELATED -j RETURN", OVPNBLOCK);
+       executeCommand(command);
+
        // read connection configuration
        connection *conn = getConnections();
 
        // set firewall rules for n2n connections
-       char command[STRING_SIZE];
        char *local_subnet_address = NULL;
        char *transfer_subnet_address = NULL;
        while (conn != NULL) {
diff --git a/src/patches/linux-2.6.30-no-pcspkr-modalias.patch b/src/patches/linux-2.6.30-no-pcspkr-modalias.patch
deleted file mode 100644 (file)
index 439269c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
-index 34f4d2e..3e40c70 100644
---- a/drivers/input/misc/pcspkr.c
-+++ b/drivers/input/misc/pcspkr.c
-@@ -24,7 +24,6 @@
- MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
- MODULE_DESCRIPTION("PC Speaker beeper driver");
- MODULE_LICENSE("GPL");
--MODULE_ALIAS("platform:pcspkr");
- static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
- {
diff --git a/src/patches/linux-3.10-apu_leds.patch b/src/patches/linux-3.10-apu_leds.patch
new file mode 100644 (file)
index 0000000..53d389a
--- /dev/null
@@ -0,0 +1,215 @@
+diff -Naur linux-3.10.33.org/arch/x86/Kconfig linux-3.10.33/arch/x86/Kconfig
+--- linux-3.10.33.org/arch/x86/Kconfig 2014-03-07 06:58:45.000000000 +0100
++++ linux-3.10.33/arch/x86/Kconfig     2014-03-17 17:02:46.703135023 +0100
+@@ -2199,6 +2199,12 @@
+          - AC adapter status updates
+          - Battery status updates
++config APULED
++      bool "PCEngines APU Led Support"
++      depends on DMI
++      ---help---
++        This option enables system support for the PCEngines APU.
++
+ config ALIX
+       bool "PCEngines ALIX System Support (LED setup)"
+       select GPIOLIB
+diff -Naur linux-3.10.33.org/arch/x86/platform/apu/apu-led.c linux-3.10.33/arch/x86/platform/apu/apu-led.c
+--- linux-3.10.33.org/arch/x86/platform/apu/apu-led.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.33/arch/x86/platform/apu/apu-led.c      2014-03-17 17:00:36.187188456 +0100
+@@ -0,0 +1,181 @@
++/*
++ * LEDs driver for PCEngines apu
++ *
++ * Copyright (C) 2013 Christian Herzog <daduke@daduke.org>, based on
++ * Petr Leibman's leds-alix
++ * Hardware presence check added by Arne Fitzenreiter <arne_f@ipfire.org>
++ * Based on leds-wrap.c
++ * Hardware info taken from http://www.dpie.com/manuals/miniboards/kontron/KTD-S0043-0_KTA55_SoftwareGuide.pdf
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/leds.h>
++#include <linux/err.h>
++#include <asm/io.h>
++#include <linux/dmi.h>
++
++#define DRVNAME               "apu-led"
++#define BASEADDR      (0xFED801BD)
++#define LEDON         (0x8)
++#define LEDOFF                (0xC8)
++
++static struct platform_device *pdev;
++unsigned int *p1;
++unsigned int *p2;
++unsigned int *p3;
++
++static void apu_led_set_1(struct led_classdev *led_cdev,
++              enum led_brightness value) {
++      if (value)
++              iowrite8(LEDON, p1);
++      else
++              iowrite8(LEDOFF, p1);
++}
++
++static void apu_led_set_2(struct led_classdev *led_cdev,
++              enum led_brightness value) {
++      if (value)
++              iowrite8(LEDON, p2);
++      else
++              iowrite8(LEDOFF, p2);
++}
++
++static void apu_led_set_3(struct led_classdev *led_cdev,
++              enum led_brightness value) {
++      if (value)
++              iowrite8(LEDON, p3);
++      else
++              iowrite8(LEDOFF, p3);
++}
++
++static struct led_classdev apu_led_1 = {
++      .name           = "apu:1",
++      .brightness_set = apu_led_set_1,
++};
++
++static struct led_classdev apu_led_2 = {
++      .name           = "apu:2",
++      .brightness_set = apu_led_set_2,
++};
++
++static struct led_classdev apu_led_3 = {
++      .name           = "apu:3",
++      .brightness_set = apu_led_set_3,
++};
++
++
++#ifdef CONFIG_PM
++static int apu_led_suspend(struct platform_device *dev,
++              pm_message_t state)
++{
++      led_classdev_suspend(&apu_led_1);
++      led_classdev_suspend(&apu_led_2);
++      led_classdev_suspend(&apu_led_3);
++      return 0;
++}
++
++static int apu_led_resume(struct platform_device *dev)
++{
++      led_classdev_resume(&apu_led_1);
++      led_classdev_resume(&apu_led_2);
++      led_classdev_resume(&apu_led_3);
++      return 0;
++}
++#else
++#define apu_led_suspend NULL
++#define apu_led_resume NULL
++#endif
++
++static int apu_led_probe(struct platform_device *pdev)
++{
++      int ret;
++
++      ret = led_classdev_register(&pdev->dev, &apu_led_1);
++      if (ret == 0)
++      {
++              ret = led_classdev_register(&pdev->dev, &apu_led_2);
++              if (ret >= 0)
++              {
++                      ret = led_classdev_register(&pdev->dev, &apu_led_3);
++                      if (ret < 0)
++                              led_classdev_unregister(&apu_led_2);
++              }
++              if (ret < 0)
++                      led_classdev_unregister(&apu_led_1);
++      }
++      return ret;
++}
++
++static int apu_led_remove(struct platform_device *pdev)
++{
++      led_classdev_unregister(&apu_led_1);
++      led_classdev_unregister(&apu_led_2);
++      led_classdev_unregister(&apu_led_3);
++      return 0;
++}
++
++static struct platform_driver apu_led_driver = {
++      .probe          = apu_led_probe,
++      .remove         = apu_led_remove,
++      .suspend        = apu_led_suspend,
++      .resume         = apu_led_resume,
++      .driver         = {
++      .name           = DRVNAME,
++      .owner          = THIS_MODULE,
++      },
++};
++
++static int __init apu_led_init(void)
++{
++      int ret=0;
++      const char *vendor, *product;
++
++      vendor = dmi_get_system_info(DMI_SYS_VENDOR);
++      if (!vendor || strcmp(vendor, "PC Engines"))
++              goto out;
++
++      product = dmi_get_system_info(DMI_PRODUCT_NAME);
++      if (!product || strcmp(product, "APU"))
++              goto out;
++
++      printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
++             KBUILD_MODNAME, vendor, product);
++
++      ret = platform_driver_register(&apu_led_driver);
++      if (ret < 0)
++              goto out;
++
++      pdev = platform_device_register_simple(DRVNAME, -1, NULL, 0);
++      if (IS_ERR(pdev)) {
++              ret = PTR_ERR(pdev);
++              platform_driver_unregister(&apu_led_driver);
++              goto out;
++      }
++
++      p1 = ioremap(BASEADDR, 1);
++      p2 = ioremap(BASEADDR+1, 1);
++      p3 = ioremap(BASEADDR+2, 1);
++
++out:
++      return ret;
++}
++
++static void __exit apu_led_exit(void)
++{
++      platform_device_unregister(pdev);
++      platform_driver_unregister(&apu_led_driver);
++}
++
++module_init(apu_led_init);
++module_exit(apu_led_exit);
++
++MODULE_AUTHOR("Christian Herzog");
++MODULE_DESCRIPTION("PCEngines apu LED driver");
++MODULE_LICENSE("GPL");
+diff -Naur linux-3.10.33.org/arch/x86/platform/apu/Makefile linux-3.10.33/arch/x86/platform/apu/Makefile
+--- linux-3.10.33.org/arch/x86/platform/apu/Makefile   1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.33/arch/x86/platform/apu/Makefile       2014-03-17 17:05:19.245651480 +0100
+@@ -0,0 +1 @@
++obj-$(CONFIG_APULED)          += apu-led.o
+diff -Naur linux-3.10.33.org/arch/x86/platform/Makefile linux-3.10.33/arch/x86/platform/Makefile
+--- linux-3.10.33.org/arch/x86/platform/Makefile       2014-03-07 06:58:45.000000000 +0100
++++ linux-3.10.33/arch/x86/platform/Makefile   2014-03-17 14:53:15.078571307 +0100
+@@ -1,4 +1,5 @@
+ # Platform specific code goes here
++obj-y += apu/
+ obj-y += ce4100/
+ obj-y += efi/
+ obj-y += geode/
index 6606095b1f3e61edad3c2d8af2df4642829fac14..71eb24e481e9b208a9563bb6855c230a37b2accf 100644 (file)
@@ -1,8 +1,6 @@
-diff --git a/src/_updown/_updown.in b/src/_updown/_updown.in
-index 3a40e21..d9f3ea0 100644
 --- a/src/_updown/_updown.in
 +++ b/src/_updown/_updown.in
-@@ -193,6 +193,29 @@ custom:*)         # custom parameters (see above CAUTION comment)
+@@ -178,6 +178,29 @@
        ;;
  esac
  
@@ -32,7 +30,7 @@ index 3a40e21..d9f3ea0 100644
  # utility functions for route manipulation
  # Meddling with this stuff should not be necessary and requires great care.
  uproute() {
-@@ -397,12 +420,12 @@ up-host:iptables)
+@@ -407,12 +430,12 @@
        # connection to me, with (left/right)firewall=yes, coming up
        # This is used only by the default updown script, not by your custom
        # ones, so do not mess with it; see CAUTION comment up at top.
@@ -46,9 +44,9 @@ index 3a40e21..d9f3ea0 100644
 -          -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
 +          -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50
        #
-       # log IPsec host connection setup
-       if [ $VPN_LOGGING ]
-@@ -410,10 +433,10 @@ up-host:iptables)
+       # allow IPIP traffic because of the implicit SA created by the kernel if
+       # IPComp is used (for small inbound packets that are not compressed)
+@@ -428,10 +451,10 @@
          if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
          then
            logger -t $TAG -p $FAC_PRIO \
@@ -61,7 +59,7 @@ index 3a40e21..d9f3ea0 100644
          fi
        fi
        ;;
-@@ -421,12 +444,12 @@ down-host:iptables)
+@@ -439,12 +462,12 @@
        # connection to me, with (left/right)firewall=yes, going down
        # This is used only by the default updown script, not by your custom
        # ones, so do not mess with it; see CAUTION comment up at top.
@@ -75,9 +73,9 @@ index 3a40e21..d9f3ea0 100644
 -          -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
 +          -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50
        #
-       # log IPsec host connection teardown
-       if [ $VPN_LOGGING ]
-@@ -434,10 +457,10 @@ down-host:iptables)
+       # IPIP exception teardown
+       if [ -n "$PLUTO_IPCOMP" ]
+@@ -459,10 +482,10 @@
          if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
          then
            logger -t $TAG -p $FAC_PRIO -- \
@@ -90,7 +88,7 @@ index 3a40e21..d9f3ea0 100644
          fi
        fi
        ;;
-@@ -447,24 +470,24 @@ up-client:iptables)
+@@ -472,24 +495,24 @@
        # ones, so do not mess with it; see CAUTION comment up at top.
        if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ]
        then
@@ -113,16 +111,26 @@ index 3a40e21..d9f3ea0 100644
 -        iptables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
 +        iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
              -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
-             -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+-            -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
 -        iptables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++            -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j RETURN
 +        iptables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
              -s $PLUTO_MY_CLIENT $S_MY_PORT \
 -            -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
 +            -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j MARK --set-mark 50
        fi
        #
-       # log IPsec client connection setup
-@@ -473,12 +496,51 @@ up-client:iptables)
+       # allow IPIP traffic because of the implicit SA created by the kernel if
+@@ -497,7 +520,7 @@
+       # INPUT is correct here even for forwarded traffic.
+       if [ -n "$PLUTO_IPCOMP" ]
+       then
+-        iptables -I INPUT 1 -i $PLUTO_INTERFACE -p 4 \
++        iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p 4 \
+             -s $PLUTO_PEER -d $PLUTO_ME $IPSEC_POLICY_IN -j ACCEPT
+       fi
+       #
+@@ -507,12 +530,51 @@
          if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
          then
            logger -t $TAG -p $FAC_PRIO \
@@ -176,7 +184,7 @@ index 3a40e21..d9f3ea0 100644
        ;;
  down-client:iptables)
        # connection to client subnet, with (left/right)firewall=yes, going down
-@@ -486,28 +548,28 @@ down-client:iptables)
+@@ -520,34 +582,34 @@
        # ones, so do not mess with it; see CAUTION comment up at top.
        if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ]
        then
@@ -202,8 +210,9 @@ index 3a40e21..d9f3ea0 100644
 +        iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
              -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
              -d $PLUTO_MY_CLIENT $D_MY_PORT \
-                $IPSEC_POLICY_IN -j ACCEPT
+-               $IPSEC_POLICY_IN -j ACCEPT
 -        iptables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++               $IPSEC_POLICY_IN -j RETURN
 +        iptables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
              -s $PLUTO_MY_CLIENT $S_MY_PORT \
              -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
@@ -211,8 +220,15 @@ index 3a40e21..d9f3ea0 100644
 +               $IPSEC_POLICY_OUT -j MARK --set-mark 50
        fi
        #
-       # log IPsec client connection teardown
-@@ -516,12 +578,51 @@ down-client:iptables)
+       # IPIP exception teardown
+       if [ -n "$PLUTO_IPCOMP" ]
+       then
+-        iptables -D INPUT -i $PLUTO_INTERFACE -p 4 \
++        iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p 4 \
+             -s $PLUTO_PEER -d $PLUTO_ME $IPSEC_POLICY_IN -j ACCEPT
+       fi
+       #
+@@ -557,12 +619,51 @@
          if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
          then
            logger -t $TAG -p $FAC_PRIO -- \
@@ -266,7 +282,7 @@ index 3a40e21..d9f3ea0 100644
        ;;
  #
  # IPv6
-@@ -556,10 +657,10 @@ up-host-v6:iptables)
+@@ -597,10 +698,10 @@
        # connection to me, with (left/right)firewall=yes, coming up
        # This is used only by the default updown script, not by your custom
        # ones, so do not mess with it; see CAUTION comment up at top.
@@ -279,7 +295,7 @@ index 3a40e21..d9f3ea0 100644
            -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
            -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
        #
-@@ -580,10 +681,10 @@ down-host-v6:iptables)
+@@ -621,10 +722,10 @@
        # connection to me, with (left/right)firewall=yes, going down
        # This is used only by the default updown script, not by your custom
        # ones, so do not mess with it; see CAUTION comment up at top.
@@ -292,7 +308,7 @@ index 3a40e21..d9f3ea0 100644
            -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
            -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
        #
-@@ -606,10 +707,10 @@ up-client-v6:iptables)
+@@ -647,10 +748,10 @@
        # ones, so do not mess with it; see CAUTION comment up at top.
        if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ]
        then
@@ -305,7 +321,7 @@ index 3a40e21..d9f3ea0 100644
              -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
              -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
        fi
-@@ -618,10 +719,10 @@ up-client-v6:iptables)
+@@ -659,10 +760,10 @@
        # or sometimes host access via the internal IP is needed
        if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
        then
@@ -318,7 +334,7 @@ index 3a40e21..d9f3ea0 100644
              -s $PLUTO_MY_CLIENT $S_MY_PORT \
              -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
        fi
-@@ -645,11 +746,11 @@ down-client-v6:iptables)
+@@ -686,11 +787,11 @@
        # ones, so do not mess with it; see CAUTION comment up at top.
        if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ]
        then
@@ -332,7 +348,7 @@ index 3a40e21..d9f3ea0 100644
              -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
              -d $PLUTO_MY_CLIENT $D_MY_PORT \
                 $IPSEC_POLICY_IN -j ACCEPT
-@@ -659,11 +760,11 @@ down-client-v6:iptables)
+@@ -700,11 +801,11 @@
        # or sometimes host access via the internal IP is needed
        if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
        then
diff --git a/src/scripts/dialctrl.pl b/src/scripts/dialctrl.pl
deleted file mode 100644 (file)
index b0abab7..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/usr/bin/perl
-#
-# Dialup Statistics for IPFire
-# based on SilverStar's work on
-# http://goodymuc.go.funpic.de
-#
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-($sec,$min,$hour,$mday,$mon,$year,$wday,$ydat,$isdst)=localtime();
-             $jahr=$year;
-             $monat=$mon+1;
-             $tag=$mday;
-             $jahr=$year;
-
-$jahr=$year +1900;
-
-if (length($monat) == 1)
-{
-    $monat="0$monat";
-}
-if(length($tag) == 1)
-{
-   $tag="0$tag";
-}
-if(length($hour) == 1)
-{
-   $hour="0$hour";
-}
-if(length($min) == 1)
-{
-   $min="0$min";
-}
-if(length($sec) == 1)
-{
-   $sec="0$sec";
-}
-
-my $s_date = $tag."/".$monat."/".$jahr;
-my $s_time = $hour.":".$min.":".$sec;
-my $file_log = "/var/log/counter/dialup.log";
-my $file_connect = "/var/log/counter/connect";
-my $file_reset = "/var/log/counter/reset";
-
-if ($ARGV[0] eq 'up') {
-       if (! -e "$file_log") {
-               &new;
-       } else {
-               open(CONNECT,">$file_connect");
-               close(CONNECT);
-               open(COUNTER,"<$file_log");
-               $line = <COUNTER>;
-               ($start,$update,$up,$down,$rec,$on,$bit) = split(/\|/,$line);
-               close(COUNTER);
-               $up++;
-               $update = $s_date." on ".$s_time;
-               open(COUNTER,">$file_log");
-               print COUNTER "$start\|$update\|$up\|$down\|$rec\|$on\|$bit";
-               close(COUNTER);
-       }
-}
-
-if ($ARGV[0] eq 'down') {
-       if (! -e "$file_log") {
-               &new;
-       } else {
-               open(COUNTER,"<$file_log");
-               $line = <COUNTER>;
-               ($start,$update,$up,$down,$rec,$on,$bit) = split(/\|/,$line);
-               close(COUNTER);
-               $on =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/;
-               $d1 = $1; $h1 = $2; $m1 = $3; $s1 = $4;
-               $con = &General::age("$file_connect");
-               $con =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/;
-               $d2 = $1; $h2 = $2; $m2 = $3; $s2 = $4;
-               $sum_d = ($d1 + $d2) * 86400;
-               $sum_h = ($h1 + $h2) * 3600;
-               $sum_m = ($m1 + $m2) * 60;
-               $sum_s = ($s1 + $s2);
-               $sum_1 = $sum_d + $sum_h + $sum_m + $sum_s;
-               $d = int($sum_1 / 86400);
-               $totalhours = int($sum_1 / 3600);
-               $h = $totalhours % 24;
-               $totalmins = int($sum_1 / 60);
-               $m = $totalmins % 60;
-               $s = $sum_1 % 60;
-               $on = "${d}d ${h}h ${m}m ${s}s";
-               $down++;
-               $update = $s_date." on ".$s_time;
-               open(COUNTER,">$file_log");
-               print COUNTER "$start\|$update\|$up\|$down\|$rec\|$on\|$bit";
-               close(COUNTER);
-       }
-}
-
-if ($ARGV[0] eq 'rec') {
-       if (! -e "$file_log") {
-               &new;
-       } else {
-               open(COUNTER,"<$file_log");
-               $line = <COUNTER>;
-               ($start,$update,$up,$down,$rec,$on,$bit) = split(/\|/,$line);
-               close(COUNTER);
-               $rec++;
-               $update = $s_date." on ".$s_time;
-               open(COUNTER,">$file_log");
-               print COUNTER "$start\|$update\|$up\|$down\|$rec\|$on\|$bit";
-               close(COUNTER);
-       }
-}
-
-elsif ($ARGV[0] eq 'show') {
-if (! -e "$file_log") {
-               &new;
-       }
-else {
-               open(COUNTER,"<$file_log");
-                       $line = <COUNTER>;
-                       ($start,$update,$up,$down,$rec,$on,$bit) = split(/\|/,$line);
-                       $on =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/;
-                       $d1 = $1; $h1 = $2; $m1 = $3; $s1 = $4;
-               close(COUNTER);
-               if ( ! -e "${General::swroot}/red/active") {
-                       $timecon = "0d 0h 0m 0s";
-               } else {
-                       $timecon = &General::age("$file_connect");
-               }
-               $timecon =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/;
-               $d2 = $1; $h2 = $2; $m2 = $3; $s2 = $4;
-               $timeres = &General::age("$file_reset");
-               $timeres =~ /(\d+)d\s+(\d+)h\s+(\d+)m\s+(\d+)s/;
-               $d3 = $1; $h3 = $2; $m3 = $3; $s3 = $4;
-               $sum_d1 = ($d1 + $d2) * 86400;
-               $sum_h1 = ($h1 + $h2) * 3600;
-               $sum_m1 = ($m1 + $m2) * 60;
-               $sum_s1 = ($s1 + $s2);
-               $sum_1 = $sum_d1 + $sum_h1 + $sum_m1 + $sum_s1;
-               $sum_d2 = $d3 * 86400;
-               $sum_h2 = $h3 * 3600;
-               $sum_m2 = $m3 * 60;
-               $sum_s2 = $s3;
-               $sum_2 = $sum_d2 + $sum_h2 + $sum_m2 + $sum_s2;
-               $d = int($sum_1 / 86400);
-               $totalhours = int($sum_1 / 3600);
-               $h = $totalhours % 24;
-               $totalmins = int($sum_1 / 60);
-               $m = $totalmins % 60;
-               $s = $sum_1 % 60;
-               $current = "${d}d ${h}h ${m}m ${s}s";
-               $ontime = ( $sum_1 * 100 ) / $sum_2;
-               if ($ontime >= 99.95) {
-                       $ontime = sprintf("%.0f", $ontime);
-               }
-               elsif ($ontime <= 0.05) {
-                       $ontime = sprintf("%.0f", $ontime);
-               }
-               else {
-                       $ontime = sprintf("%.1f", $ontime);
-               }
-
-print <<END
-<br />$Lang::tr{'since'} $update
-<table style='width:60%'>
-<tr><td>$Lang::tr{'connections'}: $up</td><td>$Lang::tr{'disconnects'}: $down</td><td>$Lang::tr{'attemps'}: $rec</td></tr>
-<tr><td><b>$Lang::tr{'total connection time'}:</b><td>$current</td><td> ~ $ontime%</td></tr>
-</table>
-END
-;
-       }
-}
-
-elsif ($ARGV[0] eq 'reset') {
-       &new;
-}
-
-elsif ($ARGV[0] eq '') {
-       print "\nDont run on the console...\n\n";
-}
-
-exit 0;
-
-sub new {
-       open(COUNTER,">$file_log");
-       $start = $s_date." on ".$s_time;
-       $update = "&#8249;no action since clearing&#8250;";
-       $up = "0";
-       $down = "0";
-       $rec = "0";
-       $on = "0d 0h 0m";
-       $bit = "0";
-       print COUNTER "$start\|$update\|$up\|$down\|$rec\|$on\|$bit";
-       close(COUNTER);
-       open(CONNECT,">$file_connect");
-               print CONNECT "0";
-               close(CONNECT);
-               open(RESET,">$file_reset");
-               print RESET "0";
-               close(RESET);
-}
index 12c0f1df5f19853160f5c212bb91c15cd8889ec1..f97e75074b48e5bf9d6f6412b800ce7d5084a03e 100644 (file)
@@ -44,37 +44,15 @@ if (open(FILE, "$filename")) {
 # ignore monthly update if not in minimize update mode
 exit 0 if (($settings{'MINIMIZEUPDATES'} ne 'on') && ($ARGV[1] eq '-m'));
 
-my $ip;
-if (open(IP, "${General::swroot}/red/local-ipaddress")) {
-    $ip = <IP>;
-    close(IP);
-    chomp $ip;
-} else {
-    &General::log('Dynamic DNS failure : unable to open local-ipaddress file.');
-    exit 0;
-}
+my $ip = &General::GetDyndnsRedIP();
 
-#If IP is reserved network, we are behind a router. May we ask for our real public IP ?
-if ( &General::IpInSubnet ($ip,'10.0.0.0','255.0.0.0') ||
-     &General::IpInSubnet ($ip,'172.16.0.0','255.240.0.0') ||
-     &General::IpInSubnet ($ip,'192.168.0.0','255.255.0.0')) {
-    # We can, but are we authorized by GUI ?
-    if ($settings{'BEHINDROUTER'} eq 'FETCH_IP') {
-       if ($ARGV[0] eq '-f'){
-           $settings{'BEHINDROUTERWAITLOOP'} = -1; # When forced option, fectch PublicIP now
-       }
-
-       # Increment counter modulo 4. When it is zero, fetch ip else exit
-       # This divides by 4 the requests to the dyndns server.
-       $settings{'BEHINDROUTERWAITLOOP'} = ($settings{'BEHINDROUTERWAITLOOP'}+1) %4;
-       &General::writehash("${General::swroot}/ddns/settings", \%settings);
-       exit 0 if ( $settings{'BEHINDROUTERWAITLOOP'} ne 0 );
-       my $RealIP = &General::FetchPublicIp;
-       $ip = (&General::validip ($RealIP) ?  $RealIP : 'unavailable');
-       &General::log ("Dynamic DNS public router IP is:$ip");
-    }
+if ($ip eq "unavailable") {
+       &General::log("Dynamic DNS error: RED/Public IP is unavailable");
+       exit(0);
 }
 
+&General::log("Dynamic DNS public router IP is: $ip");
+
 if ($ARGV[0] eq '-f') {
        unlink ($cachefile);    # next regular calls will try again if this force update fails.
 } else {