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


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

1.9
date	2002.03.08.20.51.56;	author dinoex;	state Exp;
branches;
next	1.8;

1.8
date	2000.05.13.17.11.01;	author green;	state Exp;
branches;
next	1.7;

1.7
date	2000.03.20.04.51.02;	author fenner;	state Exp;
branches;
next	1.6;

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

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

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

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

1.2
date	99.11.17.17.19.24;	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.10
log
@Rename Patches to make navigation much more easier.
@
text
@--- includes.h.orig	Sat Jan 26 17:44:22 2002
+++ includes.h	Fri Mar  8 20:59:17 2002
@@@@ -24,12 +24,12 @@@@
 #include <sys/select.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
-#include <sys/endian.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/time.h>
 #include <sys/un.h>
 #include <sys/resource.h>
+#include <machine/endian.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@@@ -38,7 +38,6 @@@@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include <netgroup.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
@@@@ -62,5 +61,46 @@@@
  * client program.  Socketpairs do not seem to work on all systems.
  */
 #define USE_PIPES 1
+
+#if defined(__FreeBSD__) && __FreeBSD__ <= 3
+/*
+ * Data types.
+ */
+typedef u_char          sa_family_t;
+typedef int             socklen_t;
+
+/*
+ * bsd-api-new-02a: protocol-independent placeholder for socket addresses
+ */
+#define	_SS_MAXSIZE	128
+#define	_SS_ALIGNSIZE	(sizeof(int64_t))
+#define	_SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(u_char) * 2)
+#define	_SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(u_char) * 2 - \
+				_SS_PAD1SIZE - _SS_ALIGNSIZE)
+
+struct sockaddr_storage {
+	u_char		ss_len;		/* address length */
+	sa_family_t	ss_family;	/* address family */
+	char		__ss_pad1[_SS_PAD1SIZE];
+	int64_t		__ss_align;	/* force desired structure storage alignment */
+	char		__ss_pad2[_SS_PAD2SIZE];
+};
+
+/* defines for comatibility with older FreeBSD releases */
+#ifndef	SHUT_RD
+#define	SHUT_RD		0
+#endif
+#ifndef	SHUT_WR
+#define	SHUT_WR		1
+#endif
+#ifndef	SHUT_RDWR
+#define	SHUT_RDWR	2
+#endif
+
+#ifndef INET_ADDRSTRLEN
+#define	INET_ADDRSTRLEN	46
+#endif
+
+#endif
 
 #endif				/* INCLUDES_H */
@


1.9
log
@- add defines for comatibility with older FreeBSD releases 3.x and 2.2.8
	SHUT_RD, SHUT_WR, SHUT_RDWR
	INET_ADDRSTRLEN
- add dirname() from FreeBSD 4.5
- use utimes instead of futimes fore FreeBSD < 4.x
@
text
@@


1.8
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
--- includes.h.orig	Fri Apr 14 06:30:31 2000
+++ includes.h	Sat May 13 12:12:41 2000
d25 1
a25 1
@@@@ -65,5 +64,30 @@@@
d53 16
@


1.7
log
@Fix socklen_t for FreeBSD 3.

PR:		ports/17491
@
text
@d1 2
a2 2
--- includes.h.orig	Fri Jan 14 20:15:50 2000
+++ includes.h	Fri Jan 14 20:20:05 2000
@


1.6
log
@Add the actual change of names in sockaddr_storage.  This broke things
for people after what time my system was previously made.  Sorry.

Submitted by:	sumikawa
@
text
@d35 1
a35 1
+typedef u_int32_t       socklen_t;
@


1.5
log
@Update to a more current OpenSSH, including...

	IPv6 support!!

Thank you very much, Sumikawa san.

Submitted by:	Munechika SUMIKAWA <sumikawa@@ebina.hitachi.co.jp>
@
text
@d1 2
a2 2
--- /usr/ports/distfiles/OpenSSH-1.2.1/src/usr.bin/ssh/includes.h	Sun Nov 28 16:37:35 1999
+++ includes.h	Thu Jan 13 18:03:48 2000
d25 1
a25 1
@@@@ -65,5 +64,33 @@@@
d47 2
a48 2
+	u_char		__ss_len;		/* address length */
+	sa_family_t	__ss_family;	/* address family */
a52 3
+#else
+#define	ss_len __ss_len
+#define	ss_family __ss_family
@


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 2
a2 2
--- /usr/ports/distfiles/OpenSSH-1.2/src/usr.bin/ssh/includes.h	Tue Nov  2 16:21:02 1999
+++ ./includes.h	Tue Nov 23 19:20:38 1999
d25 34
@


1.3
log
@Give OpenSSH TIS client-side authentication.

Submitted by:	peter
@
text
@d1 13
a13 8
--- readconf.h.dist	Fri Nov 19 23:32:48 1999
+++ readconf.h	Fri Nov 19 23:48:22 1999
@@@@ -54,6 +54,7 @@@@
   int compression;		/* Compress packets in both directions. */
   int compression_level;	/* Compression level 1 (fast) to 9 (best). */
   int keepalives;		/* Set SO_KEEPALIVE. */
+  int tis_authentication;	/* TIS client-side authentication */
   LogLevel log_level;		/* Level for logging. */
d15 10
a24 1
   int port;			/* Port to connect. */
@


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 8
a8 6
diff -ru /home/green/ssh/auth-rsa.c ./auth-rsa.c
--- /home/green/ssh/auth-rsa.c	Wed Nov  3 03:36:00 1999
+++ ./auth-rsa.c	Mon Nov  8 00:06:40 1999
@@@@ -25,8 +25,8 @@@@
 #include "mpaux.h"
 #include "uidswap.h"
d10 1
a10 7
-#include <ssl/rsa.h>
-#include <ssl/md5.h>
+#include <openssl/rsa.h>
+#include <openssl/md5.h>
 
 /* Flags that may be set in authorized_keys options. */
 extern int no_port_forwarding_flag;
@


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