Back out andrews change - 1.2.14.1 is not an official ssh release.

2 files changed, 65 insertions, 67 deletions

diff --git a/security/ssh/files/patch-ac b/security/ssh/files/patch-ac
new file mode 100644
index 000000000000..7701a515af29
--- /dev/null
+++ b/security/ssh/files/patch-ac
@@ -0,0 +1,24 @@
+*** login.c.bak	Thu Jun  6 15:39:34 1996
+--- login.c	Mon Jun 17 19:56:43 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
diff --git a/security/ssh/files/patch-af b/security/ssh/files/patch-af
index 6ac8a839817d..a100f6ddf50a 100644
--- a/security/ssh/files/patch-af
+++ b/security/ssh/files/patch-af
@@ -1,67 +1,41 @@
-*** Makefile.in.orig	Fri Jul 12 13:13:34 1996
---- Makefile.in	Tue Jul 16 02:45:04 1996
-***************
-*** 144,155 ****
-  SHELL = /bin/sh
-  
-  GMPDIR 		= gmp-1.3.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
---- 144,159 ----
-  SHELL = /bin/sh
-  
-  GMPDIR 		= gmp-1.3.2
-! GMPINCDIR	= $(GMPDIR)
-! GMPLIBDIR	= $(GMPDIR)
-! GMPLIBS		= -L$(GMPLIBDIR) -lgmp
-! GMPDEP		= $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
-  
-  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
-***************
-*** 232,238 ****
-  	$(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
---- 236,242 ----
-  	$(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
-***************
-*** 291,297 ****
-                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); \
---- 295,301 ----
-                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); \