aboutsummaryrefslogtreecommitdiffstats
path: root/security/ssh/files
diff options
context:
space:
mode:
authorpst <pst@FreeBSD.org>1996-02-06 10:57:10 +0800
committerpst <pst@FreeBSD.org>1996-02-06 10:57:10 +0800
commit76e6d1f53c20ca3232c89b37e975795d33203151 (patch)
treea796563bb5b844020d4b8c23aca68cd36d59e961 /security/ssh/files
parentbb0baafe07dbc3bd40b6c82ae7364036125bc337 (diff)
downloadfreebsd-ports-graphics-76e6d1f53c20ca3232c89b37e975795d33203151.tar.gz
freebsd-ports-graphics-76e6d1f53c20ca3232c89b37e975795d33203151.tar.zst
freebsd-ports-graphics-76e6d1f53c20ca3232c89b37e975795d33203151.zip
Upgrade to snapshot of ssh. 1.1.12a was recalled due to even worse
security problems. Also re-do the method we use for disconnecting ourselves from the supplied gmp and z libraries so that this can be maintained in the future (sigh!).
Diffstat (limited to 'security/ssh/files')
-rw-r--r--security/ssh/files/patch-ac14
-rw-r--r--security/ssh/files/patch-af74
2 files changed, 74 insertions, 14 deletions
diff --git a/security/ssh/files/patch-ac b/security/ssh/files/patch-ac
deleted file mode 100644
index c2c53c02946..00000000000
--- a/security/ssh/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-*** sshd.c.old Sun Oct 1 11:16:22 1995
---- sshd.c Tue Nov 21 02:03:24 1995
-***************
-*** 1581,1586 ****
---- 1581,1589 ----
- log_init(av0, debug_flag && !inetd_flag, debug_flag,
- options.quiet_mode, options.log_facility);
-
-+ #ifdef HAVE_SETSID
-+ setsid();
-+ #endif
- #ifdef USE_PIPES
- /* Redirect stdin. We close the parent side of the socket pair,
- and make the child side the standard input. */
diff --git a/security/ssh/files/patch-af b/security/ssh/files/patch-af
new file mode 100644
index 00000000000..66956019cca
--- /dev/null
+++ b/security/ssh/files/patch-af
@@ -0,0 +1,74 @@
+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)/libz.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); \