From 1349c45777637c7828a7f40b92a68ba6f18b3baa Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 7 May 2014 11:54:53 +0200
Subject: [PATCH 1/4] core77: Only add timezone-transition rules when needed.

---
 config/rootfiles/core/77/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/rootfiles/core/77/update.sh b/config/rootfiles/core/77/update.sh
index e19237fee..7e4416ab0 100644
--- a/config/rootfiles/core/77/update.sh
+++ b/config/rootfiles/core/77/update.sh
@@ -401,7 +401,7 @@ fi
 
 chown cron:cron /var/spool/cron
 # Update crontab
-cat <<EOF >> /var/spool/cron/root.orig
+grep -q timezone-transition /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
 
 # Re-read firewall rules every Sunday in March, October and November to take care of daylight saving time
 00 3 * 3 0          /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl

From 8fc66b345a22a72045f2073ed2b58feb2bac6a38 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 7 May 2014 12:00:11 +0200
Subject: [PATCH 2/4] core77: Remove dialctrl.pl call from crontab.

---
 config/rootfiles/core/77/update.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/rootfiles/core/77/update.sh b/config/rootfiles/core/77/update.sh
index 7e4416ab0..e9cf77004 100644
--- a/config/rootfiles/core/77/update.sh
+++ b/config/rootfiles/core/77/update.sh
@@ -407,6 +407,9 @@ grep -q timezone-transition /var/spool/cron/root.orig || cat <<EOF >> /var/spool
 00 3 * 3 0          /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
 00 2 * 10-11 0      /usr/local/bin/timezone-transition /usr/local/bin/firewallctrl
 EOF
+
+# Remove dialctrl script.
+sed -i /var/spool/cron/root.orig -e "/Dialup/,/dialctrl.pl/d"
 fcrontab -z &>/dev/null
 
 

From f1dd19724c3b8b0643ae84ccf2e1bc9f247328f9 Mon Sep 17 00:00:00 2001
From: Alexander Marx <alexander.marx@ipfire.org>
Date: Wed, 7 May 2014 07:53:21 +0200
Subject: [PATCH 3/4] Firewall: Add ip addres after alias name in dropdown for
 source and target

---
 html/cgi-bin/firewall.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index cf94c8f8b..e6ae5272a 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1602,7 +1602,7 @@ END
 		if (! -z "${General::swroot}/ethernet/aliases"){
 			foreach my $alias (sort keys %aliases)
 			{
-				print "<option value='$alias' $selected{'ipfire_src'}{$alias}>$alias</option>";
+				print "<option value='$alias' $selected{'ipfire_src'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
 			}
 		}
 		print<<END;
@@ -1706,7 +1706,7 @@ END
 		if (! -z "${General::swroot}/ethernet/aliases"){
 			foreach my $alias (sort keys %aliases)
 			{
-				print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias</option>";
+				print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>";
 			}
 		}
 		print<<END;

From 7fa1b16e5d84108da9b218a28cb224961e523d35 Mon Sep 17 00:00:00 2001
From: Alexander Marx <alexander.marx@ipfire.org>
Date: Wed, 7 May 2014 12:09:28 +0200
Subject: [PATCH 4/4] Firewall: Fix slow generation of host table in firewall
 groups

---
 html/cgi-bin/fwhosts.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index c5e1c2845..eeb83ac12 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1632,7 +1632,7 @@ sub getcolor
 		}
 
 		#Now check if IP is part of ORANGE,BLUE or GREEN
-		if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
+		if ( &Header::orange_used() && &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
 			$tdcolor="<font style='color: $Header::colourorange;'>$c</font>";
 			return $tdcolor;
 		}
@@ -1640,7 +1640,7 @@ sub getcolor
 			$tdcolor="<font style='color: $Header::colourgreen;'>$c</font>";
 			return $tdcolor;
 		}
-		if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
+		if ( &Header::blue_used() && &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
 			$tdcolor="<font style='color: $Header::colourblue;'>$c</font>";
 			return $tdcolor;
 		}