Fixed USE=krb4 build, stable on sparc wrt #96727

Package-Manager: portage-2.0.51.19

4 files changed, 46 insertions, 9 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 7cfd5f8d7daa..47d81db3cde7 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.74 2005/06/24 13:36:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.75 2005/06/24 20:26:16 gustavoz Exp $
+
+  24 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  +files/krb4-build.patch, heimdal-0.6.5.ebuild:
+  Fixed USE=krb4 build, stable on sparc wrt #96727
 
   24 Jun 2005; Seemant Kulleen <seemant@gentoo.org> heimdal-0.6.5.ebuild:
   add revdep alert to this about com_err as well
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index bf137f6475b7..6cd1868ed3af 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,13 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6f4f0246f8037a5ce93b840ab15570c5 heimdal-0.6.4-r1.ebuild 3524
 MD5 6c9cbfc951ebeca1a88d8722de4dde80 metadata.xml 231
-MD5 b0f3100ae5ee9a72be61f5458f73a687 ChangeLog 12564
+MD5 a24e73d8e8e04514c19aa85a57bf0b7f heimdal-0.6.5.ebuild 3811
+MD5 58fb55e5766d6f91d55db2a94c52b650 ChangeLog 12720
 MD5 8ff78d3463eb4bbfdd4d0cdf29ac937c heimdal-0.6.4.ebuild 2805
-MD5 6f4f0246f8037a5ce93b840ab15570c5 heimdal-0.6.4-r1.ebuild 3524
-MD5 8ad30c8f9299bb633fff9da019798c11 heimdal-0.6.5.ebuild 3774
+MD5 0f222a777af729dc4d6076ab03342056 files/krb5.conf 423
 MD5 0becad2fb5b2e15b30b47b2939304647 files/heimdal-kadmind 546
 MD5 2be6ab7b49a076e078f34913d65bcaad files/heimdal-kdc 514
+MD5 695b4c971cc27af8d7c24c69d7646f26 files/digest-heimdal-0.6.4-r1 147
 MD5 f4811d443f68fe11946a031ada8ce125 files/heimdal-kpasswdd 551
+MD5 c9a17d0a75733352c1e45b1d1c4470b1 files/digest-heimdal-0.6.5 147
+MD5 f51748af8baa63a8eecdb0ba7a0106cc files/krb4-build.patch 853
 MD5 06ae43d9ec1ce6f03630f6bd5e1631eb files/krb5-kdc.schema 4051
-MD5 0f222a777af729dc4d6076ab03342056 files/krb5.conf 423
 MD5 64ac3c23dcd54135648853869219dad6 files/digest-heimdal-0.6.4 147
-MD5 695b4c971cc27af8d7c24c69d7646f26 files/digest-heimdal-0.6.4-r1 147
-MD5 c9a17d0a75733352c1e45b1d1c4470b1 files/digest-heimdal-0.6.5 147
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFCvGxcKRy60XGEcJIRAnqMAJsH8eI3HExZtXlpCTpKxprHazxBpgCgod+A
+0iQJZXCYTOA/bbyx2fkajt8=
+=60h/
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/heimdal/files/krb4-build.patch b/app-crypt/heimdal/files/krb4-build.patch
new file mode 100644
index 000000000000..5be6812248ac
--- /dev/null
+++ b/app-crypt/heimdal/files/krb4-build.patch
@@ -0,0 +1,21 @@
+diff -Nura heimdal-0.6.5/kdc/kerberos4.c heimdal-0.6.5.krb4fix/kdc/kerberos4.c
+--- heimdal-0.6.5/kdc/kerberos4.c	2005-06-14 11:26:55.000000000 -0300
++++ heimdal-0.6.5.krb4fix/kdc/kerberos4.c	2005-06-24 15:21:58.000000000 -0300
+@@ -391,7 +391,7 @@
+ 	    char *s;
+ 	    s = kdc_log_msg(0, "Client not found in database: (krb4) %s: %s",
+ 			    client_name, krb5_get_err_text(context, ret));
+-	    make_err_reply(context, reply, KERB_ERR_PRINCIPAL_UNKNOWN, s);
++	    make_err_reply(reply, KERB_ERR_PRINCIPAL_UNKNOWN, s);
+ 	    free(s);
+ 	    goto out2;
+ 	}
+@@ -400,7 +400,7 @@
+ 	    char *s;
+ 	    s = kdc_log_msg(0, "Local client not found in database: (krb4) "
+ 			    "%s", client_name);
+-	    make_err_reply(context, reply, KERB_ERR_PRINCIPAL_UNKNOWN, s);
++	    make_err_reply(reply, KERB_ERR_PRINCIPAL_UNKNOWN, s);
+ 	    free(s);
+ 	    goto out2;
+ 	}
diff --git a/app-crypt/heimdal/heimdal-0.6.5.ebuild b/app-crypt/heimdal/heimdal-0.6.5.ebuild
index ce81ce832acb..ae3ee669fc4a 100644
--- a/app-crypt/heimdal/heimdal-0.6.5.ebuild
+++ b/app-crypt/heimdal/heimdal-0.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.5.ebuild,v 1.3 2005/06/24 13:36:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.5.ebuild,v 1.4 2005/06/24 20:26:16 gustavoz Exp $
 
 inherit libtool eutils virtualx toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.pdc.kth.se/pub/heimdal/src/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ppc sparc ~x86"
 IUSE="ssl berkdb ipv6 krb4 ldap X"
 
 RDEPEND="ssl? ( dev-libs/openssl )
@@ -42,6 +42,7 @@ src_unpack() {
 
 	EPATCH_SUFFIX="patch" \
 		epatch ${GENTOODIR}/patches
+	epatch ${FILESDIR}/krb4-build.patch
 }
 
 src_compile() {