Version bump, compressed patches and QA fix

24 files changed, 204 insertions, 1027 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index b8ae0f59152c..8fcefd8ca66c 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,28 @@
 # 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.43 2004/09/05 20:24:04 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.44 2004/09/14 10:26:48 aliz Exp $
+
+*mit-krb5-1.3.5 (14 Sep 2004)
+
+  14 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> mit-krb5-1.3.1-r1.ebuild,
+  mit-krb5-1.3.1.ebuild, mit-krb5-1.3.3-r1.ebuild, mit-krb5-1.3.3.ebuild,
+  mit-krb5-1.3.4.ebuild, mit-krb5-1.3.5.ebuild,
+  files/mit-krb5-1.3.1-res_search.patch,
+  files/mit-krb5-1.3.1-res_search.patch.bz2, files/mit-krb5-1.3.3-aname.patch,
+  files/mit-krb5-1.3.3-aname.patch.bz2, files/mit-krb5-1.3.3-autoheader.patch,
+  files/mit-krb5-1.3.3-autoheader.patch.bz2,
+  files/mit-krb5-1.3.3-res_search.patch,
+  files/mit-krb5-1.3.3-res_search.patch.bz2,
+  files/mit-krb5-1.3.4-autoheader.patch,
+  files/mit-krb5-1.3.4-autoheader.patch.bz2,
+  files/mit-krb5-1.3.4-res_search.patch,
+  files/mit-krb5-1.3.4-res_search.patch.bz2,
+  files/mit-krb5-1.3.5-autoheader.patch.bz2,
+  files/mit-krb5-1.3.5-res_search.patch.bz2,
+  files/mit-krb5-1.3.5-suid_fix.patch.bz2:
+  +Version bump.
+  +Fixed insecure suid binary.
+  +Compressed patches.
 
   05 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> mit-krb5-1.3.4.ebuild:
   Stable on x86.
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 1f646907ebf7..45765a6a6d08 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -2,6 +2,7 @@ MD5 5e02a335ddbc436bcef7856ed38948a3 mit-krb5-1.3.4.ebuild 4347
 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
+MD5 5e02a335ddbc436bcef7856ed38948a3 mit-krb5-1.3.5.ebuild 4347
 MD5 79336c040eb2d01caec90ca700897bbd mit-krb5-1.3.3-r1.ebuild 4315
 MD5 e978f7d06b9549f4d5a13be2c36dfe62 ChangeLog 7364
 MD5 43c3a7a1974ef9610bb9458e1a3a4d87 metadata.xml 353
@@ -20,6 +21,7 @@ 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 8f275083c0b04344cbb068d883cda623 files/digest-mit-krb5-1.3.5 60
 MD5 a76969580caa87329b1758711499ca61 files/mit-krb5-1.3.3-aname.patch 6329
 MD5 1a722b032004738cd34e3ed16b8c75ca files/mit-krb5-1.3.4-res_search.patch 8486
 MD5 9c1e5ef724936d4d3922e788bffc70a3 files/mit-krb5-1.3.3-autoheader.patch 694
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.5 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.5
new file mode 100644
index 000000000000..6f4616f34d51
--- /dev/null
+++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.5
@@ -0,0 +1 @@
+MD5 8da4179bfd929eebc9f005fb427db1a0 krb5-1.3.5.tar 6522880
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.1-res_search.patch b/app-crypt/mit-krb5/files/mit-krb5-1.3.1-res_search.patch
deleted file mode 100644
index d87315e7e97f..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.3.1-res_search.patch
+++ /dev/null
@@ -1,245 +0,0 @@
---- 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/files/mit-krb5-1.3.1-res_search.patch.bz2 b/app-crypt/mit-krb5/files/mit-krb5-1.3.1-res_search.patch.bz2
new file mode 100644
index 000000000000..ad5916ffb176
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.1-res_search.patch.bz2
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.3-aname.patch b/app-crypt/mit-krb5/files/mit-krb5-1.3.3-aname.patch
deleted file mode 100644
index 8c79f76aff2a..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.3.3-aname.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-diff -c -r5.39 an_to_ln.c
-*** an_to_ln.c	3 Sep 2002 19:29:34 -0000	5.39
-- --- an_to_ln.c	2 Jun 2004 22:04:21 -0000
-***************
-*** 270,278 ****
-   * If no regcomp() then just return the input string verbatim in the output
-   * string.
-   */
-! static void
-  do_replacement(char *regexp, char *repl, int doall, char *in, char *out)
-  {
-  #if	HAVE_REGCOMP
-      regex_t	match_exp;
-      regmatch_t	match_match;
-- --- 270,283 ----
-   * If no regcomp() then just return the input string verbatim in the output
-   * string.
-   */
-! #define use_bytes(x) \
-!     out_used += (x); \
-!     if (out_used > MAX_FORMAT_BUFFER) goto mem_err
-! 
-! static int
-  do_replacement(char *regexp, char *repl, int doall, char *in, char *out)
-  {
-+     size_t out_used = 0;
-  #if	HAVE_REGCOMP
-      regex_t	match_exp;
-      regmatch_t	match_match;
-***************
-*** 287,303 ****
-  	do {
-  	    if (!regexec(&match_exp, cp, 1, &match_match, 0)) {
-  		if (match_match.rm_so) {
-  		    strncpy(op, cp, match_match.rm_so);
-  		    op += match_match.rm_so;
-  		}
-  		strncpy(op, repl, MAX_FORMAT_BUFFER - 1 - (op - out));
-  		op += strlen(op);
-  		cp += match_match.rm_eo;
-! 		if (!doall)
-  		    strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
-  		matched = 1;
-  	    }
-  	    else {
-  		strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
-  		matched = 0;
-  	    }
-- --- 292,313 ----
-  	do {
-  	    if (!regexec(&match_exp, cp, 1, &match_match, 0)) {
-  		if (match_match.rm_so) {
-+ 		    use_bytes(match_match.rm_so);
-  		    strncpy(op, cp, match_match.rm_so);
-  		    op += match_match.rm_so;
-  		}
-+ 		use_bytes(strlen(repl));
-  		strncpy(op, repl, MAX_FORMAT_BUFFER - 1 - (op - out));
-  		op += strlen(op);
-  		cp += match_match.rm_eo;
-! 		if (!doall) {
-! 		    use_bytes(strlen(cp));
-  		    strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
-+ 		}
-  		matched = 1;
-  	    }
-  	    else {
-+ 		use_bytes(strlen(cp));
-  		strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
-  		matched = 0;
-  	    }
-***************
-*** 322,338 ****
-  	    sdispl = (size_t) (loc1 - cp);
-  	    edispl = (size_t) (loc2 - cp);
-  	    if (sdispl) {
-  		strncpy(op, cp, sdispl);
-  		op += sdispl;
-  	    }
-  	    strncpy(op, repl, MAX_FORMAT_BUFFER - 1 - (op - out));
-  	    op += strlen(repl);
-  	    cp += edispl;
-! 	    if (!doall)
-  		strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
-  	    matched = 1;
-  	}
-  	else {
-  	    strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
-  	    matched = 0;
-  	}
-- --- 332,353 ----
-  	    sdispl = (size_t) (loc1 - cp);
-  	    edispl = (size_t) (loc2 - cp);
-  	    if (sdispl) {
-+ 		use_bytes(sdispl);
-  		strncpy(op, cp, sdispl);
-  		op += sdispl;
-  	    }
-+ 	    use_bytes(strlen(repl));
-  	    strncpy(op, repl, MAX_FORMAT_BUFFER - 1 - (op - out));
-  	    op += strlen(repl);
-  	    cp += edispl;
-! 	    if (!doall) {
-! 		use_bytes(strlen(cp));
-  		strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
-+ 	    }
-  	    matched = 1;
-  	}
-  	else {
-+ 	    use_bytes(strlen(cp));
-  	    strncpy(op, cp, MAX_FORMAT_BUFFER - 1 - (op - out));
-  	    matched = 0;
-  	}
-***************
-*** 340,346 ****
-- --- 355,369 ----
-  #else	/* HAVE_REGEXP_H */
-      memcpy(out, in, MAX_FORMAT_BUFFER);
-  #endif	/* HAVE_REGCOMP */
-+     return 1;
-+  mem_err:
-+ #ifdef HAVE_REGCMP
-+     	regfree(&match_exp);
-+ #endif
-+ 	return 0;
-+ 	
-  }
-+ #undef use_bytes
-  
-  /*
-   * aname_replacer()	- Perform the specified substitutions on the input
-***************
-*** 412,418 ****
-  
-  		    /* Do the replacemenbt */
-  		    memset(out, '\0', MAX_FORMAT_BUFFER);
-! 		    do_replacement(rule, repl, doglobal, in, out);
-  		    free(rule);
-  		    free(repl);
-  
-- --- 435,446 ----
-  
-  		    /* Do the replacemenbt */
-  		    memset(out, '\0', MAX_FORMAT_BUFFER);
-! 		    if (!do_replacement(rule, repl, doglobal, in, out)) {
-! 			free(rule);
-! 		    free(repl);
-! 			kret = KRB5_LNAME_NOTRANS;
-! 			break;
-! 		    }
-  		    free(rule);
-  		    free(repl);
-  
-***************
-*** 459,464 ****
-- --- 487,493 ----
-      char		*fprincname;
-      char		*selstring = 0;
-      int			num_comps, compind;
-+     size_t selstring_used;
-      char		*cout;
-      krb5_data		*datap;
-      char		*outstring;
-***************
-*** 479,484 ****
-- --- 508,514 ----
-  		     */
-  		    current = strchr(current, ':');
-  		    selstring = (char *) malloc(MAX_FORMAT_BUFFER);
-+ 		    selstring_used = 0;
-  		    if (current && selstring) {
-  			current++;
-  			cout = selstring;
-***************
-*** 497,502 ****
-- --- 527,540 ----
-  								  aname,
-  								  compind-1))
-  				    ) {
-+ 				    if ((datap->length < MAX_FORMAT_BUFFER)
-+ 					&&  (selstring_used+datap->length
-+ 					     < MAX_FORMAT_BUFFER)) {
-+ 					selstring_used += datap->length;
-+ 				    } else {
-+ 					kret = ENOMEM;
-+ 					goto errout;
-+ 				    }
-  				    strncpy(cout,
-  					    datap->data,
-  					    (unsigned) datap->length);
-***************
-*** 527,533 ****
-  			else
-  			    kret = KRB5_CONFIG_BADFORMAT;
-  
-! 			if (kret)
-  			    free(selstring);
-  		    }
-  		}
-- --- 565,571 ----
-  			else
-  			    kret = KRB5_CONFIG_BADFORMAT;
-  
-! 			errout: if (kret)
-  			    free(selstring);
-  		    }
-  		}
-***************
-*** 643,649 ****
-      const char		*hierarchy[5];
-      char		**mapping_values;
-      int			i, nvalid;
-!     char		*cp;
-      char		*typep, *argp;
-      unsigned int        lnsize;
-  
-- --- 681,687 ----
-      const char		*hierarchy[5];
-      char		**mapping_values;
-      int			i, nvalid;
-!     char		*cp, *s;
-      char		*typep, *argp;
-      unsigned int        lnsize;
-  
-***************
-*** 677,687 ****
-  
-  		    /* Just use the last one. */
-  		    /* Trim the value. */
-! 		    cp = &mapping_values[nvalid-1]
-! 			[strlen(mapping_values[nvalid-1])];
-! 		    while (isspace((int) (*cp))) cp--;
-! 		    cp++;
-! 		    *cp = '\0';
-  
-  		    /* Copy out the value if there's enough room */
-  		    if (strlen(mapping_values[nvalid-1])+1 <= (size_t) lnsize)
-- --- 715,728 ----
-  
-  		    /* Just use the last one. */
-  		    /* Trim the value. */
-! 		    s = mapping_values[nvalid-1];
-! 		    cp = s + strlen(s);
-! 		    while (cp > s) {
-! 			cp--;
-! 			if (!isspace((int)(*cp)))
-! 			    break;
-! 			*cp = '\0';
-! 		    }
-  
-  		    /* Copy out the value if there's enough room */
-  		    if (strlen(mapping_values[nvalid-1])+1 <= (size_t) lnsize)
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.3-aname.patch.bz2 b/app-crypt/mit-krb5/files/mit-krb5-1.3.3-aname.patch.bz2
new file mode 100644
index 000000000000..6217ced5931b
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.3-aname.patch.bz2
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.3-autoheader.patch b/app-crypt/mit-krb5/files/mit-krb5-1.3.3-autoheader.patch
deleted file mode 100644
index a3e125162807..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.3.3-autoheader.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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.3-autoheader.patch.bz2 b/app-crypt/mit-krb5/files/mit-krb5-1.3.3-autoheader.patch.bz2
new file mode 100644
index 000000000000..123567b253c8
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.3-autoheader.patch.bz2
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
deleted file mode 100644
index d87315e7e97f..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.3.3-res_search.patch
+++ /dev/null
@@ -1,245 +0,0 @@
---- 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/files/mit-krb5-1.3.3-res_search.patch.bz2 b/app-crypt/mit-krb5/files/mit-krb5-1.3.3-res_search.patch.bz2
new file mode 100644
index 000000000000..ad5916ffb176
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.3-res_search.patch.bz2
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
deleted file mode 100644
index a3e125162807..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.3.4-autoheader.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-autoheader.patch.bz2 b/app-crypt/mit-krb5/files/mit-krb5-1.3.4-autoheader.patch.bz2
new file mode 100644
index 000000000000..123567b253c8
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.4-autoheader.patch.bz2
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
deleted file mode 100644
index d87315e7e97f..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.3.4-res_search.patch
+++ /dev/null
@@ -1,245 +0,0 @@
---- 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/files/mit-krb5-1.3.4-res_search.patch.bz2 b/app-crypt/mit-krb5/files/mit-krb5-1.3.4-res_search.patch.bz2
new file mode 100644
index 000000000000..ad5916ffb176
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.4-res_search.patch.bz2
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.5-autoheader.patch.bz2 b/app-crypt/mit-krb5/files/mit-krb5-1.3.5-autoheader.patch.bz2
new file mode 100644
index 000000000000..123567b253c8
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.5-autoheader.patch.bz2
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.5-res_search.patch.bz2 b/app-crypt/mit-krb5/files/mit-krb5-1.3.5-res_search.patch.bz2
new file mode 100644
index 000000000000..ad5916ffb176
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.5-res_search.patch.bz2
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.5-suid_fix.patch.bz2 b/app-crypt/mit-krb5/files/mit-krb5-1.3.5-suid_fix.patch.bz2
new file mode 100644
index 000000000000..41e627f9dc9b
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.5-suid_fix.patch.bz2
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.1-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.1-r1.ebuild
index 747bc29c87ea..1ca2d857ee2e 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.3.1-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1-r1.ebuild,v 1.4 2004/07/14 02:55:51 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.1-r1.ebuild,v 1.5 2004/09/14 10:26:48 aliz Exp $
 
 inherit eutils gnuconfig
 
@@ -25,7 +25,7 @@ PROVIDE="virtual/krb5"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-res_search.patch
+	epatch ${FILESDIR}/${P}-res_search.patch.bz2
 }
 
 src_compile() {
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.1.ebuild
index a2ab9b680255..135ce99ec66b 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.3.1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.14 2004/06/27 21:33:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.1.ebuild,v 1.15 2004/09/14 10:26:48 aliz Exp $
 
 inherit eutils gnuconfig
 
@@ -23,7 +23,7 @@ PROVIDE="virtual/krb5"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-res_search.patch
+	epatch ${FILESDIR}/${P}-res_search.patch.bz2
 }
 
 src_compile() {
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.3-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.3-r1.ebuild
index c817ab067aad..8111b6841ae1 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.3.3-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3-r1.ebuild,v 1.13 2004/07/15 01:11:59 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.3-r1.ebuild,v 1.14 2004/09/14 10:26:48 aliz Exp $
 
 inherit eutils
 
@@ -27,10 +27,10 @@ src_unpack() {
 	unpack ${A}
 	tar -zxf ${MY_P}.tar.gz
 	cd ${S}
-	epatch ${FILESDIR}/${P}-res_search.patch
-	epatch ${FILESDIR}/${P}-autoheader.patch
+	epatch ${FILESDIR}/${P}-res_search.patch.bz2
+	epatch ${FILESDIR}/${P}-autoheader.patch.bz2
 	cd ${S}/lib/krb5/os
-	epatch ${FILESDIR}/${P}-aname.patch
+	epatch ${FILESDIR}/${P}-aname.patch.bz2
 }
 
 src_compile() {
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.3.ebuild
index 036535a3f54c..890fc8fabfaa 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.3.3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.6 2004/06/27 21:33:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.3.ebuild,v 1.7 2004/09/14 10:26:48 aliz Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ src_unpack() {
 	unpack ${A}
 	tar -zxf ${MY_P}.tar.gz
 	cd ${S}
-	epatch ${FILESDIR}/${P}-res_search.patch
+	epatch ${FILESDIR}/${P}-res_search.patch.bz2
 }
 
 src_compile() {
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.4.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.4.ebuild
index 8da0d0af7614..ad508402d3e5 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.3.4.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2004/09/05 20:24:04 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.4.ebuild,v 1.8 2004/09/14 10:26:48 aliz Exp $
 
 inherit eutils
 
@@ -30,8 +30,8 @@ src_unpack() {
 	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
+	epatch ${FILESDIR}/${P}-res_search.patch.bz2
+	epatch ${FILESDIR}/${P}-autoheader.patch.bz2
 }
 
 src_compile() {
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.5.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.5.ebuild
new file mode 100644
index 000000000000..17132bd36741
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.5.ebuild
@@ -0,0 +1,165 @@
+# 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.5.ebuild,v 1.1 2004/09/14 10:26:48 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}/${P}-res_search.patch.bz2
+	epatch ${FILESDIR}/${P}-autoheader.patch.bz2
+	epatch ${FILESDIR}/${P}-suid_fix.patch.bz2
+}
+
+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 ""
+}