Fix regular expresion matching (#193712).

(Portage version: 2.1.2.12)

4 files changed, 22 insertions, 2 deletions

diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index e7230bae5e2a..fa5cfcf4e874 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/squidguard
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.14 2007/09/24 22:45:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.15 2007/09/25 11:29:00 mrness Exp $
+
+*squidguard-1.2.1-r2 (25 Sep 2007)
+
+  25 Sep 2007; Alin Năstac <mrness@gentoo.org>
+  +files/squidguard-1.2.1-regexp.patch, -squidguard-1.2.1-r1.ebuild,
+  +squidguard-1.2.1-r2.ebuild:
+  Fix regular expresion matching (#193712).
 
   24 Sep 2007; Brent Baude <ranger@gentoo.org> squidguard-1.2.1-r1.ebuild:
   Marking squidguard-1.2.1-r1 ppc64 stable for bug 189781
diff --git a/net-proxy/squidguard/files/digest-squidguard-1.2.1-r1 b/net-proxy/squidguard/files/digest-squidguard-1.2.1-r2
index b8df36f399bf..b8df36f399bf 100644
--- a/net-proxy/squidguard/files/digest-squidguard-1.2.1-r1
+++ b/net-proxy/squidguard/files/digest-squidguard-1.2.1-r2
diff --git a/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch b/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch
new file mode 100644
index 000000000000..5a1a1ed6331d
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch
@@ -0,0 +1,12 @@
+diff -Nru squidGuard-1.2.1.orig/src/sg.y.in squidGuard-1.2.1/src/sg.y.in
+--- squidGuard-1.2.1.orig/src/sg.y.in	2007-02-02 15:37:07.000000000 +0200
++++ squidGuard-1.2.1/src/sg.y.in	2007-09-25 14:22:14.000000000 +0300
+@@ -2347,7 +2347,7 @@
+ 	}
+       }
+       if(aclpass->dest->regExp != NULL && access){
+-	if((result = sgRegExpMatch(aclpass->dest->regExp,req->url)) != 0){
++	if((result = sgRegExpMatch(aclpass->dest->regExp,req->strippedurl)) != 0){
+ 	  if(aclpass->access){
+ 	    access++;
+ 	    break;
diff --git a/net-proxy/squidguard/squidguard-1.2.1-r1.ebuild b/net-proxy/squidguard/squidguard-1.2.1-r2.ebuild
index 6fe97d690b62..3b7a55284c72 100644
--- a/net-proxy/squidguard/squidguard-1.2.1-r1.ebuild
+++ b/net-proxy/squidguard/squidguard-1.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.1-r1.ebuild,v 1.5 2007/09/24 22:45:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.1-r2.ebuild,v 1.1 2007/09/25 11:29:00 mrness Exp $
 
 inherit eutils autotools
 
@@ -28,6 +28,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	epatch "${FILESDIR}/${P}-tests.patch"
+	epatch "${FILESDIR}/${P}-regexp.patch"
 	eautoconf
 }