1.2.16 --> 1.2.17

(new agent forwarding protocol that is said to work this time)
This commit is contained in:
Adam David 1996-11-20 12:45:59 +00:00
parent 5b59e10b4c
commit 80926da9e8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=4614
7 changed files with 53 additions and 50 deletions

View File

@ -1,17 +1,17 @@
# New ports collection makefile for: ssh
# Version required: 1.2.16
# Version required: 1.2.17
# Date created: 30 Jul 1995
# Whom: torstenb@FreeBSD.ORG
#
# $Id: Makefile,v 1.34 1996/10/16 04:55:58 ache Exp $
# $Id: Makefile,v 1.35 1996/11/18 11:39:31 asami Exp $
#
# Maximal ssh package requires YES values for
# USE_PERL, USE_TCPWRAP
#
DISTNAME= ssh-1.2.16
DISTNAME= ssh-1.2.17
CATEGORIES= security net
MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/
MASTER_SITES= ftp://ftp.funet.fi/pub/unix/security/login/ssh/
MAINTAINER= torstenb@FreeBSD.ORG
@ -20,7 +20,7 @@ MAINTAINER= torstenb@FreeBSD.ORG
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
DISTFILES= ${DISTNAME}.tar.gz rsaref2.tar.gz
MASTER_SITES= \
ftp://ftp.cs.hut.fi/pub/ssh/ \
ftp://ftp.funet.fi/pub/unix/security/login/ssh/ \
ftp://nic.funet.fi/pub/crypt/mirrors/ftp.dsi.unimi.it/applied-crypto/ \
ftp://rzsun2.informatik.uni-hamburg.de/pub/virus/crypt/ripem/ \
ftp://ftp.dsi.unimi.it/pub/security/crypt/math/ \

View File

@ -1,2 +1,2 @@
MD5 (ssh-1.2.16.tar.gz) = 4b36e9d1d651e5230c6717834d739ed4
MD5 (ssh-1.2.17.tar.gz) = f38c5bdce93e81c33176f95c6e635dc7
MD5 (rsaref2.tar.gz) = 0b474c97bf1f1c0d27e5a95f1239c08d

View File

@ -4,7 +4,7 @@
*** 159,170 ****
SHELL = /bin/sh
GMPDIR = gmp-2.0.2
GMPDIR = gmp-2.0.2-ssh-2
! GMPLIBS = -L$(GMPDIR) -lgmp
! GMPDEP = $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
@ -17,7 +17,7 @@
--- 159,176 ----
SHELL = /bin/sh
GMPDIR = gmp-2.0.2
GMPDIR = gmp-2.0.2-ssh-2
! # We have the same libgmp in the system, so use it instead
! GMPINCDIR = /usr/include
! GMPLIBDIR = /usr/lib
@ -38,7 +38,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$(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)\" -DSSH_BINDIR=\"$(bindir)\" $(CFLAGS) $(X_CFLAGS) $<
sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
-rm -f sshd
@ -46,7 +46,7 @@
$(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) $<
! $(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)\" -DSSH_BINDIR=\"$(bindir)\" $(CFLAGS) $(X_CFLAGS) $<
sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
-rm -f sshd
@ -112,7 +112,7 @@
*** 462,488 ****
clean:
-rm -f *.o minfd.h gmon.out *core $(PROGRAMS) gen_minfd rfc-pg
-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
! cd $(GMPDIR); $(MAKE) clean
# cd $(RSAREFSRCDIR); rm -f *.o *.a
! cd $(ZLIBDIR); $(MAKE) clean
@ -128,19 +128,19 @@
-mkdir $(DISTNAME)
cp $(DISTFILES) $(DISTNAME)
-rm $(DISTNAME)/config.h
! tar cf - $(GMPDIR) | (cd $(DISTNAME); tar xf -)
! cd $(DISTNAME)/$(GMPDIR); $(MAKE) clean
! tar pcf - $(GMPDIR) | (cd $(DISTNAME); tar pxf -)
! cd $(DISTNAME)/$(GMPDIR); $(MAKE) distclean
# tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
# cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
! tar cf - $(ZLIBDIR) | (cd $(DISTNAME); tar xf -)
! tar pcf - $(ZLIBDIR) | (cd $(DISTNAME); tar pxf -)
! cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a
tar cf $(DISTNAME).tar $(DISTNAME)
tar pcf $(DISTNAME).tar $(DISTNAME)
-rm -f $(DISTNAME).tar.gz
gzip $(DISTNAME).tar
--- 468,494 ----
clean:
-rm -f *.o minfd.h gmon.out *core $(PROGRAMS) gen_minfd rfc-pg
-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
! # cd $(GMPDIR); $(MAKE) clean
# cd $(RSAREFSRCDIR); rm -f *.o *.a
! # cd $(ZLIBDIR); $(MAKE) clean
@ -156,11 +156,11 @@
-mkdir $(DISTNAME)
cp $(DISTFILES) $(DISTNAME)
-rm $(DISTNAME)/config.h
! # tar cf - $(GMPDIR) | (cd $(DISTNAME); tar xf -)
! # cd $(DISTNAME)/$(GMPDIR); $(MAKE) clean
! # tar pcf - $(GMPDIR) | (cd $(DISTNAME); tar pxf -)
! # cd $(DISTNAME)/$(GMPDIR); $(MAKE) distclean
# tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
# cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
! # tar cf - $(ZLIBDIR) | (cd $(DISTNAME); tar xf -)
! # tar pcf - $(ZLIBDIR) | (cd $(DISTNAME); tar pxf -)
! # cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a
tar cf $(DISTNAME).tar $(DISTNAME)
-rm -f $(DISTNAME).tar.gz

View File

@ -1,17 +1,17 @@
# New ports collection makefile for: ssh
# Version required: 1.2.16
# Version required: 1.2.17
# Date created: 30 Jul 1995
# Whom: torstenb@FreeBSD.ORG
#
# $Id: Makefile,v 1.34 1996/10/16 04:55:58 ache Exp $
# $Id: Makefile,v 1.35 1996/11/18 11:39:31 asami Exp $
#
# Maximal ssh package requires YES values for
# USE_PERL, USE_TCPWRAP
#
DISTNAME= ssh-1.2.16
DISTNAME= ssh-1.2.17
CATEGORIES= security net
MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/
MASTER_SITES= ftp://ftp.funet.fi/pub/unix/security/login/ssh/
MAINTAINER= torstenb@FreeBSD.ORG
@ -20,7 +20,7 @@ MAINTAINER= torstenb@FreeBSD.ORG
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
DISTFILES= ${DISTNAME}.tar.gz rsaref2.tar.gz
MASTER_SITES= \
ftp://ftp.cs.hut.fi/pub/ssh/ \
ftp://ftp.funet.fi/pub/unix/security/login/ssh/ \
ftp://nic.funet.fi/pub/crypt/mirrors/ftp.dsi.unimi.it/applied-crypto/ \
ftp://rzsun2.informatik.uni-hamburg.de/pub/virus/crypt/ripem/ \
ftp://ftp.dsi.unimi.it/pub/security/crypt/math/ \

View File

@ -1,2 +1,2 @@
MD5 (ssh-1.2.16.tar.gz) = 4b36e9d1d651e5230c6717834d739ed4
MD5 (ssh-1.2.17.tar.gz) = f38c5bdce93e81c33176f95c6e635dc7
MD5 (rsaref2.tar.gz) = 0b474c97bf1f1c0d27e5a95f1239c08d

View File

@ -1,9 +1,9 @@
*** configure.old Tue Oct 22 02:36:46 1996
--- configure Tue Oct 22 02:40:51 1996
*** configure.orig Wed Oct 30 04:27:56 1996
--- configure Fri Nov 15 07:18:17 1996
***************
*** 1302,1313 ****
;;
esac
*** 1331,1342 ****
export CFLAGS CC
- # Socket pairs appear to be broken on several systems. I don't know exactly
- # where, so I'll use pipes everywhere for now.
@ -14,9 +14,9 @@
echo $ac_n "checking that the compiler works""... $ac_c" 1>&6
if test "$cross_compiling" = yes; then
--- 1302,1307 ----
--- 1331,1336 ----
***************
*** 5092,5098 ****
*** 5140,5146 ****
EOF
cat >> $CONFIG_STATUS <<EOF
@ -24,7 +24,7 @@
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
--- 5086,5092 ----
--- 5134,5140 ----
EOF
cat >> $CONFIG_STATUS <<EOF
@ -33,13 +33,16 @@
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
***************
*** 5284,5289 ****
--- 5278,5285 ----
*** 5332,5338 ****
--- 5326,5336 ----
done
for ac_config_dir in gmp-2.0.2; do
+
for ac_config_dir in gmp-2.0.2-ssh-2; do
+
+ continue # XXX don't configure gmp
+ # Do not complain, so a configure script can configure whichever
+ # parts of a large source tree are present.
# Do not complain, so a configure script can configure whichever
# parts of a large source tree are present.
if test ! -d $srcdir/$ac_config_dir; then

View File

@ -4,7 +4,7 @@
*** 159,170 ****
SHELL = /bin/sh
GMPDIR = gmp-2.0.2
GMPDIR = gmp-2.0.2-ssh-2
! GMPLIBS = -L$(GMPDIR) -lgmp
! GMPDEP = $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
@ -17,7 +17,7 @@
--- 159,176 ----
SHELL = /bin/sh
GMPDIR = gmp-2.0.2
GMPDIR = gmp-2.0.2-ssh-2
! # We have the same libgmp in the system, so use it instead
! GMPINCDIR = /usr/include
! GMPLIBDIR = /usr/lib
@ -38,7 +38,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$(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)\" -DSSH_BINDIR=\"$(bindir)\" $(CFLAGS) $(X_CFLAGS) $<
sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
-rm -f sshd
@ -46,7 +46,7 @@
$(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) $<
! $(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)\" -DSSH_BINDIR=\"$(bindir)\" $(CFLAGS) $(X_CFLAGS) $<
sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
-rm -f sshd
@ -112,7 +112,7 @@
*** 462,488 ****
clean:
-rm -f *.o minfd.h gmon.out *core $(PROGRAMS) gen_minfd rfc-pg
-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
! cd $(GMPDIR); $(MAKE) clean
# cd $(RSAREFSRCDIR); rm -f *.o *.a
! cd $(ZLIBDIR); $(MAKE) clean
@ -128,19 +128,19 @@
-mkdir $(DISTNAME)
cp $(DISTFILES) $(DISTNAME)
-rm $(DISTNAME)/config.h
! tar cf - $(GMPDIR) | (cd $(DISTNAME); tar xf -)
! cd $(DISTNAME)/$(GMPDIR); $(MAKE) clean
! tar pcf - $(GMPDIR) | (cd $(DISTNAME); tar pxf -)
! cd $(DISTNAME)/$(GMPDIR); $(MAKE) distclean
# tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
# cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
! tar cf - $(ZLIBDIR) | (cd $(DISTNAME); tar xf -)
! tar pcf - $(ZLIBDIR) | (cd $(DISTNAME); tar pxf -)
! cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a
tar cf $(DISTNAME).tar $(DISTNAME)
tar pcf $(DISTNAME).tar $(DISTNAME)
-rm -f $(DISTNAME).tar.gz
gzip $(DISTNAME).tar
--- 468,494 ----
clean:
-rm -f *.o minfd.h gmon.out *core $(PROGRAMS) gen_minfd rfc-pg
-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
! # cd $(GMPDIR); $(MAKE) clean
# cd $(RSAREFSRCDIR); rm -f *.o *.a
! # cd $(ZLIBDIR); $(MAKE) clean
@ -156,11 +156,11 @@
-mkdir $(DISTNAME)
cp $(DISTFILES) $(DISTNAME)
-rm $(DISTNAME)/config.h
! # tar cf - $(GMPDIR) | (cd $(DISTNAME); tar xf -)
! # cd $(DISTNAME)/$(GMPDIR); $(MAKE) clean
! # tar pcf - $(GMPDIR) | (cd $(DISTNAME); tar pxf -)
! # cd $(DISTNAME)/$(GMPDIR); $(MAKE) distclean
# tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
# cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
! # tar cf - $(ZLIBDIR) | (cd $(DISTNAME); tar xf -)
! # tar pcf - $(ZLIBDIR) | (cd $(DISTNAME); tar pxf -)
! # cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a
tar cf $(DISTNAME).tar $(DISTNAME)
-rm -f $(DISTNAME).tar.gz