1 |
commit: 5b167cec903c19052428a803d83e44adaef78876 |
2 |
Author: Eray Aslan <eras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 24 14:22:58 2016 +0000 |
4 |
Commit: Eray Aslan <eras <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 24 14:23:30 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b167cec |
7 |
|
8 |
net-proxy/squid: security bump to 3.5.15 - bug 575542 |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
net-proxy/squid/Manifest | 1 + |
13 |
net-proxy/squid/squid-3.5.15.ebuild | 249 ++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 250 insertions(+) |
15 |
|
16 |
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest |
17 |
index f3926e9..4bbf611 100644 |
18 |
--- a/net-proxy/squid/Manifest |
19 |
+++ b/net-proxy/squid/Manifest |
20 |
@@ -2,6 +2,7 @@ DIST squid-3.5.10.tar.xz 2297452 SHA256 736e69fbddd6e985d2f85c995526f0a2bc4294c4 |
21 |
DIST squid-3.5.11.tar.xz 2298436 SHA256 c26211b8e349fd9a5fd357da33074ff6523c111024dd3a5a1f77153538aa40cf SHA512 7d7557f949d7a5995eff4745f6bf58d3c4899b882828a83332e269c4396de8470d7847d76701f383fd889cf7990b8d5c9ace6d557d00a9dd4a8d326f9b116c09 WHIRLPOOL 47acb40ecdaee9ce166e8db0da8a9642125a6af8306b3fd47e29c2edb7e96242a9535f1dfb028310334863fe914458c8b3d6f0f0f9c26c1c44cf4fdea0b2ed02 |
22 |
DIST squid-3.5.12.tar.xz 2299644 SHA256 8bc83f3869f7404aefb10883109e28443255cf6dde50a13904c7954619707a42 SHA512 2620f2b560df58c9a6ca5be38e91e7b67ee04a5a28de133ecd0fed232094570c453690a08a4835ad59ebf1cd002a6e6d7c7c4ea502b6d719d74f97111a5302d1 WHIRLPOOL 758c5f9d0a7dd8c87052008ec994966263f6fc956fdd9a254977f79bc2cccabe22e1dda6c6119f4e411ecec8ace9af8a5b86430ceccc075481e46955cc69dd25 |
23 |
DIST squid-3.5.14.tar.xz 2315320 SHA256 79ec4cdd4f965314e6db8e3f6ddcebf2d24518edd790a68e0bd4d0a7735ace1b SHA512 0b500dbe36fb9cd487e6954244bad7fbebd2bd6af442d1c5f7ebf9c73d846a1b1c061b035afa3bf34709e41e0fef4c8023f0d1114e21b794591ee49fe8843a1f WHIRLPOOL 1c89b4aa961aa8c6b3c8f68662f506432b5f54922f49749d7977708f186bb4a842ef7182190c0ad403f4d3b0ac670d940044556db60dbcffae04dcb9b5b35738 |
24 |
+DIST squid-3.5.15.tar.xz 2315628 SHA256 9cfce3231c7b3b33816fc54414d8720a51ac5e723663e0685a8bb995b9f450d2 SHA512 b5a6b4bc94d007f475419123b7ff4cdf7d47a024b859d2f7de0952115285114f06fd389fc6f463c21a1ce7d41e06227972bd802bafd2704cf0814afdee893dde WHIRLPOOL a8c73ac1a9a36b405cfb2d804ad51e673ffc812e561860f5b2775b468fcebc84834842ae4f55d4be928936f1750ea54b54d788149758a362282e1287696fe094 |
25 |
DIST squid-3.5.6.tar.xz 2291152 SHA256 cd080e8d5eaabebf6808792751322bd05f2a9c8fe4377f54c7155682ef6c38d5 SHA512 f6c2550cdb5b2f3317105c986caddf06d010bffa0c61d065cffcde72e5bc30c4608486c79c4b25418dfb9f0a8d7ef1d2fabb6b07d1f0262a19fafc945af98bef WHIRLPOOL 863c6f73c3c26737d98cbff15afa5b6630310226ee9ec10a3e38f646b1416137e998f9bb1e5b492e5871129aed3c98e729b3a757d35088162e671d310a887336 |
26 |
DIST squid-3.5.7.tar.xz 2294580 SHA256 ec6f861bddee007b1dd320667a26ddc9ff76847bbe4cbb59c0134588e65c8699 SHA512 13757da759c1a64fe13d451cff40c4ae30b18c2939f6971b4ef25e24b771ea973e3357f05ec89fccff51acc9e2c77418880b05f6020d58b7633141b928aaf349 WHIRLPOOL 9ce722647f6144ae5192a0a177d5d085252039eed3a7cbdf1fcb638c32097bf21710db71044448fc98bdba7c15daefb79dee5912b4d0c41cbc0e0b0fda695ee1 |
27 |
DIST squid-3.5.8.tar.xz 2295644 SHA256 f402a21d4fae8b3e9df13683dc530366e4b1753df21e91c05a0a9514a1abfc62 SHA512 df371934b141fd0e57223ef2a801b71ae2c88c918e1ebd17a82105d33a8f6d439da65cd6437b42a3857f0d64ce461ea31d01299d452ede3650a44cf6826e16e1 WHIRLPOOL 9ca3f07b3068a439299b30e8be924208bc36e336f7929c593563bf6dadf9eaaa051c213e34eafc1ec6db43540b61367bd666c7c172e370d600aa6823779bd192 |
28 |
|
29 |
diff --git a/net-proxy/squid/squid-3.5.15.ebuild b/net-proxy/squid/squid-3.5.15.ebuild |
30 |
new file mode 100644 |
31 |
index 0000000..f92b88f |
32 |
--- /dev/null |
33 |
+++ b/net-proxy/squid/squid-3.5.15.ebuild |
34 |
@@ -0,0 +1,249 @@ |
35 |
+# Copyright 1999-2016 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+# $Id$ |
38 |
+ |
39 |
+EAPI=5 |
40 |
+inherit autotools eutils linux-info pam toolchain-funcs user versionator |
41 |
+ |
42 |
+DESCRIPTION="A full-featured web proxy cache" |
43 |
+HOMEPAGE="http://www.squid-cache.org/" |
44 |
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz" |
45 |
+ |
46 |
+LICENSE="GPL-2" |
47 |
+SLOT="0" |
48 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
49 |
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ |
50 |
+ ecap esi ssl-crtd \ |
51 |
+ mysql postgres sqlite \ |
52 |
+ qos tproxy \ |
53 |
+ +htcp +wccp +wccpv2 \ |
54 |
+ pf-transparent ipf-transparent kqueue \ |
55 |
+ elibc_uclibc kernel_linux" |
56 |
+ |
57 |
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) |
58 |
+ pam? ( virtual/pam ) |
59 |
+ ldap? ( net-nds/openldap ) |
60 |
+ kerberos? ( virtual/krb5 ) |
61 |
+ qos? ( net-libs/libnetfilter_conntrack ) |
62 |
+ ssl? ( dev-libs/openssl:0 dev-libs/nettle >=net-libs/gnutls-3.1.5 ) |
63 |
+ sasl? ( dev-libs/cyrus-sasl ) |
64 |
+ ecap? ( net-libs/libecap:1 ) |
65 |
+ esi? ( dev-libs/expat dev-libs/libxml2 ) |
66 |
+ !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) |
67 |
+ >=sys-libs/db-4:* |
68 |
+ dev-lang/perl |
69 |
+ dev-libs/libltdl:0" |
70 |
+DEPEND="${COMMON_DEPEND} |
71 |
+ ecap? ( virtual/pkgconfig ) |
72 |
+ sys-apps/ed |
73 |
+ test? ( dev-util/cppunit )" |
74 |
+RDEPEND="${COMMON_DEPEND} |
75 |
+ samba? ( net-fs/samba ) |
76 |
+ mysql? ( dev-perl/DBD-mysql ) |
77 |
+ postgres? ( dev-perl/DBD-Pg ) |
78 |
+ selinux? ( sec-policy/selinux-squid ) |
79 |
+ sqlite? ( dev-perl/DBD-SQLite ) |
80 |
+ !<=sci-biology/meme-4.8.1-r1" |
81 |
+ |
82 |
+REQUIRED_USE="tproxy? ( caps ) |
83 |
+ qos? ( caps )" |
84 |
+ |
85 |
+pkg_pretend() { |
86 |
+ if use tproxy; then |
87 |
+ local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" |
88 |
+ linux-info_pkg_setup |
89 |
+ fi |
90 |
+} |
91 |
+ |
92 |
+pkg_setup() { |
93 |
+ enewgroup squid |
94 |
+ enewuser squid -1 -1 /var/cache/squid squid |
95 |
+} |
96 |
+ |
97 |
+src_prepare() { |
98 |
+ epatch "${FILESDIR}/${PN}-3.5.7-gentoo.patch" |
99 |
+ sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ |
100 |
+ INSTALL QUICKSTART \ |
101 |
+ scripts/fileno-to-pathname.pl \ |
102 |
+ scripts/check_cache.pl \ |
103 |
+ tools/cachemgr.cgi.8 \ |
104 |
+ tools/purge/conffile.hh \ |
105 |
+ tools/purge/README || die |
106 |
+ sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \ |
107 |
+ INSTALL QUICKSTART || die |
108 |
+ sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \ |
109 |
+ QUICKSTART || die |
110 |
+ sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \ |
111 |
+ QUICKSTART \ |
112 |
+ src/log/access_log.cc || die |
113 |
+ sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \ |
114 |
+ src/log/access_log.cc || die |
115 |
+ sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \ |
116 |
+ helpers/external_acl/unix_group/ext_unix_group_acl.8 \ |
117 |
+ helpers/external_acl/session/ext_session_acl.8 \ |
118 |
+ src/ssl/ssl_crtd.8 || die |
119 |
+ sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \ |
120 |
+ scripts/check_cache.pl || die |
121 |
+ sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \ |
122 |
+ src/ssl/ssl_crtd.8 || die |
123 |
+ sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ |
124 |
+ src/ssl/ssl_crtd.8 || die |
125 |
+ sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ |
126 |
+ src/ssl/ssl_crtd.8 || die |
127 |
+ # /var/run/squid to /run/squid |
128 |
+ sed -i -e 's:$(localstatedir)::' \ |
129 |
+ src/ipc/Makefile.am || die |
130 |
+ sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \ |
131 |
+ libltdl/configure.ac || die |
132 |
+ |
133 |
+ epatch_user |
134 |
+ |
135 |
+ eautoreconf |
136 |
+} |
137 |
+ |
138 |
+src_configure() { |
139 |
+ local basic_modules="MSNT-multi-domain,NCSA,POP3,getpwnam" |
140 |
+ use samba && basic_modules+=",SMB" |
141 |
+ use ldap && basic_modules+=",LDAP" |
142 |
+ use pam && basic_modules+=",PAM" |
143 |
+ use sasl && basic_modules+=",SASL" |
144 |
+ use nis && ! use elibc_uclibc && basic_modules+=",NIS" |
145 |
+ use radius && basic_modules+=",RADIUS" |
146 |
+ if use mysql || use postgres || use sqlite ; then |
147 |
+ basic_modules+=",DB" |
148 |
+ fi |
149 |
+ |
150 |
+ local digest_modules="file" |
151 |
+ use ldap && digest_modules+=",LDAP,eDirectory" |
152 |
+ |
153 |
+ local negotiate_modules="none" |
154 |
+ local myconf="--without-mit-krb5 --without-heimdal-krb5" |
155 |
+ if use kerberos ; then |
156 |
+ negotiate_modules="kerberos,wrapper" |
157 |
+ if has_version app-crypt/heimdal ; then |
158 |
+ myconf="--without-mit-krb5 --with-heimdal-krb5" |
159 |
+ else |
160 |
+ myconf="--with-mit-krb5 --without-heimdal-krb5" |
161 |
+ fi |
162 |
+ fi |
163 |
+ |
164 |
+ local ntlm_modules="none" |
165 |
+ use samba && ntlm_modules="smb_lm" |
166 |
+ |
167 |
+ local ext_helpers="file_userip,session,unix_group" |
168 |
+ use samba && ext_helpers+=",wbinfo_group" |
169 |
+ use ldap && ext_helpers+=",LDAP_group,eDirectory_userip" |
170 |
+ use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group" |
171 |
+ |
172 |
+ local storeio_modules="aufs,diskd,rock,ufs" |
173 |
+ |
174 |
+ local transparent |
175 |
+ if use kernel_linux ; then |
176 |
+ transparent+=" --enable-linux-netfilter" |
177 |
+ use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack" |
178 |
+ fi |
179 |
+ |
180 |
+ if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then |
181 |
+ transparent+=" $(use_enable kqueue)" |
182 |
+ if use pf-transparent; then |
183 |
+ transparent+=" --enable-pf-transparent" |
184 |
+ elif use ipf-transparent; then |
185 |
+ transparent+=" --enable-ipf-transparent" |
186 |
+ fi |
187 |
+ fi |
188 |
+ |
189 |
+ tc-export CC AR |
190 |
+ |
191 |
+ econf \ |
192 |
+ --sysconfdir=/etc/squid \ |
193 |
+ --libexecdir=/usr/libexec/squid \ |
194 |
+ --localstatedir=/var \ |
195 |
+ --with-pidfile=/run/squid.pid \ |
196 |
+ --datadir=/usr/share/squid \ |
197 |
+ --with-logdir=/var/log/squid \ |
198 |
+ --with-default-user=squid \ |
199 |
+ --enable-removal-policies="lru,heap" \ |
200 |
+ --enable-storeio="${storeio_modules}" \ |
201 |
+ --enable-disk-io \ |
202 |
+ --enable-auth-basic="${basic_modules}" \ |
203 |
+ --enable-auth-digest="${digest_modules}" \ |
204 |
+ --enable-auth-ntlm="${ntlm_modules}" \ |
205 |
+ --enable-auth-negotiate="${negotiate_modules}" \ |
206 |
+ --enable-external-acl-helpers="${ext_helpers}" \ |
207 |
+ --enable-log-daemon-helpers \ |
208 |
+ --enable-url-rewrite-helpers \ |
209 |
+ --enable-cache-digests \ |
210 |
+ --enable-delay-pools \ |
211 |
+ --enable-eui \ |
212 |
+ --enable-icmp \ |
213 |
+ --enable-follow-x-forwarded-for \ |
214 |
+ --with-large-files \ |
215 |
+ --disable-strict-error-checking \ |
216 |
+ --disable-arch-native \ |
217 |
+ --with-ltdl-includedir=/usr/include \ |
218 |
+ --with-ltdl-libdir=/usr/$(get_libdir) \ |
219 |
+ $(use_with caps libcap) \ |
220 |
+ $(use_enable ipv6) \ |
221 |
+ $(use_enable snmp) \ |
222 |
+ $(use_with ssl openssl) \ |
223 |
+ $(use_with ssl nettle) \ |
224 |
+ $(use_with ssl gnutls) \ |
225 |
+ $(use_enable ssl-crtd) \ |
226 |
+ $(use_enable ecap) \ |
227 |
+ $(use_enable esi) \ |
228 |
+ $(use_enable htcp) \ |
229 |
+ $(use_enable wccp) \ |
230 |
+ $(use_enable wccpv2) \ |
231 |
+ ${transparent} \ |
232 |
+ ${myconf} |
233 |
+} |
234 |
+ |
235 |
+src_install() { |
236 |
+ emake DESTDIR="${D}" install |
237 |
+ |
238 |
+ # need suid root for looking into /etc/shadow |
239 |
+ fowners root:squid /usr/libexec/squid/basic_ncsa_auth |
240 |
+ fperms 4750 /usr/libexec/squid/basic_ncsa_auth |
241 |
+ if use pam; then |
242 |
+ fowners root:squid /usr/libexec/squid/basic_pam_auth |
243 |
+ fperms 4750 /usr/libexec/squid/basic_pam_auth |
244 |
+ fi |
245 |
+ # pinger needs suid as well |
246 |
+ fowners root:squid /usr/libexec/squid/pinger |
247 |
+ fperms 4750 /usr/libexec/squid/pinger |
248 |
+ |
249 |
+ # cleanup |
250 |
+ rm -f "${D}"/usr/bin/Run* |
251 |
+ rm -rf "${D}"/run/squid "${D}"/var/cache/squid |
252 |
+ |
253 |
+ dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt |
254 |
+ newdoc helpers/negotiate_auth/kerberos/README README.kerberos |
255 |
+ newdoc helpers/basic_auth/RADIUS/README README.RADIUS |
256 |
+ newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group |
257 |
+ newdoc tools/purge/README README.purge |
258 |
+ newdoc tools/helper-mux.README README.helper-mux |
259 |
+ dohtml RELEASENOTES.html |
260 |
+ |
261 |
+ newpamd "${FILESDIR}/squid.pam" squid |
262 |
+ newconfd "${FILESDIR}/squid.confd-r1" squid |
263 |
+ newinitd "${FILESDIR}/squid.initd-r4" squid |
264 |
+ if use logrotate; then |
265 |
+ insinto /etc/logrotate.d |
266 |
+ newins "${FILESDIR}/squid.logrotate" squid |
267 |
+ else |
268 |
+ exeinto /etc/cron.weekly |
269 |
+ newexe "${FILESDIR}/squid.cron" squid.cron |
270 |
+ fi |
271 |
+ |
272 |
+ diropts -m0750 -o squid -g squid |
273 |
+ keepdir /var/log/squid /etc/ssl/squid /var/lib/squid |
274 |
+} |
275 |
+ |
276 |
+pkg_postinst() { |
277 |
+ if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \ |
278 |
+ [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 ]]; then |
279 |
+ elog "Please read the release notes at:" |
280 |
+ elog " http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html" |
281 |
+ echo |
282 |
+ fi |
283 |
+} |