[git.ipfire.org] IPFire 2.x development tree branch, master, updated. f1dd19724c3b8b0643ae84ccf2e1bc9f247328f9

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. f1dd19724c3b8b0643ae84ccf2e1bc9f247328f9

[git]

[-- Attachment #1: Type: text/plain, Size: 3377 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, master has been updated
       via  f1dd19724c3b8b0643ae84ccf2e1bc9f247328f9 (commit)
       via  8fc66b345a22a72045f2073ed2b58feb2bac6a38 (commit)
       via  1349c45777637c7828a7f40b92a68ba6f18b3baa (commit)
      from  6e283deb2dcc9039a5966ab21033bf06574ce65e (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 f1dd19724c3b8b0643ae84ccf2e1bc9f247328f9
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Wed May 7 07:53:21 2014 +0200

    Firewall: Add ip addres after alias name in dropdown for source and target

commit 8fc66b345a22a72045f2073ed2b58feb2bac6a38
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 7 12:00:11 2014 +0200

    core77: Remove dialctrl.pl call from crontab.

commit 1349c45777637c7828a7f40b92a68ba6f18b3baa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 7 11:54:53 2014 +0200

    core77: Only add timezone-transition rules when needed.

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

Summary of changes:
 config/rootfiles/core/77/update.sh | 5 ++++-
 html/cgi-bin/firewall.cgi          | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/77/update.sh b/config/rootfiles/core/77/update.sh
index e19237f..e9cf770 100644
--- a/config/rootfiles/core/77/update.sh
+++ b/config/rootfiles/core/77/update.sh
@@ -401,12 +401,15 @@ 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
 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
 
 
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index cf94c8f..e6ae527 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;


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