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


1.12
date	2002.03.12.17.54.07;	author dinoex;	state dead;
branches;
next	1.11;

1.11
date	2001.10.03.13.15.16;	author dinoex;	state Exp;
branches;
next	1.10;

1.10
date	2000.02.12.23.55.48;	author green;	state Exp;
branches;
next	1.9;

1.9
date	2000.02.09.03.28.48;	author sumikawa;	state Exp;
branches;
next	1.8;

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

1.7
date	99.12.08.04.06.37;	author green;	state Exp;
branches;
next	1.6;

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

1.5
date	99.11.28.21.40.58;	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.15.06.18.46;	author green;	state Exp;
branches;
next	1.2;

1.2
date	99.11.09.12.43.45;	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.12
log
@Rename Patches to make navigation much more easier.
@
text
@--- Makefile.inc.orig	Sun Jul 29 16:00:07 2001
+++ Makefile.inc	Wed Oct  3 13:49:31 2001
@@@@ -17,10 +17,16 @@@@
 
 .include <bsd.obj.mk>
 
-.if exists(${.CURDIR}/../lib/${__objdir})
-LDADD+=         -L${.CURDIR}/../lib/${__objdir} -lssh
-DPADD+=         ${.CURDIR}/../lib/${__objdir}/libssh.a
-.else
+AFS?=		no
+KERBEROS?=	no
+KERBEROS5?=	no
+PAM?=		no
+SKEY?=		no
+TCP_WRAPPERS?=	yes
+
+CFLAGS+=	-I${OPENSSLINC} ${INET6FLAGS}
+
+.if !defined(IGNORE_LIBSSH)
 LDADD+=         -L${.CURDIR}/../lib -lssh
 DPADD+=         ${.CURDIR}/../lib/libssh.a
 .endif
@


1.11
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.10
log
@Clean things up by using the new knob for OpenSSL usage.

Submitted by:	kris
@
text
@d1 3
a3 3
--- Makefile.inc.orig	Fri Feb 11 23:56:29 2000
+++ Makefile.inc	Fri Feb 11 23:57:56 2000
@@@@ -2,10 +2,14 @@@@
d13 1
d17 1
a17 2
+.if !defined(MAKEFILE_INC_FIRST_PASS)
+MAKEFILE_INC_FIRST_PASS=	0
d19 2
@


1.9
log
@Simplify IPv6 checking.

Suggested by:	green
@
text
@d1 2
a2 2
--- Makefile.inc.orig	Wed Feb  9 01:00:11 2000
+++ Makefile.inc	Wed Feb  9 01:08:09 2000
d18 1
a18 1
+CFLAGS+=	-I${PREFIX}/include ${INET6FLAGS}
@


1.8
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 3
a3 3
--- Makefile.inc.orig	Fri Jan 14 08:35:05 2000
+++ Makefile.inc	Fri Jan 14 08:40:03 2000
@@@@ -2,10 +2,17 @@@@
d18 1
a18 4
+CFLAGS+=	-I${PREFIX}/include
+.if defined(USE_INET6)
+CFLAGS+=	-DINET6
+.endif
@


1.7
log
@I've cleaned up ${CVS_DATE} usage a bit (keep spaces correctly), and
updated to today's snapshot of OpenSSH.

Various updates from the latest ${CVS_DATE}, and requisite patch
changes, are the "big new thing".  Nothing major has changed;  the
biggest ones would be using atomicio() in a lot of places and a
fix for a SIGHUP not updating sshd(8)'s configuration until the
next connection.
@
text
@d1 3
a3 3
--- /usr/ports/distfiles/OpenSSH-1.2/src/usr.bin/ssh/Makefile.inc	Mon Oct 25 16:27:26 1999
+++ Makefile.inc	Mon Nov 29 01:06:23 1999
@@@@ -2,10 +2,14 @@@@
d19 3
@


1.6
log
@Add the PAM SSH RSA key authentication module.  For example, you can add,
"login  auth    sufficient      pam_ssh.so" to your /etc/pam.conf, and
users with a ~/.ssh/identity can login(1) with their SSH key :)

PR:		15158
Submitted by:	Andrew J. Korty <ajk@@waterspout.com>
Reviewed by:	obrien
@
text
@d18 1
a18 1
+CFLAGS+=	-DHAVE_OPENPTY -I${PREFIX}/include
@


1.5
log
@Change CFLAGS to get modified in Makefile.inc, fixing the
problem several people have reported with make.conf setting ${CFLAGS}.

Partially submitted by:	Jos Backus <Jos.Backus@@nl.origin-it.com>
@
text
@d2 2
a3 2
+++ Makefile.inc	Sun Nov 28 16:29:13 1999
@@@@ -2,10 +2,13 @@@@
d13 1
@


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
@d2 2
a3 2
+++ ./Makefile.inc	Tue Nov 23 19:19:33 1999
@@@@ -2,10 +2,9 @@@@
d15 3
d20 1
a20 1
-.endif
@


1.3
log
@Enable TCP wrapper support (conditionalized to turn off if tcpd.h is
nonexistant).  Also, add the Makefile hooks for AFS, Kerberos, and S/Key.
@
text
@d1 5
a5 5
--- Makefile.inc.orig	Tue Oct 26 03:31:00 1999
+++ Makefile.inc	Tue Nov  9 06:45:18 1999
@@@@ -1,11 +1,8 @@@@
-CFLAGS+=	-I${.CURDIR}/..
+CFLAGS+=	-I${.CURDIR}/.. -I${PREFIX}/include
a6 2
-.include <bsd.obj.mk>
-
@


1.2
log
@Make some various cleanups.  Note that I did not add RESTRICTED since this is
in no way cryptographically encumbered code.  The fact that it's
redistributed by me from freefall is completely coincidental.

Submitted by:	obrien, Christian Weisgerber <naddy@@unix-ag.uni-kl.de>
@
text
@d13 4
a16 4
+AFS?=		NO
+KERBEROS?=	NO
+SKEY?=		NO
+TCP_WRAPPERS?=	YES
@


1.1
log
@Initial revision
@
text
@d1 2
a2 3
diff -ru /home/green/ssh/Makefile.inc ./Makefile.inc
--- /home/green/ssh/Makefile.inc	Tue Oct 26 03:31:00 1999
+++ ./Makefile.inc	Mon Nov  8 00:12:19 1999
d4 2
a5 1
 CFLAGS+=	-I${.CURDIR}/..
@


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