squidclamav: fix warning page delivery.

The page reside on the ipfire not on the clients so only rewrite-url can used.

diff --git a/lfs/squidclamav b/lfs/squidclamav
index 263826f84f6ec5dccfe102ff4809e223a73d351d..697b59ab03a3cc75e3838f38689f1e69c884ff62 100644 (file)
--- 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@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 0bdb21bde0cefc4b4f3c5603894339f2281bf589..e64bcafefd0975def17e12aee218def8d9ef26d6 100644 (file)
--- 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)