Kerberos IV support (cannot have both IV and V at the same time).

Note that I reverted some LIBZ stuff in patch-ac that was (while
correct) not necessary and conflicted with the Kerberos patch.

I have not tested the combination of Kerberos IV and INET6 (yet).

5 files changed, 59 insertions, 42 deletions

diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 1bc16c18a27..70e9490a86b 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 1999/09/08 22:18:04 hubertf Exp $
+# $NetBSD: Makefile,v 1.60 1999/09/18 22:04:55 kim Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -7,6 +7,8 @@ CATEGORIES=		security net
 MASTER_SITES=		ftp://ftp.cs.hut.fi/pub/ssh/ \
 			ftp://ftp.funet.fi/pub/unix/security/login/ssh/ \
 			ftp://ftp.cert.dfn.de/pub/tools/net/ssh/
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.cs.hut.fi/ssh/
@@ -65,6 +67,26 @@ DEPENDS+=		socks5-1.0.2:../../net/socks5
 .endif
 .endif
 
+# Include Kerberos v4 support
+# http://www.monkey.org/~dugsong/ssh-afs/
+.if defined(KERBEROS) && ${KERBEROS} == 4
+USE_KERBEROS=		yes
+PATCH_SITES+=		ftp://ftp.monkey.org/pub/users/dugsong/
+PATCHFILES+=		ssh-1.2.27-afs-kerberos.patch-1
+PATCH_DIST_STRIP+=	-p1
+CONFIGURE_ARGS+=	--with-krb4=/usr
+.else
+MASTER_SITES+=		ftp://ftp.monkey.org/pub/users/dugsong/
+DISTFILES+=		ssh-1.2.27-afs-kerberos.patch-1
+.endif
+
+.if defined(KERBEROS) && ${KERBEROS} == 5
+USE_KERBEROS=	yes
+CONFIGURE_ARGS+=--with-krb5
+.else
+CONFIGURE_ARGS+=--without-krb5
+.endif
+
 # Find X11 libraries with xpkgwedge
 .if defined(USE_LOCALBASE_FOR_X11)
 CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
@@ -95,9 +117,7 @@ PATCHDIR=		${WRKDIR}/.patches
 PATCH_SUM_FILE=		${FILESDIR}/patch-sum-v6
 .else
 MASTER_SITES+=		ftp://ftp.kyoto.wide.ad.jp/IPv6/ssh/
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
-			ssh-1.2.27-IPv6-1.5-patch.gz
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=		ssh-1.2.27-IPv6-1.5-patch.gz
 .endif
 
 # be more effective on M68060 machines
@@ -137,6 +157,14 @@ fetch-depends:
 # Make sure that "automake" is never run.
 post-patch:
 	@find ${WRKSRC} -name Makefile.in -print | xargs ${TOUCH} ${TOUCH_FLAGS}
+.if defined(KERBEROS) && ${KERBEROS} == 4
+	@${MV} ${WRKSRC}/configure ${WRKSRC}/configure.tmp
+	@${SED} \
+	    -e 's;KERBEROS_INCS="-I\$${KERBEROS_ROOT}/include";&/kerberosIV;' \
+	    ${WRKSRC}/configure.tmp > ${WRKSRC}/configure
+	@${CHMOD} a+rx ${WRKSRC}/configure
+	@${RM} -f ${WRKSRC}/configure.tmp
+.endif
 
 post-build:
 	@cd ${PKGDIR}; \
diff --git a/security/ssh/files/md5 b/security/ssh/files/md5
index c703db53a7b..ffabb81ce23 100644
--- a/security/ssh/files/md5
+++ b/security/ssh/files/md5
@@ -1,4 +1,5 @@
-$NetBSD: md5,v 1.11 1999/07/13 13:27:58 itojun Exp $
+$NetBSD: md5,v 1.12 1999/09/18 22:04:57 kim Exp $
 
 MD5 (ssh-1.2.27.tar.gz) = c22bc000bee0f7d6f4845eab72a81395
 MD5 (ssh-1.2.27-IPv6-1.5-patch.gz) = b854131fe8aa025abeef32cecfe1b037
+MD5 (ssh-1.2.27-afs-kerberos.patch-1) = d440f74958d9c3805b76dbc13e97e87d
diff --git a/security/ssh/files/patch-sum b/security/ssh/files/patch-sum
index 1b1b0461305..c2a344f2414 100644
--- a/security/ssh/files/patch-sum
+++ b/security/ssh/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.6 1999/09/18 21:10:18 kim Exp $
+$NetBSD: patch-sum,v 1.7 1999/09/18 22:04:57 kim Exp $
 
 MD5 (patch-aa) = dca3a23f5066125131e34fba33baa4ae
 MD5 (patch-ab) = 9807586f0bcbc7e92045d40be272d585
-MD5 (patch-ac) = 31e64894bfcc03ce805444ff261c7777
+MD5 (patch-ac) = 6ca9c5c5300c27a541928a2c2bc44388
 MD5 (patch-ad) = 60483c735ff0e3c47e640002be0cee75
 MD5 (patch-ae) = e654824aa0394aa47d474011902411a9
 MD5 (patch-af) = 577e03bb92268c10b74ae3e60caf9147
diff --git a/security/ssh/files/patch-sum-v6 b/security/ssh/files/patch-sum-v6
index 5da9013d61c..223659e662d 100644
--- a/security/ssh/files/patch-sum-v6
+++ b/security/ssh/files/patch-sum-v6
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum-v6,v 1.2 1999/09/18 21:10:18 kim Exp $
+$NetBSD: patch-sum-v6,v 1.3 1999/09/18 22:04:57 kim Exp $
 
 MD5 (patch-aa) = dca3a23f5066125131e34fba33baa4ae
 MD5 (patch-ab) = 9807586f0bcbc7e92045d40be272d585
-MD5 (patch-ac) = 31e64894bfcc03ce805444ff261c7777
+MD5 (patch-ac) = 6ca9c5c5300c27a541928a2c2bc44388
 MD5 (patch-ad) = 60483c735ff0e3c47e640002be0cee75
 MD5 (patch-ae) = e654824aa0394aa47d474011902411a9
 MD5 (patch-af) = 577e03bb92268c10b74ae3e60caf9147
diff --git a/security/ssh/patches/patch-ac b/security/ssh/patches/patch-ac
index 800a5ae92d0..aadc92b3fb8 100644
--- a/security/ssh/patches/patch-ac
+++ b/security/ssh/patches/patch-ac
@@ -1,30 +1,18 @@
-$NetBSD: patch-ac,v 1.7 1999/09/18 21:08:20 kim Exp $
+$NetBSD: patch-ac,v 1.8 1999/09/18 22:04:57 kim Exp $
 
 --- Makefile.in.orig	Wed May 12 07:19:31 1999
-+++ Makefile.in	Sat Sep 18 17:00:27 1999
-@@ -305,8 +305,10 @@
++++ Makefile.in	Sat Sep 18 17:25:37 1999
+@@ -304,7 +304,8 @@
+ GMPLIBS 	= -L$(GMPDIR) -lgmp
  GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
  
- ZLIBDIR		= zlib-1.0.4
--ZLIBDEP		= $(ZLIBDIR)/libz.a
--ZLIBLIBS	= -L$(ZLIBDIR) -lz
-+ZLIBINCDIR	= /usr/include
-+ZLIBLIBDIR	= /usr/lib
-+ZLIBDEP		= $(ZLIBINCDIR)/libz.a
-+ZLIBLIBS	= -L$(ZLIBLIBDIR) -lz
+-ZLIBDIR		= zlib-1.0.4
++#ZLIBDIR	= zlib-1.0.4
++ZLIBDIR		= /usr/lib
+ ZLIBDEP		= $(ZLIBDIR)/libz.a
+ ZLIBLIBS	= -L$(ZLIBDIR) -lz
  
- RSAREFDIR	= rsaref2
- RSAREFSRCDIR 	= $(RSAREFDIR)/source
-@@ -411,7 +413,7 @@
- 	$(CC) -o rfc-pg rfc-pg.o
- 
- .c.o:
--	$(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
-+	$(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
- 
- sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
- 	-rm -f sshd
-@@ -459,14 +461,14 @@
+@@ -459,14 +460,14 @@
  $(GMPDIR)/libgmp.a:
  	cd $(GMPDIR); $(MAKE)
  
@@ -47,7 +35,7 @@ $NetBSD: patch-ac,v 1.7 1999/09/18 21:08:20 kim Exp $
  
  $(RSAREFSRCDIR)/librsaref.a:
  	-if test '!' -d $(RSAREFDIR); then \
-@@ -523,10 +525,10 @@
+@@ -523,10 +524,10 @@
  # (otherwise it can only log in as the user it runs as, and must be
  # bound to a non-privileged port).  Also, password authentication may
  # not be available if non-root and using shadow passwords.
@@ -61,7 +49,7 @@ $NetBSD: patch-ac,v 1.7 1999/09/18 21:08:20 kim Exp $
  	-mv $(install_prefix)$(bindir)/ssh1 $(install_prefix)$(bindir)/ssh1.old
  	$(INSTALL_PROGRAM) -o root -m $(SSH_INSTALL_MODE) ssh $(install_prefix)$(bindir)/ssh1
  	-if test -f $(install_prefix)$(bindir)/ssh2; then \
-@@ -549,7 +551,7 @@
+@@ -549,7 +550,7 @@
  	-for p in $(NORMAL_PROGRAMS) $(X_PROGRAMS) $(OTHER_PROGRAMS); do \
  	  rm -f $(install_prefix)$(bindir)/$${p}1.old ; \
  	  mv $(install_prefix)$(bindir)/$${p}1 $(install_prefix)$(bindir)/$${p}1.old; \
@@ -70,7 +58,7 @@ $NetBSD: patch-ac,v 1.7 1999/09/18 21:08:20 kim Exp $
  	  if test -f $(install_prefix)$(bindir)/$${p}2; then \
  	    echo "Ssh version 2 $$p utility found, installation doesn't touch $$p link"; \
  	  else \
-@@ -566,7 +568,7 @@
+@@ -566,7 +567,7 @@
  	  rm -f $(install_prefix)$(bindir)/$${p}1.old ; \
  	  mv $(install_prefix)$(bindir)/$${p}1 $(install_prefix)$(bindir)/$${p}1.old; \
  	  $(INSTALL_DATA) $$p $(install_prefix)$(bindir)/$${p}1; \
@@ -79,7 +67,7 @@ $NetBSD: patch-ac,v 1.7 1999/09/18 21:08:20 kim Exp $
  	  if test -f $(install_prefix)$(bindir)/$${p}2; then \
  	    echo "Ssh version 2 $$p utility found, installation doesn't touch $$p link"; \
  	  else \
-@@ -582,7 +584,7 @@
+@@ -582,7 +583,7 @@
  	-for p in $(SBIN_PROGRAMS); do \
  	  rm -f $(install_prefix)$(sbindir)/$${p}1.old ; \
  	  mv $(install_prefix)$(sbindir)/$${p}1 $(install_prefix)$(sbindir)/$${p}1.old; \
@@ -88,7 +76,7 @@ $NetBSD: patch-ac,v 1.7 1999/09/18 21:08:20 kim Exp $
  	  if test -f $(install_prefix)$(sbindir)/$${p}2; then \
  	    echo "Ssh version 2 $$p utility found, installation doesn't touch $$p link"; \
  	  else \
-@@ -596,7 +598,7 @@
+@@ -596,7 +597,7 @@
  	      $(install_prefix)$(sbindir)/`echo $$p | sed '$(transform)'`; fi;\
  	done
  	-for p in $(MAN1PAGES); do \
@@ -97,7 +85,7 @@ $NetBSD: patch-ac,v 1.7 1999/09/18 21:08:20 kim Exp $
  	  rm -f $(install_prefix)$(man1dir)/$$p.1 ;\
  	  $(LN_S) $${p}1.1 $(install_prefix)$(man1dir)/$$p.1 ;\
  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-@@ -615,7 +617,7 @@
+@@ -615,7 +616,7 @@
  	    $(install_prefix)$(man1dir)/`echo slogin.1 | sed '$(transform)'`; \
  	fi
  	-for p in $(MAN1GENERATED); do \
@@ -106,7 +94,7 @@ $NetBSD: patch-ac,v 1.7 1999/09/18 21:08:20 kim Exp $
  	  rm -f $(install_prefix)$(man1dir)/$$p.1 ; \
  	  $(LN_S) $${p}1.1 $(install_prefix)$(man1dir)/$$p.1 ; \
  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-@@ -625,7 +627,7 @@
+@@ -625,7 +626,7 @@
  	  fi; \
  	done
  	-for p in $(MAN8GENERATED); do \
@@ -115,7 +103,7 @@ $NetBSD: patch-ac,v 1.7 1999/09/18 21:08:20 kim Exp $
  	  rm -f $(install_prefix)$(man8dir)/$$p.8 ; \
  	  $(LN_S) $${p}1.8 $(install_prefix)$(man8dir)/$$p.8 ; \
  	  if test "`echo $$p | sed '$(transform)'`" '!=' $$p; then \
-@@ -636,12 +638,13 @@
+@@ -636,12 +637,13 @@
  
  install-configs:
  	-if test '!' -f $(install_prefix)$(HOST_CONFIG_FILE); then \
@@ -131,7 +119,7 @@ $NetBSD: patch-ac,v 1.7 1999/09/18 21:08:20 kim Exp $
  	    $(install_prefix)$(SERVER_CONFIG_FILE); \
  	  rm -f /tmp/ssh_inst.$$$$; fi
  
-@@ -681,13 +684,13 @@
+@@ -681,13 +683,13 @@
  	-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
  	cd $(GMPDIR); $(MAKE) clean
  #	cd $(RSAREFSRCDIR); rm -f *.o *.a
@@ -147,7 +135,7 @@ $NetBSD: patch-ac,v 1.7 1999/09/18 21:08:20 kim Exp $
  
  dist: dist-free
  
-@@ -720,8 +723,8 @@
+@@ -720,8 +722,8 @@
  	gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - )
  #	tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
  #	cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
@@ -158,7 +146,7 @@ $NetBSD: patch-ac,v 1.7 1999/09/18 21:08:20 kim Exp $
  
  #ifdef F_SECURE_COMMERCIAL
  #
-@@ -749,7 +752,7 @@
+@@ -749,7 +751,7 @@
  	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null
  
  depend: