head	1.24;
access;
symbols
	RELEASE_7_4_0:1.23
	RELEASE_8_2_0:1.23
	RELEASE_6_EOL:1.23
	RELEASE_8_1_0:1.23
	RELEASE_7_3_0:1.23
	RELEASE_8_0_0:1.23
	RELEASE_7_2_0:1.23
	RELEASE_7_1_0:1.23
	RELEASE_6_4_0:1.23
	RELEASE_5_EOL:1.23
	RELEASE_7_0_0:1.23
	RELEASE_6_3_0:1.23
	PRE_XORG_7:1.23
	RELEASE_4_EOL:1.23
	RELEASE_6_2_0:1.23
	RELEASE_6_1_0:1.23
	RELEASE_5_5_0:1.23
	RELEASE_6_0_0:1.23
	RELEASE_5_4_0:1.23
	RELEASE_4_11_0:1.23
	RELEASE_5_3_0:1.23
	RELEASE_4_10_0:1.23
	RELEASE_5_2_1:1.23
	RELEASE_5_2_0:1.23
	RELEASE_4_9_0:1.23
	RELEASE_5_1_0:1.23
	RELEASE_4_8_0:1.23
	RELEASE_5_0_0:1.22
	RELEASE_4_7_0:1.21
	RELEASE_4_6_2:1.19
	RELEASE_4_6_1:1.19
	ssh_1_2_33:1.21
	ssh_1_2_32:1.20
	ssh_1_2_31:1.20
	ssh_1_2_30:1.20
	ssh_1_2_29:1.20
	ssh_1_2_28:1.20
	ssh_1_2_27:1.19
	RELEASE_4_6_0:1.19
	RELEASE_5_0_DP1:1.18
	RELEASE_4_5_0:1.18
	RELEASE_4_4_0:1.18
	RELEASE_4_3_0:1.18
	RELEASE_4_2_0:1.18
	RELEASE_4_1_1:1.18
	RELEASE_4_1_0:1.17
	RELEASE_3_5_0:1.17
	RELEASE_4_0_0:1.17
	RELEASE_3_4_0:1.17
	RELEASE_3_3_0:1.17
	RELEASE_3_2_0:1.16
	RELEASE_3_1_0:1.16
	RELEASE_2_2_8:1.16
	RELEASE_3_0_0:1.16
	RELEASE_2_2_7:1.14
	RELEASE_2_2_6:1.13
	RELEASE_2_2_5:1.13
	RELEASE_2_2_1:1.9
	RELEASE_2_2_2:1.12;
locks; strict;
comment	@# @;


1.24
date	2011.05.01.20.14.19;	author bapt;	state dead;
branches;
next	1.23;

1.23
date	2003.01.08.23.34.34;	author mdodd;	state Exp;
branches;
next	1.22;

1.22
date	2002.10.25.14.43.22;	author netchild;	state Exp;
branches;
next	1.21;

1.21
date	2002.06.30.03.57.57;	author obrien;	state Exp;
branches;
next	1.20;

1.20
date	2002.06.29.18.13.36;	author obrien;	state Exp;
branches;
next	1.19;

1.19
date	2002.04.26.06.23.41;	author sobomax;	state Exp;
branches;
next	1.18;

1.18
date	2000.09.17.08.45.12;	author kris;	state Exp;
branches;
next	1.17;

1.17
date	99.06.15.20.13.54;	author sada;	state Exp;
branches;
next	1.16;

1.16
date	98.10.08.03.42.23;	author jkh;	state Exp;
branches;
next	1.15;

1.15
date	98.09.13.20.38.06;	author chuckr;	state Exp;
branches;
next	1.14;

1.14
date	98.06.12.07.55.13;	author dima;	state Exp;
branches;
next	1.13;

1.13
date	97.09.16.00.13.25;	author torstenb;	state Exp;
branches;
next	1.12;

1.12
date	97.04.25.05.01.04;	author peter;	state Exp;
branches;
next	1.11;

1.11
date	97.04.16.19.48.23;	author ache;	state Exp;
branches;
next	1.10;

1.10
date	97.03.28.23.30.27;	author ache;	state Exp;
branches;
next	1.9;

1.9
date	97.02.27.00.44.31;	author ache;	state Exp;
branches;
next	1.8;

1.8
date	96.11.20.12.45.59;	author adam;	state Exp;
branches;
next	1.7;

1.7
date	96.10.24.23.46.11;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	96.10.16.04.56.07;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	96.07.18.11.33.45;	author torstenb;	state Exp;
branches;
next	1.4;

1.4
date	96.07.16.00.33.16;	author ache;	state dead;
branches;
next	1.3;

1.3
date	96.06.17.16.14.19;	author ache;	state Exp;
branches;
next	1.2;

1.2
date	96.02.06.02.57.08;	author pst;	state dead;
branches;
next	1.1;

1.1
date	95.11.21.04.30.29;	author peter;	state Exp;
branches;
next	;


desc
@@


1.24
log
@Remove unmaintained expired ports from security

2011-05-01 security/aafid2: Upstream disapear and distfile is no more available
2011-05-01 security/bjorb: Upstream disapear and distfile is no more available
2011-05-01 security/borzoi: Upstream disapear and distfile is no more available
2011-05-01 security/cmd5checkpw: Upstream disapear and distfile is no more available
2011-05-01 security/cops: Upstream disapear and distfile is no more available
2011-05-01 security/find_ddos: Upstream disapear and distfile is no more available
2011-05-01 security/ftpmap: Upstream disapear and distfile is no more available
2011-05-01 security/hafiye: Upstream disapear and distfile is no more available
2011-05-01 security/ident2: Upstream disapear and distfile is no more available
2011-05-01 security/liedentd: Upstream disapear and distfile is no more available
2011-05-01 security/pam_pop3: Upstream disapear and distfile is no more available
2011-05-01 security/poc: Upstream disapear and distfile is no more available
2011-05-01 security/portscanner: Upstream disapear and distfile is no more available
2011-05-01 security/ppgen: Upstream disapear and distfile is no more available
2011-05-01 security/qident: Upstream disapear and distfile is no more available
2011-05-01 security/quintuple-agent: Upstream disapear and distfile is no more available
2011-05-01 security/rc5pipe: Upstream disapear and distfile is no more available
2011-05-01 security/rid: Upstream disapear and distfile is no more available
2011-05-01 security/ssh: Upstream disapear and distfile is no more available
2011-05-01 security/tea-total: Upstream disapear and distfile is no more available
2011-05-01 security/uberkey: Upstream disapear and distfile is no more available
@
text
@--- Makefile.in.orig	Thu Jan 17 08:35:34 2002
+++ Makefile.in	Wed Jan  8 18:13:41 2003
@@@@ -307,11 +307,13 @@@@
 
 SHELL = /bin/sh
 
-GMPDIR 		= gmp-2.0.2-ssh-2
-GMPLIBS 	= @@ssh_gmp_ldadd_options@@
-GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
+GMPDIR		=
+GMPINCDIR	?= /usr/include
+GMPLIBDIR 	?= /usr/lib
+GMPLIBS 	= -L$(GMPLIBDIR) -lgmp
+GMPDEP 		= $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
 
-ZLIBDIR		= zlib-1.0.4
+ZLIBDIR		= /usr/lib
 ZLIBDEP		= $(ZLIBDIR)/libz.a
 ZLIBLIBS	= @@ssh_zlib_ldadd_options@@
 
@@@@ -418,17 +420,19 @@@@
 	$(CC) -o rfc-pg rfc-pg.o
 
 .c.o:
-	$(CC) -c -I. $(KERBEROS_INCS) -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)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
+	$(CC) -c -I. $(KERBEROS_INCS) -I$(GMPINCDIR) $(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)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
 
 sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
 	-rm -f sshd
 	$(CC) $(LDFLAGS) -o sshd $(SSHD_OBJS) \
-		$(GMPLIBS) $(ZLIBLIBS) $(WRAPLIBS) $(LIBS) $(KERBEROS_LIBS)
+		$(KERBEROS_LIBS) \
+		$(GMPLIBS) $(ZLIBLIBS) $(WRAPLIBS) $(LIBS)
 
 ssh: $(SSH_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
 	-rm -f ssh
 	$(CC) $(LDFLAGS) -o ssh $(SSH_OBJS) \
-		$(GMPLIBS) $(ZLIBLIBS) $(WRAPLIBS) $(LIBS) $(KERBEROS_LIBS)
+		$(KERBEROS_LIBS) \
+		$(GMPLIBS) $(ZLIBLIBS) $(WRAPLIBS) $(LIBS)
 
 ssh-keygen: $(KEYGEN_OBJS) $(GMPDEP) $(RSAREFDEP)
 	-rm -f ssh-keygen
@@@@ -436,7 +440,9 @@@@
 
 ssh-agent: $(AGENT_OBJS) $(GMPDEP) $(RSAREFDEP)
 	-rm -f ssh-agent
-	$(CC) $(LDFLAGS) -o ssh-agent $(AGENT_OBJS) $(GMPLIBS) $(LIBS) $(KERBEROS_LIBS) 
+	$(CC) $(LDFLAGS) -o ssh-agent $(AGENT_OBJS) \
+	$(KERBEROS_LIBS) \
+	$(GMPLIBS) $(LIBS)
 
 ssh-add: $(ADD_OBJS) $(GMPDEP) $(RSAREFDEP)
 	-rm -f ssh-add
@@@@ -461,12 +467,12 @@@@
 	sed "s#&PERL&#$(PERL)#" <$(srcdir)/make-ssh-known-hosts.pl >make-ssh-known-hosts
 	chmod +x make-ssh-known-hosts
 
-GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
+XXX_DONT_GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
 		mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
-$(GMPDIR)/libgmp.a:
+XXX_DONT_$(GMPDIR)/libgmp.a:
 	cd $(GMPDIR); $(MAKE)
 
-$(ZLIBDEP):
+XXX_DONT_$(ZLIBDEP):
 	-if test '!' -d $(ZLIBDIR); then \
 	  mkdir $(ZLIBDIR); \
 	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
@@@@ -530,7 +536,7 @@@@
 # (otherwise it can only log in as the user it runs as, and must be
 # bound to a non-privileged port).  Also, password authentication may
 # not be available if non-root and using shadow passwords.
-install: $(PROGRAMS) make-dirs generate-host-key install-configs
+install: $(PROGRAMS) make-dirs install-configs
 	-rm -f $(install_prefix)$(bindir)/ssh1.old
 	-chmod 755 $(install_prefix)$(bindir)/ssh1
 	-chmod 755 $(install_prefix)$(bindir)/ssh
@@@@ -756,7 +762,7 @@@@
 	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null
 
 depend:
-	$(MAKEDEP) -I$(srcdir) -I. -I$(GMPDIR) -I$(ZLIBDIR) $(DEFS) $(SRCS)
+	$(MAKEDEP) -I$(srcdir) -I.                          $(DEFS) $(SRCS)
 
 tags:
 	-rm -f TAGS
@


1.23
log
@- Correctly order KERBEROS_LIBS so that the build doesn't try to
  link against system krb5 libs.
- Specify a runtime linker path option.
@
text
@@


1.22
log
@Quoting the submitter:
---snip---
- Revert the partially enabled building and usage of the libgmp version
  shipping with ssh introduced with the upgrade to 1.2.33. For -current
  depend on math/libgmp-freebsd and use the libgmp in the base system
  for -stable like this port did before. This fixes compilation on
  -current and turns of the annoying errors when the configure of the
  ssh-enclosed libgmp tests the optimisations using the wrong assembler-
  syntax on 4-stable. The later causes configure to hang on 3-stable.
- Don't define 'REALLY_WANT_SSH=1' in the Makefile else the FORBIDDEN
  for FreeBSD systems shipping with OpenSSH in the base-distribution and
  not defining 'REALLY_WANT_SSH' is useless. This was also broken with
  the last commit.

Tested on 5.0-current, 4-stable and 3-stable.
---snip---

Submitted by:	marius@@alchemy.franken.de
@
text
@d1 2
a2 2
--- Makefile.in.orig	Thu Jan 17 14:35:34 2002
+++ Makefile.in	Mon Oct 21 23:43:07 2002
d21 1
a21 1
@@@@ -418,7 +420,7 @@@@
d30 26
a55 1
@@@@ -461,12 +463,12 @@@@
d71 1
a71 1
@@@@ -530,7 +532,7 @@@@
d80 1
a80 1
@@@@ -756,7 +758,7 @@@@
@


1.21
log
@Update to version 1.2.33.
@
text
@d1 3
a3 3
--- Makefile.in.orig	Thu Jan 17 05:35:34 2002
+++ Makefile.in	Sat Jun 29 20:37:40 2002
@@@@ -307,11 +307,11 @@@@
d8 1
a8 2
+GMPDIR 		= $(PREFIX)
 GMPLIBS 	= @@ssh_gmp_ldadd_options@@
d10 5
a14 1
+GMPDEP 		=
d21 1
a21 1
@@@@ -418,7 +418,7 @@@@
d26 1
a26 1
+	$(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) $(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)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
d30 9
a38 2
@@@@ -466,7 +466,7 @@@@
 $(GMPDIR)/libgmp.a:
d46 1
a46 1
@@@@ -530,7 +530,7 @@@@
d55 1
a55 1
@@@@ -756,7 +756,7 @@@@
@


1.20
log
@Update to version 1.2.28.
@
text
@d1 3
a3 3
--- Makefile.in.orig	Mon Jul  3 10:07:39 2000
+++ Makefile.in	Fri Jun 21 17:50:07 2002
@@@@ -307,13 +307,15 @@@@
d8 2
a9 1
-GMPLIBS 	= @@ssh_gmp_ldadd_options@@
d11 1
a11 5
+# We have the same libgmp in the base system, so use it instead
+GMPINCDIR	?= /usr/include
+GMPLIBDIR	?= /usr/lib
+GMPLIBS 	= -L$(GMPLIBDIR) -lgmp
+GMPDEP 		= $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
d16 1
a16 2
-ZLIBLIBS	= @@ssh_zlib_ldadd_options@@
+ZLIBLIBS	= -lz
d18 1
a18 3
 RSAREFDIR	= rsaref2
 RSAREFSRCDIR 	= $(RSAREFDIR)/source
@@@@ -418,7 +420,7 @@@@
d27 2
a28 9
@@@@ -461,12 +463,12 @@@@
 	sed "s#&PERL&#$(PERL)#" <$(srcdir)/make-ssh-known-hosts.pl >make-ssh-known-hosts
 	chmod +x make-ssh-known-hosts
 
-GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
+XXX_DONT_GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
 		mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
-$(GMPDIR)/libgmp.a:
+XXX_DONT_$(GMPDIR)/libgmp.a:
d36 1
a36 1
@@@@ -530,7 +532,7 @@@@
d45 1
a45 1
@@@@ -756,7 +758,7 @@@@
d50 1
a50 1
+	$(MAKEDEP) -I$(srcdir) -I. -I$(GMPINCDIR)           $(DEFS) $(SRCS)
@


1.19
log
@Fix libgmp breakage on -current.
@
text
@d1 4
a4 3
--- Makefile.in.orig	Wed May 12 14:19:31 1999
+++ Makefile.in	Fri Apr 26 09:19:30 2002
@@@@ -301,12 +301,17 @@@@
d7 2
a8 2
 GMPDIR 		= gmp-2.0.2-ssh-2
-GMPLIBS 	= -L$(GMPDIR) -lgmp
d10 1
a10 1
+# We have the same libgmp in the system, so use it instead
d16 4
a19 6
 ZLIBDIR		= zlib-1.0.4
-ZLIBDEP		= $(ZLIBDIR)/libz.a
-ZLIBLIBS	= -L$(ZLIBDIR) -lz
+ZLIBINCDIR	= /usr/include
+ZLIBLIBDIR	= /usr/lib
+ZLIBDEP		= $(ZLIBINCDIR)/libz.a
d24 1
a24 1
@@@@ -411,7 +416,7 @@@@
d29 1
a29 1
+	$(CC) -c -I. $(KERBEROS_INCS) -I$(GMPINCDIR) -I$(srcdir)/$(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)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
d33 1
a33 1
@@@@ -454,19 +459,19 @@@@
d38 2
a39 1
-		mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
d41 3
a43 2
-	cd $(GMPDIR); $(MAKE)
-
d45 5
a49 24
-	-if test '!' -d $(ZLIBDIR); then \
-	  mkdir $(ZLIBDIR); \
-	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
-	fi
-	cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \
-	  CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \
-	    -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a
+#GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
+#		mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
+#$(GMPDIR)/libgmp.a:
+#	cd $(GMPDIR); $(MAKE)
+#
+#$(ZLIBDEP):
+#	-if test '!' -d $(ZLIBDIR); then \
+#	  mkdir $(ZLIBDIR); \
+#	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
+#	fi
+#	cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \
+#	  CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \
+#	    -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a
 
 $(RSAREFSRCDIR)/librsaref.a:
 	-if test '!' -d $(RSAREFDIR); then \
@@@@ -523,7 +528,7 @@@@
d58 1
a58 38
@@@@ -679,15 +684,15 @@@@
 
 clean:
 	-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
-	cd $(GMPDIR); $(MAKE) clean
+#	cd $(GMPDIR); $(MAKE) clean
 #	cd $(RSAREFSRCDIR); rm -f *.o *.a
-	cd $(ZLIBDIR); $(MAKE) clean
+#	cd $(ZLIBDIR); $(MAKE) clean
 
 distclean: clean
 	-rm -f Makefile config.status config.cache config.log config.h
 	-rm -f ssh.1 sshd.8 make-ssh-known-hosts.1
-	cd $(GMPDIR); $(MAKE) distclean
-	cd $(ZLIBDIR); $(MAKE) distclean
+#	cd $(GMPDIR); $(MAKE) distclean
+#	cd $(ZLIBDIR); $(MAKE) distclean
 
 dist: dist-free
 
@@@@ -716,12 +721,12 @@@@
 	-mkdir $(DISTNAME)
 	cp $(DISTFILES) $(DISTNAME)
 	for i in $(DISTSRCS); do cp $(srcdir)/$$i $(DISTNAME); done
-	(cd $(GMPDIR); make dist)
-	gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - )
+#	(cd $(GMPDIR); make dist)
+#	gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - )
 #	tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
 #	cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
-	(cd  $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -)
-	cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS
+#	(cd  $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -)
+#	cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS
 
 #ifdef F_SECURE_COMMERCIAL
 #
@@@@ -749,7 +754,7 @@@@
d63 1
a63 1
+	$(MAKEDEP) -I$(srcdir) -I. $(DEFS) $(SRCS)
@


1.18
log
@Remove dependency on rsaref, comment out RESTRICTED line (but leave it
there for reference in case we replace these with a CRYPTO variable), and
bump PORTREVISION.
@
text
@d1 2
a2 2
--- Makefile.in.orig	Wed May 12 04:19:31 1999
+++ Makefile.in	Sun Sep 17 01:39:40 2000
d10 3
a12 3
+GMPINCDIR	= /usr/include
+GMPLIBDIR	= /usr/lib
+GMPLIBS 	= -lgmp
d30 1
a30 1
+	$(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPINCDIR) -I$(srcdir)/$(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)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
@


1.17
log
@PR:	ports/12037
Submitted by:	Issei Suzuki <issei@@jp.FreeBSD.ORG>
Upgrade to 1.2.27.
# I'm not maintainer but it seems that torstenb is too busy to
# look the PR and many people want new version ssh port.
@
text
@d1 3
a3 3
--- Makefile.in.orig	Wed May 12 20:19:31 1999
+++ Makefile.in	Sun Jun  6 01:22:50 1999
@@@@ -301,14 +301,19 @@@@
d23 1
a23 2
-RSAREFDIR	= rsaref2
+RSAREFDIR	= ${PORTSDIR}/security/rsaref/work
a24 2
 
 X_CFLAGS	= @@X_CFLAGS@@
d30 1
a30 1
+	$(CC) -c -I. $(KERBEROS_INCS) -I../../../rsaref/work -I$(srcdir)/$(GMPINCDIR) -I$(srcdir)/$(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)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
@


1.16
log
@Properly reference the rsaref sources, which are required during the build
of ssh now.  If anyone knows of a way of making the build dependency here
less gross, I'm listening! :)
@
text
@d1 3
a3 3
--- Makefile.in.orig	Wed Jul  8 09:40:39 1998
+++ Makefile.in	Wed Oct  7 19:11:37 1998
@@@@ -294,14 +294,19 @@@@
d28 1
a28 1
@@@@ -404,7 +409,7 @@@@
d37 1
a37 1
@@@@ -447,19 +452,19 @@@@
d70 1
a70 1
@@@@ -516,7 +521,7 @@@@
d79 1
a79 1
@@@@ -672,15 +677,15 @@@@
d99 1
a99 1
@@@@ -709,12 +714,12 @@@@
d116 1
a116 1
@@@@ -742,7 +747,7 @@@@
@


1.15
log
@Repair a linkage problem, whereis the ssh port was trying to
specify the location of system libs.
Reviewed by:	Mark Murray, David O'Brien
@
text
@d1 3
a3 3
--- Makefile.in.orig	Wed Jul  8 12:40:39 1998
+++ Makefile.in	Sun Sep 13 12:38:43 1998
@@@@ -294,12 +294,17 @@@@
d23 2
a24 1
 RSAREFDIR	= rsaref2
d26 2
d33 1
a33 1
+	$(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPINCDIR) -I$(srcdir)/$(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)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
@


1.14
log
@1.2.22 -> 1.2.25

Somebody needs to go through patch-af to check it, since I'm not sure
about some of the stuff.

This version fixes a security flaw in previous version.
@
text
@d1 121
a121 186
*** Makefile.in.orig	Thu Jun 11 07:01:13 1998
--- Makefile.in	Thu Jun 11 20:48:59 1998
***************
*** 287,298 ****
  SHELL = /bin/sh
  
  GMPDIR 		= gmp-2.0.2-ssh-2
! GMPLIBS 	= -L$(GMPDIR) -lgmp
! GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
  
  ZLIBDIR		= zlib-1.0.4
! ZLIBDEP		= $(ZLIBDIR)/libz.a
! ZLIBLIBS	= -L$(ZLIBDIR) -lz
  
  RSAREFDIR	= rsaref2
  RSAREFSRCDIR 	= $(RSAREFDIR)/source
--- 287,303 ----
  SHELL = /bin/sh
  
  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
! GMPLIBS 	= -L$(GMPLIBDIR) -lgmp
! GMPDEP 		= $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
  
  ZLIBDIR		= zlib-1.0.4
! ZLIBINCDIR	= /usr/include
! ZLIBLIBDIR	= /usr/lib
! ZLIBDEP		= $(ZLIBINCDIR)/libz.a
! ZLIBLIBS	= -L$(ZLIBLIBDIR) -lz
  
  RSAREFDIR	= rsaref2
  RSAREFSRCDIR 	= $(RSAREFDIR)/source
***************
*** 397,403 ****
  	$(CC) -o rfc-pg rfc-pg.o
  
  .c.o:
! 	$(CC) -c -I. $(KERBEROS_INCS) -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)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
  
  sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
  	-rm -f sshd
--- 402,408 ----
  	$(CC) -o rfc-pg rfc-pg.o
  
  .c.o:
! 	$(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPINCDIR) -I$(srcdir)/$(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)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
  
  sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
  	-rm -f sshd
***************
*** 440,458 ****
  	sed "s#&PERL&#$(PERL)#" <$(srcdir)/make-ssh-known-hosts.pl >make-ssh-known-hosts
  	chmod +x make-ssh-known-hosts
  
! GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
! 		mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
! $(GMPDIR)/libgmp.a:
! 	cd $(GMPDIR); $(MAKE)
! 
! $(ZLIBDEP):
! 	-if test '!' -d $(ZLIBDIR); then \
! 	  mkdir $(ZLIBDIR); \
! 	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
! 	fi
! 	cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \
! 	  CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \
! 	    -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a
  
  $(RSAREFSRCDIR)/librsaref.a:
  	-if test '!' -d $(RSAREFDIR); then \
--- 445,463 ----
  	sed "s#&PERL&#$(PERL)#" <$(srcdir)/make-ssh-known-hosts.pl >make-ssh-known-hosts
  	chmod +x make-ssh-known-hosts
  
! #GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
! #		mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
! #$(GMPDIR)/libgmp.a:
! #	cd $(GMPDIR); $(MAKE)
! #
! #$(ZLIBDEP):
! #	-if test '!' -d $(ZLIBDIR); then \
! #	  mkdir $(ZLIBDIR); \
! #	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
! #	fi
! #	cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \
! #	  CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \
! #	    -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a
  
  $(RSAREFSRCDIR)/librsaref.a:
  	-if test '!' -d $(RSAREFDIR); then \
***************
*** 509,515 ****
  # (otherwise it can only log in as the user it runs as, and must be
  # bound to a non-privileged port).  Also, password authentication may
  # not be available if non-root and using shadow passwords.
! install: $(PROGRAMS) make-dirs generate-host-key install-configs
  	-rm -f $(install_prefix)$(bindir)/ssh1.old
  	-mv $(install_prefix)$(bindir)/ssh1 $(install_prefix)$(bindir)/ssh1.old
  	-chmod 755 $(install_prefix)$(bindir)/ssh1.old
--- 514,520 ----
  # (otherwise it can only log in as the user it runs as, and must be
  # bound to a non-privileged port).  Also, password authentication may
  # not be available if non-root and using shadow passwords.
! install: $(PROGRAMS) make-dirs install-configs
  	-rm -f $(install_prefix)$(bindir)/ssh1.old
  	-mv $(install_prefix)$(bindir)/ssh1 $(install_prefix)$(bindir)/ssh1.old
  	-chmod 755 $(install_prefix)$(bindir)/ssh1.old
***************
*** 665,679 ****
  
  clean:
  	-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
! 	cd $(GMPDIR); $(MAKE) clean
  #	cd $(RSAREFSRCDIR); rm -f *.o *.a
! 	cd $(ZLIBDIR); $(MAKE) clean
  
  distclean: clean
  	-rm -f Makefile config.status config.cache config.log config.h
  	-rm -f ssh.1 sshd.8 make-ssh-known-hosts.1
! 	cd $(GMPDIR); $(MAKE) distclean
! 	cd $(ZLIBDIR); $(MAKE) distclean
  
  dist: dist-commercial
  
--- 670,684 ----
  
  clean:
  	-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
! #	cd $(GMPDIR); $(MAKE) clean
  #	cd $(RSAREFSRCDIR); rm -f *.o *.a
! #	cd $(ZLIBDIR); $(MAKE) clean
  
  distclean: clean
  	-rm -f Makefile config.status config.cache config.log config.h
  	-rm -f ssh.1 sshd.8 make-ssh-known-hosts.1
! #	cd $(GMPDIR); $(MAKE) distclean
! #	cd $(ZLIBDIR); $(MAKE) distclean
  
  dist: dist-commercial
  
***************
*** 702,713 ****
  	-mkdir $(DISTNAME)
  	cp $(DISTFILES) $(DISTNAME)
  	for i in $(DISTSRCS); do cp $(srcdir)/$$i $(DISTNAME); done
! 	(cd $(GMPDIR); make dist)
! 	gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - )
  #	tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
  #	cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
! 	(cd  $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -)
! 	cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS
  
  #ifdef F_SECURE_COMMERCIAL
  #
--- 707,718 ----
  	-mkdir $(DISTNAME)
  	cp $(DISTFILES) $(DISTNAME)
  	for i in $(DISTSRCS); do cp $(srcdir)/$$i $(DISTNAME); done
! #	(cd $(GMPDIR); make dist)
! #	gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - )
  #	tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
  #	cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
! #	(cd  $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -)
! #	cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS
  
  #ifdef F_SECURE_COMMERCIAL
  #
***************
*** 735,741 ****
  	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null
  
  depend:
! 	$(MAKEDEP) -I$(srcdir) -I. -I$(GMPDIR) -I$(ZLIBDIR) $(DEFS) $(SRCS)
  
  tags:
  	-rm -f TAGS
--- 740,746 ----
  	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed $(srcdir)/version.h >/dev/null
  
  depend:
! 	$(MAKEDEP) -I$(srcdir) -I. $(DEFS) $(SRCS)
  
  tags:
  	-rm -f TAGS
@


1.13
log
@Upgrade to 1.2.21
@
text
@d1 2
a2 2
*** Makefile.in.orig	Tue Sep 16 01:59:13 1997
--- Makefile.in	Tue Sep 16 02:06:08 1997
d4 1
a4 1
*** 259,270 ****
d17 1
a17 1
--- 259,275 ----
d36 1
a36 1
*** 368,374 ****
d44 1
a44 1
--- 373,379 ----
d53 1
a53 1
*** 411,429 ****
d73 1
a73 1
--- 416,434 ----
d94 1
a94 1
*** 480,486 ****
d99 4
a102 4
  	-rm -f $(install_prefix)$(bindir)/ssh.old
  	-mv $(install_prefix)$(bindir)/ssh $(install_prefix)$(bindir)/ssh.old
  	-chmod 755 $(install_prefix)$(bindir)/ssh.old
--- 485,491 ----
d107 3
a109 3
  	-rm -f $(install_prefix)$(bindir)/ssh.old
  	-mv $(install_prefix)$(bindir)/ssh $(install_prefix)$(bindir)/ssh.old
  	-chmod 755 $(install_prefix)$(bindir)/ssh.old
d111 1
a111 1
*** 589,603 ****
d125 1
a125 1
  dist: dist-free
d127 1
a127 1
--- 594,608 ----
d141 1
a141 1
  dist: dist-free
d144 3
a146 3
*** 628,639 ****
  #
  #endif F_SECURE_COMMERCIAL
d155 1
a155 3
  dist-free-make-tar:
  	tar pcf $(DISTNAME).tar $(DISTNAME)
--- 633,644 ----
d157 3
a159 1
  #endif F_SECURE_COMMERCIAL
d168 2
a169 2
  dist-free-make-tar:
  	tar pcf $(DISTNAME).tar $(DISTNAME)
d171 1
a171 1
*** 656,662 ****
d179 1
a179 1
--- 661,667 ----
@


1.12
log
@Update from ssh-1.2.19 to ssh-1.2.20.  All patches applied still, I just
regenerated them to fix the line numbers.  Also, I added two commented out
options in Makefile, one to tell sshd that a group writeable homedir
is OK because all users are in their own group, and the other is to allow
an unencrypted connection (which is dangerous since it can lead to
compromise of keys), but on a secure network it's damn useful for backups
etc.
@
text
@d1 2
a2 2
*** Makefile.in.orig	Wed Apr 23 08:40:06 1997
--- Makefile.in	Fri Apr 25 12:39:38 1997
d4 1
a4 1
*** 237,248 ****
d17 1
a17 1
--- 237,254 ----
d22 4
a25 4
! GMPINCDIR       = /usr/include
! GMPLIBDIR       = /usr/lib
! GMPDEP          = $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
! GMPLIBS         = -L$(GMPLIBDIR) -lgmp
d28 4
a31 5
! # We have the same libz in the system, so use it instead
! ZLIBINCDIR      = /usr/include
! ZLIBLIBDIR      = /usr/lib
! ZLIBDEP         = $(ZLIBINCDIR)/zlib.h $(ZLIBLIBDIR)/libz.a
! ZLIBLIBS        = -L$(ZLIBLIBDIR) -lz
d36 1
a36 1
*** 336,342 ****
d44 1
a44 1
--- 342,348 ----
d48 1
a48 1
! 	$(CC) -c -I. $(KERBEROS_INCS) -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)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
d53 1
a53 1
*** 373,391 ****
d73 1
a73 1
--- 379,397 ----
d81 9
a89 9
! 
! #$(ZLIBDIR)/libz.a:
! #        -if test '!' -d $(ZLIBDIR); then \
! #          mkdir $(ZLIBDIR); \
! #          cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
! #        fi
! #        cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \
! #          CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \
! #            -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a
d94 1
a94 1
*** 442,448 ****
d102 1
a102 1
--- 448,454 ----
d111 1
a111 1
*** 551,577 ****
d125 3
a127 15
  dist:
  	-rm -rf $(DISTNAME)
  	-mkdir $(DISTNAME)
  	cp $(DISTFILES) $(DISTNAME)
  	for i in $(DISTSRCS); do cp $(srcdir)/$$i $(DISTNAME); done
! 	(cd $(GMPDIR); make dist)
! 	gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - )
  #	tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
  #	cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
! 	(cd  $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -)
! 	cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS
  	tar pcf $(DISTNAME).tar $(DISTNAME)
  	-rm -f $(DISTNAME).tar.gz
  	gzip $(DISTNAME).tar
--- 557,583 ----
d131 1
a131 1
! #       cd $(GMPDIR); $(MAKE) clean
d133 1
a133 1
! #       cd $(ZLIBDIR); $(MAKE) clean
d138 4
a141 2
! #       cd $(GMPDIR); $(MAKE) distclean
! #       cd $(ZLIBDIR); $(MAKE) distclean
d143 4
a146 4
  dist:
  	-rm -rf $(DISTNAME)
  	-mkdir $(DISTNAME)
  	cp $(DISTFILES) $(DISTNAME)
d148 2
a149 2
! #       (cd $(GMPDIR); make dist)
! #       gzip -cd $(GMPDIR)/$(GMPDIR).tar.gz | (cd $(DISTNAME); tar pxf - )
d152 17
a168 2
! #       (cd  $(srcdir); tar pcf - $(ZLIBDIR) )| (cd $(DISTNAME); tar pxf -)
! #       cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a; rm -rf CVS
a169 2
  	-rm -f $(DISTNAME).tar.gz
  	gzip $(DISTNAME).tar
d171 1
a171 1
*** 583,589 ****
d179 1
a179 1
--- 589,595 ----
@


1.11
log
@Upgrade to 1.2.19
@
text
@d1 2
a2 2
*** Makefile.in.orig	Sun Apr  6 03:56:58 1997
--- Makefile.in	Wed Apr 16 22:59:17 1997
d4 1
a4 1
*** 229,240 ****
d17 1
a17 1
--- 229,246 ----
d37 1
a37 1
*** 328,334 ****
d45 1
a45 1
--- 334,340 ----
d54 1
a54 1
*** 365,383 ****
d74 1
a74 1
--- 371,389 ----
d95 1
a95 1
*** 434,440 ****
d103 1
a103 1
--- 440,446 ----
d112 1
a112 1
*** 543,569 ****
d140 1
a140 1
--- 549,575 ----
d169 1
a169 1
*** 575,581 ****
d177 1
a177 1
--- 581,587 ----
@


1.10
log
@Upgrade to 1.2.18
@
text
@d1 2
a2 2
*** Makefile.in.orig	Thu Mar 27 09:04:06 1997
--- Makefile.in	Fri Mar 28 15:36:08 1997
d4 1
a4 1
*** 225,236 ****
d17 1
a17 1
--- 225,242 ----
d37 1
a37 1
*** 324,330 ****
d45 1
a45 1
--- 330,336 ----
d54 1
a54 1
*** 361,379 ****
d74 1
a74 1
--- 367,385 ----
d95 1
a95 1
*** 430,436 ****
d100 4
a103 4
  	$(INSTALL_PROGRAM) -o root -m $(SSH_INSTALL_MODE) ssh $(install_prefix)$(bindir)/ssh
  	-if test "`echo ssh | sed '$(transform)'`" '!=' ssh; then \
  	  rm -f $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; \
--- 436,442 ----
d108 3
a110 3
  	$(INSTALL_PROGRAM) -o root -m $(SSH_INSTALL_MODE) ssh $(install_prefix)$(bindir)/ssh
  	-if test "`echo ssh | sed '$(transform)'`" '!=' ssh; then \
  	  rm -f $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; \
d112 1
a112 1
*** 531,557 ****
d140 1
a140 1
--- 537,563 ----
d169 1
a169 1
*** 563,569 ****
d177 1
a177 1
--- 569,575 ----
@


1.9
log
@Add LOGIN_CAP abilities
Submitted by: davidn
@
text
@d1 2
a2 2
*** Makefile.in.orig	Wed Oct 30 15:27:56 1996
--- Makefile.in	Thu Jan 30 23:00:03 1997
d4 1
a4 1
*** 188,199 ****
d11 1
a11 1
  ZLIBDIR		= zlib-1.0.3
d17 1
a17 1
--- 188,205 ----
d24 2
a25 2
! GMPDEP		= $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
! GMPLIBS		= -L$(GMPLIBDIR) -lgmp
d27 6
a32 6
  ZLIBDIR		= zlib-1.0.3
! # We have newer libz in the system, so use it instead
! ZLIBINCDIR	= /usr/include
! ZLIBLIBDIR	= /usr/lib
! ZLIBDEP		= $(ZLIBINCDIR)/zlib.h $(ZLIBLIBDIR)/libz.a
! ZLIBLIBS	= -L$(ZLIBLIBDIR) -lz
d37 2
a38 2
*** 275,281 ****
  	$(CC) -o rfc-pg rfc-pg.c
d41 1
a41 1
! 	$(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) $<
d45 2
a46 2
--- 281,287 ----
  	$(CC) -o rfc-pg rfc-pg.c
d49 1
a49 1
! 	$(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) $<
d54 1
a54 1
*** 310,328 ****
d74 1
a74 1
--- 316,334 ----
d95 1
a95 1
*** 379,385 ****
d100 1
a100 1
  	$(INSTALL_PROGRAM) -o root -m 04711 ssh $(install_prefix)$(bindir)/ssh
d103 1
a103 1
--- 385,391 ----
d108 1
a108 1
  	$(INSTALL_PROGRAM) -o root -m 04711 ssh $(install_prefix)$(bindir)/ssh
d112 1
a112 1
*** 480,506 ****
d130 3
a132 3
  	-rm $(DISTNAME)/config.h
! 	tar pcf - $(GMPDIR) | (cd $(DISTNAME); tar pxf -)
! 	cd $(DISTNAME)/$(GMPDIR); $(MAKE) distclean
d135 2
a136 2
! 	tar pcf - $(ZLIBDIR) | (cd $(DISTNAME); tar pxf -)
! 	cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a
d140 1
a140 1
--- 486,512 ----
d144 1
a144 1
! #	cd $(GMPDIR); $(MAKE) clean
d151 1
a151 1
! #	cd $(GMPDIR); $(MAKE) distclean
d158 3
a160 3
  	-rm $(DISTNAME)/config.h
! #       tar pcf - $(GMPDIR) | (cd $(DISTNAME); tar pxf -)
! #	cd $(DISTNAME)/$(GMPDIR); $(MAKE) distclean
d163 2
a164 2
! #       tar pcf - $(ZLIBDIR) | (cd $(DISTNAME); tar pxf -)
! #       cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a
d169 2
a170 2
*** 512,518 ****
  	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed version.h >/dev/null
d176 3
a178 3
  	find config.h $(srcdir) -name '*.[chly]' -print | xargs etags -a
--- 518,524 ----
  	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed version.h >/dev/null
d184 1
a184 1
  	find config.h $(srcdir) -name '*.[chly]' -print | xargs etags -a
@


1.8
log
@1.2.16 --> 1.2.17
(new agent forwarding protocol that is said to work this time)
@
text
@d1 2
a2 2
*** Makefile.in.old	Tue Oct 22 02:26:19 1996
--- Makefile.in	Tue Oct 22 02:30:18 1996
d4 1
a4 1
*** 159,170 ****
d17 1
a17 1
--- 159,176 ----
d37 1
a37 1
*** 248,254 ****
d45 1
a45 1
--- 254,260 ----
d54 3
a56 3
*** 292,310 ****
  	./gen_minfd $(USER_SHELLS) > minfd.h~
  	mv -f minfd.h~ minfd.h
d74 3
a76 3
--- 298,316 ----
  	./gen_minfd $(USER_SHELLS) > minfd.h~
  	mv -f minfd.h~ minfd.h
d95 1
a95 1
*** 361,367 ****
d103 1
a103 1
--- 367,373 ----
d112 1
a112 1
*** 462,488 ****
d140 1
a140 1
--- 468,494 ----
d165 1
a165 1
  	tar cf $(DISTNAME).tar $(DISTNAME)
d169 1
a169 1
*** 494,500 ****
d177 1
a177 1
--- 500,506 ----
@


1.7
log
@Use system shared libgmp now
@
text
@d7 1
a7 1
  GMPDIR 		= gmp-2.0.2
d20 1
a20 1
  GMPDIR 		= gmp-2.0.2
d41 1
a41 1
! 	$(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) $<
d49 1
a49 1
! 	$(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) $<
d115 1
a115 1
  	-rm -f *.o minfd.h gmon.out *core $(PROGRAMS) gen_minfd rfc-pg
d131 2
a132 2
! 	tar cf - $(GMPDIR) | (cd $(DISTNAME); tar xf -)
! 	cd $(DISTNAME)/$(GMPDIR); $(MAKE) clean
d135 1
a135 1
! 	tar cf - $(ZLIBDIR) | (cd $(DISTNAME); tar xf -)
d137 1
a137 1
  	tar cf $(DISTNAME).tar $(DISTNAME)
d143 1
a143 1
  	-rm -f *.o minfd.h gmon.out *core $(PROGRAMS) gen_minfd rfc-pg
d159 2
a160 2
! #       tar cf - $(GMPDIR) | (cd $(DISTNAME); tar xf -)
! #	cd $(DISTNAME)/$(GMPDIR); $(MAKE) clean
d163 1
a163 1
! #       tar cf - $(ZLIBDIR) | (cd $(DISTNAME); tar xf -)
@


1.6
log
@Upgrade to official 1.2.16
Fix PLIST
@
text
@d1 2
a2 2
*** 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
d4 181
a184 20
*** 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
@


1.5
log
@Back out andrews change - 1.2.14.1 is not an official ssh release.
@
text
@d1 2
a2 2
*** login.c.bak	Thu Jun  6 15:39:34 1996
--- login.c	Mon Jun 17 19:56:43 1996
d4 20
a23 21
*** 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
@


1.4
log
@Upgrade to 1.2.14.1
Misc bugfixes
@
text
@@


1.3
log
@If hostname > UT_HOSTSIZE, write its numeric address instead to keep
valid information in utmp and lastlog
@
text
@@


1.2
log
@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!).
@
text
@d1 2
a2 2
*** sshd.c.old	Sun Oct  1 11:16:22 1995
--- sshd.c	Tue Nov 21 02:03:24 1995
d4 17
a20 7
*** 1581,1586 ****
--- 1581,1589 ----
        log_init(av0, debug_flag && !inetd_flag, debug_flag, 
  	       options.quiet_mode, options.log_facility);
  
+ #ifdef HAVE_SETSID
+       setsid();
d22 3
a24 3
  #ifdef USE_PIPES
        /* Redirect stdin.  We close the parent side of the socket pair,
           and make the child side the standard input. */
@


1.1
log
@two minor adjustments to ssh for freebsd specific issues:
patch-ac: call setsid() before setlogin() in the child (when emulating rsh)
  otherwise the setlogin() will fail when/if the proposed setlogin() changes
  go in.  Otherwise it silently fails and may leave the login name of the user
  session as "root" (depending on how sshd was started).  Without the proposed
  kernel change, it harmlessly sets the login name of the user's session.
patch-ad: patch the #ifdef botch that stopped a ssh login from using and
  updating the lastlog file.  This is because we have struct lastlog defined
  inside utmp.h rather than a lastlog.h include file like it was expecting.
@
text
@@
