Fix regular expresion matching (#193712).

Package-Manager: portage-2.1.2.12

5 files changed, 47 insertions, 13 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/Manifest b/net-proxy/squidguard/Manifest
index 0811c568da39..114d3e02f4e8 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX blockedsites 8 RMD160 69ecf774374ab43c8e3950977ac155bd475d1336 SHA1 d36a84e9d9f9d0296b0e8199ad27154ac6726395 SHA256 20169b61056128def8ac7b7eb393f7933362392b8d583b610b21bd3ce5c2015f
 MD5 127270fbe0d0bfbc141ffaf56313f3e6 files/blockedsites 8
 RMD160 69ecf774374ab43c8e3950977ac155bd475d1336 files/blockedsites 8
@@ -18,6 +21,10 @@ AUX squidguard-1.2.1-gentoo.patch 4137 RMD160 48bc8c0990ca0e165af0f1dc756da939f2
 MD5 2213fd1eaf683ff05edbed2bb8ba5ea0 files/squidguard-1.2.1-gentoo.patch 4137
 RMD160 48bc8c0990ca0e165af0f1dc756da939f2df2f80 files/squidguard-1.2.1-gentoo.patch 4137
 SHA256 8ea7540586a974cba4afb3a9149c3436e8d3d59355f3e532de2cbfbbdc08344b files/squidguard-1.2.1-gentoo.patch 4137
+AUX squidguard-1.2.1-regexp.patch 503 RMD160 d39c32f23a7caae4a7547fd69610c34e7c069886 SHA1 af13eb25b05a8bcc15558cf1c90e2a0e8a603769 SHA256 d0712f25dc70d1a89c932cfbe2ba569e8da95b84252e015d13409f83835254ce
+MD5 e231282d125c86a5e603cbd5e24e89a6 files/squidguard-1.2.1-regexp.patch 503
+RMD160 d39c32f23a7caae4a7547fd69610c34e7c069886 files/squidguard-1.2.1-regexp.patch 503
+SHA256 d0712f25dc70d1a89c932cfbe2ba569e8da95b84252e015d13409f83835254ce files/squidguard-1.2.1-regexp.patch 503
 AUX squidguard-1.2.1-tests.patch 6170 RMD160 b1eb1c2f56c75cb28cb6887182b36a6c99725013 SHA1 f22f70544aaf50d7ad5ca74c42f4c93c9587b44c SHA256 116664588ac5dfc1d41a93ab8d42c482a9f1ff069592c305cfe1c726695a1184
 MD5 85a1cbad7e9cde56dc3ff720ea5f0e8b files/squidguard-1.2.1-tests.patch 6170
 RMD160 b1eb1c2f56c75cb28cb6887182b36a6c99725013 files/squidguard-1.2.1-tests.patch 6170
@@ -28,14 +35,14 @@ EBUILD squidguard-1.2.0-r1.ebuild 1793 RMD160 c9344daf319fd05efeec726cde7bd224fe
 MD5 7c3f31e9d9779d3a39ac2e1bdfb17a0b squidguard-1.2.0-r1.ebuild 1793
 RMD160 c9344daf319fd05efeec726cde7bd224febab215 squidguard-1.2.0-r1.ebuild 1793
 SHA256 af86fdfc14c709843de3738956880b66e753ad9b1819c620517ceb409d373c56 squidguard-1.2.0-r1.ebuild 1793
-EBUILD squidguard-1.2.1-r1.ebuild 1752 RMD160 c0ba377951e7b0ec358580612224fb25f475f7ad SHA1 16afedebc3240382df828deb9a9691b8f0043469 SHA256 ac734ae216d716f4316d17202d351e5af9dc76436c4077994bb5ec15fc8d7ba5
-MD5 d8bd7d3552ea57a4d871e25b6ce4e635 squidguard-1.2.1-r1.ebuild 1752
-RMD160 c0ba377951e7b0ec358580612224fb25f475f7ad squidguard-1.2.1-r1.ebuild 1752
-SHA256 ac734ae216d716f4316d17202d351e5af9dc76436c4077994bb5ec15fc8d7ba5 squidguard-1.2.1-r1.ebuild 1752
-MISC ChangeLog 4611 RMD160 803a5816365491bb95786d31426cfe0a7cd2aa2e SHA1 bc8b56f1c57bdfd533ff5dcfdc964be2519017a2 SHA256 9152435d45bd03a747d11db5d67d523b949d10ea0f03792e19e74d54d71a905c
-MD5 1e917becb09bf908d2bc615b538c9f1e ChangeLog 4611
-RMD160 803a5816365491bb95786d31426cfe0a7cd2aa2e ChangeLog 4611
-SHA256 9152435d45bd03a747d11db5d67d523b949d10ea0f03792e19e74d54d71a905c ChangeLog 4611
+EBUILD squidguard-1.2.1-r2.ebuild 1792 RMD160 783f2e97de675584a0c9122aa9e527bf92afa286 SHA1 11d67108dd023f8eccc4abd352036938269b2f85 SHA256 5e9c1f5b5f2bb8c7b2f675ed88bc58e0b6b64bc1090a7308f20aa0a90bb773de
+MD5 49fd3e7d99d0b31756a86c87a3649242 squidguard-1.2.1-r2.ebuild 1792
+RMD160 783f2e97de675584a0c9122aa9e527bf92afa286 squidguard-1.2.1-r2.ebuild 1792
+SHA256 5e9c1f5b5f2bb8c7b2f675ed88bc58e0b6b64bc1090a7308f20aa0a90bb773de squidguard-1.2.1-r2.ebuild 1792
+MISC ChangeLog 4840 RMD160 161dcf5bfb7297f8c6372e5a182445556cac18ba SHA1 16cff92abdc22bf42644febd47be8970b69c0710 SHA256 dace84cb55a51fcb222fc91150cd50c8fd60c20a1452ac72575929c2d061539d
+MD5 694e852ebf9d838f340bddce87567f97 ChangeLog 4840
+RMD160 161dcf5bfb7297f8c6372e5a182445556cac18ba ChangeLog 4840
+SHA256 dace84cb55a51fcb222fc91150cd50c8fd60c20a1452ac72575929c2d061539d ChangeLog 4840
 MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057
 MD5 35bcd0f162808937c8e8dcfa3ffca0c4 metadata.xml 264
 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 metadata.xml 264
@@ -43,6 +50,13 @@ SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057 metadata
 MD5 ec8ea45f424d2c3340cf2d1ea2d81317 files/digest-squidguard-1.2.0-r1 253
 RMD160 8b9dcfec3a88a47c69bbb818dab89778cb3657a9 files/digest-squidguard-1.2.0-r1 253
 SHA256 8dece5394be00ae9f361a1cfc8f6ab43ad2f8c03cd499810f55038ca4821f435 files/digest-squidguard-1.2.0-r1 253
-MD5 7c40dfc7cc8a264fc15132ad35c92a7d files/digest-squidguard-1.2.1-r1 253
-RMD160 47e20f3ef4c4988bc954e45c6c312be0a18a7e87 files/digest-squidguard-1.2.1-r1 253
-SHA256 70a44707f5483a735541fc3f8230ad36a9e41213455be81c7e655e4c2ca37193 files/digest-squidguard-1.2.1-r1 253
+MD5 7c40dfc7cc8a264fc15132ad35c92a7d files/digest-squidguard-1.2.1-r2 253
+RMD160 47e20f3ef4c4988bc954e45c6c312be0a18a7e87 files/digest-squidguard-1.2.1-r2 253
+SHA256 70a44707f5483a735541fc3f8230ad36a9e41213455be81c7e655e4c2ca37193 files/digest-squidguard-1.2.1-r2 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFG+PEKVSA5X31g7/gRAtidAJ0bgUaB27XkKoQ9OTy7L9Kc5xICVQCeLrtA
+fGyu6f7xcr6QRVA1koVMbx4=
+=wpnu
+-----END PGP SIGNATURE-----
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
 }