diff options
Diffstat (limited to 'security/openssh/files')
-rw-r--r-- | security/openssh/files/patch-ad | 15 | ||||
-rw-r--r-- | security/openssh/files/patch-am | 22 |
2 files changed, 16 insertions, 21 deletions
diff --git a/security/openssh/files/patch-ad b/security/openssh/files/patch-ad index 7dcdab138466..f3bbcbbe37d3 100644 --- a/security/openssh/files/patch-ad +++ b/security/openssh/files/patch-ad @@ -1,22 +1,19 @@ ---- lib/Makefile.orig Mon Sep 24 22:34:07 2001 -+++ lib/Makefile Wed Oct 3 13:45:40 2001 -@@ -9,10 +9,14 @@ +--- lib/Makefile.orig Tue Jun 26 19:52:41 2001 ++++ lib/Makefile Thu Nov 15 06:10:43 2001 +@@ -9,7 +9,11 @@ rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \ key.c dispatch.c kex.c mac.c uuencode.c misc.c \ rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \ - scard.c + scard.c strlcpy.c strlcat.c - - SRCS+= readpassphrase.c - ++ +.if defined(COMPAT_GETADDRINFO) +SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c +.endif -+ + NOPROFILE= yes NOPIC= yes - -@@ -20,6 +24,8 @@ +@@ -18,6 +22,8 @@ @echo -n .include <bsd.own.mk> diff --git a/security/openssh/files/patch-am b/security/openssh/files/patch-am index 8c88701f8682..1cf6fe09175c 100644 --- a/security/openssh/files/patch-am +++ b/security/openssh/files/patch-am @@ -1,6 +1,6 @@ ---- sshd/Makefile.orig Sun Aug 20 14:42:41 2000 -+++ sshd/Makefile Sat Nov 4 17:08:36 2000 -@@ -3,8 +3,8 @@ +--- sshd/Makefile.orig Fri Nov 16 06:02:09 2001 ++++ sshd/Makefile Fri Nov 16 06:03:51 2001 +@@ -5,8 +5,8 @@ PROG= sshd BINOWN= root BINMODE=555 @@ -9,17 +9,17 @@ +BINDIR= /sbin +MAN8= sshd.8 CFLAGS+=-DHAVE_LOGIN_CAP + #CFLAGS+=-DBSD_AUTH - SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ -@@ -12,6 +12,7 @@ - auth.c auth1.c auth2.c auth-options.c session.c +@@ -17,6 +17,7 @@ + auth-skey.c auth-bsdauth.c .include <bsd.own.mk> # for KERBEROS and AFS +.include "../Makefile.inc" - .if (${KERBEROS} == "yes") - .if (${AFS} == "yes") -@@ -19,9 +20,9 @@ + .if (${KERBEROS5:L} == "yes") + CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV +@@ -31,15 +32,15 @@ LDADD+= -lkafs DPADD+= ${LIBKRBAFS} .endif # AFS @@ -31,12 +31,10 @@ DPADD+= ${LIBKRB} .endif # KERBEROS -@@ -31,7 +32,7 @@ - .include <bsd.prog.mk> -LDADD+= -lcrypto -lutil -lz +LDADD+= ${CRYPTOLIBS} -lcrypt -lutil -lz DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} - .if (${TCP_WRAPPERS} == "yes") + .if (${TCP_WRAPPERS:L} == "yes") |