Merge remote-tracking branch 'origin/master' into kernel-update

diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc
index 51cd8399ad6528e3c8089371d7949907f0fefea3..2934ad8e8671a10fc11f25a9935cedbe5d90fc7f 100644 (file)
--- a/config/rootfiles/common/armv5tel/glibc
+++ b/config/rootfiles/common/armv5tel/glibc
@@ -466,7 +466,7 @@ usr/bin/ldd
 #usr/lib/crt1.o
 #usr/lib/crti.o
 #usr/lib/crtn.o
-#usr/lib/gconv
+usr/lib/gconv
 #usr/lib/gconv/ANSI_X3.110.so
 #usr/lib/gconv/ARMSCII-8.so
 #usr/lib/gconv/ASMO_449.so

diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc
index 7ceb057d912eab31607a1ccd379c105952168c76..4e05e8ef093a17f70baff261d5a52be0da140974 100644 (file)
--- a/config/rootfiles/common/i586/glibc
+++ b/config/rootfiles/common/i586/glibc
@@ -489,7 +489,7 @@ usr/bin/ldd
 #usr/lib/crt1.o
 #usr/lib/crti.o
 #usr/lib/crtn.o
-#usr/lib/gconv
+usr/lib/gconv
 #usr/lib/gconv/ANSI_X3.110.so
 #usr/lib/gconv/ARMSCII-8.so
 #usr/lib/gconv/ASMO_449.so

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 21f66d7b2c7a06315309f1bbefb0c35a133b2377..fbd7fcd7cd5adbd325f20d7330644e97edcf254d 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -32,6 +32,8 @@ require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
+my $colour_multicast = "#A0A0A0";
+
 &Header::showhttpheaders();
 
 my @network=();
@@ -147,6 +149,11 @@ if ($netsettings{'ORANGE_DEV'}) {
        }
 }
 
+# Highlight multicast connections.
+push(@network, "224.0.0.0");
+push(@masklen, "239.0.0.0");
+push(@colour, $colour_multicast);
+
 # Add OpenVPN net and RED/BLUE/ORANGE entry (when appropriate)
 if (-e "${General::swroot}/ovpn/settings") {
        my %ovpnsettings = ();
@@ -173,7 +180,7 @@ if (-e "${General::swroot}/ovpn/settings") {
        }
 }
 
-open(IPSEC, "${General::swroot}/var/ipfire/vpn/config");
+open(IPSEC, "${General::swroot}/vpn/config");
 my @ipsec = <IPSEC>;
 close(IPSEC);
 
@@ -243,6 +250,9 @@ print <<END;
                        <td align='center' bgcolor='${Header::colourovpn}'>
                                <b><font color='#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b>
                        </td>
+                       <td align='center' bgcolor='$colour_multicast'>
+                               <b><font color='#FFFFFF'>Multicast</font></b>
+                       </td>
                </tr>
        </table>
        <br>

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 75e59b18d66be403ae59721690a22257c2ad9b2b..3ae2f71884ba00dbac18400c4691cfa67c0f5479 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -42,9 +42,9 @@ print <<END
        <div align="center">
                <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
                        <input type="hidden" name="cmd" value="_s-xclick">
-                       <input type="hidden" name="hosted_button_id" value="10781833">
-                       <input type="image" src=$Lang::tr{'donation-link'} border="0" name="submit" alt="PayPal - The safer, easier way to pay online.">
-                       <img alt="" border="0" src="https://www.paypal.com/de_DE/i/scr/pixel.gif" width="1" height="1">
+                       <input type="hidden" name="hosted_button_id" value="HHBTSN9QRWPAY">
+                       <input type="image" src="$Lang::tr{'donation-link'}" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+                       <img alt="" border="0" src="https://www.paypalobjects.com/de_DE/i/scr/pixel.gif" width="1" height="1">
                </form>
        </div>
 <br />