Update to 9.0.302, see http://www.columbia.edu/kermit/ck90.html for more

information.

Tested on NetBSD-current and OpenIndiana.

Support for ssl and kerberos is now available through the options
framework.

10 files changed, 114 insertions, 112 deletions

diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 31d4c5f2302..e13b7a91e95 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2011/05/14 19:27:53 hans Exp $
+# $NetBSD: Makefile,v 1.77 2011/08/25 14:54:06 hans Exp $
 
-DISTNAME=	cku211
-PKGNAME=	kermit-8.0.211
-PKGREVISION=	4
+DISTNAME=	cku302
+PKGNAME=	kermit-9.0.302
 CATEGORIES=	comms
 MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/
 
@@ -19,15 +18,10 @@ WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 BUILD_DEFS+=	KFLAGS LIBS MANINSTALL
 MAKE_ENV+=	KFLAGS=${KFLAGS:Q} LIBS=${LIBS:Q}
-MAKE_ENV+=	SSLINC=${SSLINC:Q} SSLLIB=${SSLLIB:Q}
 MAKE_FILE=	makefile
 
 #KFLAGS+=	-DNODEBUG -DNOOLDMODEMS
 
-# Set to empty
-SSLINC=		-I${WRKDIR}/.buildlink/include
-SSLLIB=		-L${WRKDIR}/.buildlink/lib ${COMPILER_RPATH_FLAG}${WRKDIR}/.buildlink/lib
-
 .include "options.mk"
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/kermit
@@ -46,17 +40,18 @@ LIBS+=		-ltermcap
 
 .if ${OPSYS} == "Darwin"
 .  if empty(OS_VERSION:M[0-6]\.*)
-BUILD_TARGET=	macosx103
+BUILD_TARGET_OPSYS=	macosx103
 .  else
-BUILD_TARGET=	macosx10
+BUILD_TARGET_OPSYS=	macosx10
 .  endif
 .elif ${OPSYS} == "Linux"
-BUILD_TARGET=	linux
+BUILD_TARGET_OPSYS=	linux
 .elif ${OPSYS} == "SunOS"
-BUILD_TARGET=	solaris10g+openssl+shadow+pam+zlib
+BUILD_TARGET_OPSYS=	solaris11g
 .else
-BUILD_TARGET=	netbsd+openssl
-.include "../../security/openssl/buildlink3.mk"
+BUILD_TARGET_OPSYS=	netbsd
 .endif
 
+BUILD_TARGET=	${BUILD_TARGET_OPSYS}${BUILD_TARGET_OPTIONS:ts}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/kermit/PLIST b/comms/kermit/PLIST
index 2ef87a1409e..ed1d6575df7 100644
--- a/comms/kermit/PLIST
+++ b/comms/kermit/PLIST
@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:38:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/08/25 14:54:06 hans Exp $
 bin/kermit
 man/man1/kermit.1
 share/doc/kermit/ckaaaa.txt
-share/doc/kermit/ckc211.txt
+share/doc/kermit/ckc302.txt
 share/doc/kermit/ckcbwr.txt
 share/doc/kermit/ckccfg.txt
 share/doc/kermit/ckcplm.txt
 share/doc/kermit/ckermit70.txt
 share/doc/kermit/ckermit80.txt
+share/doc/kermit/ckermit90.txt
 share/doc/kermit/ckubwr.txt
 share/doc/kermit/ckuins.txt
 share/doc/kermit/ckututor.txt
diff --git a/comms/kermit/distinfo b/comms/kermit/distinfo
index 2d17341c882..5213099fb9e 100644
--- a/comms/kermit/distinfo
+++ b/comms/kermit/distinfo
@@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.18 2011/08/25 13:46:28 hans Exp $
+$NetBSD: distinfo,v 1.19 2011/08/25 14:54:06 hans Exp $
 
-SHA1 (kermit-8.0.211/cku211.tar.gz) = cd5e0524d27fea0275a0938da2a5fc115e0978b8
-RMD160 (kermit-8.0.211/cku211.tar.gz) = c80de6eeec3b4d87a09946a4d440da3b4faaa3b2
-Size (kermit-8.0.211/cku211.tar.gz) = 2878523 bytes
-SHA1 (patch-aa) = 222e5c3879271f876c9b61d5a51a6825f443b048
-SHA1 (patch-ab) = 7e874c4d7d6febe4c6694134879fe0008f6e9c8f
-SHA1 (patch-ac) = 01e7ab07fcebd971672488221efa4d987c4ebf3e
-SHA1 (patch-ad) = 8f6073b0e68cf3191ffba6d818a87ab3f3095ea4
+SHA1 (kermit-9.0.302/cku302.tar.gz) = d04c8b5600bc0bb0f163d294881f7a5a0d4395b5
+RMD160 (kermit-9.0.302/cku302.tar.gz) = ef3a71b5a42868c80408ac09662d00b71da0b0c8
+Size (kermit-9.0.302/cku302.tar.gz) = 3122219 bytes
+SHA1 (patch-aa) = 58b2a3d95d1671dccbd1742b18618dbc3ec1fe8e
+SHA1 (patch-ab) = d27c998f44a1d2b53cb2e893d9ef9e8c14292d3f
+SHA1 (patch-ac) = 62cc9e92f2413a42312d9f6d168ee85664b6aab9
 SHA1 (patch-ae) = 53384e9cbfe13559d69ab95215a4575f726dc325
 SHA1 (patch-af) = 2a09f9f933d3c1e6860983d8138ac61f33306ef7
-SHA1 (patch-ag) = 5eff93d977bff114d2d193b6d069264388ebc997
+SHA1 (patch-ag) = cae37680ea5af85f4d2c774fe230f73a1f0be48c
 SHA1 (patch-ah) = 5b2098dfd57f8bd4d107acafaabe1a2c9b97d037
 SHA1 (patch-ai) = 975a18c41b7fc031515bda5c4a9c284e80c9d1a4
 SHA1 (patch-aj) = 6468e2139639f601de4609db8dff07b8b3a82d82
 SHA1 (patch-ak) = 9ded2d7cc3a83158edfbbe87851f892ccb09df0b
-SHA1 (patch-al) = f28a0449e763069f64719693de0848bf50e61099
+SHA1 (patch-al) = 48438352380a74e19951fe669cb176d3c62d537d
 SHA1 (patch-am) = 8c5acbfefe7b7d11825cc32c4449582b51f6cad9
diff --git a/comms/kermit/options.mk b/comms/kermit/options.mk
index 1e506b5b912..fbf1f7385a9 100644
--- a/comms/kermit/options.mk
+++ b/comms/kermit/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2008/03/01 05:17:32 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2011/08/25 14:54:06 hans Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.kermit
-PKG_SUPPORTED_OPTIONS=		kermit-suid-uucp
+PKG_SUPPORTED_OPTIONS=		kermit-suid-uucp ssl kerberos
 PKG_OPTIONS_OPTIONAL_GROUPS+=	socks
 PKG_OPTIONS_GROUP.socks=	socks4 socks5
 
@@ -30,3 +30,20 @@ KFLAGS+=	-DSOCKS -DCK_SOCKS5
 LIBS+=		-L${BUILDLINK_PREFIX.socks5}/lib -lsocks5
 .include "../../net/socks5/buildlink3.mk"
 .endif
+
+.if !empty(PKG_OPTIONS:Mkerberos)
+BUILD_TARGET_OPTIONS+=	+krb5
+.include "../../security/mit-krb5/buildlink3.mk"
+K5INC=		-I${WRKDIR}/.buildlink/include
+K5LIB=		-L${WRKDIR}/.buildlink/lib ${COMPILER_RPATH_FLAG}${WRKDIR}/.buildlink/lib
+MAKE_ENV+=	K5INC=${K5INC:Q} K5LIB=${K5LIB:Q}
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+BUILD_TARGET_OPTIONS+=	+ssl
+.include "../../security/openssl/buildlink3.mk"
+# Set to empty
+SSLINC=		-I${WRKDIR}/.buildlink/include
+SSLLIB=		-L${WRKDIR}/.buildlink/lib ${COMPILER_RPATH_FLAG}${WRKDIR}/.buildlink/lib
+MAKE_ENV+=	SSLINC=${SSLINC:Q} SSLLIB=${SSLLIB:Q}
+.endif
diff --git a/comms/kermit/patches/patch-aa b/comms/kermit/patches/patch-aa
index 46e29666ec2..f13b7a4d6ce 100644
--- a/comms/kermit/patches/patch-aa
+++ b/comms/kermit/patches/patch-aa
@@ -1,36 +1,43 @@
-$NetBSD: patch-aa,v 1.8 2011/05/14 19:27:53 hans Exp $
+$NetBSD: patch-aa,v 1.9 2011/08/25 14:54:06 hans Exp $
 
---- makefile.orig	2004-04-17 20:52:00.000000000 +0200
-+++ makefile	2009-12-26 23:49:53.284197908 +0100
-@@ -745,8 +745,8 @@ K5LIB=-L/usr/kerberos/lib
- K5INC=-I/usr/kerberos/include
+--- makefile.orig	2011-08-21 17:12:07.000000000 +0200
++++ makefile	2011-08-25 16:36:42.000000000 +0200
+@@ -824,12 +824,12 @@ manroot = $(prefix)
+ 
+ K4LIB=-L/usr/kerberos/lib
+ K4INC=-I/usr/kerberos/include
+-K5LIB=-L/usr/kerberos/lib
+-K5INC=-I/usr/kerberos/include
++#K5LIB=-L/usr/kerberos/lib
++#K5INC=-I/usr/kerberos/include
  SRPLIB=-L$(srproot)/lib
  SRPINC=-I$(srproot)/include
 -SSLLIB=-L$(sslroot)/ssl/lib
 -SSLINC=-I$(sslroot)/ssl/include
 +#SSLLIB=-L$(sslroot)/ssl/lib
 +#SSLINC=-I$(sslroot)/ssl/include
- #
- # aix41+krb5+krb4:                    IBM AIX 4.1 with Kerberos IV and V
- # aix43gcc+krb5+krb4:                 IBM AIX 4.3 built with gcc, ditto
-@@ -1821,6 +1821,16 @@ netbsd:
- 	-DCK_DTRCD -DCK_DTRCTS -DTPUTSARGTYPE=int -DFNFLOAT $(KFLAGS) -O" \
- 	"LIBS= -lcurses -lcrypt -lm $(LIBS)"
  
-+# For NetBSD 1.6 and later OpenSSL is included
-+netbsd+openssl:
-+	@echo Making C-Kermit $(CKVER) for NetBSD with curses...
-+	$(MAKE) xermit KTARGET=$${KTARGET:-$(@)} \
-+	"CFLAGS= -DBSD44 -DCK_CURSES -DTCPSOCKET -DUSE_STRERROR \
-+	-DNETBSD15 -DNETBSD16 \
-+	-DCK_AUTHENTICATION -DCK_SSL $(SSLINC) -DZLIB \
-+	-DCK_DTRCD -DCK_DTRCTS -DTPUTSARGTYPE=int -DFNFLOAT $(KFLAGS) -O" \
-+	"LIBS= -lcurses -lcrypt $(SSLLIB) -lssl -lcrypto -lm $(LIBS)"
-+
- #NetBSD 1.5.x in which the return type of the function pointer that is the
- #third argument of tputs() was changed from void to int...  The regular NetBSD
- #target builds OK here but this one eliminates the (harmless) warning.
-@@ -3263,7 +3273,7 @@ solaris2xg+openssl+zlib+pam+shadow:
+ # To override these assignments; for example, if your OpenSSL files are
+ # not in /usr/local/ssl, invoke the desired target like this:
+@@ -1869,7 +1869,7 @@ netbsd+krb5:
+ 	-DCK_CAST $$HAVE_DES -DNOFTP_GSSAPI $(K5INC) $(K5INC)/krb5 \
+ 	$(KFLAGS)" \
+ 	"LIBS= $(K5LIB) -L/usr/pkg/lib -R/usr/pkg/lib -lcurses $$DES_LIB \
+-	-lcrypto -lgssapi -lkrb5 -lm -lutil $(LIBS)"
++	-lcrypto -lgssapi_krb5 -lkrb5 -lm -lutil $(LIBS)"
+ 
+ # NetBSD - With Kerberos 5 and SSL and Zlib.
+ # OK: 2011/08/21 on 5.1 with MIT Kerberos.
+@@ -1896,7 +1896,7 @@ netbsd+krb5+ssl netbsd+krb5+openssl+zlib
+ 	-DCK_SSL -DCK_PAM -DZLIB -DNO_DCL_INET_ATON $$OPENSSLOPTION \
+ 	$(KFLAGS)" "LNKFLAGS = $(LNKFLAGS)" \
+ 	"LIBS= $(K5LIB) -L/usr/pkg/lib -R/usr/pkg/lib -lssl $$DES_LIB \
+-	-lcrypto -lcrypt -lgssapi -lkrb5 -lz -lm -lpam -lutil -lcurses $(LIBS)"
++	-lcrypto -lcrypt -lgssapi_krb5 -lkrb5 -lz -lm -lpam -lutil -lcurses $(LIBS)"
+ 
+ #Special Security Enhanced NetBSD target with SRP, SSL, and zlib support.
+ #To build this, you need to BUILD the pkgsrc srp_client package.  After
+@@ -3544,7 +3544,7 @@ solaris2xg+openssl+zlib+pam+shadow:
  	-DCK_AUTHENTICATION -DCK_SSL -DCK_PAM -DCK_SHADOW  -DZLIB \
  	-DBIGBUFOK $(SSLINC) $(KFLAGS)" \
  	"LIBS= $(SSLLIB) -ltermlib \
@@ -39,17 +46,12 @@ $NetBSD: patch-aa,v 1.8 2011/05/14 19:27:53 hans Exp $
  
  #Ditto but with GCC 3.1 in which you have to specify 32-bit with -m32.
  #In Solaris 9 (and maybe 8) you'll also need specifiy the Library path.
-@@ -3401,6 +3411,13 @@ solaris9g+openssl+shadow+pam+zlib:
- 	"KFLAGS=-DSOLARIS9 -DHDBUUCP -DDIRENT -DZLIB -DCK_PAM -DCK_SHADOW \
- 	-DLIBDES $(KFLAGS)" "LIBS= -lpam -ldes425 -lz $(LIBS)"
- 
-+#Solaris 10 with gcc + OpenSSL + Shadow (32-bit)
-+solaris10g+openssl+shadow+pam+zlib:
-+	$(MAKE) "MAKE=$(MAKE)" solaris2xg+openssl+zlib+pam+shadow \
-+	KTARGET=$${KTARGET:-$(@)} \
-+	"KFLAGS=-DSOLARIS9 -DHDBUUCP -DDIRENT -DZLIB -DCK_PAM -DCK_SHADOW \
-+	-DLIBDES $(KFLAGS)" "LIBS= -lpam -lz $(LIBS)"
-+
- #Solaris 9 with gcc + OpenSSL + Kerberos 5 + Krb4 + Shadow (32-bit)
- solaris9g+krb5+krb4+openssl+shadow+pam+zlib:
- 	$(MAKE) "MAKE=$(MAKE)" solaris2xg+krb5+krb4+openssl+shadow \
+@@ -3899,7 +3899,7 @@ solaris9g+krb5+ssl solaris10g+krb5+ssl s
+ 	-DCK_CURSES -DCK_NEWTERM -DDIRENT -DHDBUUCP -DTCPSOCKET  -DBIGBUFOK \
+ 	-DCK_AUTHENTICATION -DCK_SSL -DZLIB -DCK_KERBEROS -DKRB5 \
+ 	-DCK_ENCRYPTION -DCK_CAST $$OPENSSLOPTION \
+-	$$HAVE_DES $(SSLINC) $(K5INC) $(K5INC)/krb5 $(KFLAGS)" \
++	$$HAVE_DES $(SSLINC) $(K5INC) $(K5INC)/kerberosv5 $(KFLAGS)" \
+ 	"LIBS= $(SSLLIB) $(K5LIB) -lz -lssl -ltermlib -lsocket -lnsl -lm \
+ 	-lresolv -lcrypto \
+ 	$$GSSAPILIB -lkrb5 -lcom_err -lk5crypto $$DES_LIB $(LIBS)"
diff --git a/comms/kermit/patches/patch-ab b/comms/kermit/patches/patch-ab
index 86a7e5936c2..b28fc03b91f 100644
--- a/comms/kermit/patches/patch-ab
+++ b/comms/kermit/patches/patch-ab
@@ -1,22 +1,20 @@
-$NetBSD: patch-ab,v 1.5 2005/12/18 23:15:43 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2011/08/25 14:54:06 hans Exp $
 
---- ck_ssl.c.orig	2004-03-14 17:07:55.000000000 +0000
-+++ ck_ssl.c
-@@ -2782,6 +2782,8 @@ show_hostname_warning(char *s1, char *s2
- #ifndef HPUX1100
- #ifndef SCO_OSR505
+--- ck_ssl.c.orig	2011-07-06 15:03:32.000000000 +0200
++++ ck_ssl.c	2011-08-23 10:29:50.031163553 +0200
+@@ -2877,6 +2877,7 @@ show_hostname_warning(char *s1, char *s2
  #ifndef OpenBSD
-+#ifndef __NetBSD__
-+#ifndef __DragonFly__
  #ifndef FREEBSD4
+ #ifndef NETBSD15
++#ifndef __DragonFly__
  #ifndef LINUX
  #ifndef AIX41
-@@ -2818,6 +2820,8 @@ inet_aton(char * ipaddress, struct in_ad
+ #ifndef UW7
+@@ -2919,6 +2920,7 @@ inet_aton(char * ipaddress, struct in_ad
+ #endif /* UW7 */
  #endif /* AIX41 */
  #endif /* LINUX */
- #endif /* FREEBSD4 */
 +#endif /* __DragonFly__ */
-+#endif /* __NetBSD__ */
+ #endif /* NETBSD15 */
+ #endif /* FREEBSD4 */
  #endif /* OpenBSD */
- #endif /* SCO_OSR505 */
- #endif /* HPUX1100 */
diff --git a/comms/kermit/patches/patch-ac b/comms/kermit/patches/patch-ac
index cdabfe8cbe5..8e15ccee12b 100644
--- a/comms/kermit/patches/patch-ac
+++ b/comms/kermit/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.8 2005/12/18 23:15:43 joerg Exp $
+$NetBSD: patch-ac,v 1.9 2011/08/25 14:54:06 hans Exp $
 
---- ckcdeb.h.orig	2005-12-18 22:51:39.000000000 +0000
-+++ ckcdeb.h
-@@ -4481,7 +4481,6 @@ extern int errno;
-   The following declaration would cause problems for VMS and OS/2, in which
-   errno is an "extern volatile int noshare"...
+--- ckcdeb.h.orig	2010-08-23 15:30:56.000000000 +0200
++++ ckcdeb.h	2011-08-23 10:31:55.103102070 +0200
+@@ -4532,7 +4532,6 @@ extern int errno;
+   following is an anachronism and should be the execption rather than the
+   rule.
  */
-- extern int errno;			/* Needed by most modules. */
+-extern int errno;
  #endif /* __GLIBC__ */
  #endif /* OS2 */
  #endif /* VMS */
diff --git a/comms/kermit/patches/patch-ad b/comms/kermit/patches/patch-ad
deleted file mode 100644
index c408024aa7a..00000000000
--- a/comms/kermit/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2005/12/18 23:15:43 joerg Exp $
-
---- ckcasc.h.orig	2005-12-18 22:55:40.000000000 +0000
-+++ ckcasc.h
-@@ -42,7 +42,9 @@
- #define SYN   22        /* SYN, Ctrl-V */
- #define ETB   23        /* Ctrl-W */
- #define CAN   24        /* CAN, Ctrl-X */
-+#if 0 /* OpenSSL conflict */
- #define EM    25        /* Ctrl-Y */
-+#endif
- #define SUB   26        /* SUB Ctrl-Z */
- #define ESC   27        /* Escape Ctrl-[ */
- #define XFS   28        /* Field Separator,  Ctrl-Backslash */
diff --git a/comms/kermit/patches/patch-ag b/comms/kermit/patches/patch-ag
index 6fa62bb88dd..aa5dad96775 100644
--- a/comms/kermit/patches/patch-ag
+++ b/comms/kermit/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.1 2005/12/18 23:15:43 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2011/08/25 14:54:06 hans Exp $
 
---- ckuus6.c.orig	2005-12-18 23:06:04.000000000 +0000
-+++ ckuus6.c
-@@ -26,11 +26,7 @@
- #include "ckcnet.h"                     /* Network symbols */
- #include <signal.h>
+--- ckuus6.c.orig	2011-06-07 17:27:51.000000000 +0200
++++ ckuus6.c	2011-08-23 10:34:29.697605882 +0200
+@@ -33,11 +33,7 @@
+ #endif /* def VMS [else] */
+ #endif /* NOSTAT */
  
 -#ifdef VMS
 -#ifndef TCPSOCKET
diff --git a/comms/kermit/patches/patch-al b/comms/kermit/patches/patch-al
index 871f594e21e..1386fd54e7d 100644
--- a/comms/kermit/patches/patch-al
+++ b/comms/kermit/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1 2007/08/08 19:48:04 joerg Exp $
+$NetBSD: patch-al,v 1.2 2011/08/25 14:54:06 hans Exp $
 
---- ckuath.c.orig	2007-08-08 19:27:44.000000000 +0000
-+++ ckuath.c
-@@ -117,15 +117,6 @@ int accept_complete = 0;
+--- ckuath.c.orig	2011-06-13 19:26:54.000000000 +0200
++++ ckuath.c	2011-08-23 10:36:18.019522988 +0200
+@@ -117,19 +117,6 @@ int accept_complete = 0;
  #include <time.h>
  #include <fcntl.h>
  #include <errno.h>
@@ -10,7 +10,11 @@ $NetBSD: patch-al,v 1.1 2007/08/08 19:48:04 joerg Exp $
 -#ifndef VMS
 -#ifndef FREEBSD4
 -#ifndef OpenBSD
+-#ifdef MACOSX
+-#include <sys/malloc.h>
+-#else /* MACOSX */
 -#include <malloc.h>
+-#endif /* MACOSX */
 -#endif /* OpenBSD */
 -#endif /* FREEBSD4 */
 -#endif /* VMS */