| 1 |
eras 14/10/03 05:21:27 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: squid-3.4.8.ebuild |
| 5 |
Log: |
| 6 |
Version bump |
| 7 |
|
| 8 |
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.486 net-proxy/squid/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.486&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.486&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?r1=1.485&r2=1.486 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v |
| 20 |
retrieving revision 1.485 |
| 21 |
retrieving revision 1.486 |
| 22 |
diff -u -r1.485 -r1.486 |
| 23 |
--- ChangeLog 3 Oct 2014 05:19:56 -0000 1.485 |
| 24 |
+++ ChangeLog 3 Oct 2014 05:21:27 -0000 1.486 |
| 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.485 2014/10/03 05:19:56 eras Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.486 2014/10/03 05:21:27 eras Exp $ |
| 30 |
+ |
| 31 |
+*squid-3.4.8 (03 Oct 2014) |
| 32 |
+ |
| 33 |
+ 03 Oct 2014; Eray Aslan <eras@g.o> +squid-3.4.8.ebuild: |
| 34 |
+ Version bump |
| 35 |
|
| 36 |
03 Oct 2014; Eray Aslan <eras@g.o> squid-3.3.13-r1.ebuild, |
| 37 |
squid-3.3.13.ebuild, squid-3.4.7-r1.ebuild: |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 net-proxy/squid/squid-3.4.8.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.4.8.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.4.8.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: squid-3.4.8.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.8.ebuild,v 1.1 2014/10/03 05:21:27 eras Exp $ |
| 51 |
|
| 52 |
EAPI=5 |
| 53 |
inherit autotools eutils linux-info pam toolchain-funcs user versionator |
| 54 |
|
| 55 |
DESCRIPTION="A full-featured web proxy cache" |
| 56 |
HOMEPAGE="http://www.squid-cache.org/" |
| 57 |
SRC_URI="http://www.squid-cache.org/Versions/v3/3.4/${P}.tar.xz" |
| 58 |
|
| 59 |
LICENSE="GPL-2" |
| 60 |
SLOT="0" |
| 61 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 62 |
IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ |
| 63 |
ecap esi icap-client ssl-crtd \ |
| 64 |
mysql postgres sqlite \ |
| 65 |
qos tproxy \ |
| 66 |
+htcp +wccp +wccpv2 \ |
| 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 dev-libs/nettle ) |
| 76 |
sasl? ( dev-libs/cyrus-sasl ) |
| 77 |
ecap? ( net-libs/libecap:0.2 ) |
| 78 |
esi? ( dev-libs/expat dev-libs/libxml2 ) |
| 79 |
selinux? ( sec-policy/selinux-squid ) |
| 80 |
!x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) |
| 81 |
>=sys-libs/db-4 |
| 82 |
sys-devel/libtool |
| 83 |
dev-lang/perl |
| 84 |
sys-devel/libtool" |
| 85 |
DEPEND="${COMMON_DEPEND} |
| 86 |
ecap? ( virtual/pkgconfig ) |
| 87 |
sys-apps/ed |
| 88 |
test? ( dev-util/cppunit )" |
| 89 |
RDEPEND="${COMMON_DEPEND} |
| 90 |
samba? ( net-fs/samba ) |
| 91 |
mysql? ( dev-perl/DBD-mysql ) |
| 92 |
postgres? ( dev-perl/DBD-Pg ) |
| 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_TPROXY ~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 |
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 |
epatch_user |
| 151 |
|
| 152 |
# Bug #419685 - eautoreconf in src_prepare() fails in libltdl/ |
| 153 |
# aclocal-1.11: `configure.ac' or `configure.in' is required |
| 154 |
MAKEOPTS="${MAKEOPTS} -j1" eautoreconf |
| 155 |
} |
| 156 |
|
| 157 |
src_configure() { |
| 158 |
local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam" |
| 159 |
use samba && basic_modules+=",SMB" |
| 160 |
use ldap && basic_modules+=",LDAP" |
| 161 |
use pam && basic_modules+=",PAM" |
| 162 |
use sasl && basic_modules+=",SASL" |
| 163 |
use nis && ! use elibc_uclibc && basic_modules+=",NIS" |
| 164 |
use radius && basic_modules+=",RADIUS" |
| 165 |
if use mysql || use postgres || use sqlite ; then |
| 166 |
basic_modules+=",DB" |
| 167 |
fi |
| 168 |
|
| 169 |
local digest_modules="file" |
| 170 |
use ldap && digest_modules+=",LDAP,eDirectory" |
| 171 |
|
| 172 |
local negotiate_modules myconf |
| 173 |
if use kerberos ; then |
| 174 |
negotiate_modules="kerberos,wrapper" |
| 175 |
myconf="--with-krb5-config=yes" |
| 176 |
else |
| 177 |
negotiate_modules="none" |
| 178 |
myconf="--with-krb5-config=no" |
| 179 |
fi |
| 180 |
|
| 181 |
local ntlm_modules="none" |
| 182 |
use samba && ntlm_modules="smb_lm" |
| 183 |
|
| 184 |
local ext_helpers="file_userip,session,unix_group" |
| 185 |
use samba && ext_helpers+=",wbinfo_group" |
| 186 |
use ldap && ext_helpers+=",LDAP_group,eDirectory_userip" |
| 187 |
use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group" |
| 188 |
|
| 189 |
# uclibc does not have aio support - needed for coss (#61175) |
| 190 |
local storeio_modules="aufs,diskd,rock,ufs" |
| 191 |
|
| 192 |
local transparent |
| 193 |
if use kernel_linux ; then |
| 194 |
transparent+=" --enable-linux-netfilter" |
| 195 |
use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack" |
| 196 |
fi |
| 197 |
|
| 198 |
if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then |
| 199 |
transparent+=" $(use_enable kqueue)" |
| 200 |
if use pf-transparent; then |
| 201 |
transparent+=" --enable-pf-transparent" |
| 202 |
elif use ipf-transparent; then |
| 203 |
transparent+=" --enable-ipf-transparent" |
| 204 |
fi |
| 205 |
fi |
| 206 |
|
| 207 |
tc-export CC AR |
| 208 |
|
| 209 |
econf \ |
| 210 |
--sysconfdir=/etc/squid \ |
| 211 |
--libexecdir=/usr/libexec/squid \ |
| 212 |
--localstatedir=/var \ |
| 213 |
--with-pidfile=/run/squid.pid \ |
| 214 |
--datadir=/usr/share/squid \ |
| 215 |
--with-logdir=/var/log/squid \ |
| 216 |
--with-default-user=squid \ |
| 217 |
--enable-removal-policies="lru,heap" \ |
| 218 |
--enable-storeio="${storeio_modules}" \ |
| 219 |
--enable-disk-io \ |
| 220 |
--enable-auth \ |
| 221 |
--enable-auth-basic="${basic_modules}" \ |
| 222 |
--enable-auth-digest="${digest_modules}" \ |
| 223 |
--enable-auth-ntlm="${ntlm_modules}" \ |
| 224 |
--enable-auth-negotiate="${negotiate_modules}" \ |
| 225 |
--enable-external-acl-helpers="${ext_helpers}" \ |
| 226 |
--enable-log-daemon-helpers \ |
| 227 |
--enable-url-rewrite-helpers \ |
| 228 |
--enable-cache-digests \ |
| 229 |
--enable-delay-pools \ |
| 230 |
--enable-eui \ |
| 231 |
--enable-icmp \ |
| 232 |
--enable-follow-x-forwarded-for \ |
| 233 |
--with-large-files \ |
| 234 |
--disable-strict-error-checking \ |
| 235 |
--disable-arch-native \ |
| 236 |
$(use_with caps libcap) \ |
| 237 |
$(use_enable ipv6) \ |
| 238 |
$(use_enable snmp) \ |
| 239 |
$(use_enable ssl) \ |
| 240 |
$(use_with ssl nettle) \ |
| 241 |
$(use_enable ssl-crtd) \ |
| 242 |
$(use_enable icap-client) \ |
| 243 |
$(use_enable ecap) \ |
| 244 |
$(use_enable esi) \ |
| 245 |
$(use_enable htcp) \ |
| 246 |
$(use_enable wccp) \ |
| 247 |
$(use_enable wccpv2) \ |
| 248 |
${transparent} \ |
| 249 |
${myconf} |
| 250 |
} |
| 251 |
|
| 252 |
src_install() { |
| 253 |
emake DESTDIR="${D}" install |
| 254 |
|
| 255 |
# need suid root for looking into /etc/shadow |
| 256 |
fowners root:squid /usr/libexec/squid/basic_ncsa_auth |
| 257 |
fperms 4750 /usr/libexec/squid/basic_ncsa_auth |
| 258 |
if use pam; then |
| 259 |
fowners root:squid /usr/libexec/squid/basic_pam_auth |
| 260 |
fperms 4750 /usr/libexec/squid/basic_pam_auth |
| 261 |
fi |
| 262 |
# pinger needs suid as well |
| 263 |
fowners root:squid /usr/libexec/squid/pinger |
| 264 |
fperms 4750 /usr/libexec/squid/pinger |
| 265 |
|
| 266 |
# cleanup |
| 267 |
rm -f "${D}"/usr/bin/Run* |
| 268 |
rm -rf "${D}"/run/squid "${D}"/var/cache/squid |
| 269 |
|
| 270 |
dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt |
| 271 |
newdoc helpers/negotiate_auth/kerberos/README README.kerberos |
| 272 |
newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain |
| 273 |
newdoc helpers/basic_auth/LDAP/README README.LDAP |
| 274 |
newdoc helpers/basic_auth/RADIUS/README README.RADIUS |
| 275 |
newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group |
| 276 |
newdoc tools/purge/README README.purge |
| 277 |
newdoc tools/helper-mux.README README.helper-mux |
| 278 |
dohtml RELEASENOTES.html |
| 279 |
|
| 280 |
newpamd "${FILESDIR}/squid.pam" squid |
| 281 |
newconfd "${FILESDIR}/squid.confd-r1" squid |
| 282 |
newinitd "${FILESDIR}/squid.initd-r4" squid |
| 283 |
if use logrotate; then |
| 284 |
insinto /etc/logrotate.d |
| 285 |
newins "${FILESDIR}/squid.logrotate" squid |
| 286 |
else |
| 287 |
exeinto /etc/cron.weekly |
| 288 |
newexe "${FILESDIR}/squid.cron" squid.cron |
| 289 |
fi |
| 290 |
|
| 291 |
diropts -m0750 -o squid -g squid |
| 292 |
keepdir /var/log/squid /etc/ssl/squid /var/lib/squid |
| 293 |
} |
| 294 |
|
| 295 |
pkg_postinst() { |
| 296 |
if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \ |
| 297 |
[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 4 ]]; then |
| 298 |
elog "Please read the release notes at:" |
| 299 |
elog " http://www.squid-cache.org/Versions/v3/3.4/RELEASENOTES.html" |
| 300 |
echo |
| 301 |
fi |
| 302 |
} |
Archives