25 files changed, 57 insertions, 597 deletions

diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index b4fcaa624b9d..b8adffd10151 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -1,15 +1,14 @@
-# Ports collection Makefile for:	MIT Kerberos V
-# Date created:				6/5/1998
-# Whom:					nectar@FreeBSD.org
+# Ports collection Makefile for:	MIT Kerberos V Application Suite
+# Date created:				4/19/2010
+# Whom:					cy@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-PORTNAME=		krb5
-PORTVERSION=		1.7
-PORTREVISION=	2
+PORTNAME=		krb5-appl
+PORTVERSION=		1.0
 CATEGORIES=		security
-MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
+MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 PATCH_SITES=		http://web.mit.edu/kerberos/advisories/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
 EXTRACT_SUFX=		.tar
@@ -17,14 +16,14 @@ EXTRACT_SUFX=		.tar
 MAINTAINER=		cy@FreeBSD.org
 COMMENT=		An authentication system developed at MIT, successor to Kerberos IV
 
-BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4 \
+			krb5-config:${PORTSDIR}/security/krb5
+LIB_DEPENDS=		krb5support.0:${PORTSDIR}/security/krb5
+RUN_DEPENDS=		kinit:${PORTSDIR}/security/krb5
 
-CONFLICTS=		krb[45]-[0-9]* heimdal-[0-9]* srp-[0-9]*
+CONFLICTS=		krb4-[0-9]* krb5-1.[0-7].* heimdal-[0-9]* srp-[0-9]*
 
-BROKEN=			does not compile
-FORBIDDEN=		MITKRB5-SA-2010-001, MITKRB5-SA-2010-002, and MITKRB5-SA-2010-003.
-
-LATEST_LINK=		${PORTNAME}-17
+LATEST_LINK=		${PORTNAME}-1
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_OPENSSL=		yes
 WITH_OPENSSL_PORT=	yes
@@ -32,7 +31,7 @@ USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
 USE_LDCONFIG=		yes
 USE_AUTOTOOLS=		libtool:22
-CONFIGURE_ARGS?=	--enable-shared
+CONFIGURE_ARGS?=	--enable-shared --with-krb5=${PREFIX}/bin/krb5-config
 CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
 			CFLAGS="${CFLAGS}"
 MAKE_ARGS=		INSTALL="${INSTALL}"
@@ -41,10 +40,7 @@ OPTIONS=		KRB5_RENAME_FTP "Rename ftp to kftp" off \
 			KRB5_RENAME_TELNET "Rename telnet to ktelnet" off \
 			KRB5_RENAME_RLOGIN "Rename rlogin to krlogin" off \
 			KRB5_RENAME_RSH "Rename rsh to krsh" off \
-			KRB5_RENAME_RCP "Rename rcp to krcp" off \
-			KRB5_KRB4_COMPAT "Build and install krb4 compatibility" off \
-			KRB5_DOC "Build and install krb5 documentation" on \
-			WANT_HTML "Want HTML documentation too" on
+			KRB5_RENAME_RCP "Rename rcp to krcp" off
 
 .include <bsd.port.pre.mk>
 
@@ -58,25 +54,15 @@ BUILD_DEPENDS+=		texi2dvi:${PORTSDIR}/print/texinfo \
 INFO=			krb5-admin krb5-install krb5-user
 .endif
 
-.if !defined(WITH_KRB5_KRB4_COMPAT)
-CONFIGURE_ARGS+=	--without-krb4
-PLIST_SUB+=		KRB4="@comment "
-.else
-PLIST_SUB+=		KRB4=""
-.endif
-
 .if defined(KRB5_HOME)
 PREFIX=			${KRB5_HOME}
 .endif
 
-MAN1=			k5srvutil.1 kadmin.1 krb5-send-pr.1 krb5-config.1 \
-			kpasswd.1 klist.1 kinit.1 kdestroy.1 ksu.1 ktutil.1 \
-			sclient.1 rsh.1 rcp.1 rlogin.1 ftp.1 telnet.1 \
-			kerberos.1 kvno.1 compile_et.1
-MAN5=			kdc.conf.5 krb5.conf.5 .k5login.5
-MAN8=			krb5kdc.8 kadmin.local.8 kdb5_util.8 kadmind.8 \
-			kprop.8 kpropd.8 kproplog.8 sserver.8 kshd.8 \
-			klogind.8 login.krb5.8 ftpd.8 telnetd.8
+CFLAGS+=		-I${PREFIX}/include
+LDFLAGS+=		-L${PREFIX}/lib
+
+MAN1=			rsh.1 rcp.1 rlogin.1 ftp.1 telnet.1
+MAN8=			kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8
 
 .if defined(WITH_KRB5_RENAME_FTP)
 MAN1:=			${MAN1:C/ftp/kftp/}
@@ -124,7 +110,7 @@ PLIST_SUB+=		RCP_PROG="rcp"
 CONFIGURE_ARGS+=	--program-transform-name="${PROGRAM_TRANSFORM_NAME}"
 .endif
 
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 HTML_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc
 HTML_DOCS=		ftp.html kdestroy.html kinit.html klist.html \
@@ -144,41 +130,7 @@ post-extract:
 	fi
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e '1s,^#!\/usr\/athena/bin/perl,#!${PERL5},' \
-		${WRKSRC}/../doc/man2html
-
-pre-build:
-.if !defined(KRB5_KRB4_COMPAT)
-	@${ECHO} "------------------------------------------------------"
-	@${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build   "
-	@${ECHO} "the KerberosIV compatibility libraries.               "
-	@${ECHO} "------------------------------------------------------"
-.endif
-
-post-build:
-.if defined(WITH_KRB5_DOC)
-	@cd ${WRKSRC}/../doc && \
-	${MAKE} all
-.endif
-
 post-install:
-	@${MKDIR} ${PREFIX}/share/doc/krb5
-# html documentation
-.if defined(WITH_KRB5_DOC) && defined(WITH_WANT_HTML)
-	for html in ${HTML_DOC_DIR}/*.html; do \
-		${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \
-		${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \
-	done
-.endif
-	${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}
-# handle info files
-.if defined(WITH_KRB5_DOC)
-.for info in ${INFO}
-	${INSTALL_MAN} ${WRKSRC}/../doc/${info}.info ${PREFIX}/info/${info}.info
-.endfor
-.endif
-
 	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${ECHO} "------------------------------------------------------"
diff --git a/security/krb5-appl/distinfo b/security/krb5-appl/distinfo
index aef68fcdf9a2..f942e6cc2f7d 100644
--- a/security/krb5-appl/distinfo
+++ b/security/krb5-appl/distinfo
@@ -1,3 +1,3 @@
-MD5 (krb5-1.7-signed.tar) = 9f7b3402b4731a7fa543db193bf1b564
-SHA256 (krb5-1.7-signed.tar) = a370cae8386e8b82b309c44a220542af78cbcbb42028fb3c2224eae6dba1ffd5
-SIZE (krb5-1.7-signed.tar) = 12226560
+MD5 (krb5-appl-1.0-signed.tar) = 567e941ba7633ab3c69e53b956323ce8
+SHA256 (krb5-appl-1.0-signed.tar) = 19cbb16725a8edbb2c16ebbfb5973be07834458ec39376dec2b6f2cb6c36ff69
+SIZE (krb5-appl-1.0-signed.tar) = 634880
diff --git a/security/krb5-appl/files/patch-ac b/security/krb5-appl/files/patch-ac
deleted file mode 100644
index 8bca5437d964..000000000000
--- a/security/krb5-appl/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/admin.texinfo	Fri Feb  6 21:40:56 1998
-+++ admin.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-admin.info
- @settitle Kerberos V5 System Administrator's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Admin Guide: (krb5-admin).            Kerberos V5 System Admin's Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-appl/files/patch-ad b/security/krb5-appl/files/patch-ad
deleted file mode 100644
index c8b6d3e99e91..000000000000
--- a/security/krb5-appl/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/user-guide.texinfo	Fri Feb  6 21:40:58 1998
-+++ user-guide.texinfo	Fri Jun 19 15:13:45 1998
-@@ -3,6 +3,10 @@
- @c guide
- @setfilename krb5-user.info
- @settitle Kerberos V5 UNIX User's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* User's Guide: (krb5-user).             Kerberos V5 UNIX User's Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-appl/files/patch-ae b/security/krb5-appl/files/patch-ae
deleted file mode 100644
index f5643b5aa04f..000000000000
--- a/security/krb5-appl/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/install.texinfo	Fri Feb  6 21:40:56 1998
-+++ install.texinfo	Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-install.info
- @settitle Kerberos V5 Installation Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Installation Guide: (krb5-install).    Kerberos V5 Installation Guide
-+@end direntry
- @setchapternewpage odd                  @c chapter begins on next odd page
- @c @setchapternewpage on                   @c chapter begins on next page
- @c @smallbook                              @c Format for 7" X 9.25" paper
diff --git a/security/krb5-appl/files/patch-ai b/security/krb5-appl/files/patch-ai
index 3588a76ed199..a8860362805b 100644
--- a/security/krb5-appl/files/patch-ai
+++ b/security/krb5-appl/files/patch-ai
@@ -1,5 +1,5 @@
---- appl/gssftp/ftpd/ftpd.c.orig	Wed Jan  9 14:26:51 2002
-+++ appl/gssftp/ftpd/ftpd.c	Thu Jan 10 19:00:13 2002
+--- gssftp/ftpd/ftpd.c.orig	Wed Jan  9 14:26:51 2002
++++ gssftp/ftpd/ftpd.c	Thu Jan 10 19:00:13 2002
 @@ -487,7 +487,13 @@
  #ifndef LOG_DAEMON
  #define LOG_DAEMON 0
diff --git a/security/krb5-appl/files/patch-aj b/security/krb5-appl/files/patch-aj
index c3bb8dfd6960..997041c77f9e 100644
--- a/security/krb5-appl/files/patch-aj
+++ b/security/krb5-appl/files/patch-aj
@@ -1,5 +1,5 @@
-*** appl/gssftp/ftpd/logwtmp.c.ORIG	Fri Feb  6 19:41:25 1998
---- appl/gssftp/ftpd/logwtmp.c	Tue Jun 30 19:46:01 1998
+*** gssftp/ftpd/logwtmp.c.ORIG	Fri Feb  6 19:41:25 1998
+--- gssftp/ftpd/logwtmp.c	Tue Jun 30 19:46:01 1998
 ***************
 *** 66,72 ****
   	struct stat buf;
diff --git a/security/krb5-appl/files/patch-appl::bsd::Makefile.in b/security/krb5-appl/files/patch-appl::bsd::Makefile.in
index 581048933264..2b7510072d90 100644
--- a/security/krb5-appl/files/patch-appl::bsd::Makefile.in
+++ b/security/krb5-appl/files/patch-appl::bsd::Makefile.in
@@ -1,5 +1,5 @@
---- appl/bsd/Makefile.in.orig	Wed Feb 28 14:06:43 2001
-+++ appl/bsd/Makefile.in	Mon Dec 31 21:52:45 2001
+--- bsd/Makefile.in.orig	Wed Feb 28 14:06:43 2001
++++ bsd/Makefile.in	Mon Dec 31 21:52:45 2001
 @@ -31,8 +31,8 @@
  	-DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\"
  
diff --git a/security/krb5-appl/files/patch-appl::bsd::klogind.M b/security/krb5-appl/files/patch-appl::bsd::klogind.M
index 48544cba8955..1d48bb21db10 100644
--- a/security/krb5-appl/files/patch-appl::bsd::klogind.M
+++ b/security/krb5-appl/files/patch-appl::bsd::klogind.M
@@ -1,5 +1,5 @@
---- appl/bsd/klogind.M.orig	2008-12-15 12:29:01.000000000 -0800
-+++ appl/bsd/klogind.M	2009-08-28 13:13:28.000000000 -0700
+--- bsd/klogind.M.orig	2008-12-15 12:29:01.000000000 -0800
++++ bsd/klogind.M	2009-08-28 13:13:28.000000000 -0700
 @@ -13,7 +13,7 @@
  .B \-rcpPef
  ]
diff --git a/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h b/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h
index 256e929aa68f..efb2721cd5e8 100644
--- a/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h
+++ b/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h
@@ -1,5 +1,5 @@
---- appl/gssftp/ftp/ftp_var.h.orig	Tue Jun 17 02:37:40 2003
-+++ appl/gssftp/ftp/ftp_var.h	Sat Aug 30 05:30:44 2003
+--- gssftp/ftp/ftp_var.h.orig	Tue Jun 17 02:37:40 2003
++++ gssftp/ftp/ftp_var.h	Sat Aug 30 05:30:44 2003
 @@ -33,6 +33,10 @@
   *	@(#)ftp_var.h	5.9 (Berkeley) 6/1/90
   */
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in b/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in
index cb5a0e26d49d..784cf5991d94 100644
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in
+++ b/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in
@@ -1,11 +1,11 @@
---- appl/telnet/telnetd/Makefile.in.orig	Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/Makefile.in	Mon Dec 31 21:51:19 2001
+--- telnet/telnetd/Makefile.in.orig	Wed Feb 28 14:06:51 2001
++++ telnet/telnetd/Makefile.in	Mon Dec 31 21:51:19 2001
 @@ -24,7 +24,7 @@
  #	@(#)Makefile.generic	5.5 (Berkeley) 3/1/91
  #
  
--AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
+-AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\"
 +AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"/usr/bin/login\"
  OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
  LOCALINCLUDES=-I.. -I$(srcdir)/..
- DEFINES = $(AUTH_DEF) $(OTHERDEFS)
+ DEFINES = -DTELNET_BUFSIZE=65535 $(AUTH_DEF) $(OTHERDEFS)
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8 b/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8
index 951ee0d5692a..fc9068bd71f4 100644
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8
+++ b/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8
@@ -1,5 +1,5 @@
---- appl/telnet/telnetd/telnetd.8.orig	Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/telnetd.8	Mon Dec 31 21:16:55 2001
+--- telnet/telnetd/telnetd.8.orig	Wed Feb 28 14:06:51 2001
++++ telnet/telnetd/telnetd.8	Mon Dec 31 21:16:55 2001
 @@ -43,7 +43,7 @@
  [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP]
  [\fB\-S\fP \fItos\fP] [\fB\-U\fP] [\fB\-X\fP \fIauthtype\fP]
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c b/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
index 8bb656dc0673..2e754e7294ba 100644
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
+++ b/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
@@ -1,5 +1,5 @@
---- appl/telnet/telnetd/utility.c.orig	Wed Jan  9 14:26:59 2002
-+++ appl/telnet/telnetd/utility.c	Fri Jan 11 13:10:33 2002
+--- telnet/telnetd/utility.c.orig	Wed Jan  9 14:26:59 2002
++++ telnet/telnetd/utility.c	Fri Jan 11 13:10:33 2002
 @@ -408,18 +408,25 @@
  int
  netwrite(const char *buf, size_t len)
diff --git a/security/krb5-appl/files/patch-as b/security/krb5-appl/files/patch-as
deleted file mode 100644
index de19886eac08..000000000000
--- a/security/krb5-appl/files/patch-as
+++ /dev/null
@@ -1,195 +0,0 @@
---- clients/ksu/main.c.orig	Wed Aug 14 12:14:49 2002
-+++ clients/ksu/main.c	Tue Jul 29 18:46:00 2003
-@@ -32,6 +32,10 @@
- #include <signal.h>
- #include <grp.h>
- 
-+#ifdef LOGIN_CAP
-+#include <login_cap.h>
-+#endif
-+
- /* globals */
- char * prog_name;
- int auth_debug =0;     
-@@ -61,7 +65,7 @@
-    ill specified arguments to commands */        
- 
- void usage (){
--    fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
-+    fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
- }
- 
- /* for Ultrix and friends ... */
-@@ -77,6 +81,7 @@
-     int argc;
-     char ** argv;
- { 
-+    int asme = 0;
-     int hp =0;
-     int some_rest_copy = 0;	
-     int all_rest_copy = 0;	
-@@ -91,6 +96,7 @@
-     char * cc_target_tag = NULL; 
-     char * target_user = NULL;
-     char * source_user;
-+    char * source_shell;
-     
-     krb5_ccache cc_source = NULL;
-     const char * cc_source_tag = NULL; 
-@@ -117,6 +123,11 @@
-     krb5_principal  kdc_server;
-     krb5_boolean zero_password;
-     char * dir_of_cc_target;     
-+
-+#ifdef LOGIN_CAP
-+    login_cap_t *lc;
-+    int setwhat;
-+#endif
-     
-     options.opt = KRB5_DEFAULT_OPTIONS;
-     options.lifetime = KRB5_DEFAULT_TKT_LIFE;
-@@ -181,7 +192,7 @@
- 	com_err (prog_name, errno, "while setting euid to source user");
- 	exit (1);
-     }
--    while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkql:e:")) != -1)){
-+    while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkmql:e:")) != -1)){
- 	switch (option) {
- 	case 'r':
- 	    options.opt |= KDC_OPT_RENEWABLE;
-@@ -227,6 +238,9 @@
- 		errflg++;
- 	    }
- 	    break;
-+	case 'm':
-+	    asme = 1;
-+	    break;
- 	case 'n': 
- 	    if ((retval = krb5_parse_name(ksu_context, optarg, &client))){
- 		com_err(prog_name, retval, "when parsing name %s", optarg); 
-@@ -341,6 +355,7 @@
-     
-     /* allocate space and copy the usernamane there */        
-     source_user = xstrdup(pwd->pw_name);
-+    source_shell = xstrdup(pwd->pw_shell);
-     source_uid = pwd->pw_uid;
-     source_gid = pwd->pw_gid;
-     
-@@ -672,43 +687,64 @@
-     /* get the shell of the user, this will be the shell used by su */      
-     target_pwd = getpwnam(target_user);
-     
--    if (target_pwd->pw_shell)
--	shell = xstrdup(target_pwd->pw_shell);
--    else {
--	shell = _DEF_CSH;  /* default is cshell */   
-+    if (asme) {
-+	if (source_shell && *source_shell) {
-+	    shell = strdup(source_shell);
-+	} else {
-+	    shell = _DEF_CSH;
-+	}
-+    } else {
-+	if (target_pwd->pw_shell)
-+	    shell = strdup(target_pwd->pw_shell);
-+	else {
-+	    shell = _DEF_CSH;  /* default is cshell */
-+	}
-     }
-     
- #ifdef HAVE_GETUSERSHELL
-     
-     /* insist that the target login uses a standard shell (root is omited) */ 
-     
--    if (!standard_shell(target_pwd->pw_shell) && source_uid) {
--	fprintf(stderr, "ksu: permission denied (shell).\n");
--	sweep_up(ksu_context, cc_target);
--	exit(1);
-+    if (asme) {
-+	if (!standard_shell(pwd->pw_shell) && source_uid) {
-+	    fprintf(stderr, "ksu: permission denied (shell).\n");
-+	    sweep_up(ksu_context, cc_target);
-+	    exit(1);
-+	}
-+    } else {
-+	if (!standard_shell(target_pwd->pw_shell) && source_uid) {
-+	    fprintf(stderr, "ksu: permission denied (shell).\n");
-+	    sweep_up(ksu_context, cc_target);
-+	    exit(1);
-+	}
-     }
- #endif /* HAVE_GETUSERSHELL */
-     
--    if (target_pwd->pw_uid){
--	
--	if(set_env_var("USER", target_pwd->pw_name)){
-+    if (!asme) {
-+	if (target_pwd->pw_uid){
-+	    if (set_env_var("USER", target_pwd->pw_name)){
-+		fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+		sweep_up(ksu_context, cc_target);
-+		exit(1);
-+	    }
-+	}
-+    
-+	if (set_env_var( "HOME", target_pwd->pw_dir)){
- 	    fprintf(stderr,"ksu: couldn't set environment variable USER\n");
- 	    sweep_up(ksu_context, cc_target);
- 	    exit(1);
--	} 			
--    }	
--    
--    if(set_env_var( "HOME", target_pwd->pw_dir)){
--	fprintf(stderr,"ksu: couldn't set environment variable USER\n");
--	sweep_up(ksu_context, cc_target);
--	exit(1);
--    } 			
-+	}
-     
--    if(set_env_var( "SHELL", shell)){
--	fprintf(stderr,"ksu: couldn't set environment variable USER\n");
--	sweep_up(ksu_context, cc_target);
--	exit(1);
--    } 			
-+	if (set_env_var( "SHELL", shell)){
-+	    fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+	    sweep_up(ksu_context, cc_target);
-+	    exit(1);
-+	}
-+    }
-+
-+#ifdef LOGIN_CAP
-+       lc = login_getpwclass(pwd);
-+#endif
-     
-     /* set the cc env name to target */         	
-     
-@@ -718,7 +754,19 @@
- 	sweep_up(ksu_context, cc_target);
- 	exit(1);
-     } 			
--    
-+   
-+#ifdef LOGIN_CAP
-+    setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY;
-+    setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV;
-+    /*
-+     * Don't touch resource/priority settings if -m has been
-+     * used or -l and -c hasn't, and we're not su'ing to root.
-+     */
-+    if (target_pwd->pw_uid)
-+	setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES);
-+    if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0)
-+	err(1, "setusercontext");
-+#else
-     /* set permissions */
-     if (setgid(target_pwd->pw_gid) < 0) {
- 	perror("ksu: setgid");
-@@ -759,6 +807,7 @@
- 	sweep_up(ksu_context, cc_target);
- 	exit(1);
-     }   
-+#endif
-     
-     if (access( cc_target_tag_tmp, R_OK | W_OK )){
- 	com_err(prog_name, errno,
diff --git a/security/krb5-appl/files/patch-av b/security/krb5-appl/files/patch-av
deleted file mode 100644
index 8363b8bb1e2d..000000000000
--- a/security/krb5-appl/files/patch-av
+++ /dev/null
@@ -1,15 +0,0 @@
-*** clients/ksu/Makefile.in.ORIG	Sun Aug  2 16:51:18 1998
---- clients/ksu/Makefile.in	Sun Aug  2 16:53:48 1998
-***************
-*** 3,7 ****
-  mydir=ksu
-  BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
-  CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-  
---- 3,7 ----
-  mydir=ksu
-  BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"'
-  CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-  
diff --git a/security/krb5-appl/files/patch-ax b/security/krb5-appl/files/patch-ax
deleted file mode 100644
index 6cbb8289f93e..000000000000
--- a/security/krb5-appl/files/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/Makefile.orig	2007-09-17 20:36:09.000000000 -0700
-+++ ../doc/Makefile	2007-10-25 14:04:48.000000000 -0700
-@@ -1,8 +1,8 @@
- SRCDIR=../src
--DVI=texi2dvi4a2ps	# texi2dvi
-+DVI=texi2dvi	# texi2dvi
- DVIPS=dvips -o "$@"
- PSPDF=ps2pdf
--INFO=makeinfo
-+INFO=makeinfo --no-validate --no-split
- HTML=makeinfo --html --no-split
- RM=rm -f
- TAR=tar -chvf
diff --git a/security/krb5-appl/files/patch-ay b/security/krb5-appl/files/patch-ay
index a2141724855b..262474d0b4a7 100644
--- a/security/krb5-appl/files/patch-ay
+++ b/security/krb5-appl/files/patch-ay
@@ -1,25 +1,24 @@
---- appl/libpty/getpty.c.orig	Wed Jan  9 14:28:37 2002
-+++ appl/libpty/getpty.c	Thu Jan 10 21:30:40 2002
-@@ -24,14 +24,27 @@
- #include "libpty.h"
+--- libpty/getpty.c.orig	2009-11-05 12:15:06.000000000 -0800
++++ libpty/getpty.c	2010-04-21 21:36:45.637180364 -0700
+@@ -23,13 +23,26 @@
  #include "pty-int.h"
- #include "k5-platform.h"
+ #include <k5-platform.h>
  
 +#ifdef __FreeBSD__
-+#define PTYCHARS1	"pqrsPQRS"
-+#define PTYCHARS2	"0123456789abcdefghijklmnopqrstuv"
++#define PTYCHARS1      "pqrsPQRS"
++#define PTYCHARS2      "0123456789abcdefghijklmnopqrstuv"
 +#endif
 +
 +#ifndef PTYCHARS1
-+#define PTYCHARS1	"pqrstuvwxyzPQRST"
++#define PTYCHARS1      "pqrstuvwxyzPQRST"
 +#endif
 +
 +#ifndef PTYCHARS2
-+#define PTYCHARS2	"0123456789abcdef"
++#define PTYCHARS2      "0123456789abcdef"
 +#endif
 +
  long
- ptyint_getpty_ext(int *fd, char *slave, int slavelength, int do_grantpt)
+ ptyint_getpty_ext(int *fd, char *slave, size_t slavelength, int do_grantpt)
  {
 +    int ptynum;
 +    char *cp1, *cp2;
@@ -30,7 +29,7 @@
      struct stat stb;
      char slavebuf[1024];
  #endif
-@@ -115,14 +128,14 @@
+@@ -112,14 +125,14 @@
  	strncpy(slave, slavebuf, slavelength);
  	return 0;
      } else {
diff --git a/security/krb5-appl/files/patch-ba b/security/krb5-appl/files/patch-ba
index dd0c760df7d2..e8e44ac0cd9b 100644
--- a/security/krb5-appl/files/patch-ba
+++ b/security/krb5-appl/files/patch-ba
@@ -1,5 +1,5 @@
---- appl/bsd/login.c.orig	Tue May 27 21:06:25 2003
-+++ appl/bsd/login.c	Tue Jul 29 20:52:25 2003
+--- bsd/login.c.orig	Tue May 27 21:06:25 2003
++++ bsd/login.c	Tue Jul 29 20:52:25 2003
 @@ -1342,19 +1342,6 @@
  		setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
  	    }
diff --git a/security/krb5-appl/files/patch-bb b/security/krb5-appl/files/patch-bb
index 6545ae682c53..915db004a33f 100644
--- a/security/krb5-appl/files/patch-bb
+++ b/security/krb5-appl/files/patch-bb
@@ -1,5 +1,5 @@
---- appl/telnet/telnet/Makefile.in.orig	Sat Dec 18 10:47:05 1999
-+++ appl/telnet/telnet/Makefile.in	Sat Dec 18 10:47:13 1999
+--- telnet/telnet/Makefile.in.orig	Sat Dec 18 10:47:05 1999
++++ telnet/telnet/Makefile.in	Sat Dec 18 10:47:13 1999
 @@ -58,7 +58,6 @@
  	  $(INSTALL_DATA) $(srcdir)/$$f.1 \
  		${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
diff --git a/security/krb5-appl/files/patch-config::pre.in b/security/krb5-appl/files/patch-config::pre.in
deleted file mode 100644
index bdd183e98ad4..000000000000
--- a/security/krb5-appl/files/patch-config::pre.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/pre.in.orig	Fri Nov 19 13:47:51 2004
-+++ config/pre.in	Thu Jan 27 17:43:12 2005
-@@ -177,7 +177,7 @@
- INSTALL=@INSTALL@
- INSTALL_STRIP=
- INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
--INSTALL_SCRIPT=@INSTALL_PROGRAM@
-+INSTALL_SCRIPT=@INSTALL_SCRIPT@
- INSTALL_DATA=@INSTALL_DATA@
- INSTALL_SHLIB=@INSTALL_SHLIB@
- INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
diff --git a/security/krb5-appl/files/patch-config::shlib.conf b/security/krb5-appl/files/patch-config::shlib.conf
deleted file mode 100644
index c8a3d391a103..000000000000
--- a/security/krb5-appl/files/patch-config::shlib.conf
+++ /dev/null
@@ -1,32 +0,0 @@
---- config/shlib.conf.orig	2008-12-08 14:33:07.000000000 -0800
-+++ config/shlib.conf	2009-08-28 13:27:39.000000000 -0700
-@@ -299,24 +299,17 @@
- 	;;
- 
- *-*-freebsd*)
--	if test -x /usr/bin/objformat ; then
--		objformat=`/usr/bin/objformat`
--	else
--		objformat="aout"
--	fi
--	PICFLAGS=-fpic
--	if test "x$objformat" = "xelf" ; then
-+	case $krb5_cv_host in
-+	sparc64-*)      PICFLAGS=-fPIC;;
-+	*)              PICFLAGS=-fpic;;
-+	esac
- 		SHLIBVEXT='.so.$(LIBMAJOR)'
-+		LDCOMBINE="libtool --mode=link cc -Xcompiler -shared"
- 		RPATH_FLAG='-Wl,-rpath -Wl,'
--	else
--		RPATH_FLAG=-R
--		SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
--	fi
- 	PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
- 	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
- 	CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
- 	SHLIBEXT=.so
--	LDCOMBINE='ld -Bshareable'
- 	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
- 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
- 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
diff --git a/security/krb5-appl/files/patch-lib-krb5-os-localaddr.c b/security/krb5-appl/files/patch-lib-krb5-os-localaddr.c
deleted file mode 100644
index d8956daea367..000000000000
--- a/security/krb5-appl/files/patch-lib-krb5-os-localaddr.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- lib/krb5/os/localaddr.c.orig	2009-02-18 10:14:48.000000000 -0800
-+++ lib/krb5/os/localaddr.c	2009-08-28 13:37:41.000000000 -0700
-@@ -173,6 +173,7 @@
- }
- #endif
- 
-+#if 0
- static int
- is_loopback_address(struct sockaddr *sa)
- {
-@@ -189,6 +190,7 @@
- 	return 0;
-     }
- }
-+#endif
- 
- #ifdef HAVE_IFADDRS_H
- #include <ifaddrs.h>
-@@ -464,12 +466,14 @@
- 	    ifp->ifa_flags &= ~IFF_UP;
- 	    continue;
- 	}
-+#if 0
- 	if (is_loopback_address(ifp->ifa_addr)) {
- 	    /* Pretend it's not up, so the second pass will skip
- 	       it.  */
- 	    ifp->ifa_flags &= ~IFF_UP;
- 	    continue;
- 	}
-+#endif
- 	/* If this address is a duplicate, punt.  */
- 	match = 0;
- 	for (ifp2 = ifp_head; ifp2 && ifp2 != ifp; ifp2 = ifp2->ifa_next) {
-@@ -598,11 +602,13 @@
- 	    }
- 	    /*@=moduncon@*/
- 
-+#if 0
- 	    /* None of the current callers want loopback addresses.  */
- 	    if (is_loopback_address((struct sockaddr *)&lifr->lifr_addr)) {
- 		Tprintf (("  loopback\n"));
- 		goto skip;
- 	    }
-+#endif
- 	    /* Ignore interfaces that are down.  */
- 	    if ((lifreq.lifr_flags & IFF_UP) == 0) {
- 		Tprintf (("  down\n"));
-@@ -769,11 +775,13 @@
- 	    }
- 	    /*@=moduncon@*/
- 
-+#if 0
- 	    /* None of the current callers want loopback addresses.  */
- 	    if (is_loopback_address(&lifr->iflr_addr)) {
- 		Tprintf (("  loopback\n"));
- 		goto skip;
- 	    }
-+#endif
- 	    /* Ignore interfaces that are down.  */
- 	    if ((lifreq.iflr_flags & IFF_UP) == 0) {
- 		Tprintf (("  down\n"));
-@@ -984,11 +992,13 @@
- 	}
- 	/*@=moduncon@*/
- 
-+#if 0
- 	/* None of the current callers want loopback addresses.  */
- 	if (is_loopback_address(&ifreq.ifr_addr)) {
- 	    Tprintf (("  loopback\n"));
- 	    goto skip;
- 	}
-+#endif
- 	/* Ignore interfaces that are down.  */
- 	if ((ifreq.ifr_flags & IFF_UP) == 0) {
- 	    Tprintf (("  down\n"));
diff --git a/security/krb5-appl/files/patch-lib::gssapi::krb5::import_name.c b/security/krb5-appl/files/patch-lib::gssapi::krb5::import_name.c
deleted file mode 100644
index 40f116af2196..000000000000
--- a/security/krb5-appl/files/patch-lib::gssapi::krb5::import_name.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/gssapi/krb5/import_name.c.orig	Mon Jul 18 15:12:42 2005
-+++ lib/gssapi/krb5/import_name.c	Tue Nov  8 09:53:58 2005
-@@ -33,6 +33,11 @@
- #endif
- #endif
- 
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500100
-+#include <stdio.h>
-+#endif
-+
- #ifdef HAVE_STRING_H
- #include <string.h>
- #else
diff --git a/security/krb5-appl/pkg-descr b/security/krb5-appl/pkg-descr
index d11e2e6d1c15..f261a1cdf166 100644
--- a/security/krb5-appl/pkg-descr
+++ b/security/krb5-appl/pkg-descr
@@ -1,4 +1,6 @@
 Kerberos V5 is an authentication system developed at MIT.  
+This package/port contains the applications which used to be in the
+MIT Kerberos distribution.
 WWW: http://web.mit.edu/kerberos/
 
 Abridged from the User Guide:
diff --git a/security/krb5-appl/pkg-plist b/security/krb5-appl/pkg-plist
index bb3f01f28121..00ae2b3a2f07 100644
--- a/security/krb5-appl/pkg-plist
+++ b/security/krb5-appl/pkg-plist
@@ -1,109 +1,10 @@
-bin/compile_et
 bin/%%FTP_PROG%%
-bin/gss-client
-bin/k5srvutil
-bin/kadmin
-bin/kdestroy
-bin/kinit
-bin/klist
-bin/kpasswd
-bin/krb5-config
-bin/ksu
-bin/ktutil
-bin/kvno
 bin/%%RCP_PROG%%
 bin/%%RLOGIN_PROG%%
 bin/%%RSH_PROG%%
-bin/sclient
-bin/sim_client
 bin/%%TELNET_PROG%%
-bin/uuclient
-include/com_err.h
-include/gssapi.h
-include/gssapi/gssapi.h
-include/gssapi/gssapi_ext.h
-include/gssapi/gssapi_generic.h
-include/gssapi/gssapi_krb5.h
-include/gssapi/mechglue.h
-include/gssrpc/auth.h
-include/gssrpc/auth_gss.h
-include/gssrpc/auth_gssapi.h
-include/gssrpc/auth_unix.h
-include/gssrpc/clnt.h
-include/gssrpc/netdb.h
-include/gssrpc/pmap_clnt.h
-include/gssrpc/pmap_prot.h
-include/gssrpc/pmap_rmt.h
-include/gssrpc/rename.h
-include/gssrpc/rpc.h
-include/gssrpc/rpc_msg.h
-include/gssrpc/svc.h
-include/gssrpc/svc_auth.h
-include/gssrpc/types.h
-include/gssrpc/xdr.h
-include/krb5.h
-include/krb5/krb5.h
-include/krb5/locate_plugin.h
-include/kadm5/admin.h
-include/kadm5/chpass_util_strings.h
-include/kadm5/kadm_err.h
-include/kdb.h
-include/profile.h
-lib/libcom_err.so
-lib/libcom_err.so.3
-lib/libgssapi_krb5.so
-lib/libgssapi_krb5.so.2
-lib/libgssrpc.so
-lib/libgssrpc.so.4
-lib/libk5crypto.so
-lib/libk5crypto.so.3
-lib/libkadm5clnt.so
-lib/libkadm5clnt.so.6
-lib/libkadm5srv.so
-lib/libkadm5srv.so.6
-lib/libkdb5.so
-lib/libkdb5.so.4
-lib/libkrb5.so
-lib/libkrb5.so.3
-lib/libkrb5support.so
-lib/libkrb5support.so.0
-lib/krb5/plugins/kdb/db2.so
-lib/krb5/plugins/preauth/encrypted_challenge.so
-lib/krb5/plugins/preauth/pkinit.so
 sbin/%%FTP_PROG%%d
-sbin/gss-server
-sbin/kadmin.local
-sbin/kadmind
-sbin/kdb5_util
 sbin/klogind
-sbin/kprop
-sbin/kpropd
-sbin/kproplog
-sbin/krb5-send-pr
-sbin/krb5kdc
 sbin/kshd
 sbin/login.krb5
-sbin/sim_server
-sbin/sserver
 sbin/%%TELNET_PROG%%d
-sbin/uuserver
-share/doc/krb5/README.FreeBSD
-share/et/et_c.awk
-share/et/et_h.awk
-share/examples/krb5/kdc.conf
-share/examples/krb5/krb5.conf
-share/examples/krb5/services.append
-share/gnats/mit
-@dirrm lib/krb5/plugins/preauth
-@dirrm lib/krb5/plugins/libkrb5
-@dirrm lib/krb5/plugins/kdb
-@dirrm lib/krb5/plugins/authdata
-@dirrm lib/krb5/plugins
-@dirrm lib/krb5
-@dirrm include/gssapi
-@dirrm include/gssrpc
-@dirrm include/krb5
-@dirrm include/kadm5
-@dirrm share/et
-@dirrmtry share/gnats
-@dirrm share/examples/krb5