diff --git a/config/rootfiles/common/ppp b/config/rootfiles/common/ppp index 60e6f5b08..709e0d0e0 100644 --- 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 86c0dba5c..8bf36d695 100644 --- 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 8d4a556e6..7cf69532a 100644 --- 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 2718a1aed..e32468403 100644 --- 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 aaecb4031..c62c6fb74 100644 --- 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 d318d7f92..4061147c0 100644 --- 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 2718a1aed..e32468403 100644 --- 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 be721a37a..bf6f61f09 100644 --- 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 da4e66c0b..c897378a7 100644 --- 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 8e75f7ecb..6d71db20c 100644 --- 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 2aec3cce1..9dea789f3 100644 --- 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 "$Lang::tr{'device'}MB readMB writen"; + print "$Lang::tr{'device'}$Lang::tr{'MB read'}$Lang::{'MB writen'}"; }else{ print "$iostat1[$i]$iostat2[$i]$iostat3[$i]"; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 5288baaa3..3fbdd2072 100644 --- 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 ab85ab6e6..46f5625c1 100644 --- 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 5d772fc04..ba72f4c83 100644 --- 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)"