Fix heimdal support (#242060).

Package-Manager: portage-2.1.4.4

6 files changed, 54 insertions, 9 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 3d0215aeaffc..8940a3a88308 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/squid
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.205 2008/10/16 20:38:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.206 2008/10/17 20:19:38 mrness Exp $
+
+  17 Oct 2008; Alin Năstac <mrness@gentoo.org>
+  +files/squid-2.7.4-heimdal.patch, +files/squid-3.0.9-heimdal.patch,
+  squid-2.7.4-r2.ebuild, squid-3.0.9.ebuild:
+  Fix heimdal support (#242060).
 
   16 Oct 2008; Markus Meier <maekke@gentoo.org> squid-2.7.4-r2.ebuild:
   amd64/x86 stable, bug #242386
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index c62156200875..573e93a30f47 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -4,9 +4,11 @@ Hash: SHA1
 AUX squid-2.7.3-gentoo.patch 12128 RMD160 5cf6e9b709863c324128b49a9660e76fb22f94f6 SHA1 4778c6f8efa8e043300b59c29286b81bf020818d SHA256 a6f20ea317a7e4b4968aabeddcff0937e0372b2ed45a094284ec56b0563f7874
 AUX squid-2.7.4-charset.patch 806 RMD160 05148c248221d0c8994e23721f12c736d9581e11 SHA1 d052513093c8642d282863dc6a5180ff1af8bd41 SHA256 0ff6787182e61fed7438b300f9ac82432eb771d8808413a14b5aecc899841895
 AUX squid-2.7.4-gentoo.patch 12115 RMD160 bba9ad08596da94386d6096e85edbdd18179a2e8 SHA1 e3b9443b9bce5f62100c2e3b207c9eae2debfebb SHA256 cc739e81ebb8c3c28261048f19679a9d6616914718ed59e138dc954ec84d926b
+AUX squid-2.7.4-heimdal.patch 775 RMD160 0b77d87fe33cbb37eade0e4f3936bf86c1ad1287 SHA1 628a8d2dcdf2dac5bd91cae24ceff7d83ddb066c SHA256 74552d40f0b5002c76507795d278b7e2b453e46c2d3b4ef91370f2d28b92a2e9
 AUX squid-3.0.8-adapted-zph.patch 7704 RMD160 b0ef47037917f4528d27dbd09c06d51ba55b4d54 SHA1 89b81e01436cc99f2cea2def54f0c3beeae71918 SHA256 b942519ffec52aacdea6529c7e982f12db174b84128cb427dc82032ee77eccee
 AUX squid-3.0.8-gentoo.patch 9376 RMD160 e6d2ccdcbe9cf0906eb32c737b3d7746be9fb163 SHA1 8f552948e0549c7ed50a55934767e043cfe35a6a SHA256 fa172277cab5acf5c34a058dedcb89ab7a8c55d0c61c2829ba8c5a6269420b9a
 AUX squid-3.0.9-gentoo.patch 9376 RMD160 59e279e3aaabd9fa0b5639c47ba3b19a2399f6c3 SHA1 8e4a4b836611b5eb4453a1767cd7eaa1e471e2ad SHA256 cc033d7e5c6dbed210788b7c5a59950b94da1c24d97b1aeb256be4e9da371cdf
+AUX squid-3.0.9-heimdal.patch 775 RMD160 1ffe4051674cbd40352ee663c866569d080f88a1 SHA1 881541881cd1e18108d119746835207578c44d3a SHA256 1a3a493af1aae8e3bdf37947a0e3d4f261db758fb06fc7de7251625ebb82634d
 AUX squid-3.0.9-zph.patch 6813 RMD160 43618ebdbea01ade8437189268109b1f4518c31f SHA1 92dadd97c9dce26224691c43d703e869d19320d6 SHA256 16ad6a974648a75f01fa6d8e7b854d18689e703757ec9752d9973707f7977ff4
 AUX squid.confd 437 RMD160 8fdfc1416b2f5aaa2964affc25e5fb140f6555c5 SHA1 59e15695bf4d7269002eac5015592419ad8155cc SHA256 d90a92f886764f56fd928ec3340da078a8ff35576a8339fa91b1ce59d0d02a34
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
@@ -20,15 +22,15 @@ DIST squid-3.0.STABLE8.tar.gz 2443502 RMD160 107ce7b8c21f697019120baddca5926a01a
 DIST squid-3.0.STABLE9.tar.gz 2449207 RMD160 70b3952979c7abf42f179a85d324709e789f5a26 SHA1 ba9656b9ffd219877238e94abc7d0dca31cc1db9 SHA256 e5f13fc00c1980f9063ebe197740beb84f6f624a191268d888672be0ef066dd4
 EBUILD squid-2.7.3.ebuild 5766 RMD160 c0327edeef69e4ac2521d56a5f51df181cc772c6 SHA1 af1824c17a22d83ed7af17ac51cd801b95eaa020 SHA256 10e32bcc84e53ca8d08a3d358b93506959bcf53ab6bc955d59e05e3a3245b5f1
 EBUILD squid-2.7.4-r1.ebuild 5824 RMD160 f189692a4b1e6c3a0753d760a1cfbeba287d8826 SHA1 a9e0b1ca37682d8c9c7df7da77868147e7f8652a SHA256 9d90a3832c6d6158bd230e574432b8633f2d651ff6baf496aeb84a835ad7ecef
-EBUILD squid-2.7.4-r2.ebuild 6247 RMD160 8087b78d48f0249472e421ddd54f17f8e38d29a0 SHA1 f3eaaf5918ec93dc39c22ce5a13b87e4a209ab22 SHA256 b4c730703497b0c0ca7cdd7b8384e902ffa9a62ec1af600c7b5d52b78f15f33d
+EBUILD squid-2.7.4-r2.ebuild 6322 RMD160 939fe8518b6a20bc635df18f460b07714bfa5a0f SHA1 961362a496e4bc77c41c88343c66e8560faa539f SHA256 010818b56a5d211cfd954d2e67ee94ada4a338b4ae6c717a06eacb72d074cd8d
 EBUILD squid-3.0.8.ebuild 5743 RMD160 d1f8daae5b314192156bfd782a03a23879b10d02 SHA1 0beda6ca3ffd96127c51e099cea3196109812bec SHA256 7f43bf3449998f9531c51fdce781c19e768632964bde2a150658957fe5da7b38
-EBUILD squid-3.0.9.ebuild 6542 RMD160 35cdcc78d2d6b1084943d1003ae50e077685c1ae SHA1 44b8d7c89d82d234efd5526b1087033511efda73 SHA256 6e660d68ade0f52f42848173116171b2890baf4eb967a741c4aae1c5709b31aa
-MISC ChangeLog 47058 RMD160 41c45e35b933b83771b1ff1cea951406a6ecb2f7 SHA1 c488bfab9549cbcb20d5c4d19e80c98406b6c50a SHA256 13556996c602b8f5421ba025a45ca42a9c5b704efa209b98f75e7b8fa5474669
+EBUILD squid-3.0.9.ebuild 6617 RMD160 9b159dbfed33582e3acb102ceaa3b1e9fecfcfed SHA1 a8c042cecfe2ebda35a24543a579de330a9af44e SHA256 b77087fede33571bbac8259e7f3e45a4a5e1981ad93198141f8d9d609a98d56d
+MISC ChangeLog 47255 RMD160 24be3f794af0f5f75c4f0405e10b3fecf2153a3c SHA1 3cf849436ceb2f76f5fa9eb26eb64685ef3df242 SHA256 c4d10d9e3238aa1abc8c01949385c29860327e5291e6abcb4410e73c6bb85ead
 MISC metadata.xml 785 RMD160 e8e82152b25f16ac930d8f93a3563d6a58fdfef9 SHA1 5e343b5a7a0cc6472052190b8bdbd42539987868 SHA256 1d0379a1b9995ac6d0141a675a852f9318b3956d5c1bb19a1358fc0b08a9eeff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj3prcACgkQkKaRLQcq0GLZsACfQ3Nip1PyZQKMjS4X5HGTdQeY
-hhgAn2+/RJcIehFPDSxrf0HmntrYhSKd
-=pHoc
+iEYEARECAAYFAkj482cACgkQPrHvTlXvhtuoxgCcDOFGz808v0G2r0WVbeksTaOB
+SKUAn3GLk0O8YsDMOboLFMAtVwP2tLRc
+=WCFB
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-2.7.4-heimdal.patch b/net-proxy/squid/files/squid-2.7.4-heimdal.patch
new file mode 100644
index 000000000000..4271501aa227
--- /dev/null
+++ b/net-proxy/squid/files/squid-2.7.4-heimdal.patch
@@ -0,0 +1,18 @@
+diff -ur squid-2.7.STABLE4.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-2.7.STABLE4/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
+--- squid-2.7.STABLE4.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2007-05-14 23:36:29.000000000 +0000
++++ squid-2.7.STABLE4/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2008-10-17 20:09:19.000000000 +0000
+@@ -18,10 +18,10 @@
+ #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
+ 
+ # HEIMDAL
+-#KERBINC = -DHEIMDAL -I/usr/include/heimdal
+-#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
++KERBINC = -DHEIMDAL -I/usr/include/heimdal
++KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
+ 
+ # MIT
+-KERBINC = 
+-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
++#KERBINC = 
++#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
+ 
diff --git a/net-proxy/squid/files/squid-3.0.9-heimdal.patch b/net-proxy/squid/files/squid-3.0.9-heimdal.patch
new file mode 100644
index 000000000000..f2fd39fe1121
--- /dev/null
+++ b/net-proxy/squid/files/squid-3.0.9-heimdal.patch
@@ -0,0 +1,18 @@
+diff -ru squid-3.0.STABLE9.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-3.0.STABLE9/helpers/negotiate_auth/squid_kerb_auth/Makefile.am
+--- squid-3.0.STABLE9.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2008-10-17 15:43:40.000000000 +0200
++++ squid-3.0.STABLE9/helpers/negotiate_auth/squid_kerb_auth/Makefile.am	2008-10-17 15:57:02.000000000 +0200
+@@ -18,10 +18,10 @@
+ #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
+ 
+ # HEIMDAL
+-#KERBINC = -DHEIMDAL -I/usr/include/heimdal
+-#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
++KERBINC = -DHEIMDAL -I/usr/include/heimdal
++KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
+ 
+ # MIT
+-KERBINC = 
+-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
++#KERBINC = 
++#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
+ 
diff --git a/net-proxy/squid/squid-2.7.4-r2.ebuild b/net-proxy/squid/squid-2.7.4-r2.ebuild
index 50572cbdb977..41cf521e3ffc 100644
--- a/net-proxy/squid/squid-2.7.4-r2.ebuild
+++ b/net-proxy/squid/squid-2.7.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.4-r2.ebuild,v 1.3 2008/10/16 20:38:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.4-r2.ebuild,v 1.4 2008/10/17 20:19:38 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -65,6 +65,7 @@ src_unpack() {
 	cd "${S}" || die "source dir not found"
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	epatch "${FILESDIR}"/${P}-charset.patch
+	has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch
 	eautoreconf
 }
 
diff --git a/net-proxy/squid/squid-3.0.9.ebuild b/net-proxy/squid/squid-3.0.9.ebuild
index 9a8c320262c0..082277c04412 100644
--- a/net-proxy/squid/squid-3.0.9.ebuild
+++ b/net-proxy/squid/squid-3.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.9.ebuild,v 1.2 2008/10/16 19:09:01 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.0.9.ebuild,v 1.3 2008/10/17 20:19:38 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -69,6 +69,7 @@ src_unpack() {
 	cd "${S}" || die "source dir not found"
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	use zero-penalty-hit && epatch "${FILESDIR}"/${P}-zph.patch
+	has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${P}-heimdal.patch
 
 	eautoreconf
 }