* [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 0203401cf5dcd2fc005eb33a593b625f56258463
@ 2013-10-03 12:27 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-10-03 12:27 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 33056 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, fifteen has been updated
via 0203401cf5dcd2fc005eb33a593b625f56258463 (commit)
via 2d685e1d4c4959ef6a85c285e9f952b713527d50 (commit)
via 03caa87399b5143e85a06d908bedc99d1c6b41d4 (commit)
via f34844355bf8ce1c5239301fedc98f38ba765d5e (commit)
via d48969312e45efcde69c7bbcb5d93710f73f53a6 (commit)
via f35740ac44a9423b1bb1320c97987240bd3c7e60 (commit)
via a761716f03c7eeb31fe6f53552a4e7b48da76c3c (commit)
via 64aac4feb5e50e330da30555a54739cc89d1cd0e (commit)
via 55904cd2b463983987f769c8dfd3691ced1d7912 (commit)
via 860ad8cb1551ff0ec5b7da3d28bb9e358470382b (commit)
via d63e50f936d4d33a29af56ebefc2d1ae197d030f (commit)
via d9949d4dd18789f18c21867cc3b7c6bbe3ba2801 (commit)
via f64c99631116407320ea362121b3698c60c3a40c (commit)
via c6137209a4fa72de7ea13be0c0713bddf57c0f38 (commit)
via 8e0d8bfd4d61656bec48a63d7a9263aed8f0da94 (commit)
via e122dd636659d9e97dcd0441717955de04a737b6 (commit)
via 53f7ba12e8d0ba9f9c72e075b4a9e4e5c4a4ac00 (commit)
via 4245fe34792cb67b1fe4b073e3b4d71014c3b277 (commit)
via ae666bf128e8660512a6fe0a12eda22c4b126446 (commit)
via b31af08582737abd3913809bdf38147b6316973a (commit)
via e7c69924fc9f4af89567024ad51b87323c1a6bf3 (commit)
via 2b1ff41196a0b9ac6794904427416eb05506f13d (commit)
via 2340d265b1a21f036a04d2ad9649bd7637eeda71 (commit)
via 527bc5af18b7eefab2aac8f27a1c8be71c379b0f (commit)
via cd010e09a321ab562ff45da1b27e521da160c71f (commit)
via ae650f95188e206cd3e3cbca5445f3ed074cb66f (commit)
via 7586640395d996dcad45a6d33e22b57d41fd82b6 (commit)
via 26cce22da0ffd9b861e6734e943238bc9a2b512c (commit)
via 9e4945393d205da3f1a599651c6e94cbce386ecd (commit)
via 0006d11060177a506c675f18c4678e0b7f82c3a9 (commit)
via 8505f1ff4c743b98f4e72c0275f60ddaa06627f9 (commit)
via 3387469bdb06af775d8708db7a743c95d3d2ca27 (commit)
via 529ac19c466e3c1c079d6c8d73d21c3016edae59 (commit)
via 67df3c3f1c3dc12d4238c617d91bb6622024efa2 (commit)
via c83e7d5f81c1a86f156355ad4e04f73b94308452 (commit)
from 78403883e23271c9a7ab2bdfeeaf64cc20fd11b4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0203401cf5dcd2fc005eb33a593b625f56258463
Merge: 7840388 2d685e1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 3 14:26:33 2013 +0200
Merge remote-tracking branch 'origin/next' into fifteen
Conflicts:
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.nl
doc/language_issues.pl
doc/language_issues.tr
doc/language_missings
-----------------------------------------------------------------------
Summary of changes:
.../{oldcore/47 => core/73}/filelists/php | 0
config/rootfiles/oldcore/73/filelists/files | 3 +++
config/rootfiles/oldcore/73/update.sh | 5 +++++
config/rootfiles/packages/tor | 3 ++-
doc/language_issues.de | 1 +
doc/language_issues.en | 1 +
doc/language_issues.es | 4 ++++
doc/language_issues.fr | 4 ++++
doc/language_issues.nl | 4 ++++
doc/language_issues.pl | 4 ++++
doc/language_issues.ru | 4 ++++
doc/language_issues.tr | 4 ++++
doc/language_missings | 20 ++++++++++++++++++++
html/cgi-bin/routing.cgi | 2 +-
html/cgi-bin/tor.cgi | 22 ++++++++++++++++++++--
html/cgi-bin/wirelessclient.cgi | 4 ++--
langs/de/cgi-bin/de.pl | 7 ++++++-
langs/en/cgi-bin/en.pl | 5 +++++
lfs/iptraf-ng | 3 ++-
lfs/php | 9 +++++----
lfs/tor | 6 +++---
src/initscripts/init.d/dnsmasq | 6 ++----
src/initscripts/init.d/tor | 4 ++++
src/paks/fetchmail/install.sh | 4 ++++
src/paks/fetchmail/uninstall.sh | 2 ++
src/paks/postfix/install.sh | 8 +++++---
.../iptraf-ng-1.1.4-tcplog_flowrate_msg.patch | 12 ++++++++++++
27 files changed, 129 insertions(+), 22 deletions(-)
copy config/rootfiles/{oldcore/47 => core/73}/filelists/php (100%)
create mode 100644 src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
Difference in files:
diff --git a/config/rootfiles/core/73/filelists/php b/config/rootfiles/core/73/filelists/php
new file mode 120000
index 0000000..1ae48d7
--- /dev/null
+++ b/config/rootfiles/core/73/filelists/php
@@ -0,0 +1 @@
+../../../common/php
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/73/filelists/files b/config/rootfiles/oldcore/73/filelists/files
index a1ef1bf..6df851e 100644
--- a/config/rootfiles/oldcore/73/filelists/files
+++ b/config/rootfiles/oldcore/73/filelists/files
@@ -1,8 +1,11 @@
etc/system-release
etc/issue
+etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/squid
srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat
srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/routing.cgi
+srv/web/ipfire/cgi-bin/wirelessclient.cgi
srv/web/ipfire/html/redirect.cgi
srv/web/ipfire/html/redirect-templates/
var/ipfire/header.pl
diff --git a/config/rootfiles/oldcore/73/update.sh b/config/rootfiles/oldcore/73/update.sh
index 6afca9f..1fb3ac6 100644
--- a/config/rootfiles/oldcore/73/update.sh
+++ b/config/rootfiles/oldcore/73/update.sh
@@ -53,6 +53,11 @@ extract_files
#Update Language cache
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+# Remove invalid fetchmail symlinks when postfix is installed.
+if [ ! -e "/etc/rc.d/init.d/fetchmail" ]; then
+ rm -f /etc/rc.d/rc*.d/*fetchmail
+fi
+
sync
# This update need a reboot...
diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor
index 58de7da..f9c657c 100644
--- a/config/rootfiles/packages/tor
+++ b/config/rootfiles/packages/tor
@@ -5,7 +5,7 @@ etc/rc.d/rc0.d/K40tor
etc/rc.d/rc3.d/S60tor
etc/rc.d/rc6.d/K40tor
#etc/tor
-etc/tor/tor-tsocks.conf
+#etc/tor/tor-tsocks.conf
etc/tor/torrc
srv/web/ipfire/cgi-bin/tor.cgi
usr/bin/tor
@@ -25,6 +25,7 @@ usr/local/bin/torctrl
usr/share/tor
usr/share/tor/defaults-torrc
usr/share/tor/geoip
+usr/share/tor/geoip6
var/ipfire/backup/addons/includes/tor
var/ipfire/menu.d/EX-tor.menu
var/ipfire/tor
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 9f48b8b..514a2e9 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -484,6 +484,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: tor 0 = disabled
WARNING: translation string unused: tor accounting period daily
WARNING: translation string unused: tor accounting period monthly
WARNING: translation string unused: tor accounting period weekly
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 6f51542..ef246b4 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -515,6 +515,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: tor 0 = disabled
WARNING: translation string unused: tor accounting period daily
WARNING: translation string unused: tor accounting period monthly
WARNING: translation string unused: tor accounting period weekly
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 3dc84df..d4f500c 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -758,7 +758,9 @@ WARNING: untranslated string: fwhost stdnet
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
+WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
+WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
@@ -825,8 +827,10 @@ WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
+WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
+WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 2df8288..e161500 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -761,7 +761,9 @@ WARNING: untranslated string: fwhost stdnet
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
+WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
+WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: ntp common settings
WARNING: untranslated string: ntp sync
@@ -816,8 +818,10 @@ WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
+WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
+WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index ce70082..fed5e45 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -707,6 +707,8 @@ WARNING: untranslated string: fwhost stdnet
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
+WARNING: untranslated string: least preferred
+WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: outgoing firewall reserved groupname
WARNING: untranslated string: qos enter bandwidths
@@ -733,8 +735,10 @@ WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
+WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
+WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 3dc84df..d4f500c 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -758,7 +758,9 @@ WARNING: untranslated string: fwhost stdnet
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
+WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
+WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
@@ -825,8 +827,10 @@ WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
+WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
+WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 80f7f31..1d3eb79 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -745,7 +745,9 @@ WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: incoming traffic in bytes per second
+WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
+WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
@@ -796,8 +798,10 @@ WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
+WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
+WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 19d15fa..079f411 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -704,6 +704,8 @@ WARNING: untranslated string: fwhost stdnet
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
+WARNING: untranslated string: least preferred
+WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: outgoing firewall reserved groupname
WARNING: untranslated string: red1
@@ -729,8 +731,10 @@ WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
WARNING: untranslated string: tor daemon
+WARNING: untranslated string: tor directory port
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
+WARNING: untranslated string: tor errmsg invalid directory port
WARNING: untranslated string: tor errmsg invalid ip or mask
WARNING: untranslated string: tor errmsg invalid relay address
WARNING: untranslated string: tor errmsg invalid relay name
diff --git a/doc/language_missings b/doc/language_missings
index 4c63a35..704db02 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -257,7 +257,9 @@
< fw settings dropdown
< fw settings remark
< fw settings ruletable
+< least preferred
< minute
+< most preferred
< ntp common settings
< ntp sync
< openvpn default
@@ -291,6 +293,7 @@
< static routes
< system information
< tor
+< tor 0 = disabled
< tor accounting
< tor accounting bytes
< tor accounting bytes left
@@ -311,8 +314,10 @@
< tor connected relays
< tor contact info
< tor daemon
+< tor directory port
< tor enabled
< tor errmsg invalid accounting limit
+< tor errmsg invalid directory port
< tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name
@@ -653,7 +658,9 @@
< fw settings dropdown
< fw settings remark
< fw settings ruletable
+< least preferred
< minute
+< most preferred
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -703,6 +710,7 @@
< static routes
< system information
< tor
+< tor 0 = disabled
< tor accounting
< tor accounting bytes
< tor accounting bytes left
@@ -723,8 +731,10 @@
< tor connected relays
< tor contact info
< tor daemon
+< tor directory port
< tor enabled
< tor errmsg invalid accounting limit
+< tor errmsg invalid directory port
< tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name
@@ -1033,7 +1043,9 @@
< fw settings dropdown
< fw settings remark
< fw settings ruletable
+< least preferred
< minute
+< most preferred
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -1067,6 +1079,7 @@
< server restart
< static routes
< tor
+< tor 0 = disabled
< tor accounting
< tor accounting bytes
< tor accounting bytes left
@@ -1087,8 +1100,10 @@
< tor connected relays
< tor contact info
< tor daemon
+< tor directory port
< tor enabled
< tor errmsg invalid accounting limit
+< tor errmsg invalid directory port
< tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name
@@ -1404,8 +1419,10 @@
< fw settings ruletable
< hour-graph
< incoming traffic in bytes per second
+< least preferred
< minute
< month-graph
+< most preferred
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -1436,6 +1453,7 @@
< server restart
< static routes
< tor
+< tor 0 = disabled
< tor accounting
< tor accounting bytes
< tor accounting bytes left
@@ -1456,8 +1474,10 @@
< tor connected relays
< tor contact info
< tor daemon
+< tor directory port
< tor enabled
< tor errmsg invalid accounting limit
+< tor errmsg invalid directory port
< tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name
diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi
index afcd388..488705f 100644
--- a/html/cgi-bin/routing.cgi
+++ b/html/cgi-bin/routing.cgi
@@ -126,7 +126,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
$errormessage = $Lang::tr{'invalid ip'}." / ".$Lang::tr{'invalid netmask'};
}
- if ($settings{'IP'} =~ /0.0.0.0/){
+ if ($settings{'IP'} =~ /^0\.0\.0\.0/){
$errormessage = $Lang::tr{'invalid ip'}." - 0.0.0.0";
}
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index b920724..befd508 100755
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -108,6 +108,7 @@ $settings{'TOR_RELAY_ENABLED'} = 'off';
$settings{'TOR_RELAY_MODE'} = 'exit';
$settings{'TOR_RELAY_ADDRESS'} = '';
$settings{'TOR_RELAY_PORT'} = 9001;
+$settings{'TOR_RELAY_DIRPORT'} = 0;
$settings{'TOR_RELAY_NICKNAME'} = '';
$settings{'TOR_RELAY_CONTACT_INFO'} = '';
$settings{'TOR_RELAY_BANDWIDTH_RATE'} = 0;
@@ -143,6 +144,11 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) {
if (!&General::validport($settings{'TOR_RELAY_PORT'})) {
$errormessage = "$Lang::tr{'tor errmsg invalid relay port'}: $settings{'TOR_RELAY_PORT'}";
}
+ if ($settings{'TOR_RELAY_DIRPORT'} ne '0') {
+ if (!&General::validport($settings{'TOR_RELAY_DIRPORT'})) {
+ $errormessage = "$Lang::tr{'tor errmsg invalid directory port'}: $settings{'TOR_RELAY_DIRPORT'}";
+ }
+ }
if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
if ((!&General::validfqdn($settings{'TOR_RELAY_ADDRESS'})) && (!&General::validip($settings{'TOR_RELAY_ADDRESS'}))) {
@@ -382,7 +388,7 @@ END
</td>
<td width='25%' class='base'>$Lang::tr{'tor relay nickname'}: <img src='/blob.gif' alt='*' /></td>
<td width='20%'>
- <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' />
+ <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' maxlength='19' />
</td>
</tr>
<tr>
@@ -396,6 +402,14 @@ END
</td>
</tr>
<tr>
+ <td width='25%'> </td>
+ <td width='30%'> </td>
+ <td width='25%' class='base'>$Lang::tr{'tor directory port'}:</td>
+ <td width='20%'>
+ <input type='text' name='TOR_RELAY_DIRPORT' value='$settings{'TOR_RELAY_DIRPORT'}' size='5' /> $Lang::tr{'tor 0 = disabled'}
+ </td>
+ </tr>
+ <tr>
<td width='25%' class='base'>$Lang::tr{'tor contact info'}: <img src='/blob.gif' alt='*' /></td>
<td width='75%' colspan='3'>
<input type='text' name='TOR_RELAY_CONTACT_INFO' value='$settings{'TOR_RELAY_CONTACT_INFO'}' style='width: 98%;' />
@@ -607,7 +621,7 @@ END
END
if (exists($node->{'country_code'})) {
- if ($node->{'country_code'} eq '??') {
+ if (!$node->{'country_code'} or $node->{'country_code'} eq '??') {
print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>";
} else {
print "<a href='country.cgi#$node->{'country_code'}'><img src='/images/flags/$node->{'country_code'}.png' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>";
@@ -683,6 +697,10 @@ sub BuildConfiguration() {
print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n";
+ if ($settings{'TOR_RELAY_DIRPORT'} ne '0') {
+ print FILE "DirPort $settings{'TOR_RELAY_DIRPORT'}\n";
+ }
+
if ($settings{'TOR_RELAY_ADDRESS'} ne '') {
print FILE "Address $settings{'TOR_RELAY_ADDRESS'}\n";
}
diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index 5ff0e2c..c6e20a0 100644
--- a/html/cgi-bin/wirelessclient.cgi
+++ b/html/cgi-bin/wirelessclient.cgi
@@ -499,11 +499,11 @@ sub showEditBox() {
</td>
<td width='40%'>
<select name='PRIO'>
- <option value="0" $selected{'PRIO'}{'0'}>0</option>
+ <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'most preferred'})</option>
<option value="1" $selected{'PRIO'}{'1'}>1</option>
<option value="2" $selected{'PRIO'}{'2'}>2</option>
<option value="3" $selected{'PRIO'}{'3'}>3</option>
- <option value="4" $selected{'PRIO'}{'4'}>4</option>
+ <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'least preferred'})</option>
</select>
</td>
<td colspan="2" width='40%'></td>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index f4c6729..92b8fd0 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1279,6 +1279,7 @@
'last activity' => 'Letzte Aktivität',
'lateprompting' => 'Late prompting',
'lease expires' => 'Zuordnung verfällt',
+'least preferred' => 'weniger präferiert',
'legend' => 'Legende',
'length' => 'Länge',
'line' => 'Leitung',
@@ -1417,6 +1418,7 @@
'monthly volume start day short' => 'Erste Tag',
'months' => 'Monate',
'more' => 'weitere',
+'most preferred' => 'präferiert',
'mount' => 'Einbinden',
'mounted on' => 'Mounted auf',
'mpfire' => 'Media Player für IPFire',
@@ -1971,6 +1973,7 @@
'tone dial' => 'Tonwahl:',
'too long 80 char max' => ' ist zu lang, es sind maximal 80 Zeichen erlaubt',
'tor' => 'Tor',
+'tor 0 = disabled' => '0 = deaktiviert',
'tor accounting' => 'Accounting',
'tor accounting bytes' => 'Traffic (empfangen/gesendet)',
'tor accounting bytes left' => 'übrig',
@@ -1991,11 +1994,13 @@
'tor connected relays' => 'Verbundene Relays',
'tor contact info' => 'Kontaktinformationen',
'tor daemon' => 'Daemon',
+'tor directory port' => 'Directory-Port',
'tor enabled' => 'Tor einschalten',
'tor errmsg invalid accounting limit' => 'Ungültiges Accounting-Limit',
+'tor errmsg invalid directory port' => 'Ungültiger Directory-Port',
'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz',
'tor errmsg invalid relay address' => 'Ungültige Relay-Adresse',
-'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname.',
+'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname',
'tor errmsg invalid relay port' => 'Ungültiger Relay-Port',
'tor errmsg invalid socks port' => 'Ungültiger SOCKS-Port',
'tor exit country' => 'Exit-Land',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 6361950..085ee22 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1307,6 +1307,7 @@
'last activity' => 'Last Activity',
'lateprompting' => 'Lateprompting',
'lease expires' => 'Lease expires',
+'least preferred' => 'least preferred',
'legend' => 'Legend',
'length' => 'Length',
'line' => 'Line',
@@ -1445,6 +1446,7 @@
'monthly volume start day short' => 'First day',
'months' => 'months',
'more' => 'more',
+'most preferred' => 'most preferred',
'mount' => 'Mount',
'mounted on' => 'Mounted on',
'mpfire' => 'Media Player for IPFire',
@@ -2005,6 +2007,7 @@
'tone dial' => 'Tone dial:',
'too long 80 char max' => ' is too long, maximum allowed is 80 characters',
'tor' => 'Tor',
+'tor 0 = disabled' => '0 = disabled',
'tor accounting' => 'Accounting',
'tor accounting bytes' => 'Traffic (read/written)',
'tor accounting bytes left' => 'left',
@@ -2026,8 +2029,10 @@
'tor connected relays' => 'Connected relays',
'tor contact info' => 'Contact Info',
'tor daemon' => 'Daemon',
+'tor directory port' => 'Directory port',
'tor enabled' => 'Enable Tor',
'tor errmsg invalid accounting limit' => 'Invalid accounting limit',
+'tor errmsg invalid directory port' => 'Invalid directory port',
'tor errmsg invalid ip or mask' => 'Invalid IP subnet',
'tor errmsg invalid node id' => 'Invalid node ID',
'tor errmsg invalid relay address' => 'Invalid relay address',
diff --git a/lfs/iptraf-ng b/lfs/iptraf-ng
index d049173..e962b2c 100644
--- a/lfs/iptraf-ng
+++ b/lfs/iptraf-ng
@@ -17,7 +17,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = iptraf-ng
-PAK_VER = 1
+PAK_VER = 2
DEPS = ""
@@ -63,6 +63,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
cd $(DIR_APP) && ./configure \
--prefix=/usr
diff --git a/lfs/php b/lfs/php
index 58f442c..8139e21 100644
--- a/lfs/php
+++ b/lfs/php
@@ -24,7 +24,7 @@
include Config
-VER = 5.3.16
+VER = 5.3.27
THISAPP = php-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
-$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be
+$(DL_FILE)_MD5 = 25ae23a5b9615fe8d33de5b63e1bb788
idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
@@ -114,11 +114,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--with-mysql-sock=/var/run/mysql \
--with-ncurses \
--with-pdo-mysql \
- --without-pdo-sqlite \
+ --with-pdo-sqlite \
--with-readline \
--enable-sockets \
--with-xsl \
- --with-iconv
+ --with-iconv \
+ --enable-zip
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini
diff --git a/lfs/tor b/lfs/tor
index 6161a56..795f7c3 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -24,7 +24,7 @@
include Config
-VER = 0.2.3.25
+VER = 0.2.4.17-rc
THISAPP = tor-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
-PAK_VER = 3
+PAK_VER = 4
DEPS = "libevent2"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a1c364189a9a66ed9daa8e6436489daf
+$(DL_FILE)_MD5 = 2cdfb8dcc3306a43cf465a858bf97b2d
install : $(TARGET)
diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index a02097e..34eee0c 100644
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -50,8 +50,8 @@ case "${1}" in
boot_mesg "Starting Domain Name Service Proxy..."
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
- ARGS=
- [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN"
+ ARGS="$CUSTOM_ARGS"
+ [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="$ARGS -s $DOMAIN_NAME_GREEN"
echo > /var/ipfire/red/resolv.conf # Clear it
if [ -e "/var/ipfire/red/dns1" ]; then
@@ -73,8 +73,6 @@ case "${1}" in
# Add custom forward dns zones.
ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)"
- ARGS="$ARGS $CUSTOM_ARGS"
-
loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then
diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor
index 878080e..551538e 100644
--- a/src/initscripts/init.d/tor
+++ b/src/initscripts/init.d/tor
@@ -24,6 +24,10 @@ function setup_firewall() {
if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_PORT}" ]; then
iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_PORT}" -j ACCEPT
fi
+
+ if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_DIRPORT}" ] && [ "${TOR_RELAY_DIRPORT}" -ne 0 ]; then
+ iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_DIRPORT}" -j ACCEPT
+ fi
}
function flush_firewall() {
diff --git a/src/paks/fetchmail/install.sh b/src/paks/fetchmail/install.sh
index 31c5fec..b379c0c 100644
--- a/src/paks/fetchmail/install.sh
+++ b/src/paks/fetchmail/install.sh
@@ -25,3 +25,7 @@
extract_files
restore_backup ${NAME}
start_service --background ${NAME}
+
+ln -sf ../init.d/fetchmail /etc/rc.d/rc0.d/K25fetchmail
+ln -sf ../init.d/fetchmail /etc/rc.d/rc3.d/S35fetchmail
+ln -sf ../init.d/fetchmail /etc/rc.d/rc6.d/K25fetchmail
diff --git a/src/paks/fetchmail/uninstall.sh b/src/paks/fetchmail/uninstall.sh
index a7b8a53..2d2606f 100644
--- a/src/paks/fetchmail/uninstall.sh
+++ b/src/paks/fetchmail/uninstall.sh
@@ -25,3 +25,5 @@
stop_service ${NAME}
make_backup ${NAME}
remove_files
+
+rm -f /etc/rc.d/rc*.d/*fetchmail
diff --git a/src/paks/postfix/install.sh b/src/paks/postfix/install.sh
index b8b1809..56c23e2 100644
--- a/src/paks/postfix/install.sh
+++ b/src/paks/postfix/install.sh
@@ -27,6 +27,8 @@ postalias /etc/aliases
# Set postfix's hostname
postconf -e "myhostname=$(hostname -f)"
/etc/init.d/postfix start
-ln -sf ../init.d/fetchmail /etc/rc.d/rc0.d/K25fetchmail
-ln -sf ../init.d/fetchmail /etc/rc.d/rc3.d/S35fetchmail
-ln -sf ../init.d/fetchmail /etc/rc.d/rc6.d/K25fetchmail
+
+# Enable autostart for postfix
+ln -sf ../init.d/postfix /etc/rc.d/rc0.d/K25postfix
+ln -sf ../init.d/postfix /etc/rc.d/rc3.d/S35postfix
+ln -sf ../init.d/postfix /etc/rc.d/rc6.d/K25postfix
diff --git a/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch b/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
new file mode 100644
index 0000000..24a6ce4
--- /dev/null
+++ b/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
@@ -0,0 +1,12 @@
+diff -Nur iptraf-ng-1.1.4-orig/src/tcptable.c iptraf-ng-1.1.4/src/tcptable.c
+--- iptraf-ng-1.1.4-orig/src/tcptable.c 2013-07-23 15:06:11.000000000 +0200
++++ iptraf-ng-1.1.4/src/tcptable.c 2013-08-28 19:10:33.000000000 +0200
+@@ -444,6 +444,8 @@
+ size_t bufsize)
+ {
+ time_t interval = time(NULL) - entry->conn_starttime;
++ if (interval < 1)
++ interval = 1;
+
+ char rbuf[64];
+ rate_print(entry->bcount / interval, rbuf, sizeof(rbuf));
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-10-03 12:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-03 12:27 [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 0203401cf5dcd2fc005eb33a593b625f56258463 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox