mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-21 20:38:45 +00:00
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!).
This commit is contained in:
Paul Traina
parent
a2ca89808a
commit
444809bde1
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=2678
@ -3,10 +3,10 @@
|
||||
# Date created: 30 Jul 1995
|
||||
# Whom: torstenb@FreeBSD.ORG
|
||||
#
|
||||
# $Id: Makefile,v 1.11 1996/01/25 02:08:25 ache Exp $
|
||||
# $Id: Makefile,v 1.12 1996/01/25 04:17:28 ache Exp $
|
||||
#
|
||||
|
||||
DISTNAME= ssh-1.2.12a
|
||||
DISTNAME= ssh-1.2.12.92
|
||||
CATEGORIES= security net
|
||||
MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/snapshots/
|
||||
LIB_DEPENDS= z\\.0\\.:${PORTSDIR}/devel/libz
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (ssh-1.2.12a.tar.gz) = 51be51d40ad6abb08862520b9cf04cf3
|
||||
MD5 (ssh-1.2.12.92.tar.gz) = 9643fd6bb4687553d514bb68fc88c48a
|
||||
|
||||
@ -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. */
|
||||
74
security/ssh/files/patch-af
Normal file
74
security/ssh/files/patch-af
Normal file
@ -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); \
|
||||
@ -3,10 +3,10 @@
|
||||
# Date created: 30 Jul 1995
|
||||
# Whom: torstenb@FreeBSD.ORG
|
||||
#
|
||||
# $Id: Makefile,v 1.11 1996/01/25 02:08:25 ache Exp $
|
||||
# $Id: Makefile,v 1.12 1996/01/25 04:17:28 ache Exp $
|
||||
#
|
||||
|
||||
DISTNAME= ssh-1.2.12a
|
||||
DISTNAME= ssh-1.2.12.92
|
||||
CATEGORIES= security net
|
||||
MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/snapshots/
|
||||
LIB_DEPENDS= z\\.0\\.:${PORTSDIR}/devel/libz
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (ssh-1.2.12a.tar.gz) = 51be51d40ad6abb08862520b9cf04cf3
|
||||
MD5 (ssh-1.2.12.92.tar.gz) = 9643fd6bb4687553d514bb68fc88c48a
|
||||
|
||||
@ -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. */
|
||||
74
security/ssh2/files/patch-af
Normal file
74
security/ssh2/files/patch-af
Normal file
@ -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); \
|
||||
Loading…
Reference in New Issue
Block a user