Update ssh-1.2.13 -> ssh-1.2.14

ssh-askpass no longer uses wish, so chop the make rules that attempt to
locate it.
Go further to try and protect the ssh_host_key, since it's critical to
the operation and security of the machine.

4 files changed, 53 insertions, 101 deletions

diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 6ec2039338ff..87f3c8ee2485 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,21 +1,23 @@
 # New ports collection makefile for:	ssh
-# Version required:     1.2.13
+# Version required:     1.2.14
 # Date created:		30 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.21 1996/04/17 01:07:04 asami Exp $
+# $Id: Makefile,v 1.22 1996/05/24 19:13:04 peter Exp $
 #
 # Maximal ssh package requires YES values for
-# USE_PERL, USE_WISH, USE_TCPWRAP
+# USE_PERL, USE_TCPWRAP
 #
 
-DISTNAME=       ssh-1.2.13
+DISTNAME=       ssh-1.2.14
 CATEGORIES=	security net
-MASTER_SITES=   ftp://ftp.cs.hut.fi/pub/ssh/snapshots/
+MASTER_SITES=   ftp://ftp.cs.hut.fi/pub/ssh/
 LIB_DEPENDS=    z\\.1\\.:${PORTSDIR}/devel/libz
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
+# You can set USA_RESIDENT appropriately in /etc/make.conf if this bugs you..
+
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
 DISTFILES=	${DISTNAME}.tar.gz rsaref2.tar.gz
 MASTER_SITES=	\
@@ -84,29 +86,15 @@ post-install:
 		${PREFIX}/man/man1/ssh-agent.1 ${PREFIX}/man/man1/ssh-keygen.1 \
 		${PREFIX}/man/man1/ssh.1 ${PREFIX}/man/man8/sshd.8 \
 		${PREFIX}/man/man1/make-ssh-known-hosts.1
+	@echo "---------------------------------------------------------------"
+	@echo "If you are installing for the first time, do not forget to run:"
+	@echo "   ssh-keygen -b 1024 -f $(PREFIX)/etc/ssh_host_key -N '' "
+	@echo "---------------------------------------------------------------"
 
 .include <bsd.port.mk>
 
 # Following stuff must be after <bsd.port.mk> to expand exists() properly
 
-.if defined(USE_WISH) && ${USE_WISH} == YES || \
-    (exists(${PREFIX}/bin/wish4.0) || exists(${PREFIX}/bin/wish4.1) || \
-     exists(${PREFIX}/bin/wish)) && \
-    (!defined(USE_WISH) || ${USE_WISH} != NO)
-.if exists(${PREFIX}/bin/wish4.1)
-BUILD_DEPENDS+= wish4.1:${PORTSDIR}/x11/tk41
-CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish4.1
-.elif exists(${PREFIX}/bin/wish4.0)
-BUILD_DEPENDS+= wish4.0:${PORTSDIR}/x11/tk4
-CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish4.0
-.else
-BUILD_DEPENDS+= wish:${PORTSDIR}/x11/tk
-CONFIGURE_ENV+= WISH=${PREFIX}/bin/wish
-.endif
-.else
-CONFIGURE_ENV+= WISH=/replace_it_with_WISH_path
-.endif
-
 .if defined(USE_PERL) && ${USE_PERL} == YES || \
     exists(${PREFIX}/bin/perl5.002) && \
     (!defined(USE_PERL) || ${USE_PERL} != NO)
diff --git a/security/ssh/distinfo b/security/ssh/distinfo
index 6f27c8a66bea..74e1882ff37b 100644
--- a/security/ssh/distinfo
+++ b/security/ssh/distinfo
@@ -1,2 +1 @@
-MD5 (ssh-1.2.13.tar.gz) = 78d25c42ce4a6acd07b401c301f61697
-MD5 (rsaref2.tar.gz) = 0b474c97bf1f1c0d27e5a95f1239c08d
+MD5 (ssh-1.2.14.tar.gz) = 4c23661228a7946f9fb7aa40d6c7dad4
diff --git a/security/ssh/files/patch-af b/security/ssh/files/patch-af
index 4d5296a7dda3..a100f6ddf50a 100644
--- a/security/ssh/files/patch-af
+++ b/security/ssh/files/patch-af
@@ -1,74 +1,41 @@
-This patch has been submitted to the author, it allows one to disconnect
-ssh from the supplied libgmp and libz.  The next patch (patch-ag) actually
-uses these disconnect points to hook us into the system libraries.
-
-The rationale for splitting them up was that the previous patch (patch-ae)
-that these two patches replace was unmaintainable and overly drastic.
-
-*** Makefile.in	Thu Jan 25 17:58:10 1996
---- Makefile.in	Mon Feb  5 18:36:09 1996
-***************
-*** 114,125 ****
-  SHELL = /bin/sh
-  
-  GMPDIR 		= gmp-1.3.2
-! GMPLIBS 	= -L$(GMPDIR) -lgmp
-! GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
-  
-  ZLIBDIR		= zlib095
-! ZLIBDEP		= $(ZLIBDIR)/libz.a
-! ZLIBLIBS	= -L$(ZLIBDIR) -lz
-  
-  RSAREFDIR	= rsaref2
-  RSAREFSRCDIR 	= $(RSAREFDIR)/source
---- 114,129 ----
-  SHELL = /bin/sh
-  
-  GMPDIR 		= gmp-1.3.2
-! GMPINCDIR	= $(GMPDIR)
-! GMPLIBDIR	= $(GMPDIR)
-! GMPDEP 		= $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
-! GMPLIBS 	= -L$(GMPLIBDIR) -lgmp
-  
-  ZLIBDIR		= zlib095
-! ZLIBINCDIR	= $(ZLIBDIR)
-! ZLIBLIBDIR	= $(ZLIBDIR)
-! ZLIBDEP		= $(ZLIBINCDIR)/zlib.h $(ZLIBLIBDIR)/libz.a
-! ZLIBLIBS	= -L$(ZLIBLIBDIR) -lz
-  
-  RSAREFDIR	= rsaref2
-  RSAREFSRCDIR 	= $(RSAREFDIR)/source
-***************
-*** 186,192 ****
-  	$(CC) -o rfc-pg rfc-pg.c
-  
-  .c.o:
-! 	$(CC) -c -I. -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)\" -DBINDIR=\"$(bindir)\" $(CFLAGS) $<
-  
-  sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
-  	-rm -f sshd
---- 190,196 ----
-  	$(CC) -o rfc-pg rfc-pg.c
-  
-  .c.o:
-! 	$(CC) -c -I. -I$(GMPINCDIR) -I$(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)\" -DBINDIR=\"$(bindir)\" $(CFLAGS) $<
-  
-  sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
-  	-rm -f sshd
-***************
-*** 247,253 ****
-                CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(GMPDIR) \
-  	       -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)"
-  
-! $(ZLIBDEP):
-  	-if test '!' -d $(ZLIBDIR); then \
-  	  mkdir $(ZLIBDIR); \
-  	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
---- 251,257 ----
-                CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(GMPDIR) \
-  	       -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)"
-  
-! $(ZLIBDIR)/libz.a:
-  	-if test '!' -d $(ZLIBDIR); then \
-  	  mkdir $(ZLIBDIR); \
-  	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
+--- Makefile.in.orig	Thu Jun  6 19:39:35 1996
++++ Makefile.in	Fri Jun  7 11:58:02 1996
+@@ -137,12 +137,16 @@
+ SHELL = /bin/sh
+ 
+ GMPDIR 		= gmp-1.3.2
+-GMPLIBS 	= -L$(GMPDIR) -lgmp
+-GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
++GMPINCDIR	= $(GMPDIR)
++GMPLIBDIR	= $(GMPDIR)
++GMPDEP 		= $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
++GMPLIBS 	= -L$(GMPLIBDIR) -lgmp
+ 
+ ZLIBDIR		= zlib095
+-ZLIBDEP		= $(ZLIBDIR)/libz.a
+-ZLIBLIBS	= -L$(ZLIBDIR) -lz
++ZLIBINCDIR	= $(ZLIBDIR)
++ZLIBLIBDIR	= $(ZLIBDIR)
++ZLIBDEP		= $(ZLIBINCDIR)/zlib.h $(ZLIBLIBDIR)/libz.a
++ZLIBLIBS	= -L$(ZLIBLIBDIR) -lz
+ 
+ RSAREFDIR	= rsaref2
+ RSAREFSRCDIR 	= $(RSAREFDIR)/source
+@@ -223,7 +227,7 @@
+ 	$(CC) -o rfc-pg rfc-pg.c
+ 
+ .c.o:
+-	$(CC) -c -I. -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)\" -DBINDIR=\"$(bindir)\" $(CFLAGS) $(X_CFLAGS) $<
++	$(CC) -c -I. -I$(GMPINCDIR) -I$(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)\" -DBINDIR=\"$(bindir)\" $(CFLAGS) $(X_CFLAGS) $<
+ 
+ sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
+ 	-rm -f sshd
+@@ -282,7 +286,7 @@
+               CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(GMPDIR) \
+ 	       -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)"
+ 
+-$(ZLIBDEP):
++$(ZLIBDIR)/libz.a:
+ 	-if test '!' -d $(ZLIBDIR); then \
+ 	  mkdir $(ZLIBDIR); \
+ 	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
diff --git a/security/ssh/pkg-plist b/security/ssh/pkg-plist
index bd7de1fc754f..60c21a3c5a52 100644
--- a/security/ssh/pkg-plist
+++ b/security/ssh/pkg-plist
@@ -7,8 +7,6 @@ bin/ssh-askpass
 bin/ssh-keygen
 bin/make-ssh-known-hosts
 etc/ssh_config
-etc/ssh_host_key
-etc/ssh_host_key.pub
 etc/sshd_config
 man/man1/make-ssh-known-hosts.1.gz
 man/man1/scp.1.gz