Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-proxy/squidguard/files: squidguard-1.2.1-regexp.patch squidguard-1.2.1-tests.patch
Date: Tue, 25 Sep 2007 12:01:18
Message-Id: E1Ia8yB-0007Uw-9o@stork.gentoo.org
1 mrness 07/09/25 11:52:51
2
3 Modified: squidguard-1.2.1-regexp.patch
4 squidguard-1.2.1-tests.patch
5 Log:
6 Fix bug 193712 properly (sg.y is not automatically regenerated by configure); use emake install
7 (Portage version: 2.1.2.12)
8
9 Revision Changes Path
10 1.2 net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch?r1=1.1&r2=1.2
15
16 Index: squidguard-1.2.1-regexp.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-proxy/squidguard/files/squidguard-1.2.1-regexp.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- squidguard-1.2.1-regexp.patch 25 Sep 2007 11:29:01 -0000 1.1
23 +++ squidguard-1.2.1-regexp.patch 25 Sep 2007 11:52:50 -0000 1.2
24 @@ -1,6 +1,18 @@
25 +diff -Nru squidGuard-1.2.1.orig/src/sg.y squidGuard-1.2.1/src/sg.y
26 +--- squidGuard-1.2.1.orig/src/sg.y 2007-04-11 11:57:02.000000000 +0300
27 ++++ squidGuard-1.2.1/src/sg.y 2007-09-25 14:36:30.000000000 +0300
28 +@@ -2347,7 +2347,7 @@
29 + }
30 + }
31 + if(aclpass->dest->regExp != NULL && access){
32 +- if((result = sgRegExpMatch(aclpass->dest->regExp,req->url)) != 0){
33 ++ if((result = sgRegExpMatch(aclpass->dest->regExp,req->strippedurl)) != 0){
34 + if(aclpass->access){
35 + access++;
36 + break;
37 diff -Nru squidGuard-1.2.1.orig/src/sg.y.in squidGuard-1.2.1/src/sg.y.in
38 ---- squidGuard-1.2.1.orig/src/sg.y.in 2007-02-02 15:37:07.000000000 +0200
39 -+++ squidGuard-1.2.1/src/sg.y.in 2007-09-25 14:22:14.000000000 +0300
40 +--- squidGuard-1.2.1.orig/src/sg.y.in 2007-09-25 14:36:46.000000000 +0300
41 ++++ squidGuard-1.2.1/src/sg.y.in 2007-09-25 14:35:04.000000000 +0300
42 @@ -2347,7 +2347,7 @@
43 }
44 }
45
46
47
48 1.2 net-proxy/squidguard/files/squidguard-1.2.1-tests.patch
49
50 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch?rev=1.2&view=markup
51 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch?rev=1.2&content-type=text/plain
52 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch?r1=1.1&r2=1.2
53
54 Index: squidguard-1.2.1-tests.patch
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/net-proxy/squidguard/files/squidguard-1.2.1-tests.patch,v
57 retrieving revision 1.1
58 retrieving revision 1.2
59 diff -u -r1.1 -r1.2
60 --- squidguard-1.2.1-tests.patch 17 Jun 2007 15:59:01 -0000 1.1
61 +++ squidguard-1.2.1-tests.patch 25 Sep 2007 11:52:50 -0000 1.2
62 @@ -24,45 +24,7 @@
63
64 diff -Nru squidGuard-1.2.1.orig/test/test2.expected squidGuard-1.2.1/test/test2.expected
65 --- squidGuard-1.2.1.orig/test/test2.expected 2000-03-27 14:09:17.000000000 +0300
66 -+++ squidGuard-1.2.1/test/test2.expected 2007-06-17 11:53:08.000000000 +0300
67 -@@ -6,8 +6,8 @@
68 - 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
69 -
70 -
71 --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
72 --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
73 -+
74 -+
75 - 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
76 -
77 -
78 -@@ -251,7 +251,7 @@
79 -
80 - 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
81 -
82 --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
83 -+
84 -
85 - 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
86 - 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
87 -@@ -261,7 +261,7 @@
88 -
89 - 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
90 - 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
91 --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
92 -+
93 - 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
94 - 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
95 -
96 -@@ -330,7 +330,7 @@
97 -
98 - 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
99 -
100 --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
101 -+
102 -
103 -
104 -
105 ++++ squidGuard-1.2.1/test/test2.expected 2007-09-25 14:43:49.000000000 +0300
106 @@ -954,7 +954,7 @@
107 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
108 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
109
110
111
112 --
113 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups