Package: release.debian.org
Severity: important
User: release.debian.org@packages.debian.org
Usertags: unblock
Hello release team,
please unblock package squidguard.
Unblock squidguard/1.5-4
The version squidguard/1.5-4 fixes one RC bug which prevents webfiltering
with squid3 because of a new redirector protocol introduced in Debian with
squid3 version 3.4.8-1. Here is the changelog for updated squidguard:
* Fix for working with squid 3.4 and higher. Closes: #772831
<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772831>
* Update dependency to squid3 (>= 3.4.0) because the new patch
let squidguard only support newer versions of squid3 and
don't support squid 2.7 anymore.
Details are in the attached debdiff.
Many thanks for your work,
---
Have a nice day.
Joachim (Germany)
diff -urN d00/debian/changelog d02/debian/changelog
--- d00/debian/changelog 2014-09-22 16:41:02.000000000 +0200
+++ d02/debian/changelog 2014-12-25 20:26:51.333680178 +0100
@@ -1,3 +1,12 @@
+squidguard (1.5-4) unstable; urgency=medium
+
+ * Fix for working with squid 3.4 and higher. Closes: #772831
+ * Update dependency to squid3 (>= 3.4.0) because the new patch
+ let squidguard only support newer versions of squid3 and
+ don't support squid 2.7 anymore.
+
+ -- Joachim Wiedorn <joodebian@joonet.de> Thu, 25 Dec 2014 20:21:03 +0100
+
squidguard (1.5-3) unstable; urgency=medium
* debian/control:
diff -urN d00/debian/control d02/debian/control
--- d00/debian/control 2014-09-21 01:30:31.000000000 +0200
+++ d02/debian/control 2014-12-25 20:23:22.241254212 +0100
@@ -1,7 +1,7 @@
Source: squidguard
Section: web
Priority: optional
-Maintainer: Joachim Wiedorn <ad_debian@joonet.de>
+Maintainer: Joachim Wiedorn <joodebian@joonet.de>
Build-Depends: debhelper (>= 9),
libldap2-dev, libdb-dev,
po-debconf, bison, flex
@@ -13,7 +13,7 @@
Package: squidguard
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: squid3 | squid, liburi-perl, libwww-perl
+Recommends: squid3 (>= 3.4.0), liburi-perl, libwww-perl
Suggests: ldap-utils, squidguard-doc
Description: filter and redirector plugin for Squid
squidGuard is a free, flexible and ultra fast filter, redirector
diff -urN d00/debian/copyright d02/debian/copyright
--- d00/debian/copyright 2014-09-21 00:10:14.000000000 +0200
+++ d02/debian/copyright 2014-12-25 20:22:00.403519436 +0100
@@ -19,7 +19,7 @@
License: W3C-Software
Files: debian/*
-Copyright: 2010-2014, Joachim Wiedorn <ad_debian@joonet.de>
+Copyright: 2010-2014, Joachim Wiedorn <joodebian@joonet.de>
License: GPL-2
diff -urN d00/debian/patches/14_fix-working-with-squid-3-4.patch d02/debian/patches/14_fix-working-with-squid-3-4.patch
--- d00/debian/patches/14_fix-working-with-squid-3-4.patch 1970-01-01 01:00:00.000000000 +0100
+++ d02/debian/patches/14_fix-working-with-squid-3-4.patch 2014-12-25 19:23:52.000000000 +0100
@@ -0,0 +1,144 @@
+Package: squidguard
+Subject: fix for working (only) with squid 3.4 and higher
+Author: Joachim Wiedorn <joodebian at joonet.de>
+Origin: other, http://bugs.squid-cache.org/show_bug.cgi?id=3978
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772831
+Forwarded: yes
+Last-Update: 2014-12-22
+
+Incorrectly use of Squid helper protocol (old squid-2.5 protocol).
+This bugfix let it work together with squid3 v3.4 and higher. Pay
+attention that with this patch squidguard don't work with squid 3.3
+and lower anymore!
+---
+
+diff -urN s13/src/main.c s14/src/main.c
+--- s13/src/main.c 2014-12-11 18:10:03.943372692 +0100
++++ s14/src/main.c 2014-12-23 23:07:49.583732080 +0100
+@@ -185,7 +185,7 @@
+ sgReloadConfig();
+ }
+ if(failsafe_mode) {
+- puts("");
++ puts("ERR message=\"squidGuard failsafe mode\"");
+ fflush(stdout);
+ if(sig_hup){
+ sgReloadConfig();
+@@ -194,7 +194,7 @@
+ }
+ if(parseLine(buf,&squidInfo) != 1){
+ sgLogError("ERROR: Error parsing squid line: %s",buf);
+- puts("");
++ puts("BH message=\"squidGuard error parsing squid line\"");
+ }
+ else {
+ src = Source;
+@@ -206,14 +206,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 {
+@@ -225,9 +225,11 @@
+ 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);
++
+ /* sgLogDebug("DEBUG: %s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method); */
+ break;
+ }
+diff -urN s13/src/main.c.in s14/src/main.c.in
+--- s13/src/main.c.in 2011-10-01 20:49:00.000000000 +0200
++++ s14/src/main.c.in 2014-12-11 18:19:26.775347885 +0100
+@@ -185,7 +185,7 @@
+ sgReloadConfig();
+ }
+ if(failsafe_mode) {
+- puts("");
++ puts("ERR message=\"squidGuard failsafe mode\"");
+ fflush(stdout);
+ if(sig_hup){
+ sgReloadConfig();
+@@ -194,7 +194,7 @@
+ }
+ if(parseLine(buf,&squidInfo) != 1){
+ sgLogError("ERROR: Error parsing squid line: %s",buf);
+- puts("");
++ puts("BH message=\"squidGuard error parsing squid line\"");
+ }
+ else {
+ src = Source;
+@@ -206,14 +206,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 {
+@@ -225,9 +225,11 @@
+ 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);
++
+ /* sgLogDebug("DEBUG: %s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method); */
+ break;
+ }
+diff -urN s13/src/sgDiv.c s14/src/sgDiv.c
+--- s13/src/sgDiv.c 2011-10-01 20:49:00.000000000 +0200
++++ s14/src/sgDiv.c 2014-12-11 18:19:26.775347885 +0100
+@@ -782,7 +782,7 @@
+ }
+ sgLogError("ERROR: Going into emergency mode");
+ while(fgets(buf, MAX_BUF, stdin) != NULL){
+- puts("");
++ puts("ERR");
+ fflush(stdout);
+ }
+ sgLogError("ERROR: Ending emergency mode, stdin empty");
+diff -urN s13/src/sgDiv.c.in s14/src/sgDiv.c.in
+--- s13/src/sgDiv.c.in 2014-12-11 18:10:26.551870993 +0100
++++ s14/src/sgDiv.c.in 2014-12-11 18:19:26.775347885 +0100
+@@ -784,7 +784,7 @@
+ }
+ sgLogError("ERROR: Going into emergency mode");
+ while(fgets(buf, MAX_BUF, stdin) != NULL){
+- puts("");
++ puts("ERR");
+ fflush(stdout);
+ }
+ sgLogError("ERROR: Ending emergency mode, stdin empty");
diff -urN d00/debian/patches/series d02/debian/patches/series
--- d00/debian/patches/series 2014-09-20 23:38:23.000000000 +0200
+++ d02/debian/patches/series 2014-12-25 19:24:01.000000000 +0100
@@ -8,3 +8,4 @@
11_fix-for-clean-target-without-syslog.patch
12_enable-ldap-deprecated.patch
13_fix-time-printing-format.patch
+14_fix-working-with-squid-3-4.patch
Attachment:
signature.asc
Description: PGP signature