Closing #49598 + springcleaning.

17 files changed, 417 insertions, 611 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 2f167bac09d7..ac2418fd7789 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.20 2004/05/10 11:12:01 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.21 2004/05/10 11:38:19 aliz Exp $
+
+*mit-krb5-1.3.3 (10 May 2004)
+
+  10 May 2004; Daniel Ahlberg <aliz@gentoo.org> mit-krb5-1.3.3.ebuild:
+  Version bump, closing #49598. Also springcleaning.
 
 *mit-krb5-1.3.1-r1 (10 May 2004)
 
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 9992de45afdc..10beb5153c76 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -2,6 +2,7 @@ MD5 5bc4ddc88e19dac44c0f248eb21ad6a1 mit-krb5-1.3.1-r1.ebuild 4212
 MD5 7654fcf4d85d11d1a548b6e3504ee654 mit-krb5-1.2.8.ebuild 2490
 MD5 d1f43db6896261f081376082c7bf1e04 mit-krb5-1.2.6-r2.ebuild 1874
 MD5 06028c595dcfb749ac57a2faf0f1f408 mit-krb5-1.3.1.ebuild 4187
+MD5 618f17529d995444e30dd1768f1d7d8d mit-krb5-1.3.3.ebuild 4217
 MD5 7a60f470659f2045d6566201304dcb56 mit-krb5-1.2.7.ebuild 2639
 MD5 52ca840cba51f14e5190113e15989d85 ChangeLog 4713
 MD5 e5573e25f19694fc8ccaaced2dd576f4 metadata.xml 353
@@ -20,6 +21,7 @@ MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
 MD5 589599adcbf4b8a7ce986449eef97428 files/digest-mit-krb5-1.2.7 136
 MD5 8b46231139151cf788c6f689c7fe8ba1 files/digest-mit-krb5-1.2.8 63
 MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1 63
+MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3 60
 MD5 c9cc84d6a3582384f84c6ccd9a4d8208 files/krb5-1.2.7-xdr.patch 3153
 MD5 589b9f6ef4cc8c9d8faf77528054cdf4 files/krb5-1.2.7-principal_name_handling.patch 2124
 MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.6-r2 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.6-r2
deleted file mode 100644
index c4ecd51a80be..000000000000
--- a/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9723ca51368f8fbfcc52927d50dda7ac krb5-1.2.6.tar.gz 5488576
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.6-r3 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.6-r3
deleted file mode 100644
index c4ecd51a80be..000000000000
--- a/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.6-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9723ca51368f8fbfcc52927d50dda7ac krb5-1.2.6.tar.gz 5488576
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.7 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.7
deleted file mode 100644
index a408c7ae4794..000000000000
--- a/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 854b52face2a8f771caf88166fa269d3 krb5-1.2.7.tar.gz 5491926
-MD5 88d770f2de2c1bd842b511f47002a807 2003-004-krb4_patchkit.tar.gz 11493
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.8 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.8
deleted file mode 100644
index 71b0bb5dbf82..000000000000
--- a/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 99b840431ad2926de66d143cdd9307eb krb5-1.2.8.tar.gz 5496127
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.3 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.3
new file mode 100644
index 000000000000..f75db9c04964
--- /dev/null
+++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.3
@@ -0,0 +1 @@
+MD5 9c872750fce0f4ff64e0325e278ce882 krb5-1.3.3.tar 6359040
diff --git a/app-crypt/mit-krb5/files/krb5-1.2.2-gentoo.diff b/app-crypt/mit-krb5/files/krb5-1.2.2-gentoo.diff
deleted file mode 100644
index ddad41c8f687..000000000000
--- a/app-crypt/mit-krb5/files/krb5-1.2.2-gentoo.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -uNr ../../krb5-1.2.2-orig/src/lib/krb4/Makefile.in ./lib/krb4/Makefile.in
---- ../../krb5-1.2.2-orig/src/lib/krb4/Makefile.in	Wed Feb 28 14:07:42 2001
-+++ ./lib/krb4/Makefile.in	Thu Feb  7 03:08:31 2002
-@@ -23,7 +23,7 @@
- 	$(TOPLIBD)/libdes425$(SHLIBEXT) \
- 	$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
- 	$(TOPLIBD)/libkrb5$(SHLIBEXT)
--SHLIB_EXPLIBS=-lkrb5 -lcom_err -ldes425 -lk5crypto
-+SHLIB_EXPLIBS=-lc -lkrb5 -lcom_err -ldes425 -lk5crypto
- SHLIB_DIRS=-L$(TOPLIBD)
- SHLIB_RDIRS=$(KRB5_LIBDIR)
- 
-diff -uNr ../../krb5-1.2.2-orig/src/lib/krb5/Makefile.in ./lib/krb5/Makefile.in
---- ../../krb5-1.2.2-orig/src/lib/krb5/Makefile.in	Wed Feb 28 14:07:43 2001
-+++ ./lib/krb5/Makefile.in	Thu Feb  7 03:08:13 2002
-@@ -58,7 +58,7 @@
- SHLIB_EXPDEPS = \
- 	$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
- 	$(TOPLIBD)/libcom_err$(SHLIBEXT)
--SHLIB_EXPLIBS=-lk5crypto -lcom_err @GEN_LIB@ @RESOLV_LIB@
-+SHLIB_EXPLIBS=-lc -lk5crypto -lcom_err @GEN_LIB@ @RESOLV_LIB@
- SHLIB_DIRS=-L$(TOPLIBD)
- SHLIB_RDIRS=$(KRB5_LIBDIR)
- 
diff --git a/app-crypt/mit-krb5/files/krb5-1.2.6-gentoo.diff b/app-crypt/mit-krb5/files/krb5-1.2.6-gentoo.diff
deleted file mode 100644
index 180f6a58f530..000000000000
--- a/app-crypt/mit-krb5/files/krb5-1.2.6-gentoo.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: kadm_ser_wrap.c
-===================================================================
-RCS file: /cvs/krbdev/krb5/src/kadmin/v4server/kadm_ser_wrap.c,v
-retrieving revision 1.10.4.1
-diff -c -r1.10.4.1 kadm_ser_wrap.c
-*** kadm_ser_wrap.c	2000/05/23 21:44:50	1.10.4.1
-- --- kadm_ser_wrap.c	2002/10/22 22:07:11
-***************
-*** 170,183 ****
-      u_char *retdat, *tmpdat;
-      int retval, retlen;
-  
-!     if (strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) {
-  	errpkt(dat, dat_len, KADM_BAD_VER);
-  	return KADM_BAD_VER;
-      }
-      in_len = KADM_VERSIZE;
-      /* get the length */
-!     if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0)
-  	return KADM_LENGTH_ERROR;
-      in_len += retc;
-      authent.length = *dat_len - r_len - KADM_VERSIZE - sizeof(krb5_ui_4);
-      memcpy((char *)authent.dat, (char *)(*dat) + in_len, authent.length);
-- --- 170,190 ----
-      u_char *retdat, *tmpdat;
-      int retval, retlen;
-  
-!     if ((*dat_len < KADM_VERSIZE + sizeof(krb5_ui_4))
-! 	|| strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) {
-  	errpkt(dat, dat_len, KADM_BAD_VER);
-  	return KADM_BAD_VER;
-      }
-      in_len = KADM_VERSIZE;
-      /* get the length */
-!     if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0
-! 	|| (r_len > *dat_len - KADM_VERSIZE - sizeof(krb5_ui_4))
-! 	|| (*dat_len - r_len - KADM_VERSIZE -
-! 	    sizeof(krb5_ui_4) > sizeof(authent.dat))) {
-! 	errpkt(dat, dat_len, KADM_LENGTH_ERROR);
-  	return KADM_LENGTH_ERROR;
-+     }
-+ 
-      in_len += retc;
-      authent.length = *dat_len - r_len - KADM_VERSIZE - sizeof(krb5_ui_4);
-      memcpy((char *)authent.dat, (char *)(*dat) + in_len, authent.length);
-
-
diff --git a/app-crypt/mit-krb5/files/krb5-1.2.7-principal_name_handling.patch b/app-crypt/mit-krb5/files/krb5-1.2.7-principal_name_handling.patch
deleted file mode 100644
index a220866d8237..000000000000
--- a/app-crypt/mit-krb5/files/krb5-1.2.7-principal_name_handling.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: include/krb5.hin
-===================================================================
-RCS file: /cvs/krbdev/krb5/src/include/krb5.hin,v
-retrieving revision 1.94.2.5.2.17
-diff -p -u -r1.94.2.5.2.17 krb5.hin
---- src/include/krb5.hin	2002/04/16 23:47:53	1.94.2.5.2.17
-+++ src/include/krb5.hin	2003/03/19 00:38:54
-@@ -326,7 +326,7 @@ typedef krb5_const krb5_principal_data F
- #define	krb5_princ_size(context, princ) (princ)->length
- #define	krb5_princ_type(context, princ) (princ)->type
- #define	krb5_princ_name(context, princ) (princ)->data
--#define	krb5_princ_component(context, princ,i) ((princ)->data + i)
-+#define	krb5_princ_component(context, princ,i) (i < krb5_princ_size(context, princ) ? ((princ)->data + i) : NULL)
-
- /*
-  * end "base-defs.h"
-Index: kdc/kdc_util.c
-===================================================================
-RCS file: /cvs/krbdev/krb5/src/kdc/kdc_util.c,v
-retrieving revision 5.96.2.2.2.3
-diff -p -u -r5.96.2.2.2.3 kdc_util.c
---- src/kdc/kdc_util.c	2002/10/31 00:38:34	5.96.2.2.2.3
-+++ src/kdc/kdc_util.c	2003/03/19 00:39:00
-@@ -157,7 +157,8 @@ realm_compare(princ1, princ2)
- krb5_boolean krb5_is_tgs_principal(principal)
- 	krb5_principal	principal;
- {
--	if ((krb5_princ_component(kdc_context, principal, 0)->length ==
-+	if (krb5_princ_size(kdc_context, principal) > 0 &&
-+	    (krb5_princ_component(kdc_context, principal, 0)->length ==
- 	     KRB5_TGS_NAME_SIZE) &&
- 	    (!memcmp(krb5_princ_component(kdc_context, principal, 0)->data,
- 		     KRB5_TGS_NAME, KRB5_TGS_NAME_SIZE)))
-Index: lib/krb5/krb/unparse.c
-===================================================================
-RCS file: /cvs/krbdev/krb5/src/lib/krb5/krb/unparse.c,v
-retrieving revision 5.27.4.1
-diff -p -u -r5.27.4.1 unparse.c
---- src/lib/krb5/krb/unparse.c	2002/08/12 22:55:01	5.27.4.1
-+++ src/lib/krb5/krb/unparse.c	2003/03/19 00:39:02
-@@ -153,7 +153,8 @@ krb5_unparse_name_ext(context, principal
- 		*q++ = COMPONENT_SEP;
- 	}
- 
--	q--;			/* Back up last component separator */
-+	if (i > 0)
-+	    q--;		/* Back up last component separator */
- 	*q++ = REALM_SEP;
- 	
- 	cp = krb5_princ_realm(context, principal)->data;
-
diff --git a/app-crypt/mit-krb5/files/krb5-1.2.7-xdr.patch b/app-crypt/mit-krb5/files/krb5-1.2.7-xdr.patch
deleted file mode 100644
index d25f5717bff1..000000000000
--- a/app-crypt/mit-krb5/files/krb5-1.2.7-xdr.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Index: xdr_mem.c
-===================================================================
-RCS file: /cvs/krbdev/krb5/src/lib/rpc/xdr_mem.c,v
-retrieving revision 1.8
-diff -c -r1.8 xdr_mem.c
-*** src/lib/rpc/xdr_mem.c	1998/02/14 02:27:24	1.8
-- --- src/lib/rpc/xdr_mem.c	2003/02/04 22:57:24
-***************
-*** 47,52 ****
-- --- 47,54 ----
-  #include <gssrpc/xdr.h>
-  #include <netinet/in.h>
-  #include <stdio.h>
-+ #include <string.h>
-+ #include <limits.h>
-
-  static bool_t	xdrmem_getlong();
-  static bool_t	xdrmem_putlong();
-***************
-*** 83,89 ****
-  	xdrs->x_op = op;
-  	xdrs->x_ops = &xdrmem_ops;
-  	xdrs->x_private = xdrs->x_base = addr;
-! 	xdrs->x_handy = size;
-  }
-  
-  static void
-- --- 85,91 ----
-  	xdrs->x_op = op;
-  	xdrs->x_ops = &xdrmem_ops;
-  	xdrs->x_private = xdrs->x_base = addr;
-! 	xdrs->x_handy = (size > INT_MAX) ? INT_MAX : size; /* XXX */
-  }
-
-  static void
-***************
-*** 98,105 ****
-  	long *lp;
-  {
-
-! 	if ((xdrs->x_handy -= sizeof(rpc_int32)) < 0)
-  		return (FALSE);
-  	*lp = (long)ntohl(*((rpc_u_int32 *)(xdrs->x_private)));
-  	xdrs->x_private += sizeof(rpc_int32);
-  	return (TRUE);
-- --- 100,109 ----
-  	long *lp;
-  {
-  
-! 	if (xdrs->x_handy < sizeof(rpc_int32))
-  		return (FALSE);
-+ 	else
-+ 		xdrs->x_handy -= sizeof(rpc_int32);
-  	*lp = (long)ntohl(*((rpc_u_int32 *)(xdrs->x_private)));
-  	xdrs->x_private += sizeof(rpc_int32);
-  	return (TRUE);
-***************
-*** 111,118 ****
-  	long *lp;
-  {
-  
-! 	if ((xdrs->x_handy -= sizeof(rpc_int32)) < 0)
-  		return (FALSE);
-  	*(rpc_int32 *)xdrs->x_private = (rpc_int32)htonl((rpc_u_int32)(*lp));
-  	xdrs->x_private += sizeof(rpc_int32);
-  	return (TRUE);
-- --- 115,124 ----
-  	long *lp;
-  {
-
-! 	if (xdrs->x_handy < sizeof(rpc_int32))
-  		return (FALSE);
-+ 	else
-+ 		xdrs->x_handy -= sizeof(rpc_int32);
-  	*(rpc_int32 *)xdrs->x_private = (rpc_int32)htonl((rpc_u_int32)(*lp));
-  	xdrs->x_private += sizeof(rpc_int32);
-  	return (TRUE);
-***************
-*** 125,132 ****
-  	register unsigned int len;
-  {
-
-! 	if ((xdrs->x_handy -= len) < 0)
-  		return (FALSE);
-  	memmove(addr, xdrs->x_private, len);
-  	xdrs->x_private += len;
-  	return (TRUE);
-- --- 131,140 ----
-  	register unsigned int len;
-  {
-  
-! 	if (xdrs->x_handy < len)
-  		return (FALSE);
-+ 	else
-+ 		xdrs->x_handy -= len;
-  	memmove(addr, xdrs->x_private, len);
-  	xdrs->x_private += len;
-  	return (TRUE);
-***************
-*** 139,146 ****
-  	register unsigned int len;
-  {
-  
-! 	if ((xdrs->x_handy -= len) < 0)
-  		return (FALSE);
-  	memmove(xdrs->x_private, addr, len);
-  	xdrs->x_private += len;
-  	return (TRUE);
-- --- 147,156 ----
-  	register unsigned int len;
-  {
-  
-! 	if (xdrs->x_handy < len)
-  		return (FALSE);
-+ 	else
-+ 		xdrs->x_handy -= len;
-  	memmove(xdrs->x_private, addr, len);
-  	xdrs->x_private += len;
-  	return (TRUE);
-***************
-*** 179,185 ****
-  {
-  	rpc_int32 *buf = 0;
-  
-! 	if (xdrs->x_handy >= len) {
-  		xdrs->x_handy -= len;
-  		buf = (rpc_int32 *) xdrs->x_private;
-  		xdrs->x_private += len;
-- --- 189,195 ----
-  {
-  	rpc_int32 *buf = 0;
-
-! 	if (len >= 0 && xdrs->x_handy >= len) {
-  		xdrs->x_handy -= len;
-  		buf = (rpc_int32 *) xdrs->x_private;
-  		xdrs->x_private += len;
-
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.3-res_search.patch b/app-crypt/mit-krb5/files/mit-krb5-1.3.3-res_search.patch
new file mode 100644
index 000000000000..d87315e7e97f
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.3-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.2.6-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.2.6-r2.ebuild
deleted file mode 100644
index fdc89dfb0089..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.2.6-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.2.6-r2.ebuild,v 1.8 2004/03/13 21:50:28 mr_bones_ Exp $
-
-inherit eutils
-
-S=${WORKDIR}/krb5-${PV}/src
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://www.crypto-publish.org/dist/mit-kerberos5/krb5-${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="krb4"
-
-PROVIDE="virtual/krb5"
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/kadmin/v4server/
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.2.2-gentoo.diff
-}
-
-src_compile() {
-	local myconf
-
-	use krb4 && myconf="${myconf} --with-krb4 --enable-krb4" \
-		|| myconf="${myconf} --without-krb4 --disable-krb4"
-
-	econf \
-		--with-ccopts="${CFLAGS}" \
-		--mandir=/usr/share/man \
-		--localstatedir=/etc \
-		--enable-shared \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--enable-dns \
-		${myconf} || die
-
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	cd ..
-	dodoc README
-
-	# 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 {rcp,rsh,telnet,v4rcp,ftp,rlogin}
-	do
-		mv ${D}/usr/share/man/man1/${i}.1.gz ${D}/usr/share/man/man1/k${i}.1.gz
-		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
-	insinto /etc/conf.d
-	newins ${FILESDIR}/krb5.confd krb5
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/krb5.initd krb5
-}
-
-pkg_postinst() {
-	einfo "Configuration files are now under /etc."
-	einfo "The client apps are now installed with the k prefix"
-	eindo "(ie. kftp, kftpd, ktelnet, ktelnetd, etc...)"
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.2.6-r3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.2.6-r3.ebuild
deleted file mode 100644
index 0e23dd224f17..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.2.6-r3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.2.6-r3.ebuild,v 1.8 2004/03/13 21:50:28 mr_bones_ Exp $
-
-inherit eutils
-
-S=${WORKDIR}/krb5-${PV}/src
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://www.crypto-publish.org/dist/mit-kerberos5/krb5-${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="krb4"
-
-PROVIDE="virtual/krb5"
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-
-	# This is a security patch, remove when 1.2.7 comes to http://www.crypto-publish.org/
-	cd ${S}/kadmin/v4server/
-	epatch ${FILESDIR}/krb5-${PV}-gentoo.diff
-
-	#cd ${S}
-	#epatch ${FILESDIR}/krb5-1.2.2-gentoo.diff
-}
-
-src_compile() {
-	local myconf
-
-	use krb4 && myconf="${myconf} --with-krb4 --enable-krb4" \
-		|| myconf="${myconf} --without-krb4 --disable-krb4"
-
-	econf \
-		--with-ccopts="${CFLAGS}" \
-		--mandir=/usr/share/man \
-		--localstatedir=/etc \
-		--enable-shared \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--enable-dns \
-		${myconf} || die
-
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	cd ..
-	dodoc README
-
-	# 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 {rcp,rsh,telnet,v4rcp,ftp,rlogin}
-	do
-		mv ${D}/usr/share/man/man1/${i}.1.gz ${D}/usr/share/man/man1/k${i}.1.gz
-		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
-	insinto /etc/conf.d
-	newins ${FILESDIR}/krb5.confd krb5
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/krb5.initd krb5
-}
-
-pkg_postinst() {
-	einfo "Configuration files are now under /etc."
-	einfo "The client apps are now installed with the k prefix"
-	einfo "(ie. kftp, kftpd, ktelnet, ktelnetd, etc...)"
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.2.7.ebuild b/app-crypt/mit-krb5/mit-krb5-1.2.7.ebuild
deleted file mode 100644
index 8a7247821150..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.2.7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.2.7.ebuild,v 1.8 2004/03/13 21:50:28 mr_bones_ 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://www.mirrors.wiretapped.net/security/cryptography/apps/kerberos/krb5-mit/unix/${MY_P}.tar.gz
-	http://www.galiette.com/krb5/${MY_P}.tar.gz
-	http://munitions.vipul.net/software/system/auth/kerberos/${MY_P}.tar.gz
-	http://web.mit.edu/kerberos/www/advisories/2003-004-krb4_patchkit.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE="krb4"
-
-PROVIDE="virtual/krb5"
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	EPATCH_SINGLE_MSG="Applying MIT krb5 Security Advisory 2003-003 fix"
-	epatch ${FILESDIR}/${MY_P}-xdr.patch
-	EPATCH_SINGLE_MSG="Applying MIT krb5 Security Advisory 2003-004 fix"
-	epatch ${WORKDIR}/2003-004-krb4_patchkit/patch.${PV}
-	EPATCH_SINGLE_MSG="Applying MIT krb5 Security Advisory 2003-005 fix"
-	epatch ${FILESDIR}/${MY_P}-principal_name_handling.patch
-
-	# Fix bad errno definitions (bug #16450 and #16267)
-	ebegin Fixing errno definitions
-	find . -name '*.[ch]' | xargs grep -l 'extern.*int.*errno' \
-		| xargs -n1 perl -pi.orig -e '
-			$.==1 && s/^/#include <errno.h>\n/;
-			s/extern\s+int\s+errno\s*\;//;'
-	eend 0
-}
-
-src_compile() {
-	local myconf
-
-	use krb4 && myconf="${myconf} --with-krb4 --enable-krb4" \
-		|| myconf="${myconf} --without-krb4 --disable-krb4"
-
-	econf \
-		--with-ccopts="${CFLAGS}" \
-		--mandir=/usr/share/man \
-		--localstatedir=/etc \
-		--enable-shared \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--enable-dns \
-		${myconf} || die
-
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	cd ..
-	dodoc README
-
-	# 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 {rcp,rsh,telnet,v4rcp,ftp,rlogin}
-	do
-		mv ${D}/usr/share/man/man1/${i}.1.gz ${D}/usr/share/man/man1/k${i}.1.gz
-		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
-	insinto /etc/conf.d
-	newins ${FILESDIR}/krb5.confd krb5
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/krb5.initd krb5
-}
-
-pkg_postinst() {
-	einfo "Configuration files are now under /etc."
-	einfo "The client apps are now installed with the k prefix"
-	einfo "(ie. kftp, kftpd, ktelnet, ktelnetd, etc...)"
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.2.8.ebuild b/app-crypt/mit-krb5/mit-krb5-1.2.8.ebuild
deleted file mode 100644
index b2319ab75e8c..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.2.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.2.8.ebuild,v 1.8 2004/03/13 21:50:28 mr_bones_ 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://www.mirrors.wiretapped.net/security/cryptography/apps/kerberos/krb5-mit/unix/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ppc alpha hppa"
-IUSE="krb4 static"
-
-PROVIDE="virtual/krb5"
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	# Fix bad errno definitions (bug #16450 and #16267)
-	ebegin Fixing errno definitions
-	find . -name '*.[ch]' | xargs grep -l 'extern.*int.*errno' \
-		| xargs -n1 perl -pi.orig -e '
-			$.==1 && s/^/#include <errno.h>\n/;
-			s/extern\s+int\s+errno\s*\;//;'
-	eend $?
-}
-
-src_compile() {
-	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"
-
-	econf \
-		--with-ccopts="${CFLAGS}" \
-		--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 ""
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.3.ebuild
new file mode 100644
index 000000000000..0a0e86cc9ef1
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.3.ebuild,v 1.1 2004/05/10 11:38:20 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"
+RESTRICT="nomirror"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~ia64 ~amd64 ~mips"
+IUSE="krb4 static"
+
+DEPEND="virtual/glibc
+	sys-devel/autoconf
+	!virtual/krb5"
+
+RDEPEND="virtual/glibc
+	!virtual/krb5"
+
+PROVIDE="virtual/krb5"
+
+src_unpack() {
+	unpack ${A}
+	tar -zxf ${MY_P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${P}-res_search.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 ""
+}