[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-scm
Subject:    [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c724c483e00b325b9b1ab98b9c8ad427
From:       git () ipfire ! org (Michael Tremer)
Date:       2014-01-29 13:44:41
Message-ID: 20140129134442.6C5D92107B () argus ! ipfire ! org
[Download RAW message or body]

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  c724c483e00b325b9b1ab98b9c8ad427ca31c41a (commit)
       via  45455cbe1cd1c7e95e9c5986490a4b7eec5a3629 (commit)
       via  fc466a563f2a5694213077680407d1f60a735421 (commit)
       via  64474e3939e3d17fb80d64be614d97d07c9c7f43 (commit)
       via  b23dd8b769d1a3775b3a7fc1ae9461f0e7e3c13a (commit)
       via  4944049ea4ea306ffd762da0ebdd81cae4653386 (commit)
       via  b1be2de786d913b406792dc0ff30bfa794f30023 (commit)
       via  11e012ef666e8c4d2af865db02756398929c35cd (commit)
       via  726e688235f91da4309437abba84c8943a9367fa (commit)
       via  b985d3160ae2367d773ed96d155ad7348d9ffbf1 (commit)
       via  86661c9ed081424e45a4af1b60d937de463df4da (commit)
      from  21b9f5dccd880d07790e56041f9763d51782d92d (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 c724c483e00b325b9b1ab98b9c8ad427ca31c41a
Author: Michael Tremer <michael.tremer at ipfire.org>
Date:   Wed Jan 29 14:43:11 2014 +0100

    Update translations.

commit 45455cbe1cd1c7e95e9c5986490a4b7eec5a3629
Author: Michael Tremer <michael.tremer at ipfire.org>
Date:   Wed Jan 29 14:41:36 2014 +0100

    core76: Add timezone-transition script to updater.

commit fc466a563f2a5694213077680407d1f60a735421
Merge: 64474e3 86661c9
Author: Michael Tremer <michael.tremer at ipfire.org>
Date:   Wed Jan 29 14:40:53 2014 +0100

    Merge remote-tracking branch 'ms/timezone-transision' into next

commit 64474e3939e3d17fb80d64be614d97d07c9c7f43
Author: Michael Tremer <michael.tremer at ipfire.org>
Date:   Wed Jan 29 14:39:20 2014 +0100

    Fix firewall rules update that it will only execute when a  timezone transition \
has happened.

commit b23dd8b769d1a3775b3a7fc1ae9461f0e7e3c13a
Author: Michael Tremer <michael.tremer at ipfire.org>
Date:   Wed Jan 29 14:37:17 2014 +0100

    core76: Add jobs for daylight saving time to updater.

commit 4944049ea4ea306ffd762da0ebdd81cae4653386
Author: Alexander Marx <amarx at ipfire.org>
Date:   Wed Jan 29 12:58:18 2014 +0100

    CRON: reread firewallrules daylight saving

commit b1be2de786d913b406792dc0ff30bfa794f30023
Author: Alexander Marx <amarx at ipfire.org>
Date:   Wed Jan 29 12:22:54 2014 +0100

    NEW THEME: added padding right for TH and TD tags

commit 11e012ef666e8c4d2af865db02756398929c35cd
Author: Alexander Marx <amarx at ipfire.org>
Date:   Wed Jan 29 08:09:06 2014 +0100

    NEW THEME: added padding-left to all tables <td> because it looks much better

commit 726e688235f91da4309437abba84c8943a9367fa
Author: Alexander Marx <amarx at ipfire.org>
Date:   Wed Jan 29 13:23:02 2014 +0100

    Firewallgroups: added untranslated string 'name'

commit b985d3160ae2367d773ed96d155ad7348d9ffbf1
Author: Alexander Marx <amarx at ipfire.org>
Date:   Wed Jan 29 07:46:41 2014 +0100

    FIREWALL: changes column title in firewall-groups from IP Address to IP/MAC \
Address

commit 86661c9ed081424e45a4af1b60d937de463df4da
Author: Michael Tremer <michael.tremer at ipfire.org>
Date:   Sun Jan 19 21:39:07 2014 +0100

    Add timezone transision script.

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

Summary of changes:
 config/cron/crontab                                 |  4 ++++
 config/rootfiles/common/stage2                      |  1 +
 config/rootfiles/core/76/filelists/files            |  1 +
 config/rootfiles/core/76/update.sh                  |  9 +++++++++
 doc/language_issues.de                              |  5 +++++
 doc/language_issues.en                              |  5 +++++
 doc/language_issues.es                              |  6 ++++++
 doc/language_issues.fr                              |  6 ++++++
 doc/language_issues.nl                              |  6 ++++++
 doc/language_issues.pl                              |  6 ++++++
 doc/language_issues.ru                              |  6 ++++++
 doc/language_issues.tr                              |  6 ++++++
 doc/language_missings                               |  4 ++++
 html/cgi-bin/firewall.cgi                           |  2 +-
 html/cgi-bin/fwhosts.cgi                            |  2 +-
 html/html/themes/ipfire/include/css/style.css       |  7 ++++++-
 .../update.sh => scripts/timezone-transition}       | 21 +++++++++++++--------
 17 files changed, 86 insertions(+), 11 deletions(-)
 copy src/{paks/fetchmail/update.sh => scripts/timezone-transition} (79%)

Difference in files:
diff --git a/config/cron/crontab b/config/cron/crontab
index ad90b07..3b70df4 100644
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@ -58,3 +58,7 @@ HOME=/
 
 # pakfire
 %nightly,random * 23-4	/usr/local/bin/pakfire update >/dev/null 2>&1
+
+# 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
diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index a796624..a2b1cfa 100644
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -94,6 +94,7 @@ usr/local/bin/scanhd
 usr/local/bin/setddns.pl
 usr/local/bin/settime
 usr/local/bin/timecheck
+usr/local/bin/timezone-transition
 #usr/local/bin/uname
 usr/local/bin/update-lang-cache
 #usr/local/include
diff --git a/config/rootfiles/core/76/filelists/files \
b/config/rootfiles/core/76/filelists/files index f069534..ce685e5 100644
--- a/config/rootfiles/core/76/filelists/files
+++ b/config/rootfiles/core/76/filelists/files
@@ -17,6 +17,7 @@ srv/web/ipfire/html/themes/darkdos
 srv/web/ipfire/html/themes/ipfire
 srv/web/ipfire/html/themes/ipfire-legacy
 srv/web/ipfire/html/themes/maniac
+usr/local/bin/timezone-transition
 usr/local/bin/setddns.pl
 var/ipfire/backup/bin/backup.pl
 var/ipfire/backup/exclude
diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh
index aaa34bf..655da31 100644
--- a/config/rootfiles/core/76/update.sh
+++ b/config/rootfiles/core/76/update.sh
@@ -314,6 +314,15 @@ if [ -e /var/ipfire/qos/enable ]; then
 	/usr/local/bin/qosctrl start
 fi
 
+# Update crontab
+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
+fcrontab -z &>/dev/null
+
 
 case $(uname -m) in
 	i?86 )
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 50cdc5a..11ae4bc 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -434,6 +434,7 @@ WARNING: translation string unused: proxy no proxy local
 WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: reboot ask
+WARNING: translation string unused: reboot question
 WARNING: translation string unused: reboot schedule
 WARNING: translation string unused: reboot sure
 WARNING: translation string unused: refresh update list
@@ -441,12 +442,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 6a516c3..55f395f 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -461,6 +461,7 @@ WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
+WARNING: translation string unused: reboot question
 WARNING: translation string unused: reboot schedule
 WARNING: translation string unused: reboot sure
 WARNING: translation string unused: refresh update list
@@ -468,12 +469,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 98f1137..83e1328 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -409,6 +409,7 @@ WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
+WARNING: translation string unused: reboot question
 WARNING: translation string unused: reboot schedule
 WARNING: translation string unused: reboot sure
 WARNING: translation string unused: refresh update list
@@ -416,12 +417,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -685,6 +690,7 @@ WARNING: untranslated string: fwdfw err time
 WARNING: untranslated string: fwdfw external port nat
 WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
+WARNING: untranslated string: fwdfw hint mac
 WARNING: untranslated string: fwdfw iface
 WARNING: untranslated string: fwdfw log
 WARNING: untranslated string: fwdfw log rule
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index a281203..ced3bf8 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -420,6 +420,7 @@ WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
+WARNING: translation string unused: reboot question
 WARNING: translation string unused: reboot schedule
 WARNING: translation string unused: reboot sure
 WARNING: translation string unused: refresh update list
@@ -427,12 +428,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -697,6 +702,7 @@ WARNING: untranslated string: fwdfw err time
 WARNING: untranslated string: fwdfw external port nat
 WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
+WARNING: untranslated string: fwdfw hint mac
 WARNING: untranslated string: fwdfw iface
 WARNING: untranslated string: fwdfw log
 WARNING: untranslated string: fwdfw log rule
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 0ec13dc..8bd7f1c 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -425,6 +425,7 @@ WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
+WARNING: translation string unused: reboot question
 WARNING: translation string unused: reboot schedule
 WARNING: translation string unused: reboot sure
 WARNING: translation string unused: refresh update list
@@ -432,12 +433,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -643,6 +648,7 @@ WARNING: untranslated string: fwdfw err time
 WARNING: untranslated string: fwdfw external port nat
 WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
+WARNING: untranslated string: fwdfw hint mac
 WARNING: untranslated string: fwdfw iface
 WARNING: untranslated string: fwdfw log
 WARNING: untranslated string: fwdfw log rule
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 98f1137..83e1328 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -409,6 +409,7 @@ WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
+WARNING: translation string unused: reboot question
 WARNING: translation string unused: reboot schedule
 WARNING: translation string unused: reboot sure
 WARNING: translation string unused: refresh update list
@@ -416,12 +417,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -685,6 +690,7 @@ WARNING: untranslated string: fwdfw err time
 WARNING: untranslated string: fwdfw external port nat
 WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
+WARNING: untranslated string: fwdfw hint mac
 WARNING: untranslated string: fwdfw iface
 WARNING: untranslated string: fwdfw log
 WARNING: untranslated string: fwdfw log rule
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index b4043ad..4aad65c 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -414,6 +414,7 @@ WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
+WARNING: translation string unused: reboot question
 WARNING: translation string unused: reboot schedule
 WARNING: translation string unused: reboot sure
 WARNING: translation string unused: refresh update list
@@ -421,12 +422,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -680,6 +685,7 @@ WARNING: untranslated string: fwdfw err time
 WARNING: untranslated string: fwdfw external port nat
 WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
+WARNING: untranslated string: fwdfw hint mac
 WARNING: untranslated string: fwdfw iface
 WARNING: untranslated string: fwdfw log
 WARNING: untranslated string: fwdfw log rule
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 978c74f..a260ff2 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -430,6 +430,7 @@ WARNING: translation string unused: proxy port
 WARNING: translation string unused: psk
 WARNING: translation string unused: quick control
 WARNING: translation string unused: reboot ask
+WARNING: translation string unused: reboot question
 WARNING: translation string unused: reboot schedule
 WARNING: translation string unused: reboot sure
 WARNING: translation string unused: refresh update list
@@ -437,12 +438,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -649,6 +654,7 @@ WARNING: untranslated string: fwdfw err time
 WARNING: untranslated string: fwdfw external port nat
 WARNING: untranslated string: fwdfw hint ip1
 WARNING: untranslated string: fwdfw hint ip2
+WARNING: untranslated string: fwdfw hint mac
 WARNING: untranslated string: fwdfw iface
 WARNING: untranslated string: fwdfw log
 WARNING: untranslated string: fwdfw log rule
diff --git a/doc/language_missings b/doc/language_missings
index 1324a4e..8b4ad3d 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -137,6 +137,7 @@
 < fwdfw from
 < fwdfw hint ip1
 < fwdfw hint ip2
+< fwdfw hint mac
 < fwdfw iface
 < fwdfw ipsec network
 < fwdfw log
@@ -569,6 +570,7 @@
 < fwdfw from
 < fwdfw hint ip1
 < fwdfw hint ip2
+< fwdfw hint mac
 < fwdfw iface
 < fwdfw ipsec network
 < fwdfw log
@@ -985,6 +987,7 @@
 < fwdfw from
 < fwdfw hint ip1
 < fwdfw hint ip2
+< fwdfw hint mac
 < fwdfw iface
 < fwdfw ipsec network
 < fwdfw log
@@ -1390,6 +1393,7 @@
 < fwdfw from
 < fwdfw hint ip1
 < fwdfw hint ip2
+< fwdfw hint mac
 < fwdfw iface
 < fwdfw ipsec network
 < fwdfw log
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 86cba60..6f4e10b 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -2716,7 +2716,7 @@ END
 				<td colspan='13'>&nbsp;</td>
 			</tr>
 			<tr>
-				<td colspan='13'>
+				<td colspan='13' style="padding-left:0px;">
 					<table width="100%" border='1' rules="cols" cellspacing='0'>
 END
 
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index baecde3..67e8dc8 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1680,7 +1680,7 @@ sub viewtablegrp
 					print"<form method='post' style='display:inline'><input type='image' \
src='/images/delete.gif' alt=$Lang::tr{'delete'} title=$Lang::tr{'delete'} \
align='right' /><input type='hidden' name='grp_name' value='$grpname' ><input \
type='hidden' name='ACTION' value='delgrp'></form>";  }
 				print"<form method='post' style='display:inline'><input type='image' \
src='/images/edit.gif' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} align='right' \
/><input type='hidden' name='grp_name' value='$grpname' ><input type='hidden' \
name='remark' value='$remark' ><input type='hidden' name='ACTION' \
                value='editgrp'></form>";
-				print"<table width='100%' cellspacing='0' class='tbl'><tr><th \
align='center'><b>Name</b></th><th align='center'><b>$Lang::tr{'ip \
address'}</b></th><th align='center' width='25%'><b>$Lang::tr{'fwhost \
type'}</th><th></th></tr>"; +				print"<table width='100%' cellspacing='0' \
class='tbl'><tr><th align='center'><b>$Lang::tr{'name'}</b></th><th \
align='center'><b>$Lang::tr{'fwhost ip_mac'}</b></th><th align='center' \
width='25%'><b>$Lang::tr{'fwhost type'}</th><th></th></tr>";  }
 			my $col='';
 			if ( ($fwhostsettings{'ACTION'} eq 'editgrp' || $fwhostsettings{'update'} ne '') \
                && $fwhostsettings{'grp_name'} eq $customgrp{$key}[0]) {
diff --git a/html/html/themes/ipfire/include/css/style.css \
b/html/html/themes/ipfire/include/css/style.css index 9f3e25b..0e990d6 100644
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -274,6 +274,8 @@ table {
 	border-top: 1px solid lightgrey;
 	border-bottom: 1px solid lightgrey;
 	background: #cccccc;
+	padding-left: 0.5em;
+	padding-right: 0.5em;
 }
 
 .tbl th:first-child {
@@ -291,7 +293,10 @@ table {
 .tbl th:only-child {
 	border: 1px solid lightgrey;
 }
-
+.tbl td{
+	padding-left: 0.5em;
+	padding-right: 0.5em;
+}
 .tbl tr td:first-child {
 	border-left: 1px solid lightgrey;
 }
diff --git a/src/scripts/timezone-transition b/src/scripts/timezone-transition
new file mode 100644
index 0000000..a8e436f
--- /dev/null
+++ b/src/scripts/timezone-transition
@@ -0,0 +1,37 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2014 IPFire Team <info at ipfire.org>                         #
+#                                                                          #
+############################################################################
+
+# This script checks if a daylight saving time transition
+# has just happened and will run the given command.
+
+HOUR_NOW=$(date "+%H")
+HOUR_THEN=$(date --date="1 hour ago" "+%H")
+
+# We expect that the result in HOUR_THEN is HOUR_NOW - 1
+HOUR_EXPECTED=$(( ${HOUR_NOW} - 1 ))
+
+if [ "${HOUR_EXPECTED}" -eq "${HOUR_THEN}" ]; then
+	exit 0
+fi
+
+$@


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


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic