webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 11:05:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ppp-update' into beyond-next

Browse Source
This commit is contained in:
Michael Tremer
2014-03-26 23:43:04 +01:00
parent 5240f73d9c 93b36c3e22
commit 41dfa08d2a
14 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
config/rootfiles/common/ppp
View File

@@ -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

1
doc/language_issues.de
View File

@@ -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

1
doc/language_issues.en
View File

@@ -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

1
doc/language_issues.es
View File

@@ -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

1
doc/language_issues.fr
View File

@@ -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

1
doc/language_issues.nl
View File

@@ -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

1
doc/language_issues.pl
View File

@@ -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

1
doc/language_issues.ru
View File

@@ -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

1
doc/language_issues.tr
View File

@@ -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

8
doc/language_missings
View File

@@ -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

2
html/cgi-bin/media.cgi
View File

@@ -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>";
}

2
langs/de/cgi-bin/de.pl
View File

@@ -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',

2
langs/en/cgi-bin/en.pl
View File

@@ -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',

11
lfs/ppp
View File

@@ -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)"