3 files changed, 8 insertions, 100 deletions

diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index 05c8e3c2d67e..2f3689386901 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=		krb5
-PORTVERSION=		1.4
+PORTVERSION=		1.4.1
 CATEGORIES=		security
-MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION}/
+MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/\.[0-9]*$/&/:C/\.[0-9]*$//}/
 EXTRACT_SUFX=		.tar
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
 
@@ -57,7 +57,10 @@ MAN5=			kdc.conf.5 krb5.conf.5 .k5login.5
 MAN8=			krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
 			ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \
 			kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8 \
-			k5srvutil.8 krb524d.8
+			k5srvutil.8
+.if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
+MAN8+=			krb524d.8
+.endif
 
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
diff --git a/security/krb5-17/distinfo b/security/krb5-17/distinfo
index fdd372887903..e956dd2b35a8 100644
--- a/security/krb5-17/distinfo
+++ b/security/krb5-17/distinfo
@@ -1,2 +1,2 @@
-MD5 (krb5-1.4-signed.tar) = 2fa56607677544e3a27b42f7cfa1155b
-SIZE (krb5-1.4-signed.tar) = 6625280
+MD5 (krb5-1.4.1-signed.tar) = 617e0071fa5b74ab4116f064678af551
+SIZE (krb5-1.4.1-signed.tar) = 6666240
diff --git a/security/krb5-17/files/patch-appl::telnet::telnet::telnet.c b/security/krb5-17/files/patch-appl::telnet::telnet::telnet.c
deleted file mode 100644
index 29f0d2c5ec40..000000000000
--- a/security/krb5-17/files/patch-appl::telnet::telnet::telnet.c
+++ /dev/null
@@ -1,95 +0,0 @@
-Index: appl/telnet/telnet/telnet.c
-===================================================================
-RCS file: appl/telnet/telnet/telnet.c,v
-retrieving revision 5.18
-diff -c -r5.18 telnet.c
-*** telnet.c	15 Nov 2002 20:21:35 -0000	5.18
---- telnet.c	15 Mar 2005 18:59:32 -0000
-***************
-*** 1475,1480 ****
---- 1475,1482 ----
-  	unsigned char flags;
-  	cc_t value;
-  {
-+ 	if ((slc_replyp - slc_reply) + 6 > sizeof(slc_reply))
-+ 		return;
-  	if ((*slc_replyp++ = func) == IAC)
-  		*slc_replyp++ = IAC;
-  	if ((*slc_replyp++ = flags) == IAC)
-***************
-*** 1488,1498 ****
-  {
-      register int len;
-  
--     *slc_replyp++ = IAC;
--     *slc_replyp++ = SE;
-      len = slc_replyp - slc_reply;
-!     if (len <= 6)
-  	return;
-      if (NETROOM() > len) {
-  	ring_supply_data(&netoring, slc_reply, slc_replyp - slc_reply);
-  	printsub('>', &slc_reply[2], slc_replyp - slc_reply - 2);
---- 1490,1501 ----
-  {
-      register int len;
-  
-      len = slc_replyp - slc_reply;
-!     if (len <= 4 || (len + 2 > sizeof(slc_reply)))
-  	return;
-+     *slc_replyp++ = IAC;
-+     *slc_replyp++ = SE;
-+     len += 2;
-      if (NETROOM() > len) {
-  	ring_supply_data(&netoring, slc_reply, slc_replyp - slc_reply);
-  	printsub('>', &slc_reply[2], slc_replyp - slc_reply - 2);
-***************
-*** 1645,1650 ****
---- 1648,1654 ----
-  	register unsigned char *ep;
-  {
-  	register unsigned char *vp, c;
-+ 	unsigned int len, olen, elen;
-  
-  	if (opt_reply == NULL)		/*XXX*/
-  		return;			/*XXX*/
-***************
-*** 1662,1680 ****
-  		return;
-  	}
-  	vp = env_getvalue(ep);
-! 	if (opt_replyp + (vp ? strlen((char *)vp) : 0) +
-! 				strlen((char *)ep) + 6 > opt_replyend)
-  	{
-! 		register unsigned int len;
-! 		opt_replyend += OPT_REPLY_SIZE;
-! 		len = opt_replyend - opt_reply;
-  		opt_reply = (unsigned char *)realloc(opt_reply, len);
-  		if (opt_reply == NULL) {
-  /*@*/			printf("env_opt_add: realloc() failed!!!\n");
-  			opt_reply = opt_replyp = opt_replyend = NULL;
-  			return;
-  		}
-! 		opt_replyp = opt_reply + len - (opt_replyend - opt_replyp);
-  		opt_replyend = opt_reply + len;
-  	}
-  	if (opt_welldefined((char *) ep))
---- 1666,1684 ----
-  		return;
-  	}
-  	vp = env_getvalue(ep);
-! 	elen = 2 * (vp ? strlen((char *)vp) : 0) +
-! 		2 * strlen((char *)ep) + 6;
-! 	if ((opt_replyend - opt_replyp) < elen)
-  	{
-! 		len = opt_replyend - opt_reply + elen;
-! 		olen = opt_replyp - opt_reply;
-  		opt_reply = (unsigned char *)realloc(opt_reply, len);
-  		if (opt_reply == NULL) {
-  /*@*/			printf("env_opt_add: realloc() failed!!!\n");
-  			opt_reply = opt_replyp = opt_replyend = NULL;
-  			return;
-  		}
-! 		opt_replyp = opt_reply + olen;
-  		opt_replyend = opt_reply + len;
-  	}
-  	if (opt_welldefined((char *) ep))