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 3a99677dd6d6251dbe1cc8b70f7e55957230ac29 (commit) via ed94927d20eecaa83df3f71df5a0d937647965ef (commit) via e3c3a6ba5bae10987336ce8170f1d0359c6e8efb (commit) via d88845890c02924a3a7cd108451e763e52790749 (commit) via a945fa225d9d128f889021c99f35a96809e33d27 (commit) via dfabfbedcaedab44714bfc9cbd7d464482c1e5ad (commit) via 9c6be5543e82bd2f0a87d6c40e23b7b18f712806 (commit) from b21618696d28c672ddd11f8943bf27d38d5996dc (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 3a99677dd6d6251dbe1cc8b70f7e55957230ac29 Merge: ed94927 b216186 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 16 23:25:20 2014 +0200

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

commit ed94927d20eecaa83df3f71df5a0d937647965ef Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 16 23:25:06 2014 +0200

netexternal.cgi: Fix font colour on yellow background.

commit e3c3a6ba5bae10987336ce8170f1d0359c6e8efb Merge: d888458 a945fa2 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 16 20:58:41 2014 +0200

Merge remote-tracking branch 'morlix/check_mk'

commit d88845890c02924a3a7cd108451e763e52790749 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jul 16 20:54:56 2014 +0200

core80: Add proxy.cgi.

commit a945fa225d9d128f889021c99f35a96809e33d27 Author: Timo Eissler timo@eissler.pro Date: Wed Jul 16 17:27:01 2014 +0200

check_mk_agent: fix DL_FROM

commit dfabfbedcaedab44714bfc9cbd7d464482c1e5ad Author: Timo Eissler timo@eissler.pro Date: Tue Jul 15 20:45:02 2014 +0200

check_mk_agent: increase PAK_VER

commit 9c6be5543e82bd2f0a87d6c40e23b7b18f712806 Author: Timo Eissler timo@eissler.pro Date: Tue Jul 15 20:36:23 2014 +0200

check_mk_agent: update to 1.2.4p5

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

Summary of changes: html/cgi-bin/netexternal.cgi | 14 +++++++++----- lfs/check_mk_agent | 8 ++++---- 2 files changed, 13 insertions(+), 9 deletions(-)

Difference in files: diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi index 39c50e1..299612d 100644 --- a/html/cgi-bin/netexternal.cgi +++ b/html/cgi-bin/netexternal.cgi @@ -111,22 +111,26 @@ END my $status = &check_dnssec($nameserver, "ping.ipfire.org");

my $colour = ""; + my $bgcolour = ""; my $message = "";

# DNSSEC Not supported if ($status == 0) { $message = $Lang::tr{'dnssec not supported'}; - $colour = ${Header::colourred}; + $colour = "white"; + $bgcolour = ${Header::colourred};

# DNSSEC Aware } elsif ($status == 1) { $message = $Lang::tr{'dnssec aware'}; - $colour = ${Header::colouryellow}; + $colour = "black"; + $bgcolour = ${Header::colouryellow};

# DNSSEC Validating } elsif ($status == 2) { $message = $Lang::tr{'dnssec validating'}; - $colour = ${Header::colourgreen}; + $colour = "white"; + $bgcolour = ${Header::colourgreen};

# Error } else { @@ -138,8 +142,8 @@ END print <<END; <tr bgcolor="$table_colour"> <td>$nameserver</td> - <td bgcolor="$colour" align="center"> - <font color='white'><strong>$message</strong></font> + <td bgcolor="$bgcolour" align="center"> + <font color="$colour"><strong>$message</strong></font> </td> </tr> END diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent index 6e6d557..541d7d6 100644 --- a/lfs/check_mk_agent +++ b/lfs/check_mk_agent @@ -24,15 +24,15 @@

include Config

-VER = 1.2.2p2 +VER = 1.2.4p5

THISAPP = check_mk_agent-$(VER) DL_FILE = check_mk-${VER}.tar.gz -DL_FROM = http://mathias-kettner.de/download +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/check_mk-${VER} TARGET = $(DIR_INFO)/$(THISAPP) PROG = check_mk_agent -PAK_VER = 2 +PAK_VER = 3

DEPS = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = caa0f7662b4d170b2b6db2516bd41a89 +$(DL_FILE)_MD5 = ef3055d191bd38295d1716b3f7824115

install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects))

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