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 8bab8832b7b7e4d4367961bc30f89b3a7ff301c9 (commit) via 943be282dab5ed2d6d403b9467ff3f33a288dbae (commit) via 406190b2d4e01d5497d3ccb4132490812bb52834 (commit) from 9663c20e2d8936845eff43137fb9108feae1f355 (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 8bab8832b7b7e4d4367961bc30f89b3a7ff301c9 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 2 17:45:09 2014 +0200

redirect wrapper: Adopt to new squid helper protocol.

commit 943be282dab5ed2d6d403b9467ff3f33a288dbae Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 2 17:43:17 2014 +0200

squidclamav: Adopt new squid helper protocol.

commit 406190b2d4e01d5497d3ccb4132490812bb52834 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 2 13:36:39 2014 +0200

icinga: Update rootfile.

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

Summary of changes: config/rootfiles/core/78/filelists/files | 1 + config/rootfiles/packages/icinga | 1 - config/urlfilter/redirect_wrapper | 2 +- lfs/squidclamav | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/78/filelists/files b/config/rootfiles/core/78/filelists/files index fc6357c..851ce36 100644 --- a/config/rootfiles/core/78/filelists/files +++ b/config/rootfiles/core/78/filelists/files @@ -10,6 +10,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/html/themes/ipfire/include/functions.pl usr/bin/squidGuard +usr/sbin/redirect_wrapper usr/sbin/updxlrator usr/local/bin/setddns.pl var/ipfire/langs diff --git a/config/rootfiles/packages/icinga b/config/rootfiles/packages/icinga index 74bc4c5..e31b73a 100644 --- a/config/rootfiles/packages/icinga +++ b/config/rootfiles/packages/icinga @@ -37,7 +37,6 @@ usr/lib/icinga/plugins/check_dns usr/lib/icinga/plugins/check_dummy usr/lib/icinga/plugins/check_file_age usr/lib/icinga/plugins/check_flexlm -usr/lib/icinga/plugins/check_fping usr/lib/icinga/plugins/check_ftp usr/lib/icinga/plugins/check_hpjd usr/lib/icinga/plugins/check_http diff --git a/config/urlfilter/redirect_wrapper b/config/urlfilter/redirect_wrapper index ceae12b..96cc0a0 100644 --- a/config/urlfilter/redirect_wrapper +++ b/config/urlfilter/redirect_wrapper @@ -100,7 +100,7 @@ while($line = <>) { }

# break if redirector changes data - if($return ne "\n" and $return ne $line ){ + if($return ne "ERR\n" and $return ne $line ){ if ( $redirectors->[$i] ne "/usr/sbin/updxlrator"){ if ($debug){ writetolog($redirectors->[$i]." is stopping querry because block was found."); diff --git a/lfs/squidclamav b/lfs/squidclamav index 7d9e6af..263826f 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squidclamav -PAK_VER = 17 +PAK_VER = 18

DEPS = "clamav"

@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-dont_use_ipv6.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-squid-helper-protocol.patch cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make install install -v -m 664 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf

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