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