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