1 |
mrness 09/05/02 15:11:20 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: squid-3.0.14-r2.ebuild |
5 |
Log: |
6 |
Fix encoding errors reported for some misconfigured sites (#267318). |
7 |
(Portage version: 2.1.6.7/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.245 net-proxy/squid/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.245&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.245&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/ChangeLog?r1=1.244&r2=1.245 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v |
19 |
retrieving revision 1.244 |
20 |
retrieving revision 1.245 |
21 |
diff -u -r1.244 -r1.245 |
22 |
--- ChangeLog 26 Apr 2009 12:03:49 -0000 1.244 |
23 |
+++ ChangeLog 2 May 2009 15:11:20 -0000 1.245 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for net-proxy/squid |
26 |
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.244 2009/04/26 12:03:49 mrness Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.245 2009/05/02 15:11:20 mrness Exp $ |
29 |
+ |
30 |
+*squid-3.0.14-r2 (02 May 2009) |
31 |
+ |
32 |
+ 02 May 2009; Alin Năstac <mrness@g.o> +squid-3.0.14-r2.ebuild: |
33 |
+ Fix encoding errors reported for some misconfigured sites (#267318). |
34 |
|
35 |
*squid-3.1.0.7_beta (26 Apr 2009) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.1 net-proxy/squid/squid-3.0.14-r2.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/squid-3.0.14-r2.ebuild?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/squid-3.0.14-r2.ebuild?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: squid-3.0.14-r2.ebuild |
46 |
=================================================================== |
47 |
# Copyright 1999-2009 Gentoo Foundation |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.14-r2.ebuild,v 1.1 2009/05/02 15:11:20 mrness Exp $ |
50 |
|
51 |
EAPI="2" |
52 |
WANT_AUTOCONF="latest" |
53 |
WANT_AUTOMAKE="latest" |
54 |
|
55 |
inherit eutils pam toolchain-funcs autotools linux-info |
56 |
|
57 |
# lame archive versioning scheme.. |
58 |
S_PMV="${PV%%.*}" |
59 |
S_PV="${PV%.*}" |
60 |
S_PL="${PV##*.}" |
61 |
S_PP="${PN}-${S_PV}.STABLE${S_PL}" |
62 |
|
63 |
RESTRICT="test" # check if test works in next bump |
64 |
|
65 |
DESCRIPTION="A full-featured web proxy cache" |
66 |
HOMEPAGE="http://www.squid-cache.org/" |
67 |
SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz |
68 |
mirror://gentoo/${P}-chunk-encoding.patch.gz" |
69 |
|
70 |
LICENSE="GPL-2" |
71 |
SLOT="0" |
72 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
73 |
IUSE="pam ldap samba sasl kerberos nis radius ssl snmp selinux icap-client logrotate \ |
74 |
mysql postgres sqlite \ |
75 |
zero-penalty-hit \ |
76 |
pf-transparent ipf-transparent kqueue \ |
77 |
elibc_uclibc kernel_linux epoll" |
78 |
|
79 |
DEPEND="pam? ( virtual/pam ) |
80 |
ldap? ( net-nds/openldap ) |
81 |
kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) ) |
82 |
ssl? ( dev-libs/openssl ) |
83 |
sasl? ( dev-libs/cyrus-sasl ) |
84 |
selinux? ( sec-policy/selinux-squid ) |
85 |
!x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) |
86 |
>=sys-libs/db-4 |
87 |
dev-lang/perl" |
88 |
RDEPEND="${DEPEND} |
89 |
samba? ( net-fs/samba ) |
90 |
mysql? ( dev-perl/DBD-mysql ) |
91 |
postgres? ( dev-perl/DBD-Pg ) |
92 |
sqlite? ( dev-perl/DBD-SQLite )" |
93 |
|
94 |
S="${WORKDIR}/${S_PP}" |
95 |
|
96 |
pkg_setup() { |
97 |
if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then |
98 |
eerror "coss store IO has been disabled by upstream due to stability issues!" |
99 |
eerror "If you want to install this version, switch the store type to something else" |
100 |
eerror "before attempting to install this version again." |
101 |
|
102 |
die "/etc/squid/squid.conf: cache_dir use a disabled store type" |
103 |
fi |
104 |
|
105 |
enewgroup squid 31 |
106 |
enewuser squid 31 -1 /var/cache/squid squid |
107 |
} |
108 |
|
109 |
src_prepare() { |
110 |
epatch "${FILESDIR}"/${P}-gentoo.patch |
111 |
epatch "${FILESDIR}"/${P}-max-forwards.patch |
112 |
epatch "${FILESDIR}"/${P}-gcc43.patch |
113 |
epatch "${FILESDIR}"/${P}-cross-compile.patch |
114 |
epatch "${WORKDIR}"/${P}-chunk-encoding.patch |
115 |
use zero-penalty-hit && epatch "${FILESDIR}"/${P}-adapted-zph.patch |
116 |
has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch |
117 |
|
118 |
eautoreconf |
119 |
} |
120 |
|
121 |
src_configure() { |
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 |
if use mysql || use postgres || use sqlite ; then |
130 |
basic_modules="DB,${basic_modules}" |
131 |
fi |
132 |
|
133 |
local ext_helpers="ip_user,session,unix_group" |
134 |
use samba && ext_helpers="wbinfo_group,${ext_helpers}" |
135 |
use ldap && ext_helpers="ldap_group,${ext_helpers}" |
136 |
|
137 |
local ntlm_helpers="fakeauth" |
138 |
use samba && ntlm_helpers="SMB,${ntlm_helpers}" |
139 |
|
140 |
local negotiate_helpers= |
141 |
use kerberos && local negotiate_helpers="squid_kerb_auth" |
142 |
|
143 |
local myconf="" |
144 |
|
145 |
# coss support has been disabled |
146 |
# If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175) |
147 |
myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null" |
148 |
|
149 |
if use kernel_linux; then |
150 |
myconf="${myconf} --enable-linux-netfilter |
151 |
$(use_enable epoll)" |
152 |
elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then |
153 |
myconf="${myconf} $(use_enable kqueue)" |
154 |
if use pf-transparent; then |
155 |
myconf="${myconf} --enable-pf-transparent" |
156 |
elif use ipf-transparent; then |
157 |
myconf="${myconf} --enable-ipf-transparent" |
158 |
fi |
159 |
fi |
160 |
|
161 |
export CC=$(tc-getCC) |
162 |
|
163 |
econf \ |
164 |
--sysconfdir=/etc/squid \ |
165 |
--libexecdir=/usr/libexec/squid \ |
166 |
--localstatedir=/var \ |
167 |
--datadir=/usr/share/squid \ |
168 |
--with-default-user=squid \ |
169 |
--enable-auth="basic,digest,negotiate,ntlm" \ |
170 |
--enable-removal-policies="lru,heap" \ |
171 |
--enable-digest-auth-helpers="password" \ |
172 |
--enable-basic-auth-helpers="${basic_modules}" \ |
173 |
--enable-external-acl-helpers="${ext_helpers}" \ |
174 |
--enable-ntlm-auth-helpers="${ntlm_helpers}" \ |
175 |
--enable-negotiate-auth-helpers="${negotiate_helpers}" \ |
176 |
--enable-useragent-log \ |
177 |
--enable-cache-digests \ |
178 |
--enable-delay-pools \ |
179 |
--enable-referer-log \ |
180 |
--enable-arp-acl \ |
181 |
--with-large-files \ |
182 |
--with-filedescriptors=8192 \ |
183 |
$(use_enable snmp) \ |
184 |
$(use_enable ssl) \ |
185 |
$(use_enable icap-client) \ |
186 |
${myconf} || die "econf failed" |
187 |
} |
188 |
|
189 |
src_install() { |
190 |
emake DESTDIR="${D}" install || die "emake install failed" |
191 |
|
192 |
# need suid root for looking into /etc/shadow |
193 |
fowners root:squid /usr/libexec/squid/ncsa_auth |
194 |
fowners root:squid /usr/libexec/squid/pam_auth |
195 |
fperms 4750 /usr/libexec/squid/ncsa_auth |
196 |
fperms 4750 /usr/libexec/squid/pam_auth |
197 |
|
198 |
# some cleanups |
199 |
rm -f "${D}"/usr/bin/Run* |
200 |
|
201 |
dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ |
202 |
helpers/ntlm_auth/no_check/README.no_check_ntlm_auth |
203 |
newdoc helpers/basic_auth/SMB/README README.auth_smb |
204 |
dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html |
205 |
newdoc helpers/basic_auth/LDAP/README README.auth_ldap |
206 |
doman helpers/basic_auth/LDAP/*.8 |
207 |
dodoc helpers/basic_auth/SASL/squid_sasl_auth* |
208 |
|
209 |
newpamd "${FILESDIR}/squid.pam" squid |
210 |
newconfd "${FILESDIR}/squid.confd" squid |
211 |
if use logrotate; then |
212 |
newinitd "${FILESDIR}/squid.initd-logrotate" squid |
213 |
insinto /etc/logrotate.d |
214 |
newins "${FILESDIR}/squid.logrotate" squid |
215 |
else |
216 |
newinitd "${FILESDIR}/squid.initd" squid |
217 |
exeinto /etc/cron.weekly |
218 |
newexe "${FILESDIR}/squid.cron" squid.cron |
219 |
fi |
220 |
|
221 |
rm -rf "${D}"/var |
222 |
diropts -m0755 -o squid -g squid |
223 |
keepdir /var/cache/squid /var/log/squid |
224 |
} |
225 |
|
226 |
pkg_postinst() { |
227 |
echo |
228 |
ewarn "Squid authentication helpers have been installed suid root." |
229 |
ewarn "This allows shadow based authentication (see bug #52977 for more)." |
230 |
echo |
231 |
ewarn "Be careful what type of cache_dir you select!" |
232 |
ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow" |
233 |
ewarn "when there isn't sufficient traffic to keep squid reasonably busy." |
234 |
ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'." |
235 |
echo |
236 |
ewarn "Squid can be configured to run in transparent mode like this:" |
237 |
ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" |
238 |
if use zero-penalty-hit; then |
239 |
echo |
240 |
ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel" |
241 |
ewarn "with the patch that can be found on http://zph.bratcheda.org site." |
242 |
fi |
243 |
} |