1 |
mrness 10/11/27 12:57:05 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: squid-3.1.9.ebuild |
5 |
Removed: squid-3.1.6-r1.ebuild squid-2.7.7.ebuild |
6 |
Log: |
7 |
Version bump (#342997). |
8 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.317 net-proxy/squid/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.317&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.317&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?r1=1.316&r2=1.317 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v |
20 |
retrieving revision 1.316 |
21 |
retrieving revision 1.317 |
22 |
diff -u -r1.316 -r1.317 |
23 |
--- ChangeLog 9 Oct 2010 16:32:02 -0000 1.316 |
24 |
+++ ChangeLog 27 Nov 2010 12:57:05 -0000 1.317 |
25 |
@@ -1,6 +1,17 @@ |
26 |
# ChangeLog for net-proxy/squid |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.316 2010/10/09 16:32:02 armin76 Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.317 2010/11/27 12:57:05 mrness Exp $ |
30 |
+ |
31 |
+*squid-3.1.9 (27 Nov 2010) |
32 |
+ |
33 |
+ 27 Nov 2010; Alin Năstac <mrness@g.o> -squid-2.7.7.ebuild, |
34 |
+ -files/squid-2.7.7-gentoo.patch, -files/squid-2-capability.patch, |
35 |
+ -squid-3.1.6-r1.ebuild, -files/squid-3.1.6-bug3011.patch, |
36 |
+ -files/squid-3.1.6-gentoo.patch, -files/squid-3.1.6-libmd5.patch, |
37 |
+ -files/squid-3.1.6-qafixes.patch, +squid-3.1.9.ebuild, |
38 |
+ +files/squid-3.1.9-gentoo.patch, +files/squid-3.1.9-libmd5.patch, |
39 |
+ +files/squid-3.1.9-qafixes.patch, -files/squid-3-capability.patch: |
40 |
+ Version bump (#342997). |
41 |
|
42 |
09 Oct 2010; Raúl Porcel <armin76@g.o> squid-3.1.8.ebuild: |
43 |
ia64/sparc stable wrt #334263 |
44 |
|
45 |
|
46 |
|
47 |
1.1 net-proxy/squid/squid-3.1.9.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.1.9.ebuild?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.1.9.ebuild?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: squid-3.1.9.ebuild |
53 |
=================================================================== |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.9.ebuild,v 1.1 2010/11/27 12:57:05 mrness Exp $ |
57 |
|
58 |
EAPI="2" |
59 |
|
60 |
inherit eutils pam toolchain-funcs |
61 |
|
62 |
DESCRIPTION="A full-featured web proxy cache" |
63 |
HOMEPAGE="http://www.squid-cache.org/" |
64 |
SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz" |
65 |
|
66 |
LICENSE="GPL-2" |
67 |
SLOT="0" |
68 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
69 |
IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ |
70 |
ecap icap-client \ |
71 |
mysql postgres sqlite \ |
72 |
zero-penalty-hit \ |
73 |
pf-transparent ipf-transparent kqueue \ |
74 |
elibc_uclibc kernel_linux +epoll tproxy" |
75 |
RESTRICT=test |
76 |
|
77 |
COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) |
78 |
pam? ( virtual/pam ) |
79 |
ldap? ( net-nds/openldap ) |
80 |
kerberos? ( virtual/krb5 ) |
81 |
ssl? ( dev-libs/openssl ) |
82 |
sasl? ( dev-libs/cyrus-sasl ) |
83 |
ecap? ( net-libs/libecap ) |
84 |
selinux? ( sec-policy/selinux-squid ) |
85 |
!x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) |
86 |
>=sys-libs/db-4 |
87 |
dev-lang/perl" |
88 |
DEPEND="${COMMON_DEPEND} |
89 |
sys-devel/automake |
90 |
sys-devel/autoconf |
91 |
sys-devel/libtool |
92 |
sys-apps/ed |
93 |
test? ( dev-util/cppunit )" |
94 |
RDEPEND="${COMMON_DEPEND} |
95 |
samba? ( net-fs/samba ) |
96 |
mysql? ( dev-perl/DBD-mysql ) |
97 |
postgres? ( dev-perl/DBD-Pg ) |
98 |
sqlite? ( dev-perl/DBD-SQLite )" |
99 |
|
100 |
pkg_setup() { |
101 |
if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then |
102 |
eerror "coss store IO has been disabled by upstream due to stability issues!" |
103 |
eerror "If you want to install this version, switch the store type to something else" |
104 |
eerror "before attempting to install this version again." |
105 |
|
106 |
die "/etc/squid/squid.conf: cache_dir use a disabled store type" |
107 |
fi |
108 |
|
109 |
if use tproxy && ! use caps; then |
110 |
eerror "libcap is required by Transparent Proxy support for Netfilter TPROXY!" |
111 |
eerror "Please enable caps USE flag and try again." |
112 |
|
113 |
die "invalid combination of USE flags" |
114 |
fi |
115 |
|
116 |
enewgroup squid 31 |
117 |
enewuser squid 31 -1 /var/cache/squid squid |
118 |
} |
119 |
|
120 |
src_prepare() { |
121 |
epatch "${FILESDIR}"/${P}-gentoo.patch |
122 |
epatch "${FILESDIR}"/${P}-qafixes.patch |
123 |
epatch "${FILESDIR}"/${P}-libmd5.patch |
124 |
|
125 |
# eautoreconf breaks lib/libLtdl/libtool script |
126 |
./bootstrap.sh || die "autoreconf failed" |
127 |
} |
128 |
|
129 |
src_configure() { |
130 |
local myconf="" |
131 |
|
132 |
local basic_modules="getpwnam,NCSA,MSNT" |
133 |
use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" |
134 |
use ldap && basic_modules="LDAP,${basic_modules}" |
135 |
use pam && basic_modules="PAM,${basic_modules}" |
136 |
use sasl && basic_modules="SASL,${basic_modules}" |
137 |
use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" |
138 |
use radius && basic_modules="squid_radius_auth,${basic_modules}" |
139 |
if use mysql || use postgres || use sqlite ; then |
140 |
basic_modules="DB,${basic_modules}" |
141 |
fi |
142 |
|
143 |
local digest_modules="password" |
144 |
use ldap && digest_modules="ldap,${digest_modules}" |
145 |
|
146 |
local ext_helpers="ip_user,session,unix_group" |
147 |
use samba && ext_helpers="wbinfo_group,${ext_helpers}" |
148 |
use ldap && ext_helpers="ldap_group,${ext_helpers}" |
149 |
|
150 |
local ntlm_helpers="fakeauth" |
151 |
use samba && ntlm_helpers="smb_lm,${ntlm_helpers}" |
152 |
|
153 |
local negotiate_helpers= |
154 |
if use kerberos; then |
155 |
negotiate_helpers="squid_kerb_auth" |
156 |
has_version app-crypt/mit-krb5 \ |
157 |
&& myconf="--enable-mit --disable-heimdal" \ |
158 |
|| myconf="--disable-mit --enable-heimdal" |
159 |
fi |
160 |
|
161 |
# coss support has been disabled |
162 |
# If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175) |
163 |
myconf="${myconf} --enable-storeio=ufs,diskd,aufs" |
164 |
|
165 |
if use kernel_linux; then |
166 |
myconf="${myconf} --enable-linux-netfilter |
167 |
$(use_enable tproxy linux-tproxy) |
168 |
$(use_enable epoll)" |
169 |
elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then |
170 |
myconf="${myconf} $(use_enable kqueue)" |
171 |
if use pf-transparent; then |
172 |
myconf="${myconf} --enable-pf-transparent" |
173 |
elif use ipf-transparent; then |
174 |
myconf="${myconf} --enable-ipf-transparent" |
175 |
fi |
176 |
fi |
177 |
|
178 |
export CC=$(tc-getCC) |
179 |
|
180 |
econf \ |
181 |
--sysconfdir=/etc/squid \ |
182 |
--libexecdir=/usr/libexec/squid \ |
183 |
--localstatedir=/var \ |
184 |
--with-pidfile=/var/run/squid.pid \ |
185 |
--datadir=/usr/share/squid \ |
186 |
--with-logdir=/var/log/squid \ |
187 |
--with-default-user=squid \ |
188 |
--enable-auth="basic,digest,negotiate,ntlm" \ |
189 |
--enable-removal-policies="lru,heap" \ |
190 |
--enable-digest-auth-helpers="${digest_modules}" \ |
191 |
--enable-basic-auth-helpers="${basic_modules}" \ |
192 |
--enable-external-acl-helpers="${ext_helpers}" \ |
193 |
--enable-ntlm-auth-helpers="${ntlm_helpers}" \ |
194 |
--enable-negotiate-auth-helpers="${negotiate_helpers}" \ |
195 |
--enable-useragent-log \ |
196 |
--enable-cache-digests \ |
197 |
--enable-delay-pools \ |
198 |
--enable-referer-log \ |
199 |
--enable-arp-acl \ |
200 |
--with-large-files \ |
201 |
--with-filedescriptors=8192 \ |
202 |
--disable-strict-error-checking \ |
203 |
$(use_enable caps) \ |
204 |
$(use_enable ipv6) \ |
205 |
$(use_enable snmp) \ |
206 |
$(use_enable ssl) \ |
207 |
$(use_enable icap-client) \ |
208 |
$(use_enable ecap) \ |
209 |
$(use_enable zero-penalty-hit zph-qos) \ |
210 |
${myconf} || die "econf failed" |
211 |
} |
212 |
|
213 |
src_install() { |
214 |
emake DESTDIR="${D}" install || die "emake install failed" |
215 |
|
216 |
# need suid root for looking into /etc/shadow |
217 |
fowners root:squid /usr/libexec/squid/ncsa_auth |
218 |
fowners root:squid /usr/libexec/squid/pam_auth |
219 |
fperms 4750 /usr/libexec/squid/ncsa_auth |
220 |
fperms 4750 /usr/libexec/squid/pam_auth |
221 |
|
222 |
# some cleanups |
223 |
rm -f "${D}"/usr/bin/Run* |
224 |
|
225 |
dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ |
226 |
helpers/ntlm_auth/no_check/README.no_check_ntlm_auth |
227 |
newdoc helpers/basic_auth/SMB/README README.auth_smb |
228 |
dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html |
229 |
newdoc helpers/basic_auth/LDAP/README README.auth_ldap |
230 |
doman helpers/basic_auth/LDAP/*.8 |
231 |
dodoc helpers/basic_auth/SASL/squid_sasl_auth* |
232 |
|
233 |
newpamd "${FILESDIR}/squid.pam" squid |
234 |
newconfd "${FILESDIR}/squid.confd" squid |
235 |
if use logrotate; then |
236 |
newinitd "${FILESDIR}/squid.initd-logrotate" squid |
237 |
insinto /etc/logrotate.d |
238 |
newins "${FILESDIR}/squid.logrotate" squid |
239 |
else |
240 |
newinitd "${FILESDIR}/squid.initd" squid |
241 |
exeinto /etc/cron.weekly |
242 |
newexe "${FILESDIR}/squid.cron" squid.cron |
243 |
fi |
244 |
|
245 |
rm -rf "${D}"/var |
246 |
diropts -m0755 -o squid -g squid |
247 |
keepdir /var/cache/squid /var/log/squid |
248 |
} |
249 |
|
250 |
pkg_postinst() { |
251 |
echo |
252 |
ewarn "Squid authentication helpers have been installed suid root." |
253 |
ewarn "This allows shadow based authentication (see bug #52977 for more)." |
254 |
echo |
255 |
ewarn "Be careful what type of cache_dir you select!" |
256 |
ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow" |
257 |
ewarn "when there isn't sufficient traffic to keep squid reasonably busy." |
258 |
ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'." |
259 |
echo |
260 |
ewarn "Squid can be configured to run in transparent mode like this:" |
261 |
ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" |
262 |
if use zero-penalty-hit; then |
263 |
echo |
264 |
ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel" |
265 |
ewarn "with the patch that can be found on http://zph.bratcheda.org site." |
266 |
fi |
267 |
} |