Fix heimdal support (#242060).

(Portage version: 2.1.4.4)

5 files changed, 46 insertions, 3 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/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
 }