From 7cc060415e17d65cb593fc6c62167f4f7fc2f55e Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 2 Jun 2014 00:54:19 +0200
Subject: [PATCH] squidGuard: Update for new squid helper protocol.

---
 config/rootfiles/core/78/filelists/files      |  1 +
 lfs/squidguard                                |  1 +
 ...squidguard-1.4-squid-helper-protocol.patch | 75 +++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 src/patches/squidguard-1.4-squid-helper-protocol.patch

diff --git a/config/rootfiles/core/78/filelists/files b/config/rootfiles/core/78/filelists/files
index 6b9f795fe..7ba6c8011 100644
--- a/config/rootfiles/core/78/filelists/files
+++ b/config/rootfiles/core/78/filelists/files
@@ -9,6 +9,7 @@ srv/web/ipfire/cgi-bin/modem-status.cgi
 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/local/bin/setddns.pl
 var/ipfire/langs
 var/ipfire/menu.d/20-status.menu
diff --git a/lfs/squidguard b/lfs/squidguard
index c70a0d881..a48c25cbe 100644
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidguard-1.4-squid-helper-protocol.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \
 		--sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man  \
 		--with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \
diff --git a/src/patches/squidguard-1.4-squid-helper-protocol.patch b/src/patches/squidguard-1.4-squid-helper-protocol.patch
new file mode 100644
index 000000000..98069465a
--- /dev/null
+++ b/src/patches/squidguard-1.4-squid-helper-protocol.patch
@@ -0,0 +1,75 @@
+http://bugs.squid-cache.org/show_bug.cgi?id=3978
+
+--- squidGuard-1.4.orig/src/main.c	2013-12-11 17:42:15.000000000 +1300
++++ squidGuard-1.4.orig/src/main.c	2013-12-11 19:04:09.000000000 +1300
+@@ -175,7 +175,7 @@ 
+ 	sgReloadConfig();
+       }
+       if(failsafe_mode) {
+-	puts("");
++	puts("ERR message=\"squidGuard failsafe mode\"");
+ 	fflush(stdout);
+ 	if(sig_hup){
+           sgReloadConfig();
+@@ -184,7 +184,7 @@ 
+       }
+       if(parseLine(buf,&squidInfo) != 1){
+ 	sgLogError("Error parsing squid line: %s",buf);
+-	puts("");
++	puts("BH message=\"squidGuard error parsing squid line\"");
+       }
+         else {
+ 	src = Source;
+@@ -196,14 +196,14 @@ 
+ 	  acl = sgAclCheckSource(src);
+ 	  if((redirect = sgAclAccess(src,acl,&squidInfo)) == NULL){
+ 	    if(src == NULL || src->cont_search == 0){
+-	      puts(""); 
++	      puts("ERR");
+ 	      break;
+ 	    } else
+ 	      if(src->next != NULL){
+ 		src = src->next;
+ 		continue;
+ 	      } else {
+-		puts("");
++		puts("ERR");
+ 		break;
+ 	      }
+ 	  } else {
+@@ -215,9 +215,10 @@ 
+ 	      squidInfo.ident[0] = '-';
+ 	      squidInfo.ident[1] = '\0';
+ 	    }
+-	    fprintf(stdout,"%s %s/%s %s %s\n",redirect,squidInfo.src,
+-		    squidInfo.srcDomain,squidInfo.ident,
+-		    squidInfo.method);
++	    if (isdigit(redirect[0]) && isdigit(redirect[1]) && isdigit(redirect[2]) && redirect[3]==':') {
++	      fprintf(stdout,"OK status=%c%c%c url=\"%s\"\n", redirect[0], redirect[1], redirect[2], &redirect[4]);
++	    } else
++	      fprintf(stdout,"OK rewrite-url=\"%s\"\n",redirect);
+             /* sgLogError("%s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method);  */
+ 	    break;
+ 	  }
+--- squidGuard-1.4.orig/src/sgDiv.c	2013-12-11 17:42:15.000000000 +1300
++++ squidGuard-1.4.orig/src/sgDiv.c	2013-12-11 18:58:33.000000000 +1300
+@@ -771,7 +771,7 @@ 
+   }
+   sgLogError("Going into emergency mode");
+   while(fgets(buf, MAX_BUF, stdin) != NULL){
+-    puts("");
++    puts("ERR");
+     fflush(stdout);
+   }
+   sgLogError("ending emergency mode, stdin empty");
+--- squidGuard-1.4.orig/src/sgDiv.c.in	2013-12-11 17:42:15.000000000 +1300
++++ squidGuard-1.4.orig/src/sgDiv.c.in	2013-12-11 18:58:40.000000000 +1300
+@@ -782,7 +782,7 @@ 
+   }
+   sgLogError("Going into emergency mode");
+   while(fgets(buf, MAX_BUF, stdin) != NULL){
+-    puts("");
++    puts("ERR");
+     fflush(stdout);
+   }
+   sgLogError("ending emergency mode, stdin empty");
-- 
2.39.2