Version bump to fix bugs #61412 - Security vulnerabilty - ftpd Signal. Handling. bug #58799 LDAP support and bug #54421 header file layout

11 files changed, 401 insertions, 23 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 3cb12ccc445e..f3696cf041fe 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.46 2004/07/17 21:25:12 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.47 2004/09/13 15:40:34 dragonheart Exp $
+
+*heimdal-0.6.3 (14 Sep 2004)
+
+  14 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/heimdal-0.6.3-ldap-subtree.patch, +files/heimdal-0.6.3.all.patch,
+  +files/krb5-kdc.schema, +files/krb5.conf, +heimdal-0.6.3.ebuild:
+  Version bump to fix bugs #61412 - Security vulnerabilty - ftpd Signal
+  Handling. bug #58799 LDAP support and bug #54421 header file layout
 
 *heimdal-0.6.2-r1 (16 Jul 2004)
 
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 600ff926436d..e4298df8f15e 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,15 +1,31 @@
-MD5 aee9e1e8938d800d1c71c09bb7e9e744 heimdal-0.6.2-r1.ebuild 3141
-MD5 2d6d8e571cefbe442db2cc985d4a5d07 ChangeLog 6038
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ca8299025daa75aeeb16bace8f84858d ChangeLog 6413
+MD5 50e7d57fd90a1ea8eb07905670818664 heimdal-0.6.3.ebuild 2791
 MD5 e5573e25f19694fc8ccaaced2dd576f4 metadata.xml 353
+MD5 aee9e1e8938d800d1c71c09bb7e9e744 heimdal-0.6.2-r1.ebuild 3141
 MD5 bf72d9d820834284e0f4681b508bac49 heimdal-0.6.2.ebuild 2810
-MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
+MD5 0f222a777af729dc4d6076ab03342056 files/krb5.conf 423
+MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
 MD5 59cbfb44a4bd4c27cf0dd3943b50ae52 files/digest-heimdal-0.6.2-r1 66
-MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.1-fPIC.patch 352
-MD5 f340a581575eaaa3fd3eba3074e74247 files/heimdal-kdc 526
-MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.2-fPIC.patch 352
-MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
-MD5 f9c8a7861720b4a4e82f6327e87c0f3d files/heimdal-kpasswdd 558
+MD5 d241569631159016adcce030e98dcb72 files/heimdal-kadmind 555
 MD5 59cbfb44a4bd4c27cf0dd3943b50ae52 files/digest-heimdal-0.6.2 66
+MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.1-fPIC.patch 352
+MD5 2be6ab7b49a076e078f34913d65bcaad files/heimdal-kdc 514
 MD5 bdcc2eedb42140afd25307f21aa5bb17 files/heimdal-0.6-gcc3.patch 466
-MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
-MD5 479b54a695275632c9190178b7903bb8 files/heimdal-kadmind 553
+MD5 2912d07f59da59800652b98c8b8c32c8 files/heimdal-kpasswdd 560
+MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
+MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
+MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.2-fPIC.patch 352
+MD5 3927bef9ae6c9b6cf6c5d6eb9c2bfcf7 files/digest-heimdal-0.6.3 66
+MD5 f0e0f39d4efb0fe27133d47bff91e453 files/heimdal-0.6.3.all.patch 2313
+MD5 06ae43d9ec1ce6f03630f6bd5e1631eb files/krb5-kdc.schema 4051
+MD5 52dcc61b4dcb2747e0f2cbd2b1b3186f files/heimdal-0.6.3-ldap-subtree.patch 737
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBRb+JmdTrptrqvGERAiSJAJwMGmKyoUhd+uy7pnB+yGeD1rC7RwCff0R1
+8wvvCn8G1MJs50hJi5/hF7c=
+=3/q1
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/heimdal/files/digest-heimdal-0.6.3 b/app-crypt/heimdal/files/digest-heimdal-0.6.3
new file mode 100644
index 000000000000..d48c81061206
--- /dev/null
+++ b/app-crypt/heimdal/files/digest-heimdal-0.6.3
@@ -0,0 +1 @@
+MD5 2265fd2d4573dd3a8da45ce62519e48b heimdal-0.6.3.tar.gz 3333604
diff --git a/app-crypt/heimdal/files/heimdal-0.6.3-ldap-subtree.patch b/app-crypt/heimdal/files/heimdal-0.6.3-ldap-subtree.patch
new file mode 100644
index 000000000000..e45b11ec08c4
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6.3-ldap-subtree.patch
@@ -0,0 +1,20 @@
+--- lib/hdb/hdb-ldap.c.orig	2004-07-30 10:50:38.883167858 +0200
++++ lib/hdb/hdb-ldap.c	2004-07-30 10:52:18.101664881 +0200
+@@ -585,7 +585,7 @@
+ 	goto out;
+     }
+ 
+-    rc = ldap_search_s((LDAP *) db->db, db->name, LDAP_SCOPE_ONELEVEL, filter, 
++    rc = ldap_search_s((LDAP *) db->db, db->name, LDAP_SCOPE_SUBTREE, filter, 
+ 		       krb5kdcentry_attrs, 0, msg);
+     if (rc != LDAP_SUCCESS) {
+ 	krb5_set_error_string(context, "ldap_search_s: %s", ldap_err2string(rc));
+@@ -931,7 +931,7 @@
+     }
+ 
+     msgid = ldap_search((LDAP *) db->db, db->name,
+-			LDAP_SCOPE_ONELEVEL, "(objectclass=krb5KDCEntry)",
++			LDAP_SCOPE_SUBTREE, "(objectclass=krb5KDCEntry)",
+ 			krb5kdcentry_attrs, 0);
+     if (msgid < 0) {
+ 	return HDB_ERR_NOENTRY;
diff --git a/app-crypt/heimdal/files/heimdal-0.6.3.all.patch b/app-crypt/heimdal/files/heimdal-0.6.3.all.patch
new file mode 100644
index 000000000000..0757a47b89a3
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6.3.all.patch
@@ -0,0 +1,62 @@
+diff -ru heimdal-0.6.3.orig/appl/kx/rxtelnet.in heimdal-0.6.3/appl/kx/rxtelnet.in
+--- heimdal-0.6.3.orig/appl/kx/rxtelnet.in	2002-03-19 03:07:34.000000000 +0930
++++ heimdal-0.6.3/appl/kx/rxtelnet.in	2004-09-13 23:34:02.154228824 +0930
+@@ -2,7 +2,7 @@
+ # $Id: heimdal-0.6.3.all.patch,v 1.1 2004/09/13 15:40:34 dragonheart Exp $
+ #
+ usage="Usage: $0 [-l username] [-k] [-f] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
+-binary=telnet
++binary=ktelnet
+ term=
+ kx_args=-P
+ while true
+Only in heimdal-0.6.3/appl/kx: rxtelnet.in.orig
+diff -ru heimdal-0.6.3.orig/appl/kx/rxterm.in heimdal-0.6.3/appl/kx/rxterm.in
+--- heimdal-0.6.3.orig/appl/kx/rxterm.in	2002-03-19 03:07:34.000000000 +0930
++++ heimdal-0.6.3/appl/kx/rxterm.in	2004-09-13 23:34:02.155227672 +0930
+@@ -2,7 +2,7 @@
+ # $Id: heimdal-0.6.3.all.patch,v 1.1 2004/09/13 15:40:34 dragonheart Exp $
+ #
+ usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
+-binary=rsh
++binary=krsh
+ term=xterm
+ while true
+ do
+Only in heimdal-0.6.3/appl/kx: rxterm.in.orig
+diff -ru heimdal-0.6.3.orig/cf/db.m4 heimdal-0.6.3/cf/db.m4
+--- heimdal-0.6.3.orig/cf/db.m4	2002-09-10 23:59:47.000000000 +0930
++++ heimdal-0.6.3/cf/db.m4	2004-09-13 23:37:13.174919192 +0930
+@@ -14,6 +14,8 @@
+ if test "$enable_berkeley_db" != no; then
+ 
+   AC_CHECK_HEADERS([				\
++	db4.2/db.h				\
++	db4.1/db.h				\
+ 	db4/db.h				\
+ 	db3/db.h				\
+ 	db.h					\
+@@ -24,6 +26,10 @@
+ 
+   AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [
+   #include <stdio.h>
++  #ifdef HAVE_DB4_2_DB_H
++  #include <db4.2/db.h>
++  #ifdef HAVE_DB4_1_DB_H
++  #include <db4.1/db.h>
+   #ifdef HAVE_DB4_DB_H
+   #include <db4/db.h>
+   #elif defined(HAVE_DB3_DB_H)
+diff -ru heimdal-0.6.3.orig/lib/editline/Makefile.am heimdal-0.6.3/lib/editline/Makefile.am
+--- heimdal-0.6.3.orig/lib/editline/Makefile.am	2002-08-13 23:18:15.000000000 +0930
++++ heimdal-0.6.3/lib/editline/Makefile.am	2004-09-13 23:30:53.917327832 +0930
+@@ -47,6 +47,9 @@
+ 
+ EXTRA_DIST = $(man_MANS)
+ 
++$(libeditline_la_OBJECTS): %.lo: %.c
++	$(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++
+ snprintf.c:
+ 	$(LN_S) $(srcdir)/../roken/snprintf.c .
+ strdup.c:
diff --git a/app-crypt/heimdal/files/heimdal-kadmind b/app-crypt/heimdal/files/heimdal-kadmind
index 4601d93db12c..0ad9c9a6b593 100644
--- a/app-crypt/heimdal/files/heimdal-kadmind
+++ b/app-crypt/heimdal/files/heimdal-kadmind
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kadmind,v 1.1 2004/07/16 18:40:15 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kadmind,v 1.2 2004/09/13 15:40:34 dragonheart Exp $
 
 depend() {
 	need net
@@ -11,8 +11,8 @@ depend() {
 
 start() {
 	ebegin "Starting heimdal kadmind"
-	start-stop-daemon --start --quiet --exec \
-		/usr/libexec/kadmind &
+	start-stop-daemon --start --quiet --background --exec \
+		/usr/sbin/kadmind
 	eend $?
 }
 
diff --git a/app-crypt/heimdal/files/heimdal-kdc b/app-crypt/heimdal/files/heimdal-kdc
index 39540206ee9d..753a101c3011 100644
--- a/app-crypt/heimdal/files/heimdal-kdc
+++ b/app-crypt/heimdal/files/heimdal-kdc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc,v 1.1 2004/07/16 18:40:15 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc,v 1.2 2004/09/13 15:40:34 dragonheart Exp $
 
 depend() {
 	need net
@@ -11,13 +11,13 @@ depend() {
 start() {
 	ebegin "Starting heimdal kdc"
 	start-stop-daemon --start --quiet --exec \
-		/usr/libexec/kdc -- --detach
+		/usr/sbin/kdc -- --detach
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping heimdal kdc"
 	start-stop-daemon --stop --quiet --exec \
-		/usr/libexec/kdc
+		/usr/sbin/kdc
 	eend $?
 }
diff --git a/app-crypt/heimdal/files/heimdal-kpasswdd b/app-crypt/heimdal/files/heimdal-kpasswdd
index 7fccec9ea777..b6e73662cf3a 100644
--- a/app-crypt/heimdal/files/heimdal-kpasswdd
+++ b/app-crypt/heimdal/files/heimdal-kpasswdd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kpasswdd,v 1.1 2004/07/16 18:40:15 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kpasswdd,v 1.2 2004/09/13 15:40:34 dragonheart Exp $
 
 depend() {
 	need net
@@ -11,8 +11,8 @@ depend() {
 
 start() {
 	ebegin "Starting heimdal kpasswdd"
-	start-stop-daemon --start --quiet --exec \
-		/usr/libexec/kpasswdd &
+	start-stop-daemon --background --start --quiet --exec \
+		/usr/sbin/kpasswdd
 	eend $?
 }
 
diff --git a/app-crypt/heimdal/files/krb5-kdc.schema b/app-crypt/heimdal/files/krb5-kdc.schema
new file mode 100644
index 000000000000..cedba1cfeb3f
--- /dev/null
+++ b/app-crypt/heimdal/files/krb5-kdc.schema
@@ -0,0 +1,136 @@
+# $Id: krb5-kdc.schema,v 1.1 2004/09/13 15:40:34 dragonheart Exp $
+# Definitions for a Kerberos V KDC schema
+
+# OID Base is iso(1) org(3) dod(6) internet(1) private(4) enterprise(1) padl(5322) kdcSchema(10)
+#
+# Syntaxes are under 1.3.6.1.4.1.5322.10.0
+# Attributes types are under 1.3.6.1.4.1.5322.10.1
+# Object classes are under 1.3.6.1.4.1.5322.10.2
+
+# Syntax definitions
+
+#krb5KDCFlagsSyntax SYNTAX ::= {
+#   WITH SYNTAX            INTEGER
+#--        initial(0),             -- require as-req
+#--        forwardable(1),         -- may issue forwardable
+#--        proxiable(2),           -- may issue proxiable
+#--        renewable(3),           -- may issue renewable
+#--        postdate(4),            -- may issue postdatable
+#--        server(5),              -- may be server
+#--        client(6),              -- may be client
+#--        invalid(7),             -- entry is invalid
+#--        require-preauth(8),     -- must use preauth
+#--        change-pw(9),           -- change password service
+#--        require-hwauth(10),     -- must use hwauth
+#--        ok-as-delegate(11),     -- as in TicketFlags
+#--        user-to-user(12),       -- may use user-to-user auth
+#--        immutable(13)           -- may not be deleted         
+#   ID                     { 1.3.6.1.4.1.5322.10.0.1 }
+#}
+
+#krb5PrincipalNameSyntax SYNTAX ::= {
+#   WITH SYNTAX            OCTET STRING
+#-- String representations of distinguished names as per RFC1510
+#   ID                     { 1.3.6.1.4.1.5322.10.0.2 }
+#}
+
+# Attribute type definitions
+ 
+attributetype ( 1.3.6.1.4.1.5322.10.1.1
+	NAME 'krb5PrincipalName'
+	DESC 'The unparsed Kerberos principal name'
+	EQUALITY caseExactIA5Match
+	SINGLE-VALUE
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.5322.10.1.2
+	NAME 'krb5KeyVersionNumber'
+	EQUALITY integerMatch
+	SINGLE-VALUE
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+
+attributetype ( 1.3.6.1.4.1.5322.10.1.3
+	NAME 'krb5MaxLife'
+	EQUALITY integerMatch
+	SINGLE-VALUE
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+
+attributetype ( 1.3.6.1.4.1.5322.10.1.4
+	NAME 'krb5MaxRenew'
+	EQUALITY integerMatch
+	SINGLE-VALUE
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+
+attributetype ( 1.3.6.1.4.1.5322.10.1.5
+	NAME 'krb5KDCFlags'
+	EQUALITY integerMatch
+	SINGLE-VALUE
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+
+attributetype ( 1.3.6.1.4.1.5322.10.1.6
+	NAME 'krb5EncryptionType'
+	EQUALITY integerMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
+
+attributetype ( 1.3.6.1.4.1.5322.10.1.7
+	NAME 'krb5ValidStart'
+	EQUALITY generalizedTimeMatch
+	ORDERING generalizedTimeOrderingMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.5322.10.1.8
+	NAME 'krb5ValidEnd'
+	EQUALITY generalizedTimeMatch
+	ORDERING generalizedTimeOrderingMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.5322.10.1.9
+	NAME 'krb5PasswordEnd'
+	EQUALITY generalizedTimeMatch
+	ORDERING generalizedTimeOrderingMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
+	SINGLE-VALUE )
+
+# this is temporary; keys will eventually
+# be child entries or compound attributes.
+attributetype ( 1.3.6.1.4.1.5322.10.1.10
+	NAME 'krb5Key'
+	DESC 'Encoded ASN1 Key as an octet string'
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
+
+attributetype ( 1.3.6.1.4.1.5322.10.1.11
+	NAME 'krb5PrincipalRealm'
+	DESC 'Distinguished name of krb5Realm entry'
+	SUP distinguishedName )
+
+attributetype ( 1.3.6.1.4.1.5322.10.1.12
+	NAME 'krb5RealmName'
+	EQUALITY octetStringMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{128} )
+
+# Object class definitions
+
+objectclass ( 1.3.6.1.4.1.5322.10.2.1
+	NAME 'krb5Principal'
+	SUP top
+	AUXILIARY
+	MUST ( krb5PrincipalName )
+	MAY ( cn $ krb5PrincipalRealm ) )
+
+objectclass ( 1.3.6.1.4.1.5322.10.2.2
+	NAME 'krb5KDCEntry'
+	SUP krb5Principal
+	AUXILIARY
+	MUST ( krb5KeyVersionNumber )
+	MAY ( krb5ValidStart $ krb5ValidEnd $ krb5PasswordEnd $
+              krb5MaxLife $ krb5MaxRenew $ krb5KDCFlags $
+              krb5EncryptionType $ krb5Key ) )
+
+objectclass ( 1.3.6.1.4.1.5322.10.2.3
+	NAME 'krb5Realm'
+	SUP top
+	AUXILIARY
+	MUST ( krb5RealmName ) )
+
diff --git a/app-crypt/heimdal/files/krb5.conf b/app-crypt/heimdal/files/krb5.conf
new file mode 100644
index 000000000000..8a7a5f6bfbae
--- /dev/null
+++ b/app-crypt/heimdal/files/krb5.conf
@@ -0,0 +1,20 @@
+[libdefaults]
+	ticket_lifetime = 600
+	default_realm = EXAMPLE.COM
+	default_etypes = des3-hmac-sha1 des-cbc-crc des-cbc-md5
+	default_etypes_des = des3-hmac-sha1 des-cbc-crc des-cbc-md5
+
+[realms]
+	EXAMPLE.COM = {
+	kdc = kerberos.example.com:88
+	admin_server = kerberos.example.com:749
+	}
+
+[domain_realm]
+	.example.com = EXAMPLE.COM
+	example.com = EXAMPLE.COM
+
+[logging]
+	kdc = SYSLOG
+	admin_server = SYSLOG
+	default = SYSLOG
diff --git a/app-crypt/heimdal/heimdal-0.6.3.ebuild b/app-crypt/heimdal/heimdal-0.6.3.ebuild
new file mode 100644
index 000000000000..5afc3678b5fc
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-0.6.3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.3.ebuild,v 1.1 2004/09/13 15:40:34 dragonheart Exp $
+
+inherit libtool eutils
+
+DESCRIPTION="Kerberos 5 implementation from KTH"
+SRC_URI="ftp://ftp.pdc.kth.se/pub/heimdal/src/${P}.tar.gz"
+HOMEPAGE="http://www.pdc.kth.se/heimdal/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="-*"
+#KEYWORDS="~x86 ~sparc ~ppc ~alpha ~ia64 ~amd64 ~hppa ~mips"
+IUSE="ssl berkdb ipv6 krb4 ldap"
+PROVIDE="virtual/krb5"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	berkdb? ( sys-libs/db )
+	krb4? ( >=app-crypt/kth-krb-1.2.2-r2 )
+	ldap? ( net-nds/openldap )
+	!virtual/krb5"
+
+	# With this enabled, we create a multiple stage
+	# circular dependency with USE="ldap kerberos"
+	# -- Kain <kain@kain.org> 05 Dec 2002
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake
+	sys-devel/gcc
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}.all.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}-ldap-subtree.patch
+}
+
+src_compile() {
+
+	local myconf="
+		$(use_with ipv6)
+		$(use_with berkdb berkeley-db)
+		$(use_with ssl openssl)
+		--enable-shared
+		--includedir=/usr/include/heimdal
+		--libexecdir=/usr/sbin"
+
+	use krb4 \
+		&& myconf="${myconf} --with-krb4 --with-krb4-config=/usr/athena/bin/krb4-config" \
+		|| myconf="${myconf} --without-krb4"
+
+	use ldap && myconf="${myconf} --with-open-ldap=/usr"
+
+	append-ldflags -Wl,-z
+	econf ${myconf} || die "econf failed"
+	emake		|| die
+
+}
+
+src_install() {
+	make DESTDIR=${D} \
+		install || die
+
+	dodoc ChangeLog README NEWS TODO
+
+	# Begin client rename and install
+	for i in {telnetd,ftpd}
+	do
+		mv ${D}/usr/share/man/man8/${i}.8.gz ${D}/usr/share/man/man8/k${i}.8.gz
+		mv ${D}/usr/sbin/${i} ${D}/usr/sbin/k${i}
+	done
+	for i in {rshd,telnetd,ftpd}
+	do
+		mv ${D}/usr/share/man/man1/${i}.1.gz ${D}/usr/share/man/man1/k${i}.1.gz
+		mv ${D}/usr/sbin/${i} ${D}/usr/sbin/k${i}
+	done
+
+	# Create symlinks for the includes
+	cd ${D}/usr/include/ && \
+		ln -s heimdal gssapi && \
+		ln -s heimdal/krb5-types.h krb5-types.h && \
+		ln -s heimdal/krb5.h krb5.h && \
+		ln -s heimdal/asn1_err.h asn1_err.h && \
+		ln -s heimdal/krb5_asn1.h krb5_asn1.h && \
+		ln -s heimdal/krb5_err.h krb5_err.h && \
+		ln -s heimdal/heim_err.h heim_err.h && \
+		ln -s heimdal/k524_err.h k524_err.h && \
+		ln -s heimdal/krb5-protos.h krb5-protos.h \
+	|| die "Creation of include symlinks failed."
+
+	dodir /etc/init.d
+	exeinto /etc/init.d
+
+	doexe ${FILESDIR}/heimdal-kdc \
+		${FILESDIR}/heimdal-kadmind \
+		${FILESDIR}/heimdal-kpasswdd
+
+	insinto /etc
+		newins ${FILESDIR}/krb5.conf krb5.conf
+
+	if use ldap;
+	then
+		insinto /etc/openldap/schema
+		newins ${FILESDIR}/krb5-kdc.schema krb5-kdc.schema
+	fi
+
+
+	# default database dir
+	dodir /var/heimdal
+
+}