Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-proxy/squidguard
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2007-09-25 11:52:50 +0000
committerAlin Năstac <mrness@gentoo.org>2007-09-25 11:52:50 +0000
commit6f30d1968f6384ddb95f6c6c08734e90a7d2c2ff (patch)
tree593e5cad776c0e2ae4c06cda0b025bb48c9768b2 /net-proxy/squidguard
parentremove old ebuild; introduce doc and examples USE flags; don't install COPYRI... (diff)
downloadhistorical-6f30d1968f6384ddb95f6c6c08734e90a7d2c2ff.tar.gz
historical-6f30d1968f6384ddb95f6c6c08734e90a7d2c2ff.tar.bz2
historical-6f30d1968f6384ddb95f6c6c08734e90a7d2c2ff.zip
Fix bug 193712 properly (sg.y is not automatically regenerated by configure); use emake install
Package-Manager: portage-2.1.2.12
Diffstat (limited to 'net-proxy/squidguard')
-rw-r--r--net-proxy/squidguard/ChangeLog6
-rw-r--r--net-proxy/squidguard/Manifest38
-rw-r--r--net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch16
-rw-r--r--net-proxy/squidguard/files/squidguard-1.2.1-tests.patch40
-rw-r--r--net-proxy/squidguard/squidguard-1.2.1-r2.ebuild4
5 files changed, 39 insertions, 65 deletions
diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog
index fa5cfcf4e874..b603bb85f85f 100644
--- a/net-proxy/squidguard/ChangeLog
+++ b/net-proxy/squidguard/ChangeLog
@@ -1,12 +1,12 @@
# 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.15 2007/09/25 11:29:00 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.16 2007/09/25 11:52:50 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:
+ +files/squidguard-1.2.1-regexp.patch, files/squidguard-1.2.1-tests.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:
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index 114d3e02f4e8..5ff2ce7fd665 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -21,28 +21,28 @@ 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
-SHA256 116664588ac5dfc1d41a93ab8d42c482a9f1ff069592c305cfe1c726695a1184 files/squidguard-1.2.1-tests.patch 6170
+AUX squidguard-1.2.1-regexp.patch 994 RMD160 551f0e9b1f403e891f2a61d3c631c8de0dc81078 SHA1 2c9dc96abf05612b86215ad31fdd2feb2867074e SHA256 a264bf2272f17e570dbdfe833a40d48f36e09b2295f1845658ada4226bb098ad
+MD5 972e72b5264bdab22106f85fc5c2debe files/squidguard-1.2.1-regexp.patch 994
+RMD160 551f0e9b1f403e891f2a61d3c631c8de0dc81078 files/squidguard-1.2.1-regexp.patch 994
+SHA256 a264bf2272f17e570dbdfe833a40d48f36e09b2295f1845658ada4226bb098ad files/squidguard-1.2.1-regexp.patch 994
+AUX squidguard-1.2.1-tests.patch 3188 RMD160 7af54751b7e39b5cd01afe60c6c0901e0a34a7dd SHA1 808ec368163c050cc36dd7cb4bc300b225e16029 SHA256 15cf16bb5cbb0066a9e3087bd512a3c8582301178df15ed2f8be5080f841d4fc
+MD5 d8f1ff0e64ff0c8c68c5c87059a0c20e files/squidguard-1.2.1-tests.patch 3188
+RMD160 7af54751b7e39b5cd01afe60c6c0901e0a34a7dd files/squidguard-1.2.1-tests.patch 3188
+SHA256 15cf16bb5cbb0066a9e3087bd512a3c8582301178df15ed2f8be5080f841d4fc files/squidguard-1.2.1-tests.patch 3188
DIST squidGuard-1.2.0.tar.gz 1852737 RMD160 7c8d0f612b4e6bf459bf367fa56f309ce5cfe6e3 SHA1 8eb27b6eb85a3f8ed073b12a593a2c9ad97d7478 SHA256 6e88025d2906d635d170c53bf6ae7cc13e06839dfa2a6e5d92b5e6bb38e6ec6d
DIST squidGuard-1.2.1.tar.gz 1947273 RMD160 0b998792a3612db28adb795c9fb0ea9b70118af3 SHA1 f8134ad0627ce61659f0d79a4a0bcf60e8b25796 SHA256 bc658e9bbadde5d5424caddc6a592c6fcd3346230269b0233092985e4b773592
EBUILD squidguard-1.2.0-r1.ebuild 1793 RMD160 c9344daf319fd05efeec726cde7bd224febab215 SHA1 62c094af1503e4b26d241734dec0813af08bd376 SHA256 af86fdfc14c709843de3738956880b66e753ad9b1819c620517ceb409d373c56
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-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
+EBUILD squidguard-1.2.1-r2.ebuild 1794 RMD160 81980570ff7aa18bb025053e85e236a249cf5e7e SHA1 320d4a8332dcf0b733c98ffbf337422727462f7b SHA256 74027f0ea772bdf14f57d7116cd011e3ee243c7cc3575fd6737fc28ead771a38
+MD5 ef5cd9dea411a3cff4741c5bb3b07bd3 squidguard-1.2.1-r2.ebuild 1794
+RMD160 81980570ff7aa18bb025053e85e236a249cf5e7e squidguard-1.2.1-r2.ebuild 1794
+SHA256 74027f0ea772bdf14f57d7116cd011e3ee243c7cc3575fd6737fc28ead771a38 squidguard-1.2.1-r2.ebuild 1794
+MISC ChangeLog 4876 RMD160 d1ffa3ff551683a3d47e7378a38193d77d0840dc SHA1 7ffbf0d349a4a9468d882fe6247feba7b32fd07a SHA256 6020344b64ac00dfcd7bf73cd8938a96d9e07b28edd1c829c3770c6ca3ef0bcc
+MD5 fc5f1447a7fb6b713f798e904b8a6d55 ChangeLog 4876
+RMD160 d1ffa3ff551683a3d47e7378a38193d77d0840dc ChangeLog 4876
+SHA256 6020344b64ac00dfcd7bf73cd8938a96d9e07b28edd1c829c3770c6ca3ef0bcc ChangeLog 4876
MISC metadata.xml 264 RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 SHA1 d2fece889cd4f6e8b3b1242a7e6e4ae6eb064afa SHA256 f8d4693b4abf0f53f7c5372bef0d946217d4a2dbb7d2a81e6ca4a6c59413c057
MD5 35bcd0f162808937c8e8dcfa3ffca0c4 metadata.xml 264
RMD160 8daa5ffa55f6c07663817efed222d64000e6ddb9 metadata.xml 264
@@ -56,7 +56,7 @@ SHA256 70a44707f5483a735541fc3f8230ad36a9e41213455be81c7e655e4c2ca37193 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.5 (GNU/Linux)
-iD8DBQFG+PEKVSA5X31g7/gRAtidAJ0bgUaB27XkKoQ9OTy7L9Kc5xICVQCeLrtA
-fGyu6f7xcr6QRVA1koVMbx4=
-=wpnu
+iD8DBQFG+PabVSA5X31g7/gRAoZlAJ9khLxE4wsVfyEG3+DJUOZI/czaxQCfQHcE
+u8Mvgz2g98m4xeiSWyYlq9s=
+=IEMv
-----END PGP SIGNATURE-----
diff --git a/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch b/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch
index 5a1a1ed6331d..8bf99fe94917 100644
--- a/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch
+++ b/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch
@@ -1,6 +1,18 @@
+diff -Nru squidGuard-1.2.1.orig/src/sg.y squidGuard-1.2.1/src/sg.y
+--- squidGuard-1.2.1.orig/src/sg.y 2007-04-11 11:57:02.000000000 +0300
++++ squidGuard-1.2.1/src/sg.y 2007-09-25 14:36:30.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 -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
+--- squidGuard-1.2.1.orig/src/sg.y.in 2007-09-25 14:36:46.000000000 +0300
++++ squidGuard-1.2.1/src/sg.y.in 2007-09-25 14:35:04.000000000 +0300
@@ -2347,7 +2347,7 @@
}
}
diff --git a/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch b/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch
index 28cf378cb81a..07c8bf3decb2 100644
--- a/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch
+++ b/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch
@@ -24,45 +24,7 @@ diff -Nru squidGuard-1.2.1.orig/test/test1.expected squidGuard-1.2.1/test/test1.
diff -Nru squidGuard-1.2.1.orig/test/test2.expected squidGuard-1.2.1/test/test2.expected
--- squidGuard-1.2.1.orig/test/test2.expected 2000-03-27 14:09:17.000000000 +0300
-+++ squidGuard-1.2.1/test/test2.expected 2007-06-17 11:53:08.000000000 +0300
-@@ -6,8 +6,8 @@
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.1.23&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.book-mark.net/Mark.gif 10.0.1.23/- - GET
-
-
--http://info.foo.bar/cgi/blocked?clientaddr=10.0.1.23&clientname=&clientuser=gurr&clientgroup=kids&targetgroup=blacklist&url=http://www.angrydragon.com/sexing/sex/tn_316_jpg.jpg 10.0.1.23/- gurr GET
--http://info.foo.bar/cgi/blocked?clientaddr=10.0.1.23&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.angrydragon.com/sexing/sex/phc057.gif 10.0.1.23/- - GET
-+
-+
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.1.23&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.freesexsites.net/book-mark/22/tn_09.jpg 10.0.1.23/- - GET
-
-
-@@ -251,7 +251,7 @@
-
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://counter10.sextracker.com/c5/id/0/109497 10.0.0.64/- - GET
-
--http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.angrydragon.com/sexing/sex/tn_536_jpg.jpg 10.0.0.64/- - GET
-+
-
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.freesexsites.net/book-mark/tartban2.gif 10.0.0.64/- - GET
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://the-strip.porncity.net/866/fritz/buttons/germ.gif 10.0.0.64/- - GET
-@@ -261,7 +261,7 @@
-
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.ultrasexe.com/image/tnoire6.jpg 10.0.0.64/- - GET
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://artemis.porntrack.com/0/20807/? 10.0.0.64/- - GET
--http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.amateur-space.com/aec/images/hardcore/tn_sunshine35_jpg.jpg 10.0.0.64/- - GET
-+
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=gurr&clientgroup=kids&targetgroup=blacklist&url=http://amateur.freepictures.com/amateur/images/tn_fpcheer017_jpg.jpg 10.0.0.64/- gurr GET
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.0.64&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://amateur.freepictures.com/amateur/images/fpcheer018.jpg 10.0.0.64/- - GET
-
-@@ -330,7 +330,7 @@
-
- http://info.foo.bar/cgi/blocked?clientaddr=10.0.1.39&clientname=&clientuser=gurr&clientgroup=kids&targetgroup=blacklist&url=http://c1.xxxcounter.com/c7/id/16/44847/0/ 10.0.1.39/- gurr GET
-
--http://info.foo.bar/cgi/blocked?clientaddr=10.0.1.39&clientname=&clientuser=&clientgroup=kids&targetgroup=blacklist&url=http://www.pinkswap.com/teen/folder.gif 10.0.1.39/- - GET
-+
-
-
-
++++ squidGuard-1.2.1/test/test2.expected 2007-09-25 14:43:49.000000000 +0300
@@ -954,7 +954,7 @@
http://info.foo.bar/cgi/blocked?clientaddr=10.0.5.15&clientname=&clientuser=&clientgroup=default&targetgroup=none&url=http://www.oslo-energi.no/gifs/nav5off.gif 10.0.5.15/- - GET
http://info.foo.bar/cgi/blocked?clientaddr=10.0.5.15&clientname=&clientuser=&clientgroup=default&targetgroup=none&url=http://www.oslo-energi.no/gifs/tittel_1_fade.gif 10.0.5.15/- - GET
diff --git a/net-proxy/squidguard/squidguard-1.2.1-r2.ebuild b/net-proxy/squidguard/squidguard-1.2.1-r2.ebuild
index 3b7a55284c72..11694246af87 100644
--- a/net-proxy/squidguard/squidguard-1.2.1-r2.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-r2.ebuild,v 1.1 2007/09/25 11:29:00 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.1-r2.ebuild,v 1.2 2007/09/25 11:52:50 mrness Exp $
inherit eutils autotools
@@ -43,7 +43,7 @@ src_compile() {
}
src_install() {
- make prefix="/usr" INSTDIR="${D}" install || die "make install has failed"
+ emake prefix="/usr" INSTDIR="${D}" install || die "emake install has failed"
keepdir /var/log/squidGuard
fowners squid:squid /var/log/squidGuard