Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-proxy/squid: squid-3.1.22.ebuild ChangeLog squid-3.2.5.ebuild squid-3.2.7.ebuild squid-3.2.6.ebuild squid-3.1.23.ebuild squid-3.3.1.ebuild metadata.xml
Date: Fri, 01 Mar 2013 12:47:54
Message-Id: 20130301124750.469882171D@flycatcher.gentoo.org
1 jlec 13/03/01 12:47:50
2
3 Modified: squid-3.1.22.ebuild ChangeLog squid-3.2.5.ebuild
4 squid-3.2.7.ebuild squid-3.2.6.ebuild
5 squid-3.1.23.ebuild squid-3.3.1.ebuild metadata.xml
6 Log:
7 net-proxy/squid: block all version of sci-biology/meme colliding with /usr/bin/purge, #458208
8
9 (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)
10
11 Revision Changes Path
12 1.11 net-proxy/squid/squid-3.1.22.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.1.22.ebuild?rev=1.11&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.1.22.ebuild?rev=1.11&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.1.22.ebuild?r1=1.10&r2=1.11
17
18 Index: squid-3.1.22.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.22.ebuild,v
21 retrieving revision 1.10
22 retrieving revision 1.11
23 diff -u -r1.10 -r1.11
24 --- squid-3.1.22.ebuild 29 Dec 2012 08:52:38 -0000 1.10
25 +++ squid-3.1.22.ebuild 1 Mar 2013 12:47:50 -0000 1.11
26 @@ -1,6 +1,6 @@
27 -# Copyright 1999-2012 Gentoo Foundation
28 +# Copyright 1999-2013 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.22.ebuild,v 1.10 2012/12/29 08:52:38 ago Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.22.ebuild,v 1.11 2013/03/01 12:47:50 jlec Exp $
32
33 EAPI=4
34 inherit eutils pam toolchain-funcs autotools linux-info user
35 @@ -37,7 +37,8 @@
36 samba? ( net-fs/samba )
37 mysql? ( dev-perl/DBD-mysql )
38 postgres? ( dev-perl/DBD-Pg )
39 - sqlite? ( dev-perl/DBD-SQLite )"
40 + sqlite? ( dev-perl/DBD-SQLite )
41 + !<=sci-biology/meme-4.8.1-r1"
42
43 REQUIRED_USE="tproxy? ( caps )"
44
45
46
47
48 1.384 net-proxy/squid/ChangeLog
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.384&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.384&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?r1=1.383&r2=1.384
53
54 Index: ChangeLog
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v
57 retrieving revision 1.383
58 retrieving revision 1.384
59 diff -u -r1.383 -r1.384
60 --- ChangeLog 21 Feb 2013 16:55:42 -0000 1.383
61 +++ ChangeLog 1 Mar 2013 12:47:50 -0000 1.384
62 @@ -1,6 +1,11 @@
63 # ChangeLog for net-proxy/squid
64 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
65 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.383 2013/02/21 16:55:42 jer Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.384 2013/03/01 12:47:50 jlec Exp $
67 +
68 + 01 Mar 2013; Justin Lecher <jlec@g.o> squid-3.1.22.ebuild,
69 + squid-3.1.23.ebuild, squid-3.2.5.ebuild, squid-3.2.6.ebuild,
70 + squid-3.2.7.ebuild, squid-3.3.1.ebuild, metadata.xml:
71 + block all version of sci-biology/meme colliding with /usr/bin/purge, #458208
72
73 21 Feb 2013; Jeroen Roovers <jer@g.o> squid-3.2.6.ebuild:
74 Stable for HPPA (bug #457664).
75
76
77
78 1.2 net-proxy/squid/squid-3.2.5.ebuild
79
80 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.2.5.ebuild?rev=1.2&view=markup
81 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.2.5.ebuild?rev=1.2&content-type=text/plain
82 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.2.5.ebuild?r1=1.1&r2=1.2
83
84 Index: squid-3.2.5.ebuild
85 ===================================================================
86 RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.5.ebuild,v
87 retrieving revision 1.1
88 retrieving revision 1.2
89 diff -u -r1.1 -r1.2
90 --- squid-3.2.5.ebuild 17 Dec 2012 19:18:52 -0000 1.1
91 +++ squid-3.2.5.ebuild 1 Mar 2013 12:47:50 -0000 1.2
92 @@ -1,6 +1,6 @@
93 -# Copyright 1999-2012 Gentoo Foundation
94 +# Copyright 1999-2013 Gentoo Foundation
95 # Distributed under the terms of the GNU General Public License v2
96 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.5.ebuild,v 1.1 2012/12/17 19:18:52 eras Exp $
97 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.5.ebuild,v 1.2 2013/03/01 12:47:50 jlec Exp $
98
99 EAPI=4
100 inherit eutils pam toolchain-funcs autotools linux-info user versionator
101 @@ -39,7 +39,8 @@
102 samba? ( net-fs/samba )
103 mysql? ( dev-perl/DBD-mysql )
104 postgres? ( dev-perl/DBD-Pg )
105 - sqlite? ( dev-perl/DBD-SQLite )"
106 + sqlite? ( dev-perl/DBD-SQLite )
107 + !<=sci-biology/meme-4.8.1-r1"
108
109 REQUIRED_USE="tproxy? ( caps )
110 qos? ( caps )"
111
112
113
114 1.2 net-proxy/squid/squid-3.2.7.ebuild
115
116 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.2.7.ebuild?rev=1.2&view=markup
117 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.2.7.ebuild?rev=1.2&content-type=text/plain
118 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.2.7.ebuild?r1=1.1&r2=1.2
119
120 Index: squid-3.2.7.ebuild
121 ===================================================================
122 RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.7.ebuild,v
123 retrieving revision 1.1
124 retrieving revision 1.2
125 diff -u -r1.1 -r1.2
126 --- squid-3.2.7.ebuild 9 Feb 2013 21:38:06 -0000 1.1
127 +++ squid-3.2.7.ebuild 1 Mar 2013 12:47:50 -0000 1.2
128 @@ -1,6 +1,6 @@
129 # Copyright 1999-2013 Gentoo Foundation
130 # Distributed under the terms of the GNU General Public License v2
131 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.7.ebuild,v 1.1 2013/02/09 21:38:06 eras Exp $
132 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.7.ebuild,v 1.2 2013/03/01 12:47:50 jlec Exp $
133
134 EAPI=4
135 inherit eutils pam toolchain-funcs autotools linux-info user versionator
136 @@ -40,7 +40,8 @@
137 samba? ( net-fs/samba )
138 mysql? ( dev-perl/DBD-mysql )
139 postgres? ( dev-perl/DBD-Pg )
140 - sqlite? ( dev-perl/DBD-SQLite )"
141 + sqlite? ( dev-perl/DBD-SQLite )
142 + !<=sci-biology/meme-4.8.1-r1"
143
144 REQUIRED_USE="tproxy? ( caps )
145 qos? ( caps )"
146
147
148
149 1.10 net-proxy/squid/squid-3.2.6.ebuild
150
151 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.2.6.ebuild?rev=1.10&view=markup
152 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.2.6.ebuild?rev=1.10&content-type=text/plain
153 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.2.6.ebuild?r1=1.9&r2=1.10
154
155 Index: squid-3.2.6.ebuild
156 ===================================================================
157 RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.6.ebuild,v
158 retrieving revision 1.9
159 retrieving revision 1.10
160 diff -u -r1.9 -r1.10
161 --- squid-3.2.6.ebuild 21 Feb 2013 16:55:42 -0000 1.9
162 +++ squid-3.2.6.ebuild 1 Mar 2013 12:47:50 -0000 1.10
163 @@ -1,6 +1,6 @@
164 # Copyright 1999-2013 Gentoo Foundation
165 # Distributed under the terms of the GNU General Public License v2
166 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.6.ebuild,v 1.9 2013/02/21 16:55:42 jer Exp $
167 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.2.6.ebuild,v 1.10 2013/03/01 12:47:50 jlec Exp $
168
169 EAPI=4
170 inherit eutils pam toolchain-funcs autotools linux-info user versionator
171 @@ -40,7 +40,8 @@
172 samba? ( net-fs/samba )
173 mysql? ( dev-perl/DBD-mysql )
174 postgres? ( dev-perl/DBD-Pg )
175 - sqlite? ( dev-perl/DBD-SQLite )"
176 + sqlite? ( dev-perl/DBD-SQLite )
177 + !<=sci-biology/meme-4.8.1-r1"
178
179 REQUIRED_USE="tproxy? ( caps )
180 qos? ( caps )"
181
182
183
184 1.2 net-proxy/squid/squid-3.1.23.ebuild
185
186 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.1.23.ebuild?rev=1.2&view=markup
187 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.1.23.ebuild?rev=1.2&content-type=text/plain
188 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.1.23.ebuild?r1=1.1&r2=1.2
189
190 Index: squid-3.1.23.ebuild
191 ===================================================================
192 RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.23.ebuild,v
193 retrieving revision 1.1
194 retrieving revision 1.2
195 diff -u -r1.1 -r1.2
196 --- squid-3.1.23.ebuild 11 Jan 2013 15:25:49 -0000 1.1
197 +++ squid-3.1.23.ebuild 1 Mar 2013 12:47:50 -0000 1.2
198 @@ -1,6 +1,6 @@
199 # Copyright 1999-2013 Gentoo Foundation
200 # Distributed under the terms of the GNU General Public License v2
201 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.23.ebuild,v 1.1 2013/01/11 15:25:49 eras Exp $
202 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.23.ebuild,v 1.2 2013/03/01 12:47:50 jlec Exp $
203
204 EAPI=4
205 inherit eutils pam toolchain-funcs autotools linux-info user
206 @@ -38,7 +38,8 @@
207 samba? ( net-fs/samba )
208 mysql? ( dev-perl/DBD-mysql )
209 postgres? ( dev-perl/DBD-Pg )
210 - sqlite? ( dev-perl/DBD-SQLite )"
211 + sqlite? ( dev-perl/DBD-SQLite )
212 + !<=sci-biology/meme-4.8.1-r1"
213
214 REQUIRED_USE="tproxy? ( caps )"
215
216
217
218
219 1.2 net-proxy/squid/squid-3.3.1.ebuild
220
221 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.3.1.ebuild?rev=1.2&view=markup
222 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.3.1.ebuild?rev=1.2&content-type=text/plain
223 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.3.1.ebuild?r1=1.1&r2=1.2
224
225 Index: squid-3.3.1.ebuild
226 ===================================================================
227 RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.1.ebuild,v
228 retrieving revision 1.1
229 retrieving revision 1.2
230 diff -u -r1.1 -r1.2
231 --- squid-3.3.1.ebuild 13 Feb 2013 16:40:17 -0000 1.1
232 +++ squid-3.3.1.ebuild 1 Mar 2013 12:47:50 -0000 1.2
233 @@ -1,6 +1,6 @@
234 # Copyright 1999-2013 Gentoo Foundation
235 # Distributed under the terms of the GNU General Public License v2
236 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.1.ebuild,v 1.1 2013/02/13 16:40:17 eras Exp $
237 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.1.ebuild,v 1.2 2013/03/01 12:47:50 jlec Exp $
238
239 EAPI=5
240 inherit eutils pam toolchain-funcs autotools linux-info user versionator
241 @@ -40,7 +40,8 @@
242 samba? ( net-fs/samba )
243 mysql? ( dev-perl/DBD-mysql )
244 postgres? ( dev-perl/DBD-Pg )
245 - sqlite? ( dev-perl/DBD-SQLite )"
246 + sqlite? ( dev-perl/DBD-SQLite )
247 + !<=sci-biology/meme-4.8.1-r1"
248
249 REQUIRED_USE="tproxy? ( caps )
250 qos? ( caps )"
251
252
253
254 1.9 net-proxy/squid/metadata.xml
255
256 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/metadata.xml?rev=1.9&view=markup
257 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/metadata.xml?rev=1.9&content-type=text/plain
258 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/metadata.xml?r1=1.8&r2=1.9
259
260 Index: metadata.xml
261 ===================================================================
262 RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/metadata.xml,v
263 retrieving revision 1.8
264 retrieving revision 1.9
265 diff -u -r1.8 -r1.9
266 --- metadata.xml 27 Aug 2012 13:22:08 -0000 1.8
267 +++ metadata.xml 1 Mar 2013 12:47:50 -0000 1.9
268 @@ -1,31 +1,31 @@
269 <?xml version="1.0" encoding="UTF-8"?>
270 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
271 <pkgmetadata>
272 -<maintainer>
273 - <email>eras@g.o</email>
274 - <name>Eray Aslan</name>
275 -</maintainer>
276 -<herd>net-proxy</herd>
277 -<longdescription>A full-featured web proxy cache</longdescription>
278 -<use>
279 - <flag name='epoll'>Enables Linux epoll() support</flag>
280 - <flag name='ecap'>Adds support for loadable content adaptation modules
281 + <maintainer>
282 + <email>eras@g.o</email>
283 + <name>Eray Aslan</name>
284 + </maintainer>
285 + <herd>net-proxy</herd>
286 + <longdescription>A full-featured web proxy cache</longdescription>
287 + <use>
288 + <flag name="epoll">Enables Linux epoll() support</flag>
289 + <flag name="ecap">Adds support for loadable content adaptation modules
290 (http://www.e-cap.org)</flag>
291 - <flag name='icap-client'>Adds ICAP client support</flag>
292 - <flag name='ipf-transparent'>Adds transparent proxy support for systems
293 + <flag name="icap-client">Adds ICAP client support</flag>
294 + <flag name="ipf-transparent">Adds transparent proxy support for systems
295 using IP-Filter (only for *bsd)</flag>
296 - <flag name='logrotate'>Use <pkg>app-admin/logrotate</pkg> for rotating
297 + <flag name="logrotate">Use <pkg>app-admin/logrotate</pkg> for rotating
298 logs</flag>
299 - <flag name='kqueue'>Enables *BSD kqueue() support</flag>
300 - <flag name='pf-transparent'>Adds transparent proxy support for systems using
301 + <flag name="kqueue">Enables *BSD kqueue() support</flag>
302 + <flag name="pf-transparent">Adds transparent proxy support for systems using
303 PF (only for *bsd)</flag>
304 - <flag name='qos'>Adds support for Quality of Service using netfilter conntrack
305 + <flag name="qos">Adds support for Quality of Service using netfilter conntrack
306 - see qos_flow directive for more info</flag>
307 - <flag name='ssl-crtd'>Adds support for dynamic SSL certificate generation in
308 + <flag name="ssl-crtd">Adds support for dynamic SSL certificate generation in
309 SslBump environments</flag>
310 - <flag name='tproxy'>Enables real Transparent Proxy support for Linux Netfilter
311 + <flag name="tproxy">Enables real Transparent Proxy support for Linux Netfilter
312 TPROXY</flag>
313 - <flag name='zero-penalty-hit'>Add Zero Penalty Hit patch
314 + <flag name="zero-penalty-hit">Add Zero Penalty Hit patch
315 (http://zph.bratcheda.org)</flag>
316 -</use>
317 + </use>
318 </pkgmetadata>