From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a545f88e402a62d1b90a929b0e6622ae6eeeb143
Date: Tue, 03 Jun 2014 13:21:31 +0200 [thread overview]
Message-ID: <20140603112131.6742421C7E@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 4046 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 a545f88e402a62d1b90a929b0e6622ae6eeeb143 (commit)
from eab3759a854442a3846548c9bae62539764796c0 (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 a545f88e402a62d1b90a929b0e6622ae6eeeb143
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Jun 3 12:29:23 2014 +0200
squidclamav: fix warning page delivery.
The page reside on the ipfire not on the clients so only rewrite-url can used.
-----------------------------------------------------------------------
Summary of changes:
lfs/squidclamav | 4 ++--
src/patches/squidclamav-5.11-squid-helper-protocol.patch | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
Difference in files:
diff --git a/lfs/squidclamav b/lfs/squidclamav
index 263826f..697b59a 100644
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = squidclamav
-PAK_VER = 18
+PAK_VER = 19
DEPS = "clamav"
diff --git a/src/patches/squidclamav-5.11-squid-helper-protocol.patch b/src/patches/squidclamav-5.11-squid-helper-protocol.patch
index 0bdb21b..e64bcaf 100644
--- a/src/patches/squidclamav-5.11-squid-helper-protocol.patch
+++ b/src/patches/squidclamav-5.11-squid-helper-protocol.patch
@@ -1,6 +1,6 @@
-diff -Nur squidclamav-5.11-vanilla/src/squidclamav.c squidclamav-5.11/src/squidclamav.c
---- squidclamav-5.11-vanilla/src/squidclamav.c 2012-10-29 09:46:06.000000000 +0100
-+++ squidclamav-5.11/src/squidclamav.c 2014-06-02 15:19:05.463465297 +0200
+diff -Naur squidclamav-5.11.org/src/squidclamav.c squidclamav-5.11/src/squidclamav.c
+--- squidclamav-5.11.org/src/squidclamav.c 2012-10-29 09:46:06.000000000 +0100
++++ squidclamav-5.11/src/squidclamav.c 2014-06-03 12:26:36.215696508 +0200
@@ -483,7 +483,7 @@
aren't appropriate, then just echo back the line from stdin */
if (buff_status == 1) {
@@ -61,7 +61,7 @@ diff -Nur squidclamav-5.11-vanilla/src/squidclamav.c squidclamav-5.11/src/squidc
}
- fprintf (stdout, "%s %s %s %s\n", urlredir,
- in_buff.src_address, in_buff.ident, in_buff.method);
-+ fprintf (stdout, "OK status=302 url=\"%s\"\n", urlredir);
++ fprintf (stdout, "OK rewrite-url=\"%s\"\n", urlredir);
fflush(stdout);
xfree(urlredir);
if (debug != 0)
@@ -170,7 +170,7 @@ diff -Nur squidclamav-5.11-vanilla/src/squidclamav.c squidclamav-5.11/src/squidc
}
- fprintf (stdout, "%s %s %s %s\n", urlredir,
- in_buff.src_address, in_buff.ident, in_buff.method);
-+ fprintf (stdout, "OK status=302 url=\"%s\"\n", urlredir);
++ fprintf (stdout, "OK rewrite-url=\"%s\"\n", urlredir);
fflush(stdout);
xfree(urlredir);
if (debug != 0)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-06-03 11:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140603112131.6742421C7E@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox