Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

diff --git a/config/rootfiles/core/73/filelists/php b/config/rootfiles/core/73/filelists/php
new file mode 120000 (symlink)
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 a1ef1bfdd5789aea1b0e49eec58e6abb1f28325b..6df851ef0cd2ea542dd7451baa4eb5e4ee4b9321 100644 (file)
--- 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 6afca9fc54afb494b2f3b6b9c23c81f3815b6e17..1fb3ac64269ed59b5cdb1173a2edcadfc10f0c87 100644 (file)
--- 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 58de7da86a2c5d4f3151cddff6f56219f383ddb0..f9c657c881a663d1cf1c7e54ecfe01d2a042c59d 100644 (file)
--- 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 9f48b8b91132806d7169bd32ed42a7b51e187659..514a2e96a498b419946c7016a8daa7c09af166a4 100644 (file)
--- 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 6f515422aa744c1004499f54d8e97ab9c5bbe948..ef246b4189066b5968b9819216e87fa3719a1fb8 100644 (file)
--- 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 3dc84df5092d7768b9d42379e79e37b79bc3cf08..d4f500ca78d6191ef18526f7da8696b680742460 100644 (file)
--- 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 2df8288d51ee7b8de47188326ca4a1819331b3f6..e16150060f07d69b519c739d3f067785907c8c84 100644 (file)
--- 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 ce700828ff99567a01b3b40814e435ff828953d6..fed5e45c4d462703a70309e54cd1f9ae7bc47472 100644 (file)
--- 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 3dc84df5092d7768b9d42379e79e37b79bc3cf08..d4f500ca78d6191ef18526f7da8696b680742460 100644 (file)
--- 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 80f7f3152c62e2459fbf007198e7f0c294809acf..1d3eb79146ebf2e8b55b47c0f0cb7b37e80abd9a 100644 (file)
--- 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 19d15fad3c2f0a768943d98931b0ce8593c6c677..079f411a528ac101bb6fe4deead64ce125366762 100644 (file)
--- 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 4c63a355a2ead38124106a45d46d622f677d263c..704db02cce419544969f71fc196dbf335618d14a 100644 (file)
--- 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 afcd38822d6fff49a5d0c592e1431df074d6ce99..488705fb528e89685e0b3476bb4498fad9212fec 100644 (file)
--- 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 b920724de7aeab1e592b851fc51f088a1a9b1879..befd5083442993a57168fa6315ccdeba3b20b568 100755 (executable)
--- 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'}:&nbsp;<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>
@@ -395,6 +401,14 @@ END
                                        <input type='text' name='TOR_RELAY_PORT' value='$settings{'TOR_RELAY_PORT'}' size='5' />
                                </td>
                        </tr>
+                       <tr>
+                               <td width='25%'>&nbsp;</td>
+                               <td width='30%'>&nbsp;</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' />&nbsp;$Lang::tr{'tor 0 = disabled'}
+                               </td>
+                       </tr>
                        <tr>
                                <td width='25%' class='base'>$Lang::tr{'tor contact info'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
                                <td width='75%' colspan='3'>
@@ -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 5ff0e2c427cd377e88b4a9f55c558461357e1cc6..c6e20a0e6f5592ebd7ca0385a42842d61d563dcd 100644 (file)
--- 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 f4c6729c784de746c30afe8cab8a01ca78b71d58..92b8fd057bdd5acb58cf179dc67f0d30547ac563 100644 (file)
--- 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 636195086cec6497319cc6479d9fba96c9aff0ba..085ee221c90197219878d59f18202733ca67211c 100644 (file)
--- 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 d0491730fb7e462b19c9519708fc4ae12cac19c1..e962b2c5e751fb8be5bc22376667b26ea325fa02 100644 (file)
--- 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 58f442ce4c839dba7c381cb4345f660b151dfba4..8139e2128400e4c6ad77061aad91fbb9e8ac3b27 100644 (file)
--- 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 6161a56484098f76ff78f92964a56f9febadbe0d..795f7c3ebcd8a16773f48e90658bd3ec9b197177 100644 (file)
--- 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 a02097e4109febedae15ee1dd3b0604001b4dd67..34eee0c26e8fbb2aa2bab5fe9b098c03d66ba8bd 100644 (file)
--- 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 878080eff3bbe4c220cbfa2fba85f16494a0f2a9..551538e2f65318111332a278bf70c0749ad44c87 100644 (file)
--- 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 31c5fecae2e3f1a09e312e3e2bbbcc0e7e03c373..b379c0cdf88042beba78d429b0d3ed502e1b2f28 100644 (file)
--- 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 a7b8a5370f68e23809d3bd94083f0150545980cb..2d2606f9962ef65a771b58eeed9519989eb0078f 100644 (file)
--- 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 b8b18098aa29086fd3199307eadb41c3618ab676..56c23e2c26bdea3576128c2881ab25171122267d 100644 (file)
--- 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 (file)
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));