1 |
eras 13/09/30 07:15:09 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: squid-3.3.9.ebuild |
5 |
Log: |
6 |
Version bump |
7 |
|
8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F) |
9 |
|
10 |
Revision Changes Path |
11 |
1.435 net-proxy/squid/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.435&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.435&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?r1=1.434&r2=1.435 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v |
20 |
retrieving revision 1.434 |
21 |
retrieving revision 1.435 |
22 |
diff -u -r1.434 -r1.435 |
23 |
--- ChangeLog 23 Sep 2013 14:40:36 -0000 1.434 |
24 |
+++ ChangeLog 30 Sep 2013 07:15:09 -0000 1.435 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for net-proxy/squid |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.434 2013/09/23 14:40:36 tomwij Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.435 2013/09/30 07:15:09 eras Exp $ |
30 |
+ |
31 |
+*squid-3.3.9 (30 Sep 2013) |
32 |
+ |
33 |
+ 30 Sep 2013; Eray Aslan <eras@g.o> +squid-3.3.9.ebuild: |
34 |
+ Version bump |
35 |
|
36 |
23 Sep 2013; Tom Wijsman <TomWij@g.o> squid-3.2.13.ebuild, |
37 |
squid-3.3.8.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.1 net-proxy/squid/squid-3.3.9.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.3.9.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.3.9.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: squid-3.3.9.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2013 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.9.ebuild,v 1.1 2013/09/30 07:15:09 eras Exp $ |
51 |
|
52 |
EAPI=5 |
53 |
|
54 |
inherit autotools eutils linux-info pam toolchain-funcs user versionator |
55 |
|
56 |
DESCRIPTION="A full-featured web proxy cache" |
57 |
HOMEPAGE="http://www.squid-cache.org/" |
58 |
SRC_URI="http://www.squid-cache.org/Versions/v3/3.3/${P}.tar.gz" |
59 |
|
60 |
LICENSE="GPL-2" |
61 |
SLOT="0" |
62 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
63 |
IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ |
64 |
ecap icap-client ssl-crtd \ |
65 |
mysql postgres sqlite \ |
66 |
qos tproxy \ |
67 |
pf-transparent ipf-transparent kqueue \ |
68 |
elibc_uclibc kernel_linux" |
69 |
|
70 |
COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) |
71 |
pam? ( virtual/pam ) |
72 |
ldap? ( net-nds/openldap ) |
73 |
kerberos? ( virtual/krb5 ) |
74 |
qos? ( net-libs/libnetfilter_conntrack ) |
75 |
ssl? ( dev-libs/openssl ) |
76 |
sasl? ( dev-libs/cyrus-sasl ) |
77 |
ecap? ( net-libs/libecap:0.2 ) |
78 |
selinux? ( sec-policy/selinux-squid ) |
79 |
!x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) |
80 |
>=sys-libs/db-4 |
81 |
sys-devel/libtool |
82 |
dev-lang/perl |
83 |
sys-devel/libtool" |
84 |
DEPEND="${COMMON_DEPEND} |
85 |
sys-apps/ed |
86 |
test? ( dev-util/cppunit )" |
87 |
RDEPEND="${COMMON_DEPEND} |
88 |
samba? ( net-fs/samba ) |
89 |
mysql? ( dev-perl/DBD-mysql ) |
90 |
postgres? ( dev-perl/DBD-Pg ) |
91 |
sqlite? ( dev-perl/DBD-SQLite ) |
92 |
!<=sci-biology/meme-4.8.1-r1" |
93 |
|
94 |
REQUIRED_USE="tproxy? ( caps ) |
95 |
qos? ( caps )" |
96 |
|
97 |
pkg_pretend() { |
98 |
if use tproxy; then |
99 |
local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" |
100 |
linux-info_pkg_setup |
101 |
fi |
102 |
} |
103 |
|
104 |
pkg_setup() { |
105 |
enewgroup squid 31 |
106 |
enewuser squid 31 -1 /var/cache/squid squid |
107 |
} |
108 |
|
109 |
src_prepare() { |
110 |
epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch" |
111 |
sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ |
112 |
lib/libTrie/configure.ac || die |
113 |
sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ |
114 |
INSTALL QUICKSTART \ |
115 |
helpers/basic_auth/MSNT/README.html \ |
116 |
helpers/basic_auth/MSNT/confload.cc \ |
117 |
helpers/basic_auth/MSNT/msntauth.conf.default \ |
118 |
scripts/fileno-to-pathname.pl \ |
119 |
scripts/check_cache.pl \ |
120 |
tools/cachemgr.cgi.8 \ |
121 |
tools/purge/conffile.hh \ |
122 |
tools/purge/README || die |
123 |
sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \ |
124 |
INSTALL QUICKSTART || die |
125 |
sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \ |
126 |
QUICKSTART || die |
127 |
sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \ |
128 |
QUICKSTART \ |
129 |
src/log/access_log.cc || die |
130 |
sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \ |
131 |
src/log/access_log.cc || die |
132 |
sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \ |
133 |
helpers/basic_auth/MSNT/README.html || die |
134 |
sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \ |
135 |
helpers/external_acl/unix_group/ext_unix_group_acl.8 \ |
136 |
helpers/external_acl/session/ext_session_acl.8 \ |
137 |
src/ssl/ssl_crtd.8 || die |
138 |
sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \ |
139 |
scripts/check_cache.pl || die |
140 |
sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \ |
141 |
src/ssl/ssl_crtd.8 || die |
142 |
sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ |
143 |
src/ssl/ssl_crtd.8 || die |
144 |
sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ |
145 |
src/ssl/ssl_crtd.8 || die |
146 |
# /var/run/squid to /run/squid |
147 |
sed -i -e 's:$(localstatedir)::' \ |
148 |
src/ipc/Makefile.am |
149 |
|
150 |
# Bug #419685 - eautoreconf in src_prepare() fails in libltdl/ |
151 |
# aclocal-1.11: `configure.ac' or `configure.in' is required |
152 |
MAKEOPTS="${MAKEOPTS} -j1" eautoreconf |
153 |
} |
154 |
|
155 |
src_configure() { |
156 |
local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam" |
157 |
use samba && basic_modules+=",SMB" |
158 |
use ldap && basic_modules+=",LDAP" |
159 |
use pam && basic_modules+=",PAM" |
160 |
use sasl && basic_modules+=",SASL" |
161 |
use nis && ! use elibc_uclibc && basic_modules+=",NIS" |
162 |
use radius && basic_modules+=",RADIUS" |
163 |
if use mysql || use postgres || use sqlite ; then |
164 |
basic_modules+=",DB" |
165 |
fi |
166 |
|
167 |
local digest_modules="file" |
168 |
use ldap && digest_modules+=",LDAP,eDirectory" |
169 |
|
170 |
local negotiate_modules="none" |
171 |
use kerberos && negotiate_modules="kerberos,wrapper" |
172 |
|
173 |
local ntlm_modules="none" |
174 |
use samba && ntlm_modules="smb_lm" |
175 |
|
176 |
local ext_helpers="file_userip,session,unix_group" |
177 |
use samba && ext_helpers+=",wbinfo_group" |
178 |
use ldap && ext_helpers+=",LDAP_group,eDirectory_userip" |
179 |
use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group" |
180 |
|
181 |
# uclibc does not have aio support - needed for coss (#61175) |
182 |
local storeio_modules="aufs,diskd,rock,ufs" |
183 |
# not stable enough yet |
184 |
#! use elibc_uclibc && storeio_modules+=",coss" |
185 |
|
186 |
local transparent |
187 |
if use kernel_linux ; then |
188 |
transparent+=" --enable-linux-netfilter" |
189 |
use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack" |
190 |
fi |
191 |
|
192 |
if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then |
193 |
transparent+=" $(use_enable kqueue)" |
194 |
if use pf-transparent; then |
195 |
transparent+=" --enable-pf-transparent" |
196 |
elif use ipf-transparent; then |
197 |
transparent+=" --enable-ipf-transparent" |
198 |
fi |
199 |
fi |
200 |
|
201 |
tc-export CC AR |
202 |
|
203 |
econf \ |
204 |
--sysconfdir=/etc/squid \ |
205 |
--libexecdir=/usr/libexec/squid \ |
206 |
--localstatedir=/var \ |
207 |
--with-pidfile=/run/squid.pid \ |
208 |
--datadir=/usr/share/squid \ |
209 |
--with-logdir=/var/log/squid \ |
210 |
--with-default-user=squid \ |
211 |
--enable-removal-policies="lru,heap" \ |
212 |
--enable-storeio="${storeio_modules}" \ |
213 |
--enable-disk-io \ |
214 |
--enable-auth \ |
215 |
--enable-auth-basic="${basic_modules}" \ |
216 |
--enable-auth-digest="${digest_modules}" \ |
217 |
--enable-auth-ntlm="${ntlm_modules}" \ |
218 |
--enable-auth-negotiate="${negotiate_modules}" \ |
219 |
--enable-external-acl-helpers="${ext_helpers}" \ |
220 |
--enable-log-daemon-helpers \ |
221 |
--enable-url-rewrite-helpers \ |
222 |
--enable-cache-digests \ |
223 |
--enable-delay-pools \ |
224 |
--enable-eui \ |
225 |
--enable-icmp \ |
226 |
--enable-follow-x-forwarded-for \ |
227 |
--enable-esi \ |
228 |
--with-large-files \ |
229 |
--disable-strict-error-checking \ |
230 |
$(use_with caps libcap) \ |
231 |
$(use_enable ipv6) \ |
232 |
$(use_enable snmp) \ |
233 |
$(use_enable ssl) \ |
234 |
$(use_enable ssl-crtd) \ |
235 |
$(use_enable icap-client) \ |
236 |
$(use_enable ecap) \ |
237 |
${transparent} |
238 |
} |
239 |
|
240 |
src_install() { |
241 |
emake DESTDIR="${D}" install |
242 |
|
243 |
# need suid root for looking into /etc/shadow |
244 |
fowners root:squid /usr/libexec/squid/basic_ncsa_auth |
245 |
fperms 4750 /usr/libexec/squid/basic_ncsa_auth |
246 |
if use pam; then |
247 |
fowners root:squid /usr/libexec/squid/basic_pam_auth |
248 |
fperms 4750 /usr/libexec/squid/basic_pam_auth |
249 |
fi |
250 |
# pinger needs suid as well |
251 |
fowners root:squid /usr/libexec/squid/pinger |
252 |
fperms 4750 /usr/libexec/squid/pinger |
253 |
|
254 |
# some cleanups |
255 |
rm -f "${D}"/usr/bin/Run* |
256 |
|
257 |
dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt |
258 |
newdoc helpers/negotiate_auth/kerberos/README README.kerberos |
259 |
newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain |
260 |
newdoc helpers/basic_auth/LDAP/README README.LDAP |
261 |
newdoc helpers/basic_auth/RADIUS/README README.RADIUS |
262 |
newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group |
263 |
newdoc tools/purge/README README.purge |
264 |
newdoc tools/helper-mux.README README.helper-mux |
265 |
dohtml RELEASENOTES.html |
266 |
|
267 |
newpamd "${FILESDIR}/squid.pam" squid |
268 |
newconfd "${FILESDIR}/squid.confd-r1" squid |
269 |
if use logrotate; then |
270 |
newinitd "${FILESDIR}/squid.initd-logrotate-r3" squid |
271 |
insinto /etc/logrotate.d |
272 |
newins "${FILESDIR}/squid.logrotate" squid |
273 |
else |
274 |
newinitd "${FILESDIR}/squid.initd-r3" squid |
275 |
exeinto /etc/cron.weekly |
276 |
newexe "${FILESDIR}/squid.cron" squid.cron |
277 |
fi |
278 |
|
279 |
diropts -m0750 -o squid -g squid |
280 |
keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid |
281 |
} |
282 |
|
283 |
pkg_postinst() { |
284 |
if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \ |
285 |
[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 3 ]]; then |
286 |
elog "Please read the release notes at:" |
287 |
elog " http://www.squid-cache.org/Versions/v3/3.3/RELEASENOTES.html" |
288 |
echo |
289 |
fi |
290 |
} |