Gentoo Archives: gentoo-commits

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