[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a1efb5dcc41a32a83644005d150420cb71e07f69

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a1efb5dcc41a32a83644005d150420cb71e07f69

[git]

[-- Attachment #1: Type: text/plain, Size: 5685 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, next has been updated
       via  a1efb5dcc41a32a83644005d150420cb71e07f69 (commit)
       via  466a93593959397ed860711a00119041c5ffb038 (commit)
       via  5ac2ed47781a5f70a24b9ecf3339010bb06d470c (commit)
       via  3c4eaa3d2dc2bac8586dc65083e2268b461cc687 (commit)
       via  c8a8778f897fb8a7ff11509107975c6d88a2f1d2 (commit)
       via  03435d851bc040aedecc8a0833baba75ff1f045e (commit)
       via  1f571dbd723fdf6d24bf0e1e5389e518930be94d (commit)
      from  e3cb5d8b8e966f78ac5e11f61220d28b990f9e48 (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 a1efb5dcc41a32a83644005d150420cb71e07f69
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Aug 5 14:15:40 2012 +0200

    core62: Add recent changes to filelist.

commit 466a93593959397ed860711a00119041c5ffb038
Merge: e3cb5d8 5ac2ed4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Aug 5 14:14:20 2012 +0200

    Merge branch 'master' into next

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/armv5tel/glibc   |    2 +-
 config/rootfiles/common/i586/glibc       |    2 +-
 config/rootfiles/core/62/filelists/files |    2 ++
 html/cgi-bin/connections.cgi             |   17 ++++++++++++++++-
 html/cgi-bin/credits.cgi                 |    6 +++---
 5 files changed, 23 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc
index 77db7bc..2393ff2 100644
--- 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 2648e70..2b0d06e 100644
--- a/config/rootfiles/common/i586/glibc
+++ b/config/rootfiles/common/i586/glibc
@@ -474,7 +474,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/core/62/filelists/files b/config/rootfiles/core/62/filelists/files
index 409e5fe..89987a1 100644
--- a/config/rootfiles/core/62/filelists/files
+++ b/config/rootfiles/core/62/filelists/files
@@ -1,2 +1,4 @@
 etc/system-release
 etc/issue
+srv/web/ipfire/cgi-bin/connections.cgi
+usr/lib/gconv
diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 21f66d7..973a7d2 100644
--- 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=();
@@ -131,6 +133,11 @@ if ($netsettings{'BLUE_DEV'}) {
 	}
 }
 
+# Add Orange Firewall Interface
+push(@network, $netsettings{'ORANGE_ADDRESS'});
+push(@masklen, "255.255.255.255" );
+push(@colour, ${Header::colourfw} );
+
 # Add Orange Network
 if ($netsettings{'ORANGE_DEV'}) {
 	push(@network, $netsettings{'ORANGE_NETADDRESS'});
@@ -147,6 +154,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 +185,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 +255,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 75e59b1..3ae2f71 100644
--- 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 />


hooks/post-receive
--
IPFire 2.x development tree