| 1 |
eras 12/08/27 13:56:01 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: squid-3.2.1.ebuild |
| 5 |
Log: |
| 6 |
Version bump - bug #431554 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha122/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.349 net-proxy/squid/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.349&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?rev=1.349&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/ChangeLog?r1=1.348&r2=1.349 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v |
| 20 |
retrieving revision 1.348 |
| 21 |
retrieving revision 1.349 |
| 22 |
diff -u -r1.348 -r1.349 |
| 23 |
--- ChangeLog 27 Aug 2012 13:22:08 -0000 1.348 |
| 24 |
+++ ChangeLog 27 Aug 2012 13:56:01 -0000 1.349 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for net-proxy/squid |
| 27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.348 2012/08/27 13:22:08 eras Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.349 2012/08/27 13:56:01 eras Exp $ |
| 30 |
+ |
| 31 |
+*squid-3.2.1 (27 Aug 2012) |
| 32 |
+ |
| 33 |
+ 27 Aug 2012; Eray Aslan <eras@g.o> +files/squid-3.2.1-gentoo.patch, |
| 34 |
+ +squid-3.2.1.ebuild: |
| 35 |
+ Version bump - bug #431554 |
| 36 |
|
| 37 |
27 Aug 2012; Eray Aslan <eras@g.o> metadata.xml: |
| 38 |
Add myself as maintainer |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 net-proxy/squid/squid-3.2.1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.2.1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/squid-3.2.1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: squid-3.2.1.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2012 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.2.1.ebuild,v 1.1 2012/08/27 13:56:01 eras Exp $ |
| 52 |
|
| 53 |
EAPI=4 |
| 54 |
inherit eutils pam toolchain-funcs autotools linux-info 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.2/${P}.tar.gz" |
| 59 |
|
| 60 |
LICENSE="GPL-2" |
| 61 |
SLOT="0" |
| 62 |
KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~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.0 ) |
| 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 |
DEPEND="${COMMON_DEPEND} |
| 84 |
sys-apps/ed |
| 85 |
test? ( dev-util/cppunit )" |
| 86 |
RDEPEND="${COMMON_DEPEND} |
| 87 |
samba? ( net-fs/samba ) |
| 88 |
mysql? ( dev-perl/DBD-mysql ) |
| 89 |
postgres? ( dev-perl/DBD-Pg ) |
| 90 |
sqlite? ( dev-perl/DBD-SQLite )" |
| 91 |
|
| 92 |
REQUIRED_USE="tproxy? ( caps ) |
| 93 |
qos? ( caps )" |
| 94 |
|
| 95 |
pkg_pretend() { |
| 96 |
if use tproxy; then |
| 97 |
echo |
| 98 |
elog "Checking kernel configuration for full Tproxy4 support" |
| 99 |
local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" |
| 100 |
linux-info_pkg_setup |
| 101 |
echo |
| 102 |
fi |
| 103 |
} |
| 104 |
|
| 105 |
pkg_setup() { |
| 106 |
enewgroup squid 31 |
| 107 |
enewuser squid 31 -1 /var/cache/squid squid |
| 108 |
} |
| 109 |
|
| 110 |
src_prepare() { |
| 111 |
epatch "${FILESDIR}/${PN}-3.2.1-gentoo.patch" |
| 112 |
sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ |
| 113 |
INSTALL QUICKSTART \ |
| 114 |
helpers/basic_auth/MSNT/README.html \ |
| 115 |
helpers/basic_auth/MSNT/confload.cc \ |
| 116 |
helpers/basic_auth/MSNT/msntauth.conf.default \ |
| 117 |
scripts/fileno-to-pathname.pl \ |
| 118 |
scripts/check_cache.pl \ |
| 119 |
tools/cachemgr.cgi.8 \ |
| 120 |
tools/purge/conffile.hh \ |
| 121 |
tools/purge/README || die |
| 122 |
sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \ |
| 123 |
INSTALL QUICKSTART || die |
| 124 |
sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \ |
| 125 |
QUICKSTART || die |
| 126 |
sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \ |
| 127 |
QUICKSTART \ |
| 128 |
src/log/access_log.cc || die |
| 129 |
sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \ |
| 130 |
src/log/access_log.cc || die |
| 131 |
sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \ |
| 132 |
helpers/basic_auth/MSNT/README.html || die |
| 133 |
sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \ |
| 134 |
helpers/external_acl/unix_group/ext_unix_group_acl.8 \ |
| 135 |
helpers/external_acl/session/ext_session_acl.8 \ |
| 136 |
src/ssl/ssl_crtd.8 || die |
| 137 |
sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \ |
| 138 |
scripts/check_cache.pl || die |
| 139 |
sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \ |
| 140 |
src/ssl/ssl_crtd.8 || die |
| 141 |
sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ |
| 142 |
src/ssl/ssl_crtd.8 || die |
| 143 |
sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \ |
| 144 |
src/ssl/ssl_crtd.8 || die |
| 145 |
eautoreconf |
| 146 |
} |
| 147 |
|
| 148 |
src_configure() { |
| 149 |
local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam" |
| 150 |
use samba && basic_modules+=",SMB" |
| 151 |
use ldap && basic_modules+=",LDAP" |
| 152 |
use pam && basic_modules+=",PAM" |
| 153 |
use sasl && basic_modules+=",SASL" |
| 154 |
use nis && ! use elibc_uclibc && basic_modules+=",NIS" |
| 155 |
use radius && basic_modules+=",RADIUS" |
| 156 |
if use mysql || use postgres || use sqlite ; then |
| 157 |
basic_modules+=",DB" |
| 158 |
fi |
| 159 |
|
| 160 |
local digest_modules="file" |
| 161 |
use ldap && digest_modules+=",LDAP,eDirectory" |
| 162 |
|
| 163 |
local negotiate_modules="none" |
| 164 |
use kerberos && negotiate_modules="kerberos,wrapper" |
| 165 |
|
| 166 |
local ntlm_modules="none" |
| 167 |
use samba && ntlm_modules="smb_lm" |
| 168 |
|
| 169 |
local ext_helpers="file_userip,session,unix_group" |
| 170 |
use samba && ext_helpers+=",wbinfo_group" |
| 171 |
use ldap && ext_helpers+=",LDAP_group,eDirectory_userip" |
| 172 |
use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group" |
| 173 |
|
| 174 |
# uclibc does not have aio support - needed for coss (#61175) |
| 175 |
local storeio_modules="aufs,diskd,rock,ufs" |
| 176 |
# not stable enough yet |
| 177 |
#! use elibc_uclibc && storeio_modules+=",coss" |
| 178 |
|
| 179 |
local transparent |
| 180 |
if use kernel_linux ; then |
| 181 |
transparent+=" --enable-linux-netfilter" |
| 182 |
use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack" |
| 183 |
fi |
| 184 |
|
| 185 |
if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then |
| 186 |
transparent+=" $(use_enable kqueue)" |
| 187 |
if use pf-transparent; then |
| 188 |
transparent+=" --enable-pf-transparent" |
| 189 |
elif use ipf-transparent; then |
| 190 |
transparent+=" --enable-ipf-transparent" |
| 191 |
fi |
| 192 |
fi |
| 193 |
|
| 194 |
export CC=$(tc-getCC) |
| 195 |
|
| 196 |
econf \ |
| 197 |
--sysconfdir=/etc/squid \ |
| 198 |
--libexecdir=/usr/libexec/squid \ |
| 199 |
--localstatedir=/var \ |
| 200 |
--with-pidfile=/var/run/squid.pid \ |
| 201 |
--datadir=/usr/share/squid \ |
| 202 |
--with-logdir=/var/log/squid \ |
| 203 |
--with-default-user=squid \ |
| 204 |
--enable-removal-policies="lru,heap" \ |
| 205 |
--enable-storeio="${storeio_modules}" \ |
| 206 |
--enable-disk-io \ |
| 207 |
--enable-auth \ |
| 208 |
--enable-auth-basic="${basic_modules}" \ |
| 209 |
--enable-auth-digest="${digest_modules}" \ |
| 210 |
--enable-auth-ntlm="${ntlm_modules}" \ |
| 211 |
--enable-auth-negotiate="${negotiate_modules}" \ |
| 212 |
--enable-external-acl-helpers="${ext_helpers}" \ |
| 213 |
--enable-log-daemon-helpers \ |
| 214 |
--enable-url-rewrite-helpers \ |
| 215 |
--enable-cache-digests \ |
| 216 |
--enable-delay-pools \ |
| 217 |
--enable-eui \ |
| 218 |
--enable-icmp \ |
| 219 |
--enable-follow-x-forwarded-for \ |
| 220 |
--enable-esi \ |
| 221 |
--with-large-files \ |
| 222 |
--with-filedescriptors=8192 \ |
| 223 |
--disable-strict-error-checking \ |
| 224 |
$(use_with caps libcap) \ |
| 225 |
$(use_enable ipv6) \ |
| 226 |
$(use_enable snmp) \ |
| 227 |
$(use_enable ssl) \ |
| 228 |
$(use_enable ssl-crtd) \ |
| 229 |
$(use_enable icap-client) \ |
| 230 |
$(use_enable ecap) \ |
| 231 |
${transparent} |
| 232 |
} |
| 233 |
|
| 234 |
src_install() { |
| 235 |
emake DESTDIR="${D}" install |
| 236 |
|
| 237 |
# need suid root for looking into /etc/shadow |
| 238 |
fowners root:squid /usr/libexec/squid/basic_ncsa_auth |
| 239 |
fperms 4750 /usr/libexec/squid/basic_ncsa_auth |
| 240 |
if use pam; then |
| 241 |
fowners root:squid /usr/libexec/squid/basic_pam_auth |
| 242 |
fperms 4750 /usr/libexec/squid/basic_pam_auth |
| 243 |
fi |
| 244 |
|
| 245 |
# some cleanups |
| 246 |
rm -f "${D}"/usr/bin/Run* |
| 247 |
|
| 248 |
dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt |
| 249 |
newdoc helpers/negotiate_auth/kerberos/README README.kerberos |
| 250 |
newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain |
| 251 |
newdoc helpers/basic_auth/LDAP/README README.LDAP |
| 252 |
newdoc helpers/basic_auth/RADIUS/README README.RADIUS |
| 253 |
newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group |
| 254 |
newdoc tools/purge/README README.purge |
| 255 |
newdoc tools/helper-mux.README README.helper-mux |
| 256 |
dohtml RELEASENOTES.html |
| 257 |
#doman helpers/basic_auth/LDAP/*.8 |
| 258 |
|
| 259 |
newpamd "${FILESDIR}/squid.pam" squid |
| 260 |
newconfd "${FILESDIR}/squid.confd" squid |
| 261 |
if use logrotate; then |
| 262 |
newinitd "${FILESDIR}/squid.initd-logrotate" squid |
| 263 |
insinto /etc/logrotate.d |
| 264 |
newins "${FILESDIR}/squid.logrotate" squid |
| 265 |
else |
| 266 |
newinitd "${FILESDIR}/squid.initd" squid |
| 267 |
exeinto /etc/cron.weekly |
| 268 |
newexe "${FILESDIR}/squid.cron" squid.cron |
| 269 |
fi |
| 270 |
|
| 271 |
#rm -rf "${D}"/var |
| 272 |
diropts -m0750 -o squid -g squid |
| 273 |
keepdir /var/cache/squid /var/log/squid /etc/ssl/squid /var/lib/squid |
| 274 |
} |
| 275 |
|
| 276 |
pkg_postinst() { |
| 277 |
echo |
| 278 |
elog "Squid authentication helpers have been installed suid root." |
| 279 |
elog "This allows shadow based authentication (see bug #52977 for more)." |
| 280 |
echo |
| 281 |
if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \ |
| 282 |
[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 2 ]]; then |
| 283 |
elog "Please read the release notes at:" |
| 284 |
elog " http://www.squid-cache.org/Versions/v3/3.2/RELEASENOTES.html" |
| 285 |
echo |
| 286 |
fi |
| 287 |
} |
Archives