Merge branch 'ppp-update' into beyond-next

diff --git a/config/rootfiles/common/ppp b/config/rootfiles/common/ppp
index 60e6f5b0806a81b8272851f83760d7bdff2d36fd..709e0d0e06498a40042b73e7ff269764d9e671b4 100644 (file)
--- a/config/rootfiles/common/ppp
+++ b/config/rootfiles/common/ppp
@@ -14,8 +14,10 @@ etc/ppp/standardloginscript
 #usr/include/pppd/chap_ms.h
 #usr/include/pppd/eap.h
 #usr/include/pppd/ecp.h
+#usr/include/pppd/eui64.h
 #usr/include/pppd/fsm.h
 #usr/include/pppd/ipcp.h
+#usr/include/pppd/ipv6cp.h
 #usr/include/pppd/ipxcp.h
 #usr/include/pppd/lcp.h
 #usr/include/pppd/magic.h
@@ -31,18 +33,18 @@ etc/ppp/standardloginscript
 #usr/include/pppd/tdb.h
 #usr/include/pppd/upap.h
 usr/lib/pppd
-usr/lib/pppd/2.4.5
-usr/lib/pppd/2.4.5/minconn.so
-usr/lib/pppd/2.4.5/openl2tp.so
-usr/lib/pppd/2.4.5/passprompt.so
-usr/lib/pppd/2.4.5/passwordfd.so
-usr/lib/pppd/2.4.5/pppoatm.so
-usr/lib/pppd/2.4.5/pppol2tp.so
-usr/lib/pppd/2.4.5/radattr.so
-usr/lib/pppd/2.4.5/radius.so
-usr/lib/pppd/2.4.5/radrealms.so
-usr/lib/pppd/2.4.5/rp-pppoe.so
-usr/lib/pppd/2.4.5/winbind.so
+usr/lib/pppd/2.4.6
+usr/lib/pppd/2.4.6/minconn.so
+usr/lib/pppd/2.4.6/openl2tp.so
+usr/lib/pppd/2.4.6/passprompt.so
+usr/lib/pppd/2.4.6/passwordfd.so
+usr/lib/pppd/2.4.6/pppoatm.so
+usr/lib/pppd/2.4.6/pppol2tp.so
+usr/lib/pppd/2.4.6/radattr.so
+usr/lib/pppd/2.4.6/radius.so
+usr/lib/pppd/2.4.6/radrealms.so
+usr/lib/pppd/2.4.6/rp-pppoe.so
+usr/lib/pppd/2.4.6/winbind.so
 usr/sbin/chat
 usr/sbin/pppd
 usr/sbin/pppdump

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 86c0dba5c56042ce5784b0bb4e4a61718627d309..8bf36d695b19a6b3467c683676128ffac8f388b1 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -3,6 +3,7 @@ WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
+WARNING: translation string unused: MB written
 WARNING: translation string unused: Ping
 WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 8d4a556e6f548ea7ad4c3826f653a43162dd4e2a..7cf69532a4eaefca13df8241e830c2f865956575 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -3,6 +3,7 @@ WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
+WARNING: translation string unused: MB written
 WARNING: translation string unused: Ping
 WARNING: translation string unused: Queuelenght
 WARNING: translation string unused: Remote IP

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 2718a1aed2e6599925d53e95e4b0819a69fcbf4b..e32468403fe793573e552aef7a0beb74331831ec 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -568,6 +568,7 @@ WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Async logging enabled
+WARNING: untranslated string: MB read
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: Set time on boot
 WARNING: untranslated string: addons

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index aaecb4031965839e6008a3de3780175bbb325a83..c62c6fb749735a4f6f286401f6ae7efc396309e2 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -579,6 +579,7 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: MB read
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: addons
 WARNING: untranslated string: advproxy cache-digest

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index d318d7f92477776fb471efd8d36bf3bd6f8e68e5..4061147c0230489f8042ff220b2d1894fa0e7d67 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -583,6 +583,7 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: MB read
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: addons
 WARNING: untranslated string: advproxy cache-digest

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 2718a1aed2e6599925d53e95e4b0819a69fcbf4b..e32468403fe793573e552aef7a0beb74331831ec 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -568,6 +568,7 @@ WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Async logging enabled
+WARNING: untranslated string: MB read
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: Set time on boot
 WARNING: untranslated string: addons

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index be721a37a737a2b6a437b2a24fd5017a18c2391c..bf6f61f09a091f3fa85ae2b752bffb64a4b1be94 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -572,6 +572,7 @@ WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Add a route
 WARNING: untranslated string: Edit an existing route
+WARNING: untranslated string: MB read
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: addons
 WARNING: untranslated string: advproxy cache-digest

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index da4e66c0b1af931466c40e548c6ccc79d5e1a656..c897378a74e37fa8cd47741a6043606858e6988f 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -633,6 +633,7 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: MB read
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
 WARNING: untranslated string: ccd err isipsecrw

diff --git a/doc/language_missings b/doc/language_missings
index 8e75f7ecb42e48cfe3fe09885f713225fc006f5d..6d71db20caa48affb27dbe69f7164ebed52bd446 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -302,6 +302,8 @@
 < lifetime
 < mac filter
 < maximum
+< MB read
+< MB written
 < minimum
 < minute
 < most preferred
@@ -773,6 +775,8 @@
 < lifetime
 < mac filter
 < maximum
+< MB read
+< MB written
 < minimum
 < minute
 < most preferred
@@ -1228,6 +1232,8 @@
 < lifetime
 < mac filter
 < maximum
+< MB read
+< MB written
 < minimum
 < minute
 < most preferred
@@ -1674,6 +1680,8 @@
 < lifetime
 < mac filter
 < maximum
+< MB read
+< MB written
 < minimum
 < minute
 < month-graph

diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index 2aec3cce1d5a5d81c04cf3c8e7a66de6119f2fe6..9dea789f33b78fc8c083dcb559cada684f026e09 100644 (file)
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -152,7 +152,7 @@ END
 
        for(my $i = 1; $i <= $#iostat1; $i++){
                if ( $i eq '1' ){
-                       print "<tr><td align='center' class='boldbase'><b>$Lang::tr{'device'}</b></td><td align='center' class='boldbase'><b>MB read</b></td><td align='center' class='boldbase'><b>MB writen</b></td></tr>";
+                       print "<tr><td align='center' class='boldbase'><b>$Lang::tr{'device'}</b></td><td align='center' class='boldbase'><b>$Lang::tr{'MB read'}</b></td><td align='center' class='boldbase'><b>$Lang::{'MB writen'}</b></td></tr>";
                }else{
                        print "<tr><td align='center'>$iostat1[$i]</td><td align='center'>$iostat2[$i]</td><td align='center'>$iostat3[$i]</td></tr>";
                }

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 5288baaa3f4750158e0b0974fb2d11e2e8857392..3fbdd2072dbc04f49f9b2bbedc0f315d84841de2 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -32,6 +32,8 @@
 'Level7 Rule' => 'Level7-Regel',
 'Level7 rule' => 'Level7-Regel',
 'Local VPN IP' => 'Internes Netzwerk (GREEN)',
+'MB read' => 'MB gelesen',
+'MB written' => 'MB geschrieben',
 'MTU' => 'MTU Size',
 'Number of Countries for the pie chart' => 'Anzahl der angezeigten Länder im Diagramm',
 'Number of IPs for the pie chart' => 'Anzahl der angezeigten IPs im Diagramm',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index ab85ab6e6a218af93f8ca61302f3e32a64700a77..46f5625c154bfaeebad2fa6ebc45c85305b6449a 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -32,6 +32,8 @@
 'Level7 Rule' => 'Level7-Rule',
 'Level7 rule' => 'Level7 rule',
 'Local VPN IP' => 'Internal Network (GREEN):',
+'MB read' => 'MB read',
+'MB written' => 'MB written',
 'MTU' => 'MTU size:',
 'Number of Countries for the pie chart' => 'Number of Countries for the pie chart',
 'Number of IPs for the pie chart' => 'Number of IPs for the pie chart',

diff --git a/lfs/ppp b/lfs/ppp
index 5d772fc04321517f232abc75327fbe09d61e6162..ba72f4c835f3c9728dbc5695beec7cc4c09d5980 100644 (file)
--- a/lfs/ppp
+++ b/lfs/ppp
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.4.5
+VER        = 2.4.6
 
 THISAPP    = ppp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4621bc56167b6953ec4071043fe0ec57
+$(DL_FILE)_MD5 = 3434d2cc9327167a0723aaaa8670083b
 
 install : $(TARGET)
 
@@ -73,13 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && rm -f include/pcap-int.h include/linux/if_pppol2tp.h
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-pppoatm.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-pppoatm-persist.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.1-oedod.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-pppoatm-modprobe.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-signal.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-printstats.patch
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ppp-2.4.2-close.patch
        cd $(DIR_APP) && sed -i -e "s+/etc/ppp/connect-errors+/var/log/connect-errors+" pppd/pathnames.h
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING) CC="gcc $(CFLAGS)"