head	1.7;
access;
symbols
	RELEASE_4_5_0:1.6
	RELEASE_4_4_0:1.6
	RELEASE_4_3_0:1.5
	RELEASE_4_2_0:1.5
	RELEASE_4_1_1:1.4
	RELEASE_4_1_0:1.4
	RELEASE_3_5_0:1.4
	RELEASE_4_0_0:1.4
	RELEASE_3_4_0:1.4
	openssh_1_2:1.1.1.1
	OPENBSD:1.1.1;
locks; strict;
comment	@# @;


1.7
date	2002.03.12.17.54.07;	author dinoex;	state dead;
branches;
next	1.6;

1.6
date	2001.06.08.08.03.26;	author dinoex;	state Exp;
branches;
next	1.5;

1.5
date	2000.11.04.23.04.25;	author green;	state Exp;
branches;
next	1.4;

1.4
date	99.11.24.03.36.21;	author green;	state Exp;
branches;
next	1.3;

1.3
date	99.11.17.00.56.07;	author green;	state Exp;
branches;
next	1.2;

1.2
date	99.11.11.14.33.23;	author green;	state Exp;
branches;
next	1.1;

1.1
date	99.11.08.06.20.52;	author green;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.11.08.06.20.52;	author green;	state Exp;
branches;
next	;


desc
@@


1.7
log
@Rename Patches to make navigation much more easier.
@
text
@--- ssh-keygen/Makefile.orig	Sun Mar  4 01:51:26 2001
+++ ssh-keygen/Makefile	Sat May 26 15:02:25 2001
@@@@ -7,12 +7,12 @@@@
 
 BINMODE?=555
 
-BINDIR=	/usr/bin
-MAN=	ssh-keygen.1
+BINDIR=	/bin
+MAN1=	ssh-keygen.1
 
 SRCS=	ssh-keygen.c
 
 .include <bsd.prog.mk>
 
-LDADD+=	-lcrypto
+LDADD+=	${CRYPTOLIBS}
 DPADD+=	${LIBCRYPTO}
@


1.6
log
@- Update from OpenSSH 2.2.0 to OpenSSH 2.9
- Features:
  Possible use of sftp/sftp-server with older FreeBSD releases.
  Use a newer version independently from the Base system.
  Easier to test and fix possible security bugs.
- Bugs:
  build of pam_ssm.so isn't be supported any more
  Any file named "cookie" can be deleted by this and any older "sshd"
  with X11 Forwarding.
@
text
@@


1.5
log
@Update to OpenSSH 2.2.0.  This is an end-of-life update for the
ports-based OpenSSH.  OpenSSH has been in the base system for more
than long enough to justify not having to maintain two separate
FreeBSD versions of OpenSSH.
@
text
@d1 3
a3 3
--- ssh-keygen/Makefile.orig	Thu Jun 29 14:35:48 2000
+++ ssh-keygen/Makefile	Sat Nov  4 17:06:49 2000
@@@@ -5,12 +5,12 @@@@
d12 1
a12 1
 SRCS=	ssh-keygen.c log-client.c
d16 3
a18 3
-LDADD+=	-lcrypto -lutil -lz
+LDADD+=	${CRYPTOLIBS} -lutil -lz
 DPADD+=	${LIBCRYPTO} ${LIBDES} ${LIBUTIL} ${LIBZ}
@


1.4
log
@Update the CVS_DATE.  This brings in support for TIS authentication,
obsoleting a couple patches (it's the same code, though, except for
additions).

This also brings in KNFization of everything (please hold the cheering
down :) and made me reroll all my patches.

My patches have been almost entirely rewritten.  The places are the
same, but the code's rewritten.  It fits with the style (KNF) now,
and looks better.

I've also added strlcat.c to the build, which, just like strlcpy.c, is
necessary for compatibility with older libcs.  After strlcat() snuck
into the OpenSSH code recently, this would prevent OpenSSH from
building on (e.g.) FreeBSD 3.2.  Adding it to ssh/lib/ makes it work
yet again :)
@
text
@d1 5
a5 3
--- /usr/ports/distfiles/OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen/Makefile	Wed Oct 27 12:54:49 1999
+++ ./ssh-keygen/Makefile	Tue Nov 23 19:28:07 1999
@@@@ -2,20 +2,13 @@@@
a6 10
 PROG=	ssh-keygen
 BINOWN=	root
-
-.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "powerpc" || \
-	${MACHINE_ARCH} == "hppa")
-BINMODE=0000
-.else
-BINMODE?=555
-.endif
-
d8 1
a8 1
+BINMODE=555
d10 1
a10 1
 MAN=	ssh-keygen.1
@


1.3
log
@Prompted by Kris Kennaway <kris@@FreeBSD.org>

Update to to the current time for OpenSSH.  The notable commit given to me
for this new date is:

(provos@@cvs.openbsd.org)

        usr.bin/ssh    : hostfile.c

in known_hosts key lookup the entry for the bits does not need to match, all
the information is contained in n and e.  This solves the problem with buggy
servers announcing the wrong modulus length.  markus and me.
@
text
@d1 3
a3 8
--- ./lib/Makefile.orig	Tue Nov 16 16:50:53 1999
+++ ./lib/Makefile	Tue Nov 16 16:52:01 1999
@@@@ -4,7 +4,7 @@@@
 SRCS=   authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
 	cipher.c compat.c compress.c crc32.c deattack.c fingerprint.c \
 	hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \
-	rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c
+	rsa.c strlcpy.c tildexpand.c ttymodes.c uidswap.c xmalloc.c
d5 14
a18 4
 NOPROFILE= yes
 NOPIC=	yes
@@@@ -13,6 +13,7 @@@@
 	@@echo -n
d20 1
a20 2
 .include <bsd.own.mk>
+.include "../Makefile.inc"
d22 5
a26 2
 .if (${KERBEROS} == "yes")
 CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
@


1.2
log
@Quite a bit of change to OpenSSH made:

Add "/usr/local/bin" to _PATH_STDPATH (makes scp work inbound, for instance.)
Fetch OpenSSH from OpenBSD's src tree.  This uses a script and ftp(1).
Add strlcpy.c to ssh/lib, so this port should build on 3.X now.
Make TCP_WRAPPERS conditional on /usr/include/tcpd.h like the PR, so it
 should build on older RELEASEs without TCP Wrappers.

The PR is still open because I am taking more from it.

PR:		ports/14653
@
text
@d1 2
a2 2
--- ./lib/Makefile.orig	Thu Nov 11 05:32:55 1999
+++ ./lib/Makefile	Thu Nov 11 08:54:34 1999
d5 4
a8 4
 	cipher.c compat.c compress.c crc32.c deattack.c hostfile.c \
 	log.c match.c mpaux.c nchan.c packet.c readpass.c rsa.c \
-	tildexpand.c ttymodes.c uidswap.c xmalloc.c
+	tildexpand.c ttymodes.c uidswap.c xmalloc.c strlcpy.c
@


1.1
log
@Initial revision
@
text
@d1 11
a11 3
diff -ru /home/green/ssh/lib/Makefile ./lib/Makefile
--- /home/green/ssh/lib/Makefile	Wed Oct 27 03:33:00 1999
+++ ./lib/Makefile	Mon Nov  8 00:06:40 1999
@


1.1.1.1
log
@Say hello to OpenSSH!  It's more secure, has a better license, and
is actively maintained by members of the OpenBSD project.
@
text
@@
