rpms/squidGuard/F-10 squidGuard-1.3-SG-2008-06-13.patch, NONE, 1.1 sources, 1.3, 1.4 squidGuard.spec, 1.12, 1.13

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31592

Modified Files:
	sources squidGuard.spec 
Added Files:
	squidGuard-1.3-SG-2008-06-13.patch 
Log Message:
1.3


squidGuard-1.3-SG-2008-06-13.patch:

--- NEW FILE squidGuard-1.3-SG-2008-06-13.patch ---
--- src/sgDiv.c.in.orig	2007-11-03 08:59:49.000000000 -0500
+++ src/sgDiv.c.in	2008-06-13 12:01:43.000000000 -0500
@@ -94,6 +94,7 @@
   int i = 0;
   char c;
   int report_once = 1;
+  int trailingdot = 1;
   size_t strsz;
   int ndx = 0;
   
@@ -148,6 +149,16 @@
             report_once--;
           }
       }
+      else if ('.' == p[ndx] && '/' == p[ndx+1] && trailingdot == 0) {
+      /* If the domain has trailing dot, remove (problem found with squid 3.0 stable1-5) */
+      /* if this char is a dot and the next char is a slash, then shift the rest of the string left one char */
+      /* We do this only the first time it is encountered. */
+         trailingdot++;
+         size_t sz = strlen(p+ndx+1);
+         strncpy(p+ndx,p+ndx+1, sz);
+         p[ndx+sz] = '\0';
+         @NOLOG1@ sgLogError("Warning: Possible bypass attempt. Found a trailing dot in the domain name: %s", s->orig); @NOLOG2@
+      }
       else
       {
         /* increment the string indexer */


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Feb 2009 13:57:30 -0000	1.3
+++ sources	17 Feb 2009 16:15:20 -0000	1.4
@@ -1,2 +1,2 @@
-b6700f59c48fde5ad4d12f871acba93a  squidGuard-1.2.1.tar.gz
+d7c2c2e03a2835e4d1c3bef751ace76f  squidGuard-1.3.tar.gz
 7ebb53ea33459c14cbc850cd73405915  blacklists.tar.gz


Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-10/squidGuard.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- squidGuard.spec	12 Feb 2009 18:02:55 -0000	1.12
+++ squidGuard.spec	17 Feb 2009 16:15:20 -0000	1.13
@@ -6,8 +6,8 @@
 %define			_cgibin			/var/www/cgi-bin
 
 Name:			squidGuard
-Version:		1.2.1
-Release:		2%{?dist}
+Version:		1.3
+Release:		1%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -29,12 +29,12 @@
 Source201:		squidGuard.fc
 
 #Patch0:			squidGuard-upstream.patch
-Patch1:			squidGuard-paths.patch
+#Patch1:			squidGuard-paths.patch
 Patch2:			squid-getlist.html.patch
 Patch3:			squidGuard-perlwarning.patch
-Patch4:			squidGuard-sed.patch
+#Patch4:			squidGuard-sed.patch
 Patch5:			squidGuard-makeinstall.patch
-Patch6:			squidGuard-1.2.1-SG-2008-06-13.patch
+Patch6:			squidGuard-1.3-SG-2008-06-13.patch
 
 URL:			http://www.squidguard.org/
 
@@ -72,10 +72,10 @@
 %setup -q
 %{__cp} %{SOURCE3} .
 #%patch0 -p1
-%patch1 -p1 -b .paths
+#%patch1 -p1 -b .paths
 %patch2 -p0
 %patch3 -p2
-%patch4 -p1
+#%patch4 -p1
 %patch5	-p1
 %patch6 -p0
 
@@ -183,6 +183,11 @@
 %{_initrddir}/transparent-proxying
 
 %changelog
+* Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.3-1
+- Update to 1.3.
+- Dropped paths, sed patches, applied upstream.
+- New SG-2008-06-13 patch.
+
 * Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.2.1-2
 - Fix sg-2008-06-13, BZ 452467.