summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2014-08-28 07:58:11 +0000
committerEray Aslan <eras@gentoo.org>2014-08-28 07:58:11 +0000
commit2af562f2361e4327afa0cd5f72a7d0d740c038cb (patch)
tree00cc6a0f528db90ea1954b6ed4507ad036028f40 /net-proxy
parentold (diff)
downloadhistorical-2af562f2361e4327afa0cd5f72a7d0d740c038cb.tar.gz
historical-2af562f2361e4327afa0cd5f72a7d0d740c038cb.tar.bz2
historical-2af562f2361e4327afa0cd5f72a7d0d740c038cb.zip
Fix automagic link againt kerberos library - bug #516632
Package-Manager: portage-2.2.12/cvs/Linux x86_64 Manifest-Sign-Key: 0x77F1F175586A3B1F
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/squid/ChangeLog5
-rw-r--r--net-proxy/squid/Manifest30
-rw-r--r--net-proxy/squid/squid-3.4.7.ebuild15
3 files changed, 30 insertions, 20 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 332757928945..40ec0378f4ff 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-proxy/squid
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.467 2014/08/28 07:17:03 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.468 2014/08/28 07:57:59 eras Exp $
+
+ 28 Aug 2014; Eray Aslan <eras@gentoo.org> squid-3.4.7.ebuild:
+ Fix automagic link againt kerberos library - bug #516632
*squid-3.3.13 (28 Aug 2014)
*squid-3.4.7 (28 Aug 2014)
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 50f3b773bae6..aee1b39ba9ae 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -20,23 +20,23 @@ EBUILD squid-3.4.3.ebuild 7910 SHA256 8862f83c6036c60dd2918e2b06f9bd324c8d331bec
EBUILD squid-3.4.4.ebuild 8030 SHA256 4e2a0c9cd0ea44c89665cc6a921504b4cb452700911eb00b21340cab317b663f SHA512 3dc14f35c2a6930f55791d3642424b402d252ccf6e58af24211d68c44ce5c252135b522bf4c3789be773311ed7c1ccb349f83d82ecd48e8399dc39f0a4599481 WHIRLPOOL de43d67ace234452e36a50f0af62b6268da79268a72a5d7388f24592d8caa1c59f976d63ed4c770a7b8d9528a778955e7d64270a5032b085afad975f69ce153c
EBUILD squid-3.4.5.ebuild 7861 SHA256 014659983864e78b0e6fde00a21394372488c17e9fe0abcacc3a260864143922 SHA512 c8de367cdce207693aa6b1c191713f0e9eadd0d6d152795bce60b17c5cf51d6d850ff3588cc06fe6543078c551b345119f66d8ab2e607165330590ba70d12bdc WHIRLPOOL f8f841b4909d705b83aa857db1ae3af24732ed6cef66142ca199dccc4a5cf9da50d10fe40ce55cbb7b2d2d2c9081fb996541e21179aa4b83418d49ea6938c73b
EBUILD squid-3.4.6.ebuild 7904 SHA256 44858662d351879413129130269e5ab666b12fe5c4a595ebc02aa13a34243dff SHA512 64c399f417ce0c078377b551bc60cefff7e0852e58f806d671227ce88655a1d5ed39f7d1a04b183d7587c753e24f909b6b3324f0642c1196b24731a3ad8a31c2 WHIRLPOOL 1095318c4f86bce09fef6a5110b8a7679248d12b2eda1e233e3f8bf935f44ee4f0796b32499fe05efd8f9f55808bdbf348bd882d652d1218795f138d4fd133e5
-EBUILD squid-3.4.7.ebuild 7903 SHA256 fb79c4e4cbcf502e17da1994a287b39b5432ed6c8428cb4562efd77db04a4610 SHA512 f23a7212bc67ae08ff34a99931aff88a058c87ff3bb440798a8d76c61354c8591546fc0a8b13e4e891aa7858dba8ba5729fc02346c9c4265a561aeb6c2eedb22 WHIRLPOOL 19bf8da26b6ab49709ba0de1d6997a4a13f41ebefee82911233028239aab6fb2b7908dd59d8be5af7a848614885a652d4324e27bb0c371271e9825b7c4f97452
-MISC ChangeLog 87953 SHA256 9402a10320bdf0ce7159113a2f2ed4a6870b1c0266f7fd2dd143ae790bdf29b8 SHA512 8fe54ebff508e403292a36a47ae02a6b8f82ad1dad3ee25ad74ab8c33a9545ed82bb458c099a65b6847de2dd7b9aa2d0de6977488d43e84dc3925384c8f43a06 WHIRLPOOL da0cdf411467823e1b34964efa3ff238185d814752680ac7cdc324d8d06bfe9ca4ed6009fbadb6db0c3e9521b9516bb5c652668f445d6ec9f9113490c479a757
+EBUILD squid-3.4.7.ebuild 8030 SHA256 3b0f07f8f724e98b7ff6efc42baf5c5557108d6ef52941753a7d72da5fb3dc90 SHA512 43670ec1d3d588f553fd06e71af25cd659d4ab526a48e58bfb4c7e73bada1d8c0e2d815f4f84af81a68e06376c0b03eb92a19482d7451c51a3819c596cfbda7c WHIRLPOOL c648b730caf79597c7c0bcca7c327092f7dc66ab694db78ee0726f1afb77331271fceb671ccc3fc711c5cedb625004e66a0ccf85b4fe71d9ae9484d91edad0c0
+MISC ChangeLog 88077 SHA256 dcf659af9dad5c71833d67da445ebaa989faf4692836cb4102e60858730ece1e SHA512 7ad02a2619712cef137b3d22340d69fde6c941bdad14c9031280279e460453a24be9e4969fdba7f78658bee596e8863c5c4fbcaff0bd4a426947b9d250185f0a WHIRLPOOL ed0570a542574160d5b4e4da98e353989979834410df60d5c5eeb769424e87ff9f8be283589019dd6d473ad946e0ba53473f54c2c9cdbba17829665c69379692
MISC metadata.xml 1570 SHA256 7a084172a69649c4565af822f331e3085911a506e422ffc68b8a0082ee07ec6e SHA512 74ee493ede7181e22dd1d6a2889ddf3b4443ab677d3801b0c50b7c728c303f813e0a53dfc0931efbade78b98185401b15079e80e8742358a2a080d5a21f7b7b4 WHIRLPOOL d8239bc47c931b8a0e10ec4f16d91845482c35a029bb1d50914874150ec71b5f1a61def07f566ae4f6b10468426e8426ea8a319c30e41f985f5faf82ab1e6942
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJT/td8AAoJEHfx8XVYajsf+J4QAJEARaNfAaQbKQpE/e4xXhCJ
-6J833qkcj+dCqePdwZe5U0IYzs8EqPBpE6Yl59wwv2o+pSvU00fs43+aPq81COAE
-V71uq7CnKs8Rn3naFBFx+HFgBdDBLpIfiTjoQk7UKITyJApnajBOizBGqWZ5iKSI
-6rZQsfkw3D2NwV1E6q34DqEix6ZGX5eKMA8gxPUpVDQtL8TN/deSgb9tOtGkF6Mm
-3vRVksb0wxbgrV6HCtnKSjCLqE5v7a8CaZRhKCQSsICEjDh1JVJoQiKYcybZZkpG
-52WbcraiCaijsGIlF5j3Ili52O+lCT8AWlBavRHcs/TMd+JLgUtE0HNujx2fYJjn
-ZA7WiOTyknWEw6EImSt0wL34bl1AFBm5NZZfRbpvSgajj0KZwetYtKAFGMlvw7nf
-dBJ4038I1GkI+dvMv/51fySb4olyoSWR4CFB7LHM/1USHXG7NVGYsLa3I6h7Ttx9
-AV656aFo6WGW+bJIDZL3MEqxGZbSggnLwAqz7vFme704PIxi90iGO7dw6gBNfrko
-2G1KYPI5YpULaWMp0s1e67uJC6TX/KZQALfnLCkqjOp5+EH4u8ffvN1kbhHdtQXd
-yCXvZp5aSxyJ3WQ/XbsQN3wFmgLbgf8fyU5Xqfjf2dI0meKtqP/ctScn2+O/v8t4
-/lpQhImbKCZSJh6IxypW
-=9QQe
+iQIcBAEBCAAGBQJT/uETAAoJEHfx8XVYajsfL/8P+wURG9y8DLNZRv4+8PxqM71r
+aw6wCXlEO8VRYNJNi4tEqfc5i3TtF+uimXzvkn61v9lw70Yt3oqKdMVzy1tM8pf5
+xzlw69uA4HvCzMW9d0w1hSUYZj8CqB7f1ZJpGdCEKp43UqCi88bXF0yJTd85Djm/
++A6TfcsfHnTf25PVlG43B9JWt3QbV91up0zSRPgW+/DrM5fRwHTGsNAJIsbjxZ2a
+rtMxUAA3dYZ8ZZYpY+To92n/NK+MOW0w7REi3w5wHnDw0Bc8ljN5QzxbG6QlWxtn
+CyIBWISGcVHRuQGeKtGG0FtGpo5Jw3ZCcyrNK4a2yZSrLPQW3Gr1VPnqmh5xq/vl
+RaF19eVBiF4ak9nq/tWHgIGPn5CvU4t5+I6JB/+hL+g81FaNYGvo6s6UsffDJ4q9
+PRlgQbXA9aO59MZ1VLMWfqcVLe281MFDjkKGqEnZ3cCI44+XTiC7uxwAsOCt31qt
+nbg9vbbnOxebTaS2ONd9BEVOLhAw+tGH61USs+vb4GI4aYrtjk9avU9ruGT2NmbA
+tYZwydjZVPGTHwaP5W799bMO2o2QtPhhxr/zVCYyw1TLU4XOcRHl4bm0Whfp80BR
+nHEDV265avX3xCa09Qr8+zJq1z6L44DR2diGXuQm5b4IvKW31ReAl322X4k4QNYO
+ha1oBCMSYEkyPM9nOX+K
+=QfLY
-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/squid-3.4.7.ebuild b/net-proxy/squid/squid-3.4.7.ebuild
index 7b1f0de7228d..7bfc35694e51 100644
--- a/net-proxy/squid/squid-3.4.7.ebuild
+++ b/net-proxy/squid/squid-3.4.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.7.ebuild,v 1.1 2014/08/28 07:17:03 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.4.7.ebuild,v 1.2 2014/08/28 07:57:59 eras Exp $
EAPI=5
inherit autotools eutils linux-info pam toolchain-funcs user versionator
@@ -122,8 +122,14 @@ src_configure() {
local digest_modules="file"
use ldap && digest_modules+=",LDAP,eDirectory"
- local negotiate_modules="none"
- use kerberos && negotiate_modules="kerberos,wrapper"
+ local negotiate_modules myconf
+ if use kerberos ; then
+ negotiate_modules="kerberos,wrapper"
+ myconf="--with-krb5-config=yes"
+ else
+ negotiate_modules="none"
+ myconf="--with-krb5-config=no"
+ fi
local ntlm_modules="none"
use samba && ntlm_modules="smb_lm"
@@ -192,7 +198,8 @@ src_configure() {
$(use_enable htcp) \
$(use_enable wccp) \
$(use_enable wccpv2) \
- ${transparent}
+ ${transparent} \
+ ${myconf}
}
src_install() {