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


1.9
date	2002.03.12.17.54.07;	author dinoex;	state dead;
branches;
next	1.8;

1.8
date	2001.10.03.13.15.16;	author dinoex;	state Exp;
branches;
next	1.7;

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

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

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

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

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

1.2
date	99.11.17.17.19.25;	author green;	state dead;
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.9
log
@Rename Patches to make navigation much more easier.
@
text
@--- ssh/Makefile.orig	Tue Sep 11 00:44:47 2001
+++ ssh/Makefile	Wed Oct  3 13:54:47 2001
@@@@ -7,8 +7,8 @@@@
 
 BINMODE?=4555
 
-BINDIR=	/usr/bin
-MAN=	ssh.1
+BINDIR=	/bin
+MAN1=	ssh.1
 LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
 MLINKS=	ssh.1 slogin.1
 
@@@@ -16,6 +16,7 @@@@
 	sshconnect.c sshconnect1.c sshconnect2.c
 
 .include <bsd.own.mk> # for AFS
+.include "../Makefile.inc"
 
 .if (${KERBEROS5:L} == "yes")
 CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
@@@@ -24,8 +25,8 @@@@
 .endif # KERBEROS5
 
 .if (${KERBEROS:L} == "yes")
-CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
-LDADD+=	 -lkrb
+CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
+LDADD+=	 -lkrb -lcom_err
 DPADD+=	 ${LIBKRB}
 .if (${AFS:L} == "yes")
 CFLAGS+= -DAFS
@@@@ -36,5 +37,5 @@@@
 
 .include <bsd.prog.mk>
 
-LDADD+=	-lcrypto -lz
-DPADD+=	${LIBCRYPTO} ${LIBZ}
+LDADD+= ${CRYPTOLIBS} -lcrypt -lutil -lz
+DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
@


1.8
log
@- Update to OpenSSH 2.9.9
- convert portname into lowercase
- PREFIX support for default sshd_config
- security-patch for cookie files obsolete
@
text
@@


1.7
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
@d1 2
a2 2
--- ssh/Makefile.orig	Sat Apr 14 18:33:20 2001
+++ ssh/Makefile	Sat May 26 14:54:24 2001
d14 1
a14 1
@@@@ -16,10 +16,11 @@@@
d20 5
d33 1
a33 2
@@@@ -29,6 +30,7 @@@@
 .endif # KERBEROS
a35 1
+.include "../Makefile.inc"
d38 3
a40 2
+LDADD+=	${CRYPTOLIBS} -lz
 DPADD+=	${LIBCRYPTO} ${LIBZ}
@


1.6
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/Makefile.orig	Thu Jun 29 14:35:47 2000
+++ ssh/Makefile	Sat Nov  4 16:58:41 2000
@@@@ -5,8 +5,8 @@@@
d14 1
a14 1
@@@@ -14,10 +14,11 @@@@
d20 1
a20 1
 .if (${KERBEROS} == "yes")
d26 1
a26 1
 .if (${AFS} == "yes")
d28 1
a28 1
@@@@ -27,6 +28,7 @@@@
d34 3
a36 3
-LDADD+=	-lutil -lz -lcrypto
+LDADD+=	-lutil -lz ${CRYPTOLIBS}
 DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
@


1.5
log
@Fix Kerberos 4 support.

Mostly submitted by:	Mark A Gebert <geeb@@thugsrus.org>
@
text
@d1 3
a3 3
--- ssh/Makefile.orig	Wed Apr 26 17:31:58 2000
+++ ssh/Makefile	Sun Jul 30 15:09:14 2000
@@@@ -2,16 +2,10 @@@@
d5 1
a5 5
 PROG=	ssh
 BINOWN=	root
+BINMODE=4555
+BINDIR=	/bin
+MAN1=	ssh.1
a6 7
-.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "powerpc" || \
-	${MACHINE_ARCH} == "hppa")
-BINMODE=0000
-.else
-BINMODE?=4555
-.endif
-
d9 2
d14 1
a14 1
@@@@ -19,10 +13,11 @@@@
d28 1
a28 1
@@@@ -32,6 +27,7 @@@@
@


1.4
log
@Update to OpenSSH 2.1.0.  They _FINALLY_ have distfiles, so now the CVS is
not needed for the port.

Big thanks to Issei-san for doing the majority of the work necessary for
this upgrade!

Submitted by:	Issei Suzuki <issei@@jp.FreeBSD.org>
@
text
@d1 2
a2 2
--- ssh/Makefile.orig	Thu Apr 27 06:31:58 2000
+++ ssh/Makefile	Fri May 12 07:23:01 2000
d23 1
a23 1
@@@@ -19,6 +13,7 @@@@
d30 7
a36 1
 CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
@


1.3
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 3
a3 3
--- /usr/ports/distfiles/OpenSSH-1.2/src/usr.bin/ssh/ssh/Makefile	Wed Nov 17 20:52:33 1999
+++ ./ssh/Makefile	Tue Nov 23 19:26:08 1999
@@@@ -2,22 +2,16 @@@@
d7 4
a10 1
-
a19 3
+BINMODE=4555
+BINDIR=	/bin
+MAN1=	ssh.1
d23 2
a24 1
 SRCS=	ssh.c sshconnect.c log-client.c readconf.c clientloop.c
d30 3
a32 2
 CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
@@@@ -32,5 +26,5 @@@@
d35 1
@


1.2
log
@Thanks to those who replied!  The include (ssl versus openssl) transform
is now done in post-patch.

Submitted by:	Anton Berezin <tobez@@plab.ku.dk>, Christian Weisgerber <naddy@@unix-ag.uni-kl.de>
@
text
@d1 3
a3 6
diff -ru /home/green/ssh/cipher.c ./cipher.c
--- /home/green/ssh/cipher.c	Wed Nov  3 03:36:00 1999
+++ ./cipher.c	Mon Nov  8 00:06:40 1999
@@@@ -17,7 +17,7 @@@@
 #include "ssh.h"
 #include "cipher.h"
d5 17
a21 2
-#include <ssl/md5.h>
+#include <openssl/md5.h>
d23 14
a36 2
 /*
  * What kind of tripple DES are these 2 routines?
@


1.1
log
@Initial revision
@
text
@@


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
@@
