Upgrade to official 1.2.16

Fix PLIST

5 files changed, 98 insertions, 69 deletions

diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 2927e41587f2..cee948601bbe 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	ssh
-# Version required:     1.2.14
+# Version required:     1.2.16
 # Date created:		30 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.32 1996/08/08 13:56:52 peter Exp $
+# $Id: Makefile,v 1.33 1996/08/19 10:31:04 asami Exp $
 #
 # Maximal ssh package requires YES values for
 # USE_PERL, USE_TCPWRAP
 #
 
-DISTNAME=       ssh-1.2.14
+DISTNAME=       ssh-1.2.16
 CATEGORIES=	security net
 MASTER_SITES=   ftp://ftp.cs.hut.fi/pub/ssh/
 
diff --git a/security/ssh/distinfo b/security/ssh/distinfo
index 90174b897703..61e457d8ad4c 100644
--- a/security/ssh/distinfo
+++ b/security/ssh/distinfo
@@ -1,2 +1,2 @@
-MD5 (ssh-1.2.14.tar.gz) = c95349f27d32ad270dda4b87051f2a5f
+MD5 (ssh-1.2.16.tar.gz) = 4b36e9d1d651e5230c6717834d739ed4
 MD5 (rsaref2.tar.gz) = 0b474c97bf1f1c0d27e5a95f1239c08d
diff --git a/security/ssh/files/patch-ac b/security/ssh/files/patch-ac
index 7701a515af29..3ae8d807cdc1 100644
--- a/security/ssh/files/patch-ac
+++ b/security/ssh/files/patch-ac
@@ -1,24 +1,23 @@
-*** login.c.bak	Thu Jun  6 15:39:34 1996
---- login.c	Mon Jun 17 19:56:43 1996
+*** gmp-2.0.2/Makefile.in.bak	Mon Sep 30 02:29:39 1996
+--- gmp-2.0.2/Makefile.in	Wed Oct 16 07:33:48 1996
 ***************
-*** 236,241 ****
---- 236,254 ----
-    strncpy(u.ut_user, user, sizeof(u.ut_user));
-  #endif /* HAVE_NAME_IN_UTMP */
-  #ifdef HAVE_HOST_IN_UTMP
-+ #ifdef __FreeBSD__
-+   if (strlen(host) > UT_HOSTSIZE) {
-+ 	  struct hostent *hp = gethostbyname(host);
-+ 
-+ 	  if (hp != NULL) {
-+ 		  struct in_addr in;
-+ 
-+ 		  memmove(&in, hp->h_addr, sizeof(in));
-+ 		  host = inet_ntoa(in);
-+ 	  } else
-+ 		  host = "invalid hostname";
-+   }
-+ #endif
-    strncpy(u.ut_host, host, sizeof(u.ut_host));
-  #endif /* HAVE_HOST_IN_UTMP */
-  #ifdef HAVE_ADDR_IN_UTMP
+*** 27,35 ****
+  infodir = $(prefix)/info
+  includedir = $(prefix)/include
+  
+! CC = gcc
+  LOCAL_CC = $(CC)
+! CFLAGS = -g -O
+  XCFLAGS = 
+  AR = ar
+  AR_FLAGS = rc
+--- 27,35 ----
+  infodir = $(prefix)/info
+  includedir = $(prefix)/include
+  
+! #CC = gcc
+  LOCAL_CC = $(CC)
+! #CFLAGS = -g -O
+  XCFLAGS = 
+  AR = ar
+  AR_FLAGS = rc
diff --git a/security/ssh/files/patch-af b/security/ssh/files/patch-af
index a100f6ddf50a..bdeef63301f8 100644
--- a/security/ssh/files/patch-af
+++ b/security/ssh/files/patch-af
@@ -1,41 +1,67 @@
---- 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); \
+*** Makefile.in.orig	Fri Oct  4 17:00:43 1996
+--- Makefile.in	Wed Oct 16 06:40:44 1996
+***************
+*** 159,170 ****
+  SHELL = /bin/sh
+  
+  GMPDIR 		= gmp-2.0.2
+! GMPLIBS 	= -L$(GMPDIR) -lgmp
+! GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
+  
+  ZLIBDIR		= zlib-1.0.3
+! ZLIBDEP		= $(ZLIBDIR)/libz.a
+! ZLIBLIBS	= -L$(ZLIBDIR) -lz
+  
+  RSAREFDIR	= rsaref2
+  RSAREFSRCDIR 	= $(RSAREFDIR)/source
+--- 159,174 ----
+  SHELL = /bin/sh
+  
+  GMPDIR 		= gmp-2.0.2
+! GMPINCDIR	= $(GMPDIR)
+! GMPLIBDIR	= $(GMPDIR)
+! GMPDEP		= $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
+! GMPLIBS		= -L$(GMPLIBDIR) -lgmp
+  
+  ZLIBDIR		= zlib-1.0.3
+! ZLIBINCDIR	= $(ZLIBDIR)
+! ZLIBLIBDIR	= $(ZLIBDIR)
+! ZLIBDEP		= $(ZLIBINCDIR)/zlib.h $(ZLIBLIBDIR)/libz.a
+! ZLIBLIBS	= -L$(ZLIBLIBDIR) -lz
+  
+  RSAREFDIR	= rsaref2
+  RSAREFSRCDIR 	= $(RSAREFDIR)/source
+***************
+*** 248,254 ****
+  	$(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) $<
+  
+  sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
+  	-rm -f sshd
+--- 252,258 ----
+  	$(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) $(X_CFLAGS) $<
+  
+  sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
+  	-rm -f sshd
+***************
+*** 297,303 ****
+  $(GMPDIR)/libgmp.a:
+  	cd $(GMPDIR); $(MAKE)
+  
+! $(ZLIBDEP):
+  	-if test '!' -d $(ZLIBDIR); then \
+  	  mkdir $(ZLIBDIR); \
+  	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
+--- 301,307 ----
+  $(GMPDIR)/libgmp.a:
+  	cd $(GMPDIR); $(MAKE)
+  
+! $(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 55844f393eeb..29cc5a46d340 100644
--- a/security/ssh/pkg-plist
+++ b/security/ssh/pkg-plist
@@ -1,7 +1,8 @@
 etc/rc.d/sshd.sh
 bin/scp
-bin/slogin
 bin/ssh
+@exec ln -fs %f %B/slogin
+@unexec rm -f %B/slogin
 bin/ssh-add
 bin/ssh-agent
 bin/ssh-askpass
@@ -15,6 +16,9 @@ man/man1/ssh-add.1.gz
 man/man1/ssh-agent.1.gz
 man/man1/ssh-keygen.1.gz
 man/man1/ssh.1.gz
+@exec ln -fs %f %B/slogin.1.gz
+@unexec rm -f %B/slogin.1.gz
 man/man8/sshd.8.gz
 sbin/sshd
 @exec if [ ! -f %D/etc/ssh_host_key ]; then echo "Generating a secret host key.." ; %D/bin/ssh-keygen -N "" -f %D/etc/ssh_host_key; fi
+@unexec rm -f %D/etc/ssh_host_key