Version bump.

8 files changed, 721 insertions, 1 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 700c4f8c5e9a..24042df7d54a 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.36 2004/07/20 17:08:21 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.37 2004/09/01 15:00:03 aliz Exp $
+
+*mit-krb5-1.3.4 (01 Sep 2004)
+
+  01 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> mit-krb5-1.3.4.ebuild,
+  files/2004-002-patch_1.3.4.txt, files/2004-003-patch_1.3.4.txt:
+  Version bump with two security related patched added.
 
   20 Jul 2004; <rphillips@gentoo.org> files/mit-krb5-1.3.3-autoheader.patch:
   updated autoheader patch.  Fixes #57185. Contributed by Axel Buttchereit
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index b77898f7531d..b7d7e31dc56c 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,3 +1,4 @@
+MD5 a1129f3fafccdb95e7a9f19eba2105ba mit-krb5-1.3.4.ebuild 4324
 MD5 0bc8c3fb7f52eb5985fa39124ed732d4 mit-krb5-1.3.1-r1.ebuild 4206
 MD5 2b97be6f009b7dc0581a1e0ac2bb24a1 mit-krb5-1.3.1.ebuild 4174
 MD5 e3356da2141e2002d88c2cb2e0bb5ec4 mit-krb5-1.3.3.ebuild 4219
@@ -7,14 +8,17 @@ MD5 43c3a7a1974ef9610bb9458e1a3a4d87 metadata.xml 353
 MD5 c451148d1b3e182a19a8f9084d0b55b8 files/krb5.confd 233
 MD5 d7dcbbab51ce1849c77c083b8d363c15 files/krb5.initd 1486
 MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
+MD5 7b9b25de3cffdafa3d572dee9644f83e files/2004-002-patch_1.3.4.txt 7196
 MD5 1a722b032004738cd34e3ed16b8c75ca files/mit-krb5-1.3.3-res_search.patch 8486
 MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
 MD5 1a722b032004738cd34e3ed16b8c75ca files/mit-krb5-1.3.1-res_search.patch 8486
 MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1-r1 63
 MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3-r1 60
+MD5 6ddd962c015b6986004819321295aecd files/2004-003-patch_1.3.4.txt 592
 MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
 MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1 63
 MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3 60
+MD5 1f5afce6458d8ca364f153965cd992ca files/digest-mit-krb5-1.3.4 60
 MD5 a76969580caa87329b1758711499ca61 files/mit-krb5-1.3.3-aname.patch 6329
 MD5 9c1e5ef724936d4d3922e788bffc70a3 files/mit-krb5-1.3.3-autoheader.patch 694
 MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
diff --git a/app-crypt/mit-krb5/files/2004-002-patch_1.3.4.txt b/app-crypt/mit-krb5/files/2004-002-patch_1.3.4.txt
new file mode 100644
index 000000000000..2703b0f799b4
--- /dev/null
+++ b/app-crypt/mit-krb5/files/2004-002-patch_1.3.4.txt
@@ -0,0 +1,268 @@
+Index: src/clients/klist/klist.c
+===================================================================
+RCS file: /cvs/krbdev/krb5/src/clients/klist/klist.c,v
+retrieving revision 5.63
+diff -c -r5.63 klist.c
+*** src/clients/klist/klist.c	11 Apr 2002 03:21:46 -0000	5.63
+--- src/clients/klist/klist.c	23 Aug 2004 03:37:26 -0000
+***************
+*** 614,619 ****
+--- 614,622 ----
+  
+      if (show_etype) {
+  	retval = krb5_decode_ticket(&cred->ticket, &tkt);
++ 	if (retval)
++ 	    goto err_tkt;
++ 
+  	if (!extra_field)
+  	    fputs("\t",stdout);
+  	else
+***************
+*** 622,629 ****
+  	       etype_string(cred->keyblock.enctype));
+  	printf("%s ",
+  	       etype_string(tkt->enc_part.enctype));
+- 	krb5_free_ticket(kcontext, tkt);
+  	extra_field++;
+      }
+  
+      /* if any additional info was printed, extra_field is non-zero */
+--- 625,635 ----
+  	       etype_string(cred->keyblock.enctype));
+  	printf("%s ",
+  	       etype_string(tkt->enc_part.enctype));
+  	extra_field++;
++ 
++     err_tkt:
++ 	if (tkt != NULL)
++ 	    krb5_free_ticket(kcontext, tkt);
+      }
+  
+      /* if any additional info was printed, extra_field is non-zero */
+Index: src/krb524/krb524d.c
+===================================================================
+RCS file: /cvs/krbdev/krb5/src/krb524/krb524d.c,v
+retrieving revision 1.55.2.3
+diff -c -r1.55.2.3 krb524d.c
+*** src/krb524/krb524d.c	28 May 2003 04:06:31 -0000	1.55.2.3
+--- src/krb524/krb524d.c	23 Aug 2004 03:37:26 -0000
+***************
+*** 582,589 ****
+  	  printf("v4 credentials encoded\n");
+  
+   error:
+!      if (v5tkt->enc_part2)
+  	 krb5_free_enc_tkt_part(context, v5tkt->enc_part2);
+  
+       if(v5_service_key.contents)
+         krb5_free_keyblock_contents(context, &v5_service_key);
+--- 582,591 ----
+  	  printf("v4 credentials encoded\n");
+  
+   error:
+!      if (v5tkt->enc_part2) {
+  	 krb5_free_enc_tkt_part(context, v5tkt->enc_part2);
++ 	 v5tkt->enc_part2 = NULL;
++      }
+  
+       if(v5_service_key.contents)
+         krb5_free_keyblock_contents(context, &v5_service_key);
+Index: src/lib/krb5/asn.1/asn1buf.c
+===================================================================
+RCS file: /cvs/krbdev/krb5/src/lib/krb5/asn.1/asn1buf.c,v
+retrieving revision 5.24
+diff -c -r5.24 asn1buf.c
+*** src/lib/krb5/asn.1/asn1buf.c	12 Mar 2003 04:33:30 -0000	5.24
+--- src/lib/krb5/asn.1/asn1buf.c	23 Aug 2004 03:37:27 -0000
+***************
+*** 255,260 ****
+--- 255,261 ----
+    (*code)->data = (char*)malloc((((*code)->length)+1)*sizeof(char));
+    if ((*code)->data == NULL) {
+      free(*code);
++     *code = NULL;
+      return ENOMEM;
+    }
+    for(i=0; i < (*code)->length; i++)
+Index: src/lib/krb5/asn.1/krb5_decode.c
+===================================================================
+RCS file: /cvs/krbdev/krb5/src/lib/krb5/asn.1/krb5_decode.c,v
+retrieving revision 5.40.2.5
+diff -c -r5.40.2.5 krb5_decode.c
+*** src/lib/krb5/asn.1/krb5_decode.c	10 Oct 2003 23:57:38 -0000	5.40.2.5
+--- src/lib/krb5/asn.1/krb5_decode.c	23 Aug 2004 03:37:27 -0000
+***************
+*** 183,190 ****
+  #define cleanup(cleanup_routine)\
+     return 0; \
+  error_out: \
+!    if (rep && *rep) \
+  	cleanup_routine(*rep); \
+     return retval;
+  
+  #define cleanup_none()\
+--- 183,192 ----
+  #define cleanup(cleanup_routine)\
+     return 0; \
+  error_out: \
+!    if (rep && *rep) { \
+  	cleanup_routine(*rep); \
++ 	*rep = NULL; \
++    } \
+     return retval;
+  
+  #define cleanup_none()\
+***************
+*** 233,238 ****
+--- 235,241 ----
+        free_field(*rep,checksum);
+        free_field(*rep,client);
+        free(*rep);
++       *rep = NULL;
+    }
+    return retval;
+  }
+***************
+*** 254,260 ****
+    { begin_structure();
+      { krb5_kvno kvno;
+        get_field(kvno,0,asn1_decode_kvno);
+!       if(kvno != KVNO) return KRB5KDC_ERR_BAD_PVNO;
+      }
+      alloc_field((*rep)->server,krb5_principal_data);
+      get_field((*rep)->server,1,asn1_decode_realm);
+--- 257,263 ----
+    { begin_structure();
+      { krb5_kvno kvno;
+        get_field(kvno,0,asn1_decode_kvno);
+!       if(kvno != KVNO) clean_return(KRB5KDC_ERR_BAD_PVNO);
+      }
+      alloc_field((*rep)->server,krb5_principal_data);
+      get_field((*rep)->server,1,asn1_decode_realm);
+***************
+*** 268,273 ****
+--- 271,277 ----
+    if (rep && *rep) {
+        free_field(*rep,server);
+        free(*rep);
++       *rep = NULL;
+    }
+    return retval;
+  }
+***************
+*** 320,325 ****
+--- 324,330 ----
+        free_field(*rep,session);
+        free_field(*rep,client);
+        free(*rep);
++       *rep = NULL;
+    }
+    return retval;
+  }
+***************
+*** 403,408 ****
+--- 408,414 ----
+    if (rep && *rep) {
+        free_field(*rep,ticket);
+        free(*rep);
++       *rep = NULL;
+    }
+    return retval;
+  }
+***************
+*** 451,456 ****
+--- 457,463 ----
+    if (rep && *rep) {
+        free_field(*rep,subkey);
+        free(*rep);
++       *rep = NULL;
+    }
+    return retval;
+  }
+***************
+*** 556,561 ****
+--- 563,569 ----
+    if (rep && *rep) {
+        free_field(*rep,checksum);
+        free(*rep);
++       *rep = NULL;
+    }
+    return retval;
+  }
+***************
+*** 614,619 ****
+--- 622,628 ----
+        free_field(*rep,r_address);
+        free_field(*rep,s_address);
+        free(*rep);
++       *rep = NULL;
+    }
+    return retval;
+  }
+***************
+*** 668,673 ****
+--- 677,683 ----
+        free_field(*rep,r_address);
+        free_field(*rep,s_address);
+        free(*rep);
++       *rep = NULL;
+    }
+    return retval;
+  }
+***************
+*** 713,718 ****
+--- 723,729 ----
+        free_field(*rep,server);
+        free_field(*rep,client);
+        free(*rep);
++       *rep = NULL;
+    }
+    return retval;
+  }
+Index: src/lib/krb5/krb/rd_rep.c
+===================================================================
+RCS file: /cvs/krbdev/krb5/src/lib/krb5/krb/rd_rep.c,v
+retrieving revision 5.33.2.2
+diff -c -r5.33.2.2 rd_rep.c
+*** src/lib/krb5/krb/rd_rep.c	14 Jun 2003 00:09:47 -0000	5.33.2.2
+--- src/lib/krb5/krb/rd_rep.c	23 Aug 2004 03:37:27 -0000
+***************
+*** 71,76 ****
+--- 71,78 ----
+  
+      /* now decode the decrypted stuff */
+      retval = decode_krb5_ap_rep_enc_part(&scratch, repl);
++     if (retval)
++ 	goto clean_scratch;
+  
+      /* Check reply fields */
+      if (((*repl)->ctime != auth_context->authentp->ctime) ||
+Index: src/lib/krb5/krb/send_tgs.c
+===================================================================
+RCS file: /cvs/krbdev/krb5/src/lib/krb5/krb/send_tgs.c,v
+retrieving revision 5.55.2.1
+diff -c -r5.55.2.1 send_tgs.c
+*** src/lib/krb5/krb/send_tgs.c	13 May 2004 19:27:59 -0000	5.55.2.1
+--- src/lib/krb5/krb/send_tgs.c	23 Aug 2004 03:37:27 -0000
+***************
+*** 269,274 ****
+--- 269,276 ----
+  	    if (!tcp_only) {
+  		krb5_error *err_reply;
+  		retval = decode_krb5_error(&rep->response, &err_reply);
++ 		if (retval)
++ 		    goto send_tgs_error_3;
+  		if (err_reply->error == KRB_ERR_RESPONSE_TOO_BIG) {
+  		    tcp_only = 1;
+  		    krb5_free_error(context, err_reply);
+***************
+*** 277,282 ****
+--- 279,286 ----
+  		    goto send_again;
+  		}
+  		krb5_free_error(context, err_reply);
++ 	    send_tgs_error_3:
++ 		;
+  	    }
+  	    rep->message_type = KRB5_ERROR;
+  	} else if (krb5_is_tgs_rep(&rep->response))
diff --git a/app-crypt/mit-krb5/files/2004-003-patch_1.3.4.txt b/app-crypt/mit-krb5/files/2004-003-patch_1.3.4.txt
new file mode 100644
index 000000000000..57a92134d4d7
--- /dev/null
+++ b/app-crypt/mit-krb5/files/2004-003-patch_1.3.4.txt
@@ -0,0 +1,17 @@
+Index: src/lib/krb5/asn.1/asn1buf.c
+===================================================================
+RCS file: /cvs/krbdev/krb5/src/lib/krb5/asn.1/asn1buf.c,v
+retrieving revision 5.24
+*** src/lib/krb5/asn.1/asn1buf.c	12 Mar 2003 04:33:30 -0000	5.24
+--- src/lib/krb5/asn.1/asn1buf.c	23 Aug 2004 03:43:47 -0000
+***************
+*** 122,127 ****
+--- 122,129 ----
+        return ASN1_OVERRUN;
+    }
+    while (nestlevel > 0) {
++     if (buf->bound - buf->next + 1 <= 0)
++       return ASN1_OVERRUN;
+      retval = asn1_get_tag_2(buf, &t);
+      if (retval) return retval;
+      if (!t.indef) {
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.4 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.4
new file mode 100644
index 000000000000..91d69f09cf19
--- /dev/null
+++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.4
@@ -0,0 +1 @@
+MD5 33fdee0c5e78f67a18a781dee31e3e19 krb5-1.3.4.tar 6369280
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.4-autoheader.patch b/app-crypt/mit-krb5/files/mit-krb5-1.3.4-autoheader.patch
new file mode 100644
index 000000000000..a3e125162807
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.4-autoheader.patch
@@ -0,0 +1,13 @@
+--- src/include/Makefile.in	2004-07-15 00:53:34.096419331 +0000
++++ src/include/Makefile.in	2004-07-15 01:05:05.544231460 +0000
+@@ -28,7 +28,9 @@
+ 	(cd krb5; $(MAKE) autoconf.h)
+ $(srcdir)/krb5/autoconf.h.in: $(srcdir)/krb5/autoconf.stmp
+ $(srcdir)/krb5/autoconf.stmp: $(srcdir)/configure.in 
+-	cd $(srcdir) && $(AUTOHEADER) --localdir=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS)
++	cd $(srcdir) &&\
++                ($(AUTOHEADER) --include=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS) || \
++                 $(AUTOHEADER) --localdir=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS))
+ 	touch $(srcdir)/krb5/autoconf.stmp
+ 
+ krb5.h: krb5/autoconf.h $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.4-res_search.patch b/app-crypt/mit-krb5/files/mit-krb5-1.3.4-res_search.patch
new file mode 100644
index 000000000000..d87315e7e97f
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.4-res_search.patch
@@ -0,0 +1,245 @@
+--- src/aclocal.m4	2004-02-20 20:20:39.000000000 +0000
++++ src/aclocal.m4	2004-02-20 20:28:51.410375799 +0000
+@@ -1229,10 +1229,13 @@
+     AC_CHECK_LIB(socket, socket, LIBS="-lsocket -lnsl $LIBS", , -lnsl)))
+   KRB5_AC_ENABLE_DNS
+   if test "$enable_dns" = yes ; then
+-    AC_CHECK_FUNC(res_search, , AC_CHECK_LIB(resolv, res_search,
+-	LIBS="$LIBS -lresolv" ; RESOLV_LIB=-lresolv,
+-	AC_MSG_ERROR(Cannot find resolver support routine res_search in -lresolv.)
+-    ))
++    AC_CHECK_FUNC(res_search, , 
++      AC_CHECK_LIB(resolv, res_search, LIBS="$LIBS -lresolv" ; RESOLV_LIB=-lresolv,
++        AC_CHECK_LIB(resolv, __res_search, LIBS="$LIBS -lresolv" ; RESOLV_LIB=-lresolv,
++	  AC_MSG_ERROR(Cannot find resolver support routine res_search in -lresolv.)
++        )
++      )
++    )
+   fi
+   AC_SUBST(RESOLV_LIB)
+   ])
+--- src/util/et/configure.in	2004-02-20 20:47:01.000000000 +0000
++++ src/util/et/configure.in	2004-02-20 20:53:12.210333060 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(error_table.y)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_C_CONST
+ AC_PROG_LEX
+--- src/util/ss/configure.in	2004-02-20 20:47:01.000000000 +0000
++++ src/util/ss/configure.in	2004-02-20 20:53:12.210333060 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(ct.y)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_PROG_LEX
+ AC_PROG_YACC
+--- src/util/profile/configure.in	2004-02-20 23:11:24.520950563 +0000
++++ src/util/profile/configure.in	2004-02-20 23:11:50.930442490 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(prof_parse.c)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_C_CONST
+ AC_CHECK_SIZEOF(short)
+--- src/util/pty/configure.in	2004-02-20 23:17:03.410278953 +0000
++++ src/util/pty/configure.in	2004-02-20 23:17:09.530765003 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(getpty.c)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_PROG_AWK
+ AC_CHECK_FUNCS(fchmod fchown revoke vhangup killpg _getpty)
+--- src/util/db2/configure.in	2004-02-20 23:18:59.747505213 +0000
++++ src/util/db2/configure.in	2004-02-20 23:19:23.904531279 +0000
+@@ -1,5 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(db/db.c)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ AC_CONFIG_HEADER(include/config.h include/db-config.h)
+ CONFIG_RULES
+ 
+--- src/include/configure.in	2004-02-20 23:23:28.726003568 +0000
++++ src/include/configure.in	2004-02-20 23:23:34.241640248 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../aclocal.m4])
+ CONFIG_RULES
+ dnl
+ AH_TEMPLATE([HAVE_STRUCT_SOCKADDR_STORAGE], 
+--- src/lib/crypto/configure.in	2004-02-20 23:34:33.750669450 +0000
++++ src/lib/crypto/configure.in	2004-02-20 23:34:57.086901780 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ 
+ AC_CHECK_HEADERS(memory.h unistd.h)
+--- src/lib/krb5/configure.in	2004-02-20 23:40:17.561718584 +0000
++++ src/lib/krb5/configure.in	2004-02-20 23:40:24.975887197 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_PROG_AWK
+ dnl
+--- src/lib/des425/configure.in	2004-02-20 23:43:17.515274152 +0000
++++ src/lib/des425/configure.in	2004-02-20 23:43:24.600524519 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_CHECK_SIZEOF(short)
+ AC_CHECK_SIZEOF(int)
+--- src/lib/kdb/configure.in	2004-02-20 23:48:47.903708354 +0000
++++ src/lib/kdb/configure.in	2004-02-20 23:49:11.884789515 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_CHECK_HEADERS(unistd.h)
+ AC_TYPE_MODE_T
+--- src/lib/gssapi/configure.in	2004-02-20 23:57:43.218633025 +0000
++++ src/lib/gssapi/configure.in	2004-02-20 23:58:02.372908951 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_PROG_AWK
+ AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h memory.h)
+--- src/lib/rpc/configure.in	2004-02-21 00:04:53.088639962 +0000
++++ src/lib/rpc/configure.in	2004-02-21 00:04:59.751997406 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(auth_gssapi.c)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_CONFIG_SUBDIRS(unit-test)
+ AC_CHECK_HEADERS(sys/uio.h)
+--- src/lib/rpc/unit-test/configure.in	2004-02-21 11:09:19.126971488 +0000
++++ src/lib/rpc/unit-test/configure.in	2004-02-21 11:09:32.756622070 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(client.c)
++AC_CONFIG_SRCDIR([../../../aclocal.m4])
+ CONFIG_RULES
+ dnl sets $(krb5_cv_host)
+ KRB5_BUILD_PROGRAM
+--- src/lib/kadm5/configure.in	2004-02-21 11:12:53.954126360 +0000
++++ src/lib/kadm5/configure.in	2004-02-21 11:13:00.109608561 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_PROG_LEX
+ AC_PROG_AWK
+--- src/kdc/configure.in	2004-02-21 11:34:23.492251841 +0000
++++ src/kdc/configure.in	2004-02-21 11:34:33.670742220 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(main.c)
++AC_CONFIG_SRCDIR([../aclocal.m4])
+ CONFIG_RULES
+ AC_PROG_INSTALL
+ AC_CHECK_HEADERS(syslog.h stdarg.h sys/select.h sys/sockio.h ifaddrs.h unistd.h)
+--- src/kadmin/configure.in	2004-02-21 11:39:36.309134276 +0000
++++ src/kadmin/configure.in	2004-02-21 11:39:50.281690189 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../aclocal.m4])
+ CONFIG_RULES
+ AC_PROG_INSTALL
+ AC_PROG_YACC
+--- src/slave/configure.in	2004-02-21 11:44:32.197209945 +0000
++++ src/slave/configure.in	2004-02-21 11:44:41.446930561 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(kprop.c)
++AC_CONFIG_SRCDIR([../aclocal.m4])
+ CONFIG_RULES
+ AC_TYPE_MODE_T
+ AC_PROG_INSTALL
+--- src/clients/configure.in	2004-02-21 11:49:07.637341321 +0000
++++ src/clients/configure.in	2004-02-21 11:49:15.256464177 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../aclocal.m4])
+ CONFIG_RULES
+ AC_PROG_INSTALL
+ KRB5_BUILD_PROGRAM
+--- src/appl/configure.in	2004-02-21 11:53:32.972976196 +0000
++++ src/appl/configure.in	2004-02-21 11:53:41.243938861 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../aclocal.m4])
+ CONFIG_RULES
+ AC_PROG_INSTALL
+ AC_CHECK_HEADERS(unistd.h stdlib.h string.h)
+--- src/appl/bsd/configure.in	2004-02-21 12:44:08.589164829 +0000
++++ src/appl/bsd/configure.in	2004-02-21 12:44:33.750963123 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(krlogind.c)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ LOGINLIBS=
+ AC_ARG_WITH([afs],
+--- src/appl/gssftp/configure.in	2004-02-21 12:48:13.998683719 +0000
++++ src/appl/gssftp/configure.in	2004-02-21 12:48:22.651551451 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(README.gssftp)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_C_CONST
+ AC_PROG_INSTALL
+--- src/appl/telnet/configure.in	2004-02-21 14:31:20.888588427 +0000
++++ src/appl/telnet/configure.in	2004-02-21 14:31:35.367033388 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_CONFIG_SUBDIRS(libtelnet telnet telnetd)
+ V5_AC_OUTPUT_MAKEFILE
+--- src/appl/telnet/libtelnet/configure.in	2004-02-21 14:34:54.130228583 +0000
++++ src/appl/telnet/libtelnet/configure.in	2004-02-21 14:35:04.842598213 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(auth.c)
++AC_CONFIG_SRCDIR([../../../aclocal.m4])
+ CONFIG_RULES
+ AC_REPLACE_FUNCS([strcasecmp strdup setsid strerror strftime getopt herror parsetos])
+ AC_CHECK_FUNCS(setenv unsetenv getenv gettosbyname cgetent)
+--- src/appl/telnet/telnet/configure.in	2004-02-21 14:37:44.213459181 +0000
++++ src/appl/telnet/telnet/configure.in	2004-02-21 14:37:53.220246506 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(telnet.c)
++AC_CONFIG_SRCDIR([../../../aclocal.m4])
+ CONFIG_RULES
+ AC_PROG_INSTALL
+ AC_FUNC_VFORK
+--- src/appl/telnet/telnetd/configure.in	2004-02-21 14:40:21.547807347 +0000
++++ src/appl/telnet/telnetd/configure.in	2004-02-21 14:40:34.278679803 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(telnetd.c)
++AC_CONFIG_SRCDIR([../../../aclocal.m4])
+ CONFIG_RULES
+ AC_PROG_INSTALL
+ AC_CHECK_LIB(util,main)
+--- src/tests/configure.in	2004-02-21 14:43:26.160454386 +0000
++++ src/tests/configure.in	2004-02-21 14:43:35.246222333 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../aclocal.m4])
+ CONFIG_RULES
+ KRB5_RUN_FLAGS
+ KRB5_BUILD_PROGRAM
+--- src/lib/krb4/configure.in	2004-02-21 14:48:36.077319065 +0000
++++ src/lib/krb4/configure.in	2004-02-21 14:48:43.785425471 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(configure.in)
++AC_CONFIG_SRCDIR([../../aclocal.m4])
+ CONFIG_RULES
+ AC_TYPE_MODE_T
+ AC_TYPE_UID_T
+--- src/krb524/configure.in	2004-02-21 14:52:49.127154403 +0000
++++ src/krb524configure.in	2004-02-21 14:52:58.079955050 +0000
+@@ -1,4 +1,5 @@
+ AC_INIT(krb524d.c)
++AC_CONFIG_SRCDIR([../aclocal.m4])
+ CONFIG_RULES
+ KRB5_BUILD_LIBRARY_STATIC
+ KRB5_BUILD_LIBOBJS
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.4.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.4.ebuild
new file mode 100644
index 000000000000..1e7e99966451
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.4.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.4.ebuild,v 1.1 2004/09/01 15:00:03 aliz Exp $
+
+inherit eutils
+
+MY_P=${PN/mit-}-${PV}
+S=${WORKDIR}/${MY_P}/src
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/1.3/${MY_P}.tar"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE="krb4 static"
+RESTRICT="nomirror"
+
+DEPEND="virtual/libc
+	sys-devel/autoconf
+	!virtual/krb5"
+RDEPEND="virtual/libc
+	!virtual/krb5"
+PROVIDE="virtual/krb5"
+
+src_unpack() {
+	unpack ${A}
+	tar -zxf ${MY_P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/2004-002-patch_${PV}.txt
+	epatch ${FILESDIR}/2004-003-patch_${PV}.txt
+
+	epatch ${FILESDIR}/${P}-res_search.patch
+	epatch ${FILESDIR}/${P}-autoheader.patch
+}
+
+src_compile() {
+	ebegin "Updating configure"
+		autoconf
+		cd ${S}/util/et
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/util/ss
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/util/profile
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/util/pty
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/util/db2
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/include
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/lib/crypto
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/lib/krb5
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/lib/des425
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/lib/kdb
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/lib/gssapi
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/lib/rpc
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/lib/rpc/unit-test
+		WANT_AUTOCONF=2.5 autoconf -I ../../../
+		cd ${S}/lib/kadm5
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/kdc
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/kadmin
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/slave
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/clients
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/appl
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/appl/bsd
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/appl/gssftp
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/appl/telnet
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/appl/telnet/libtelnet
+		WANT_AUTOCONF=2.5 autoconf -I ../../../
+		cd ${S}/appl/telnet/telnet
+		WANT_AUTOCONF=2.5 autoconf -I ../../../
+		cd ${S}/appl/telnet/telnetd
+		WANT_AUTOCONF=2.5 autoconf -I ../../../
+		cd ${S}/tests
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/lib/krb4
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/krb524
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}
+	eend $?
+
+	local myconf
+
+	use krb4 && myconf="${myconf} --with-krb4 --enable-krb4" \
+		|| myconf="${myconf} --without-krb4 --disable-krb4"
+
+	use static && myconf="${myconf} --disable-shared --enable-static" \
+		|| myconf="${myconf} --enable-shared --disable-static"
+
+	CFLAGS=`echo ${CFLAGS} | xargs`
+	CXXFLAGS=`echo ${CXXFLAGS} | xargs`
+	LDFLAGS=`echo ${LDFLAGS} | xargs`
+
+	CFLAGS="${CFLAGS}" \
+	CXXFLAGS="${CXXFLAGS}" \
+	LDFLAGS="${LDFLAGS}" \
+	econf \
+		--mandir=/usr/share/man \
+		--localstatedir=/etc \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--enable-dns \
+		${myconf} || die
+
+	if [ "${ARCH}" = "hppa" ]
+	then
+		einfo "Fixating Makefiles ..."
+		for i in `find ${S} -name Makefile`; \
+		do cp $i $i.old; sed -e 's/LDCOMBINE=ld -shared -h lib/LDCOMBINE=gcc -shared -h lib/' $i.old > $i; done
+	fi
+
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	cd ..
+	dodoc README
+	dohtml doc/*.html
+
+	# Begin client rename and install
+	for i in {telnetd,ftpd}
+	do
+		mv ${D}/usr/share/man/man8/${i}.8 ${D}/usr/share/man/man8/k${i}.8
+		mv ${D}/usr/sbin/${i} ${D}/usr/sbin/k${i}
+	done
+	for i in {rcp,rsh,telnet,ftp,rlogin}
+	do
+		mv ${D}/usr/share/man/man1/${i}.1 ${D}/usr/share/man/man1/k${i}.1
+		mv ${D}/usr/bin/${i} ${D}/usr/bin/k${i}
+	done
+
+	insinto /etc
+		newins ${FILESDIR}/krb5.conf krb5.conf
+	insinto /etc/krb5kdc
+		newins ${FILESDIR}/kdc.conf kdc.conf
+	exeinto /etc/init.d
+		newexe ${FILESDIR}/mit-krb5kadmind.initd mit-krb5kadmind
+		newexe ${FILESDIR}/mit-krb5kdc.initd mit-krb5kdc
+}
+
+pkg_postinst() {
+	einfo "See /usr/share/doc/${PF}/html/admin.html for documentation."
+	echo ""
+	einfo "The client apps are installed with the k prefix"
+	einfo "(ie. kftp, kftpd, ktelnet, ktelnetd, etc...)"
+	echo ""
+}