Merge remote-tracking branch 'ms/stunnel-addon'

diff --git a/config/backup/includes/watchdog b/config/backup/includes/watchdog
index 3ef13592a04146e42e459207c8baa44cb1187396..fe7a567886198dda072c30316652c5865a6706fb 100644 (file)
--- a/config/backup/includes/watchdog
+++ b/config/backup/includes/watchdog
@@ -1 +1,2 @@
+/etc/sysconfig/watchdog
 /etc/watchdog.conf

diff --git a/config/firewall/convert-outgoingfw b/config/firewall/convert-outgoingfw
index 2f9b74c4f9c2a3659e661bc2f621db399b616738..c917f8438491b243f2c99866b084fe4be301a26e 100755 (executable)
--- a/config/firewall/convert-outgoingfw
+++ b/config/firewall/convert-outgoingfw
@@ -427,8 +427,8 @@ sub process_rules
                                $grp1='std_net_src';
                                $source='ORANGE';
                        }elsif ($configline[2] eq 'red') {
-                               $grp1='std_net_src';
-                               $source='IPFire';
+                               $grp1='ipfire_src';
+                               $source='RED1';
                                &General::readhash($fwdfwsettings,\%fwdsettings);
                                $fwdsettings{'POLICY1'}=$outsettings{'POLICY'};
                                $fwdsettings{'POLICY'}=$outsettings{'POLICY'};
@@ -538,7 +538,7 @@ sub process_rules
                my $chain;
                foreach my $protocol (@prot){
                        my $now=localtime;
-                       if ($source eq 'IPFire'){
+                       if ($source eq 'RED1'){
                                $chain='OUTGOINGFW';
                        }else{
                                $chain='FORWARDFW';

diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi
index a5266ec19222db846cec8eaef1855152f4f29300..84a06d9db4c278e7d4f3d239ae1dcd186265d9d2 100644 (file)
--- a/config/kernel/kernel.config.armv5tel-ipfire-rpi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.32 Kernel Configuration
+# Linux/arm 3.10.38 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -681,6 +681,8 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_HL=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LAYER7=m
+# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -699,8 +701,6 @@ CONFIG_NETFILTER_XT_MATCH_RECENT=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_SOCKET=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_LAYER7=m
-# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -2956,11 +2956,13 @@ CONFIG_SND_BCM2708_SOC_I2S=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
 CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
 CONFIG_SND_BCM2708_SOC_RPI_DAC=m
+# CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC is not set
 CONFIG_SND_DESIGNWARE_I2S=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
 CONFIG_SND_SOC_PCM1794A=m
 CONFIG_SND_SOC_PCM5102A=m
+# CONFIG_SND_SOC_PCM512x is not set
 CONFIG_SND_SOC_WM8804=m
 CONFIG_SND_SIMPLE_CARD=m
 # CONFIG_SOUND_PRIME is not set

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index a50a248c7320ca0627a9ee2afc5600ae7d577ed2..2824018f343a4f096b5420387a3ac16e24a2b3f7 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -3052,37 +3052,37 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 #
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
-# CONFIG_ACQUIRE_WDT is not set
-# CONFIG_ADVANTECH_WDT is not set
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_F71808E_WDT=m
 CONFIG_SP5100_TCO=m
 CONFIG_GEODE_WDT=m
-# CONFIG_SC520_WDT is not set
+CONFIG_SC520_WDT=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
-# CONFIG_EUROTECH_WDT is not set
+CONFIG_EUROTECH_WDT=m
 CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
-# CONFIG_WAFER_WDT is not set
+CONFIG_WAFER_WDT=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_IE6XX_WDT=m
 CONFIG_ITCO_WDT=m
-# CONFIG_ITCO_VENDOR_SUPPORT is not set
+CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
 CONFIG_IT87_WDT=m
 CONFIG_HP_WATCHDOG=m
 CONFIG_HPWDT_NMI_DECODING=y
-# CONFIG_SC1200_WDT is not set
-# CONFIG_SCx200_WDT is not set
-# CONFIG_PC87413_WDT is not set
+CONFIG_SC1200_WDT=m
+CONFIG_SCx200_WDT=m
+CONFIG_PC87413_WDT=m
 CONFIG_NV_TCO=m
-# CONFIG_60XX_WDT is not set
-# CONFIG_SBC8360_WDT is not set
-# CONFIG_SBC7240_WDT is not set
-# CONFIG_CPU5_WDT is not set
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
+CONFIG_CPU5_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
-# CONFIG_SMSC37B787_WDT is not set
+CONFIG_SMSC37B787_WDT=m
 CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
@@ -3090,7 +3090,7 @@ CONFIG_W83697UG_WDT=m
 CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
-# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+CONFIG_SBC_EPX_C3_WATCHDOG=m
 
 #
 # ISA-based Watchdog Cards

diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index a116122acacc819d258df253826f7cb9727208ff..d8f452c127ff797488b2a13463a830e903f5f9b1 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -3071,36 +3071,36 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 #
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
-# CONFIG_ACQUIRE_WDT is not set
-# CONFIG_ADVANTECH_WDT is not set
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_F71808E_WDT=m
 CONFIG_SP5100_TCO=m
 CONFIG_GEODE_WDT=m
-# CONFIG_SC520_WDT is not set
+CONFIG_SC520_WDT=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
-# CONFIG_EUROTECH_WDT is not set
+CONFIG_EUROTECH_WDT=m
 CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
-# CONFIG_WAFER_WDT is not set
+CONFIG_WAFER_WDT=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_IE6XX_WDT=m
 CONFIG_ITCO_WDT=m
-# CONFIG_ITCO_VENDOR_SUPPORT is not set
+CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_IT8712F_WDT=m
 CONFIG_IT87_WDT=m
 CONFIG_HP_WATCHDOG=m
 CONFIG_HPWDT_NMI_DECODING=y
-# CONFIG_SC1200_WDT is not set
-# CONFIG_PC87413_WDT is not set
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
 CONFIG_NV_TCO=m
-# CONFIG_60XX_WDT is not set
-# CONFIG_SBC8360_WDT is not set
-# CONFIG_SBC7240_WDT is not set
-# CONFIG_CPU5_WDT is not set
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
+CONFIG_CPU5_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
-# CONFIG_SMSC37B787_WDT is not set
+CONFIG_SMSC37B787_WDT=m
 CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
@@ -3108,7 +3108,7 @@ CONFIG_W83697UG_WDT=m
 CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
-# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+CONFIG_SBC_EPX_C3_WATCHDOG=m
 CONFIG_XEN_WDT=m
 
 #

diff --git a/config/rootfiles/core/77/update.sh b/config/rootfiles/core/77/update.sh
index 0078abd941d985be4e9ad33303208896af60e47a..e19237fee16eed09f4dd1fab4a099df3505d7715 100644 (file)
--- a/config/rootfiles/core/77/update.sh
+++ b/config/rootfiles/core/77/update.sh
@@ -399,6 +399,7 @@ if [ -e /var/ipfire/qos/enable ]; then
        /usr/local/bin/qosctrl start
 fi
 
+chown cron:cron /var/spool/cron
 # Update crontab
 cat <<EOF >> /var/spool/cron/root.orig
 

diff --git a/config/rootfiles/packages/pound b/config/rootfiles/packages/pound
index a935172a73d93effb7646cc3473d5e25b4fa89c7..02f3d41b9c40d8609eac8504c2b1baca911ba4c2 100644 (file)
--- a/config/rootfiles/packages/pound
+++ b/config/rootfiles/packages/pound
@@ -1,7 +1,4 @@
 etc/rc.d/init.d/pound
-etc/rc.d/rc0.d/K40pound
-etc/rc.d/rc3.d/S60pound
-etc/rc.d/rc6.d/K40pound
 #etc/pound.cfg
 usr/sbin/pound
 usr/sbin/poundctl

diff --git a/doc/language_issues.es b/doc/language_issues.es
index dbccd8f5818e9f0fdb08d1f0d93a2591a9a093cf..b854a2b7a661cd648cc7d7e9ca4df61b2ea563c9 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -588,6 +588,7 @@ WARNING: untranslated string: advproxy errmsg cache
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: advproxy errmsg proxy ports equal
 WARNING: untranslated string: advproxy proxy port transparent
+WARNING: untranslated string: atm device
 WARNING: untranslated string: attention
 WARNING: untranslated string: bit
 WARNING: untranslated string: bytes
@@ -873,6 +874,7 @@ WARNING: untranslated string: proxy reports monthly
 WARNING: untranslated string: proxy reports today
 WARNING: untranslated string: proxy reports weekly
 WARNING: untranslated string: qos enter bandwidths
+WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: red1
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 4acdaf4858208610cb114f5d05904e4abf79b31e..6ab29e8bb64b4f8e67d1eb0895f72668dd7244f2 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -598,6 +598,7 @@ WARNING: untranslated string: advproxy errmsg cache
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: advproxy errmsg proxy ports equal
 WARNING: untranslated string: advproxy proxy port transparent
+WARNING: untranslated string: atm device
 WARNING: untranslated string: attention
 WARNING: untranslated string: bit
 WARNING: untranslated string: bytes
@@ -880,6 +881,7 @@ WARNING: untranslated string: proxy reports monthly
 WARNING: untranslated string: proxy reports today
 WARNING: untranslated string: proxy reports weekly
 WARNING: untranslated string: qos enter bandwidths
+WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: red1
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 949acdc397c5296ac62f213e0b686bde1231417b..1fa7b18739d5b4a7ba77c31dc4337dc1ba498b7a 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -600,6 +600,7 @@ WARNING: untranslated string: addons
 WARNING: untranslated string: advproxy cache-digest
 WARNING: untranslated string: advproxy errmsg proxy ports equal
 WARNING: untranslated string: advproxy proxy port transparent
+WARNING: untranslated string: atm device
 WARNING: untranslated string: bit
 WARNING: untranslated string: bytes
 WARNING: untranslated string: ccd err isipsecrw
@@ -802,6 +803,7 @@ WARNING: untranslated string: ovpn port in root range
 WARNING: untranslated string: p2p block
 WARNING: untranslated string: p2p block save notice
 WARNING: untranslated string: qos enter bandwidths
+WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: red1
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index dbccd8f5818e9f0fdb08d1f0d93a2591a9a093cf..b854a2b7a661cd648cc7d7e9ca4df61b2ea563c9 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -588,6 +588,7 @@ WARNING: untranslated string: advproxy errmsg cache
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: advproxy errmsg proxy ports equal
 WARNING: untranslated string: advproxy proxy port transparent
+WARNING: untranslated string: atm device
 WARNING: untranslated string: attention
 WARNING: untranslated string: bit
 WARNING: untranslated string: bytes
@@ -873,6 +874,7 @@ WARNING: untranslated string: proxy reports monthly
 WARNING: untranslated string: proxy reports today
 WARNING: untranslated string: proxy reports weekly
 WARNING: untranslated string: qos enter bandwidths
+WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: red1
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index e57e91e78f43d4ed2d4a448694f6b1b2b9555719..4058098609168fbc2f48ed489da08ac8929b9e24 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -591,6 +591,7 @@ WARNING: untranslated string: advproxy errmsg cache
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: advproxy errmsg proxy ports equal
 WARNING: untranslated string: advproxy proxy port transparent
+WARNING: untranslated string: atm device
 WARNING: untranslated string: attention
 WARNING: untranslated string: bit
 WARNING: untranslated string: bytes
@@ -863,6 +864,7 @@ WARNING: untranslated string: proxy reports monthly
 WARNING: untranslated string: proxy reports today
 WARNING: untranslated string: proxy reports weekly
 WARNING: untranslated string: qos enter bandwidths
+WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: red1
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index e968b591a7790a55c79679373b4a4c7281fab32f..96c38538add04d228e995225c787d01efb3c3e4f 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -641,8 +641,10 @@ 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: atm device
 WARNING: untranslated string: bytes
 WARNING: untranslated string: fwhost err hostip
+WARNING: untranslated string: random number generator daemon
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed

diff --git a/doc/language_missings b/doc/language_missings
index 742f1f750bed76c91bb95bf11043cdc12411da85..1a386c19c23e1affcf211fec821fc91c669d8013 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -23,6 +23,7 @@
 < age shour
 < age sminute
 < age ssecond
+< atm device
 < attention
 < bit
 < ccd add
@@ -356,6 +357,7 @@
 < proxy reports today
 < proxy reports weekly
 < qos enter bandwidths
+< random number generator daemon
 < red1
 < server restart
 < snat new source ip address
@@ -500,6 +502,7 @@
 < age sminute
 < age ssecond
 < Async logging enabled
+< atm device
 < attention
 < bit
 < ccd add
@@ -848,6 +851,7 @@
 < proxy reports today
 < proxy reports weekly
 < qos enter bandwidths
+< random number generator daemon
 < red1
 < server restart
 < Set time on boot
@@ -968,6 +972,7 @@
 < age shour
 < age sminute
 < age ssecond
+< atm device
 < attention
 < bit
 < ccd add
@@ -1294,6 +1299,7 @@
 < proxy reports today
 < proxy reports weekly
 < qos enter bandwidths
+< random number generator daemon
 < red1
 < server restart
 < snat new source ip address
@@ -1413,6 +1419,7 @@
 < age shour
 < age sminute
 < age ssecond
+< atm device
 < attention
 < bit
 < ccd add
@@ -1743,6 +1750,7 @@
 < proxy reports today
 < proxy reports weekly
 < qos enter bandwidths
+< random number generator daemon
 < red1
 < server restart
 < snat new source ip address

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

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index ff950c449a56e8e0e962e260b04ee7c81ef1bda0..48e3a8d2a6efe78855d02f8d8c38df6509e32927 100644 (file)
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -2562,11 +2562,11 @@ END
                                                push (@nat_ifaces,&fwlib::get_nat_address($$hash{$key}[29],$val));
                                        }
                                        @nat_ifaces=&del_double(@nat_ifaces);
-                                       $natstring = join(', ', @nat_ifaces);
+                                       $natstring = "";
                                }else{
-                                       $natstring = $$hash{$key}[29];
+                                       $natstring = "($$hash{$key}[29])";
                                }
-                               print "$Lang::tr{'firewall'} ($natstring)";
+                               print "$Lang::tr{'firewall'} $natstring";
                                if($$hash{$key}[30] ne ''){
                                        $$hash{$key}[30]=~ tr/|/,/;
                                        print": $$hash{$key}[30]";

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index edec826963f98deb30ebf01fe1c1a307252da73f..f0100a81673c5f3ab2f379b8509c1aed745093ee 100644 (file)
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -150,6 +150,9 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
                 if (($pppsettings{'VPI'} eq '0') && ($pppsettings{'VCI'} eq '0')) {
                         $errormessage = $Lang::tr{'invalid vpi vpci'};
                         goto ERROR; }
+                if ($pppsettings{'ATM_DEV'} eq '') {
+                        $errormessage = $Lang::tr{'invalid input'};
+                        goto ERROR; }
                 if ( $pppsettings{'PROTOCOL'} eq '' ) {
                         $errormessage = $Lang::tr{'invalid input'};
                         goto ERROR; }
@@ -723,11 +726,12 @@ if ($pppsettings{'TYPE'} =~ /^(pppoeatm|pptpatm)$/)
 
 print <<END
 <tr>
-        <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'adsl settings'}:</b></td>
+        <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'atm settings'}:</b></td>
 <tr>
-
+        <td nowrap='nowrap'>$Lang::tr{'atm device'}</td>
+        <td><input type='text' size='5' name='ATM_DEV' value='$pppsettings{'ATM_DEV'}' /></td>
         <td> $Lang::tr{'encapsulation'}:</td>
-        <td colspan='2' width='30%'>
+        <td>
                 <select name='ENCAP'>
                    <option value='0' $selected{'ENCAP'}{'0'}>LLC</option>
                    <option value='1' $selected{'ENCAP'}{'1'}>VCmux</option>
@@ -735,11 +739,10 @@ print <<END
         </td>
 </tr>
 <tr>
-
         <td nowrap='nowrap'>$Lang::tr{'vpi number'}</td>
         <td><input type='text' size='5' name='VPI' value='$pppsettings{'VPI'}' /></td>
-        <td align='right'>$Lang::tr{'vci number'}</td>
-        <td colspan='2'><input type='text' size='5' name='VCI' value='$pppsettings{'VCI'}' /></td>
+        <td> $Lang::tr{'vci number'}</td>
+        <td><input type='text' size='5' name='VCI' value='$pppsettings{'VCI'}' /></td>
 </tr>
 END
 ;
@@ -939,6 +942,7 @@ sub initprofile
         $pppsettings{'ENCAP'} = '0';
         $pppsettings{'VPI'} = '1';
         $pppsettings{'VCI'} = '32';
+        $pppsettings{'ATM_DEV'} = '0';
         $pppsettings{'PPTP_PEER'} = '10.0.0.138';
        $pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255';
        $pppsettings{'PPTP_ROUTE'} = '';

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 7c1762133d5dbc045869d1bbc13ba5d8821e089c..090510fe398552a1c6721b742ae676785e12b723 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -99,7 +99,6 @@
 'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.',
 'admin users' => 'Liste der Benutzer mit Super User Rechten',
 'administrator user password' => 'Passwort für Benutzer "admin":',
-'adsl settings' => 'ADSL-Einstellungen',
 'advanced' => 'Erweitert',
 'advanced server' => 'Erweiterte Server-Optionen',
 'advproxy AUTH always required' => 'Authentifizierung für uneingeschränkte Quelladressen erforderlich',
@@ -366,6 +365,8 @@
 'are you sure' => 'Sind Sie sicher?',
 'arp table entries' => 'Einträge der ARP-Tabelle',
 'artist' => 'Künstler',
+'atm device' => 'Device:',
+'atm settings' => 'ATM-Einstellungen',
 'attemps' => 'Versuche',
 'attention' => 'ACHTUNG',
 'august' => 'August',
@@ -1782,6 +1783,7 @@
 'qos warning' => 'Die Regel <strong>muss</strong> wieder gespeichert werden, ansonsten wird sie verworfen!',
 'quick playlist' => 'Quick Playlist',
 'ram' => 'RAM-Speicher',
+'random number generator daemon' => 'Random Number Generator Daemon',
 'read bytes' => 'Gelesene Bytes',
 'read list' => 'Liste der Leseberechtigten',
 'real address' => 'Reale Addresse',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a8e55f5717eccd54dc4edd8f7aff9bf8c9b0b2dd..de29f34ec48c4a6c6ce1f5c2a303f97ddb291827 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -99,7 +99,6 @@
 'admin user password has been changed' => 'Admin user password has been changed.',
 'admin users' => 'User with superuser rights',
 'administrator user password' => 'Admin user password:',
-'adsl settings' => 'ADSL settings',
 'advanced' => 'Advanced',
 'advanced server' => 'Advanced server options',
 'advproxy AUTH always required' => 'Require authentication for unrestricted source addresses',
@@ -368,6 +367,8 @@
 'are you sure' => 'Are you sure?',
 'arp table entries' => 'ARP Table Entries',
 'artist' => 'Artist',
+'atm device' => 'Device:',
+'atm settings' => 'ATM settings',
 'attemps' => 'Attempts',
 'attention' => 'ATTENTION',
 'august' => 'August',
@@ -1814,6 +1815,7 @@
 'quick control' => 'Quick Control',
 'quick playlist' => 'Quick Playlist',
 'ram' => 'RAM',
+'random number generator daemon' => 'Random Number Generator Daemon',
 'read bytes' => 'Read Bytes',
 'read list' => 'list with readonly hosts',
 'real address' => 'Real Address',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 19057c7a224eeb9391723abae522d397faa315af..ae5bf14a677979dd5b1f8c281f3392cee7b58b13 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -90,7 +90,6 @@
 'admin user password has been changed' => 'El password del usuario Admin ha cambiado',
 'admin users' => 'Usuario con niveles de superusuario (root)',
 'administrator user password' => 'Contraseña del usuario Admin:',
-'adsl settings' => 'Configuraciones ADSL',
 'advanced' => 'Avanzadas',
 'advanced server' => 'Opciones avanzadas de servidor',
 'advproxy AUTH always required' => 'Se necesita autentificación para acceso irrestricto de direcciones de orígen',
@@ -349,6 +348,7 @@
 'are you sure' => '¿Esta seguro?',
 'arp table entries' => 'Tabla de entradas ARP:',
 'artist' => 'Artista',
+'atm settings' => 'Configuraciones ATM',
 'attemps' => 'Intentos',
 'august' => 'Agosto',
 'authentication' => 'Autenticación',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index f80f11205b8c93d5c44fb4498045dec4a5933ba1..84e15a82bb342bf0759943ca4fc9b2fe5515c06e 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -92,7 +92,6 @@
 'admin user password has been changed' => 'Le mot de passe admin a été changé.',
 'admin users' => 'Utilisateur avec droits super-utilisateur',
 'administrator user password' => 'Mot de passe de l\'administrateur:',
-'adsl settings' => 'Réglages ADSL',
 'advanced' => 'Avancé',
 'advanced server' => 'Options avancées du serveur',
 'advproxy AUTH always required' => 'Exige l\'authentification pour un accès sans restriction des adresses sources',
@@ -351,6 +350,7 @@
 'are you sure' => 'Etes vous sûr ?',
 'arp table entries' => 'Table d\'entrées ARP:',
 'artist' => 'Artiste',
+'atm settings' => 'Réglages ATM',
 'attemps' => 'Tentatives',
 'august' => 'Août',
 'authentication' => 'Authentification :',

diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 4bcb55074e00f651feadd54756ccd96306c3adc8..5c39df175f06f07dacf5de36b83c94d5d46945d1 100644 (file)
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -92,7 +92,6 @@
 'admin user password has been changed' => 'Beheerderswachtwoord is gewijzigd.',
 'admin users' => 'Gebruiker met beheerdersrechten.',
 'administrator user password' => 'Beheerderswachtwoord:',
-'adsl settings' => 'ADSL instellingen',
 'advanced' => 'Geavanceerd',
 'advanced server' => 'Geavanceerde server opties',
 'advproxy AUTH always required' => 'Authenticatie vereist voor ongelimiteerde bronadressen.',
@@ -353,6 +352,7 @@
 'are you sure' => 'Weet u het zeker?',
 'arp table entries' => 'ARP Tabelingangen:',
 'artist' => 'Artiest',
+'atm settings' => 'ATM instellingen',
 'attemps' => 'Pogingen',
 'attention' => 'LET OP',
 'august' => 'Augustus',

diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index d6b9ab0b60d0e63b9a4e73a9ee09075eefcb32f8..103e5262e3616c1d1526ee83dd8208152f2af304 100644 (file)
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -92,7 +92,6 @@
 'admin user password has been changed' => 'Hasło administratora zostało zmienione.',
 'admin users' => 'Użytkownik prawami superużytkownika',
 'administrator user password' => 'Hasło administratora:',
-'adsl settings' => 'Ustawienia ADSL',
 'advanced' => 'Zaawansowane',
 'advanced server' => 'Zaawansowane ustawienia serwera',
 'advproxy AUTH always required' => 'Wymagaj autoryzacji dla adresów źródłowych bez ograniczeń',
@@ -351,6 +350,7 @@
 'are you sure' => 'Jesteś pewien?',
 'arp table entries' => 'Wpisy tabeli ARP:',
 'artist' => 'Artysta',
+'atm settings' => 'Ustawienia ATM',
 'attemps' => 'Prób',
 'august' => 'Sierpień',
 'authentication' => 'Uwierzytelnianie:',

diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 9ea9d6236e8da4cf5c3a2da3a99d0bf4386115e2..2b680b0665b0c2eae02ac8b6abe5ff6e602aafff 100644 (file)
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -90,7 +90,6 @@
 'admin user password has been changed' => 'Пароль пользователя Admin был изменён.',
 'admin users' => 'Пользователь с правами суперадминистратора',
 'administrator user password' => 'Пароль пользователя Admin:',
-'adsl settings' => 'Настройки ADSL',
 'advanced' => 'Дополнительно',
 'advanced server' => 'Дополнительные настройки сервера',
 'advproxy AUTH always required' => 'Требовать аутентификацию у незарегистрированных адресов',
@@ -349,6 +348,7 @@
 'are you sure' => 'Вы уверены?',
 'arp table entries' => 'Записи ARP-таблицы:',
 'artist' => 'Artist',
+'atm settings' => 'Настройки ATM',
 'attemps' => 'Попытки',
 'august' => 'Август',
 'authentication' => 'Аутентификация:',

diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index 96197938ab79d416b93d23d1fa5340f67bbcf7b4..c07d06bdcc2ba2c74e370942918fabe04b6e0fd8 100644 (file)
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -99,7 +99,6 @@
 'admin user password has been changed' => 'Yönetici kullanıcı şifresi değiştirildi.',
 'admin users' => 'Yetkili kullanıcı hakları ile kullanıcı',
 'administrator user password' => 'Admin kullanıcı parolası:',
-'adsl settings' => 'ADSL ayarları',
 'advanced' => 'Gelişmiş',
 'advanced server' => 'Gelişmiş Sunucu Seçenekleri',
 'advproxy AUTH always required' => 'Sınırsız kaynak adresleri için kimlik doğrulaması iste',
@@ -368,6 +367,7 @@
 'are you sure' => 'Emin misiniz?',
 'arp table entries' => 'ARP tablosu girdileri:',
 'artist' => 'Sanatçı',
+'atm settings' => 'ATM ayarları',
 'attemps' => 'Girişim',
 'attention' => 'DİKKAT',
 'august' => 'Ağustos',

diff --git a/lfs/flash-images b/lfs/flash-images
index f74c7e1e4eaf21bc0e162754a04a0ed92992405c..4e28e4cd37746eb01d4d1211a5ff1ece6ea7acd4 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -65,9 +65,9 @@ else
 endif
 
 # /boot:  64MB - OFFSET
-# /    : 600MB
+# /    : 700MB
 S_BOOT := $(shell echo $$(( 131072 - $(S_OFFSET) )))
-S_ROOT := 1228800
+S_ROOT := 1433600
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -rf $(MNThdd) $(IMGinst) $(IMGpart) $(IMGboot) $(IMGroot) && mkdir -p $(MNThdd)

diff --git a/lfs/linux b/lfs/linux
index 948d056a68d3ed0da7ab0d2661970db765837a26..c1d794ae1b2fd7dddd9d6837678314074cfe700b 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 3.10.37
+VER        = 3.10.38
 
-RPI_PATCHES = linux-3.10.34-grsec-dea8280
-GRS_PATCHES = grsecurity-2.9.1-3.10.37-ipfire1.patch.xz
+RPI_PATCHES = linux-3.10.38-grsec-1b49b45
+GRS_PATCHES = grsecurity-2.9.1-3.10.38-ipfire1.patch.xz
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -36,7 +36,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 42
+PAK_VER    = 43
 DEPS      = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -74,9 +74,9 @@ $(DL_FILE)                            = $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz    = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 $(GRS_PATCHES)                         = $(URL_IPFIRE)/$(GRS_PATCHES)
 
-$(DL_FILE)_MD5                         = a08a10ffc31b07d9422af1cd2baa3274
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 522683db031f7033b1b5dfe1b1f30e67
-$(GRS_PATCHES)_MD5                     = 7b0f44571974217d79dbcdf5d7e33976
+$(DL_FILE)_MD5                         = cef991f05d2d1a15f08ca88ac31ee83e
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = a7408e8bad57b4b2cb677dd5a0bfb7ff
+$(GRS_PATCHES)_MD5                     = a50ac65d64c72badd21695c2294f8548
 
 install : $(TARGET)
 
@@ -137,6 +137,7 @@ endif
        # Wlan Patches
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
 
        # mISDN Patches
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch

diff --git a/lfs/mc b/lfs/mc
index 18613498a7630fac1173607502e1332a740e9344..ed799be0640cef1473d0036451d7fabaa8f3297e 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.8.9
+VER        = 4.8.12
 
 THISAPP    = mc-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f8a05f9a9708241541ae177c8e2f209
+$(DL_FILE)_MD5 = 7ecccc03df060cd0ca1414a5a14e6649
 
 install : $(TARGET)
 

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

diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware
index a7f87616efcecb43bbebb6abce4586d71194a617..6882fcbdc02714a49dbaedcc2997b9bf52140be8 100644 (file)
--- a/lfs/rpi-firmware
+++ b/lfs/rpi-firmware
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 18a7921
+VER        = cd50136
 THISAPP    = rpi-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 07a83d2700fb73aad67154c9e74901f3
+$(DL_FILE)_MD5 = fced022c0e646affae0d5d5543f59054
 
 install : $(TARGET)
 

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

diff --git a/make.sh b/make.sh
index 259675ac9e6df872edbab6f69c131c59dc40c36c..07d1371e94efd1c0d876d20b3e324e9610d1ae5e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -842,7 +842,8 @@ buildpackages() {
   ipfiremake cdrom
 
   # Check if there is a loop device for building in virtual environments
-  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
+  modprobe loop 2>/dev/null
+  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
        ipfiremake flash-images
   fi
 

diff --git a/src/initscripts/init.d/fcron b/src/initscripts/init.d/fcron
index 00a70bd4a370d7eb360b3d80f4289c7da7dee309..0260d4ad6279185f79f57485ff4e7b78b8f7655a 100644 (file)
--- a/src/initscripts/init.d/fcron
+++ b/src/initscripts/init.d/fcron
@@ -13,6 +13,7 @@
 case "$1" in
        start)
                boot_mesg "Starting fcron..."
+               chown cron:cron /var/spool/cron
                loadproc /usr/sbin/fcron -y
                # remove -y to reenable fcron logging
                ;;

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

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

diff --git a/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch b/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
new file mode 100644 (file)
index 0000000..83142c8
--- /dev/null
+++ b/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
@@ -0,0 +1,11 @@
+diff -Naur linux-3.10.37.org/drivers/net/wireless/rt2x00/rt2800usb.c linux-3.10.37/drivers/net/wireless/rt2x00/rt2800usb.c
+--- linux-3.10.37.org/drivers/net/wireless/rt2x00/rt2800usb.c  2014-04-14 15:42:31.000000000 +0200
++++ linux-3.10.37/drivers/net/wireless/rt2x00/rt2800usb.c      2014-04-25 10:25:12.796630526 +0200
+@@ -1175,6 +1175,7 @@
+       /* Belkin */
+       { USB_DEVICE(0x050d, 0x945b) },
+       /* D-Link */
++      { USB_DEVICE(0x2001, 0x3317) },
+       { USB_DEVICE(0x2001, 0x3c17) },
+       /* Panasonic */
+       { USB_DEVICE(0x083a, 0xb511) },