summaryrefslogtreecommitdiff
path: root/security/openssh/files/patch-ag
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2001-06-08 08:03:26 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2001-06-08 08:03:26 +0000
commit152bebfc5c11696e27e8888b15c88231c17de8f6 (patch)
tree5ae42a021bb250161557470661927c397d63ef39 /security/openssh/files/patch-ag
parentUpdate to pan 0.9.7 "Just Another Victim of the Ambient Morality" (diff)
- 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.
Notes
Notes: svn path=/head/; revision=43631
Diffstat (limited to 'security/openssh/files/patch-ag')
-rw-r--r--security/openssh/files/patch-ag20
1 files changed, 10 insertions, 10 deletions
diff --git a/security/openssh/files/patch-ag b/security/openssh/files/patch-ag
index 366125f8eb1b..7f0fa7e85871 100644
--- a/security/openssh/files/patch-ag
+++ b/security/openssh/files/patch-ag
@@ -1,6 +1,6 @@
---- ssh/Makefile.orig Thu Jun 29 14:35:47 2000
-+++ ssh/Makefile Sat Nov 4 16:58:41 2000
-@@ -5,8 +5,8 @@
+--- ssh/Makefile.orig Sat Apr 14 18:33:20 2001
++++ ssh/Makefile Sat May 26 14:54:24 2001
+@@ -7,8 +7,8 @@
BINMODE?=4555
@@ -11,26 +11,26 @@
LINKS= ${BINDIR}/ssh ${BINDIR}/slogin
MLINKS= ssh.1 slogin.1
-@@ -14,10 +14,11 @@
+@@ -16,10 +16,11 @@
sshconnect.c sshconnect1.c sshconnect2.c
.include <bsd.own.mk> # for AFS
+.include "../Makefile.inc"
- .if (${KERBEROS} == "yes")
+ .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} == "yes")
+ .if (${AFS:L} == "yes")
CFLAGS+= -DAFS
-@@ -27,6 +28,7 @@
+@@ -29,6 +30,7 @@
.endif # KERBEROS
.include <bsd.prog.mk>
+.include "../Makefile.inc"
--LDADD+= -lutil -lz -lcrypto
-+LDADD+= -lutil -lz ${CRYPTOLIBS}
- DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
+-LDADD+= -lcrypto -lz
++LDADD+= ${CRYPTOLIBS} -lz
+ DPADD+= ${LIBCRYPTO} ${LIBZ}