[prev in list] [next in list] [prev in thread] [next in thread] 

List:       opensuse-commit
Subject:    commit squidGuard for openSUSE:Factory
From:       root () hilbert ! suse ! de (h_root)
Date:       2015-03-30 17:33:15
Message-ID: 20150330173315.C992640781 () hilbert ! suse ! de
[Download RAW message or body]

Hello community,

here is the log from the commit of package squidGuard for openSUSE:Factory checked in \
at 2015-03-30 19:33:13 \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing \
/work/SRC/openSUSE:Factory/squidGuard (Old)  and      \
/work/SRC/openSUSE:Factory/.squidGuard.new (New) \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "squidGuard"

Changes:
--------
--- /work/SRC/openSUSE:Factory/squidGuard/squidGuard.changes	2015-03-11 \
                09:57:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.squidGuard.new/squidGuard.changes	2015-03-30 \
19:33:14.000000000 +0200 @@ -1,0 +2,6 @@
+Tue Mar 10 17:09:20 UTC 2015 - ecsos@opensuse.org
+
+- fix squid 3.4 error witch patch squidGuard-1.4_upgrade.patch
+  see http://bugs.squid-cache.org/show_bug.cgi?id=3978
+
+-------------------------------------------------------------------

New:
----
  squidGuard-1.4_upgrade.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ squidGuard.spec ++++++
--- /var/tmp/diff_new_pack.NncQkK/_old	2015-03-30 19:33:15.000000000 +0200
+++ /var/tmp/diff_new_pack.NncQkK/_new	2015-03-30 19:33:15.000000000 +0200
@@ -40,6 +40,7 @@
 Patch4:         squidGuard-unusual_url_end.patch
 Patch5:         squidGuard-CVE-2009-3700.patch
 Patch6:         squidGuard-CVE-2009-3826.patch
+Patch7:         squidGuard-1.4_upgrade.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         http_proxy
 BuildRequires:  bison
@@ -100,6 +101,7 @@
 %patch4 -p0
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 find -type d | xargs chmod 755
 cp %{SOURCE1} .
 # patch the test configs


++++++ squidGuard-1.4_upgrade.patch ++++++
diff -urN squidGuard-1.4.orig/src/main.c squidGuard-1.4.upgraded/src/main.c
--- squidGuard-1.4.orig/src/main.c	2013-12-11 17:42:15.000000000 +1300
+++ squidGuard-1.4.upgraded/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;
 	  }
diff -urN squidGuard-1.4.orig/src/sgDiv.c squidGuard-1.4.upgraded/src/sgDiv.c
--- squidGuard-1.4.orig/src/sgDiv.c	2013-12-11 17:42:15.000000000 +1300
+++ squidGuard-1.4.upgraded/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");
diff -urN squidGuard-1.4.orig/src/sgDiv.c.in squidGuard-1.4.upgraded/src/sgDiv.c.in
--- squidGuard-1.4.orig/src/sgDiv.c.in	2013-12-11 17:42:15.000000000 +1300
+++ squidGuard-1.4.upgraded/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");


[prev in list] [next in list] [prev in thread] [next in thread]