1 |
mrness 08/06/22 11:52:09 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: squid-3.0.6-r2.ebuild squid-2.7.2.ebuild |
5 |
Removed: squid-2.6.20.ebuild squid-3.0.6.ebuild |
6 |
squid-2.6.18.ebuild squid-3.0.4-r1.ebuild |
7 |
Log: |
8 |
Remove obsolete versions. 2.7 version bump without qos and zero-penalty-hit support (#224733). |
9 |
Add zero-penalty-hit patch to the 3.0 branch. |
10 |
(Portage version: 2.1.4.4) |
11 |
|
12 |
Revision Changes Path |
13 |
1.191 net-proxy/squid/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.191&view=markup |
16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.191&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/ChangeLog?r1=1.190&r2=1.191 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v |
22 |
retrieving revision 1.190 |
23 |
retrieving revision 1.191 |
24 |
diff -u -r1.190 -r1.191 |
25 |
--- ChangeLog 28 May 2008 19:48:53 -0000 1.190 |
26 |
+++ ChangeLog 22 Jun 2008 11:52:08 -0000 1.191 |
27 |
@@ -1,6 +1,19 @@ |
28 |
# ChangeLog for net-proxy/squid |
29 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.190 2008/05/28 19:48:53 mrness Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.191 2008/06/22 11:52:08 mrness Exp $ |
32 |
+ |
33 |
+*squid-3.0.6-r2 (22 Jun 2008) |
34 |
+*squid-2.7.2 (22 Jun 2008) |
35 |
+ |
36 |
+ 22 Jun 2008; Alin Năstac <mrness@g.o> |
37 |
+ -files/squid-2.6.18-ToS_Hit_ToS_Preserve.patch, |
38 |
+ -files/squid-2.6.18-gentoo.patch, -files/squid-2.6.18-qos.patch, |
39 |
+ +files/squid-2.7.2-gentoo.patch, -files/squid-3.0.4-gentoo.patch, |
40 |
+ +files/squid-3.0.6-adapted-zph.patch, files/squid-3.0.6-gentoo.patch, |
41 |
+ -squid-2.6.18.ebuild, -squid-2.6.20.ebuild, +squid-2.7.2.ebuild, |
42 |
+ -squid-3.0.4-r1.ebuild, -squid-3.0.6.ebuild, +squid-3.0.6-r2.ebuild: |
43 |
+ Remove obsolete versions. 2.7 version bump without qos and zero-penalty-hit |
44 |
+ support (#224733). Add zero-penalty-hit patch to the 3.0 branch. |
45 |
|
46 |
*squid-3.0.6-r1 (28 May 2008) |
47 |
*squid-2.6.20-r1 (28 May 2008) |
48 |
|
49 |
|
50 |
|
51 |
1.1 net-proxy/squid/squid-3.0.6-r2.ebuild |
52 |
|
53 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/squid-3.0.6-r2.ebuild?rev=1.1&view=markup |
54 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/squid-3.0.6-r2.ebuild?rev=1.1&content-type=text/plain |
55 |
|
56 |
Index: squid-3.0.6-r2.ebuild |
57 |
=================================================================== |
58 |
# Copyright 1999-2008 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.6-r2.ebuild,v 1.1 2008/06/22 11:52:08 mrness Exp $ |
61 |
|
62 |
WANT_AUTOCONF="latest" |
63 |
WANT_AUTOMAKE="latest" |
64 |
|
65 |
inherit eutils pam toolchain-funcs autotools linux-info |
66 |
|
67 |
# lame archive versioning scheme.. |
68 |
S_PMV="${PV%%.*}" |
69 |
S_PV="${PV%.*}" |
70 |
S_PL="${PV##*.}" |
71 |
S_PP="${PN}-${S_PV}.STABLE${S_PL}" |
72 |
|
73 |
RESTRICT="test" # check if test works in next bump |
74 |
|
75 |
DESCRIPTION="A full-featured web proxy cache" |
76 |
HOMEPAGE="http://www.squid-cache.org/" |
77 |
SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz" |
78 |
|
79 |
LICENSE="GPL-2" |
80 |
SLOT="0" |
81 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
82 |
IUSE="pam ldap samba sasl nis radius ssl snmp selinux icap-client logrotate \ |
83 |
qos zero-penalty-hit \ |
84 |
pf-transparent ipf-transparent \ |
85 |
elibc_uclibc kernel_linux" |
86 |
|
87 |
DEPEND="pam? ( virtual/pam ) |
88 |
ldap? ( net-nds/openldap ) |
89 |
ssl? ( dev-libs/openssl ) |
90 |
sasl? ( dev-libs/cyrus-sasl ) |
91 |
selinux? ( sec-policy/selinux-squid ) |
92 |
!x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) |
93 |
>=sys-libs/db-4 |
94 |
dev-lang/perl" |
95 |
RDEPEND="${DEPEND} |
96 |
samba? ( net-fs/samba )" |
97 |
|
98 |
S="${WORKDIR}/${S_PP}" |
99 |
|
100 |
pkg_setup() { |
101 |
if use qos; then |
102 |
eerror "qos patch is no longer supported by us!" |
103 |
eerror "Please remove qos from your USE and select zero-penalty-hit flag instead." |
104 |
die "unsupported USE flags detected" |
105 |
fi |
106 |
enewgroup squid 31 |
107 |
enewuser squid 31 -1 /var/cache/squid squid |
108 |
} |
109 |
|
110 |
src_unpack() { |
111 |
unpack ${A} || die "unpack failed" |
112 |
|
113 |
cd "${S}" || die "source dir not found" |
114 |
epatch "${FILESDIR}"/${P}-gentoo.patch |
115 |
epatch "${FILESDIR}"/${P}-lincapver.patch |
116 |
use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch |
117 |
|
118 |
eautoreconf |
119 |
} |
120 |
|
121 |
src_compile() { |
122 |
local basic_modules="getpwnam,NCSA,MSNT" |
123 |
use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" |
124 |
use ldap && basic_modules="LDAP,${basic_modules}" |
125 |
use pam && basic_modules="PAM,${basic_modules}" |
126 |
use sasl && basic_modules="SASL,${basic_modules}" |
127 |
use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" |
128 |
use radius && basic_modules="squid_radius_auth,${basic_modules}" |
129 |
|
130 |
local ext_helpers="ip_user,session,unix_group" |
131 |
use samba && ext_helpers="wbinfo_group,${ext_helpers}" |
132 |
use ldap && ext_helpers="ldap_group,${ext_helpers}" |
133 |
|
134 |
local ntlm_helpers="fakeauth" |
135 |
use samba && ntlm_helpers="SMB,${ntlm_helpers}" |
136 |
|
137 |
local myconf="" |
138 |
|
139 |
# Support for uclibc #61175 |
140 |
if use elibc_uclibc; then |
141 |
myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null" |
142 |
else |
143 |
myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null" |
144 |
fi |
145 |
|
146 |
if use kernel_linux; then |
147 |
myconf="${myconf} --enable-linux-netfilter" |
148 |
elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then |
149 |
myconf="${myconf} --enable-kqueue" |
150 |
if use pf-transparent; then |
151 |
myconf="${myconf} --enable-pf-transparent" |
152 |
elif use ipf-transparent; then |
153 |
myconf="${myconf} --enable-ipf-transparent" |
154 |
fi |
155 |
fi |
156 |
|
157 |
export CC=$(tc-getCC) |
158 |
|
159 |
econf \ |
160 |
--sysconfdir=/etc/squid \ |
161 |
--libexecdir=/usr/libexec/squid \ |
162 |
--localstatedir=/var \ |
163 |
--datadir=/usr/share/squid \ |
164 |
--with-default-user=squid \ |
165 |
--enable-auth="basic,digest,negotiate,ntlm" \ |
166 |
--enable-removal-policies="lru,heap" \ |
167 |
--enable-digest-auth-helpers="password" \ |
168 |
--enable-basic-auth-helpers="${basic_modules}" \ |
169 |
--enable-external-acl-helpers="${ext_helpers}" \ |
170 |
--enable-ntlm-auth-helpers="${ntlm_helpers}" \ |
171 |
--enable-useragent-log \ |
172 |
--enable-cache-digests \ |
173 |
--enable-delay-pools \ |
174 |
--enable-referer-log \ |
175 |
--enable-arp-acl \ |
176 |
--with-large-files \ |
177 |
--with-filedescriptors=8192 \ |
178 |
$(use_enable snmp) \ |
179 |
$(use_enable ssl) \ |
180 |
$(use_enable icap-client) \ |
181 |
${myconf} || die "econf failed" |
182 |
|
183 |
emake || die "emake failed" |
184 |
} |
185 |
|
186 |
src_install() { |
187 |
make DESTDIR="${D}" install || die "make install failed" |
188 |
|
189 |
# need suid root for looking into /etc/shadow |
190 |
fowners root:squid /usr/libexec/squid/ncsa_auth |
191 |
fowners root:squid /usr/libexec/squid/pam_auth |
192 |
fperms 4750 /usr/libexec/squid/ncsa_auth |
193 |
fperms 4750 /usr/libexec/squid/pam_auth |
194 |
|
195 |
# some cleanups |
196 |
rm -f "${D}"/usr/bin/Run* |
197 |
|
198 |
dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ |
199 |
helpers/ntlm_auth/no_check/README.no_check_ntlm_auth |
200 |
newdoc helpers/basic_auth/SMB/README README.auth_smb |
201 |
dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html |
202 |
newdoc helpers/basic_auth/LDAP/README README.auth_ldap |
203 |
doman helpers/basic_auth/LDAP/*.8 |
204 |
dodoc helpers/basic_auth/SASL/squid_sasl_auth* |
205 |
|
206 |
newpamd "${FILESDIR}/squid.pam" squid |
207 |
newconfd "${FILESDIR}/squid.confd" squid |
208 |
if use logrotate; then |
209 |
newinitd "${FILESDIR}/squid.initd-logrotate" squid |
210 |
insinto /etc/logrotate.d |
211 |
newins "${FILESDIR}/squid.logrotate" squid |
212 |
else |
213 |
newinitd "${FILESDIR}/squid.initd" squid |
214 |
exeinto /etc/cron.weekly |
215 |
newexe "${FILESDIR}/squid.cron" squid.cron |
216 |
fi |
217 |
|
218 |
rm -rf "${D}"/var |
219 |
diropts -m0755 -o squid -g squid |
220 |
keepdir /var/cache/squid /var/log/squid |
221 |
} |
222 |
|
223 |
pkg_postinst() { |
224 |
echo |
225 |
ewarn "Squid authentication helpers have been installed suid root." |
226 |
ewarn "This allows shadow based authentication (see bug #52977 for more)." |
227 |
echo |
228 |
ewarn "Be careful what type of cache_dir you select!" |
229 |
ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow" |
230 |
ewarn "when there isn't sufficient traffic to keep squid reasonably busy." |
231 |
ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'." |
232 |
echo |
233 |
ewarn "Squid can be configured to run in transparent mode like this:" |
234 |
ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" |
235 |
if use zero-penalty-hit; then |
236 |
echo |
237 |
ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel" |
238 |
ewarn "with the patch that can be found on http://zph.bratcheda.org site." |
239 |
fi |
240 |
} |
241 |
|
242 |
|
243 |
|
244 |
1.1 net-proxy/squid/squid-2.7.2.ebuild |
245 |
|
246 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/squid-2.7.2.ebuild?rev=1.1&view=markup |
247 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/squid-2.7.2.ebuild?rev=1.1&content-type=text/plain |
248 |
|
249 |
Index: squid-2.7.2.ebuild |
250 |
=================================================================== |
251 |
# Copyright 1999-2008 Gentoo Foundation |
252 |
# Distributed under the terms of the GNU General Public License v2 |
253 |
# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.2.ebuild,v 1.1 2008/06/22 11:52:08 mrness Exp $ |
254 |
|
255 |
WANT_AUTOCONF="latest" |
256 |
WANT_AUTOMAKE="latest" |
257 |
|
258 |
inherit eutils pam toolchain-funcs autotools linux-info |
259 |
|
260 |
#lame archive versioning scheme.. |
261 |
S_PMV="${PV%%.*}" |
262 |
S_PV="${PV%.*}" |
263 |
S_PL="${PV##*.}" |
264 |
S_PL="${S_PL/_rc/-RC}" |
265 |
S_PP="${PN}-${S_PV}.STABLE${S_PL}" |
266 |
|
267 |
DESCRIPTION="A full-featured web proxy cache" |
268 |
HOMEPAGE="http://www.squid-cache.org/" |
269 |
SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz" |
270 |
|
271 |
LICENSE="GPL-2" |
272 |
SLOT="0" |
273 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
274 |
IUSE="pam ldap samba sasl nis ssl snmp selinux logrotate \ |
275 |
qos zero-penalty-hit \ |
276 |
pf-transparent ipf-transparent \ |
277 |
elibc_uclibc kernel_linux" |
278 |
|
279 |
DEPEND="pam? ( virtual/pam ) |
280 |
ldap? ( net-nds/openldap ) |
281 |
ssl? ( dev-libs/openssl ) |
282 |
sasl? ( dev-libs/cyrus-sasl ) |
283 |
selinux? ( sec-policy/selinux-squid ) |
284 |
!x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) |
285 |
>=sys-libs/db-4 |
286 |
dev-lang/perl" |
287 |
RDEPEND="${DEPEND} |
288 |
samba? ( net-fs/samba )" |
289 |
|
290 |
S="${WORKDIR}/${S_PP}" |
291 |
|
292 |
pkg_setup() { |
293 |
if use qos; then |
294 |
eerror "qos patch is no longer supported!" |
295 |
eerror "Please remove qos USE flag and use zph* config options instead." |
296 |
die "unsupported USE flags detected" |
297 |
fi |
298 |
if use zero-penalty-hit; then |
299 |
ewarn "This version supports natively IP TOS/Priority mangling," |
300 |
ewarn "but it does not support zph_preserve_miss_tos." |
301 |
ewarn "If you need that, please use squid-3.0.6-r2 or higher." |
302 |
fi |
303 |
enewgroup squid 31 |
304 |
enewuser squid 31 -1 /var/cache/squid squid |
305 |
} |
306 |
|
307 |
src_unpack() { |
308 |
unpack ${A} || die "unpack failed" |
309 |
|
310 |
cd "${S}" || die "source dir not found" |
311 |
epatch "${FILESDIR}"/${P}-gentoo.patch |
312 |
eautoreconf |
313 |
} |
314 |
|
315 |
src_compile() { |
316 |
local basic_modules="getpwnam,NCSA,MSNT" |
317 |
use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" |
318 |
use ldap && basic_modules="LDAP,${basic_modules}" |
319 |
use pam && basic_modules="PAM,${basic_modules}" |
320 |
use sasl && basic_modules="SASL,${basic_modules}" |
321 |
use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" |
322 |
|
323 |
local ext_helpers="ip_user,session,unix_group" |
324 |
use samba && ext_helpers="wbinfo_group,${ext_helpers}" |
325 |
use ldap && ext_helpers="ldap_group,${ext_helpers}" |
326 |
|
327 |
local ntlm_helpers="fakeauth" |
328 |
use samba && ntlm_helpers="SMB,${ntlm_helpers}" |
329 |
|
330 |
local myconf="" |
331 |
|
332 |
# Support for uclibc #61175 |
333 |
if use elibc_uclibc; then |
334 |
myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null" |
335 |
myconf="${myconf} --disable-async-io" |
336 |
else |
337 |
myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null" |
338 |
myconf="${myconf} --enable-async-io" |
339 |
fi |
340 |
|
341 |
if use kernel_linux; then |
342 |
myconf="${myconf} --enable-linux-netfilter" |
343 |
if kernel_is ge 2 6 && linux_chkconfig_present EPOLL ; then |
344 |
myconf="${myconf} --enable-epoll" |
345 |
fi |
346 |
elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then |
347 |
myconf="${myconf} --enable-kqueue" |
348 |
if use pf-transparent; then |
349 |
myconf="${myconf} --enable-pf-transparent" |
350 |
elif use ipf-transparent; then |
351 |
myconf="${myconf} --enable-ipf-transparent" |
352 |
fi |
353 |
fi |
354 |
|
355 |
export CC=$(tc-getCC) |
356 |
|
357 |
econf \ |
358 |
--sysconfdir=/etc/squid \ |
359 |
--libexecdir=/usr/libexec/squid \ |
360 |
--localstatedir=/var \ |
361 |
--datadir=/usr/share/squid \ |
362 |
--enable-auth="basic,digest,ntlm" \ |
363 |
--enable-removal-policies="lru,heap" \ |
364 |
--enable-digest-auth-helpers="password" \ |
365 |
--enable-basic-auth-helpers="${basic_modules}" \ |
366 |
--enable-external-acl-helpers="${ext_helpers}" \ |
367 |
--enable-ntlm-auth-helpers="${ntlm_helpers}" \ |
368 |
--enable-ident-lookups \ |
369 |
--enable-useragent-log \ |
370 |
--enable-cache-digests \ |
371 |
--enable-delay-pools \ |
372 |
--enable-referer-log \ |
373 |
--enable-arp-acl \ |
374 |
--with-pthreads \ |
375 |
--with-large-files \ |
376 |
--enable-htcp \ |
377 |
--enable-carp \ |
378 |
--enable-follow-x-forwarded-for \ |
379 |
--with-maxfd=8192 \ |
380 |
$(use_enable snmp) \ |
381 |
$(use_enable ssl) \ |
382 |
${myconf} || die "econf failed" |
383 |
|
384 |
emake || die "emake failed" |
385 |
} |
386 |
|
387 |
src_install() { |
388 |
make DESTDIR="${D}" install || die "make install failed" |
389 |
|
390 |
# need suid root for looking into /etc/shadow |
391 |
fowners root:squid /usr/libexec/squid/ncsa_auth |
392 |
fowners root:squid /usr/libexec/squid/pam_auth |
393 |
fperms 4750 /usr/libexec/squid/ncsa_auth |
394 |
fperms 4750 /usr/libexec/squid/pam_auth |
395 |
|
396 |
# some cleanups |
397 |
rm -f "${D}"/usr/bin/Run* |
398 |
|
399 |
dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ |
400 |
helpers/ntlm_auth/no_check/README.no_check_ntlm_auth |
401 |
newdoc helpers/basic_auth/SMB/README README.auth_smb |
402 |
dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html |
403 |
newdoc helpers/basic_auth/LDAP/README README.auth_ldap |
404 |
doman helpers/basic_auth/LDAP/*.8 |
405 |
dodoc helpers/basic_auth/SASL/squid_sasl_auth* |
406 |
|
407 |
newpamd "${FILESDIR}/squid.pam" squid |
408 |
newconfd "${FILESDIR}/squid.confd" squid |
409 |
if use logrotate; then |
410 |
newinitd "${FILESDIR}/squid.initd-logrotate" squid |
411 |
insinto /etc/logrotate.d |
412 |
newins "${FILESDIR}/squid.logrotate" squid |
413 |
else |
414 |
newinitd "${FILESDIR}/squid.initd" squid |
415 |
exeinto /etc/cron.weekly |
416 |
newexe "${FILESDIR}/squid.cron" squid.cron |
417 |
fi |
418 |
|
419 |
rm -rf "${D}"/var |
420 |
diropts -m0755 -o squid -g squid |
421 |
keepdir /var/cache/squid /var/log/squid |
422 |
} |
423 |
|
424 |
pkg_postinst() { |
425 |
echo |
426 |
ewarn "Squid authentication helpers have been installed suid root." |
427 |
ewarn "This allows shadow based authentication (see bug #52977 for more)." |
428 |
echo |
429 |
ewarn "Be careful what type of cache_dir you select!" |
430 |
ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow" |
431 |
ewarn "when there isn't sufficient traffic to keep squid reasonably busy." |
432 |
ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'." |
433 |
echo |
434 |
ewarn "Squid can be configured to run in transparent mode like this:" |
435 |
ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" |
436 |
} |
437 |
|
438 |
|
439 |
|
440 |
-- |
441 |
gentoo-commits@l.g.o mailing list |