freebsd-ports/security/openssh/files/patch-ab

--- Makefile.inc.orig	Fri Feb 11 23:56:29 2000
+++ Makefile.inc	Fri Feb 11 23:57:56 2000
@@ -2,10 +2,14 @@
 
 .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
+PAM?=		no
+SKEY?=		no
+TCP_WRAPPERS?=	yes
+.if !defined(MAKEFILE_INC_FIRST_PASS)
+MAKEFILE_INC_FIRST_PASS=	0
+CFLAGS+=	-I${OPENSSLINC} ${INET6FLAGS}
 LDADD+=         -L${.CURDIR}/../lib -lssh
 DPADD+=         ${.CURDIR}/../lib/libssh.a
 .endif
Clean things up by using the new knob for OpenSSL usage. Submitted by: kris 2000-02-12 23:55:48 +00:00			`--- Makefile.inc.orig Fri Feb 11 23:56:29 2000`
			`+++ Makefile.inc Fri Feb 11 23:57:56 2000`
Simplify IPv6 checking. Suggested by: green 2000-02-09 03:28:48 +00:00			`@@ -2,10 +2,14 @@`
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 :) 1999-11-24 03:36:23 +00:00
			`.include <bsd.obj.mk>`
Say hello to OpenSSH! It's more secure, has a better license, and is actively maintained by members of the OpenBSD project. 1999-11-08 06:20:54 +00:00
			`-.if exists(${.CURDIR}/../lib/${__objdir})`
			`-LDADD+= -L${.CURDIR}/../lib/${__objdir} -lssh`
			`-DPADD+= ${.CURDIR}/../lib/${__objdir}/libssh.a`
			`-.else`
Enable TCP wrapper support (conditionalized to turn off if tcpd.h is nonexistant). Also, add the Makefile hooks for AFS, Kerberos, and S/Key. 1999-11-15 06:18:46 +00:00			`+AFS?= no`
			`+KERBEROS?= no`
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 1999-11-29 07:09:45 +00:00			`+PAM?= no`
Enable TCP wrapper support (conditionalized to turn off if tcpd.h is nonexistant). Also, add the Makefile hooks for AFS, Kerberos, and S/Key. 1999-11-15 06:18:46 +00:00			`+SKEY?= no`
			`+TCP_WRAPPERS?= yes`
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> 1999-11-28 21:40:58 +00:00			`+.if !defined(MAKEFILE_INC_FIRST_PASS)`
			`+MAKEFILE_INC_FIRST_PASS= 0`
Clean things up by using the new knob for OpenSSL usage. Submitted by: kris 2000-02-12 23:55:48 +00:00			`+CFLAGS+= -I${OPENSSLINC} ${INET6FLAGS}`
Say hello to OpenSSH! It's more secure, has a better license, and is actively maintained by members of the OpenBSD project. 1999-11-08 06:20:54 +00:00			`LDADD+= -L${.CURDIR}/../lib -lssh`
			`DPADD+= ${.CURDIR}/../lib/libssh.a`
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> 1999-11-28 21:40:58 +00:00			`.endif`