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