diff options
| author | Brian Feldman <green@FreeBSD.org> | 2000-07-30 19:14:17 +0000 |
|---|---|---|
| committer | Brian Feldman <green@FreeBSD.org> | 2000-07-30 19:14:17 +0000 |
| commit | 562b1a452e5aab61bb5bb144297e7891e78a2fb4 (patch) | |
| tree | 4bbf368a0d19a48c23e14881ed36a9a842e925cb /security/openssh | |
| parent | Don't require interactivity during install when PACKAGE_BUILDING is (diff) | |
Fix Kerberos 4 support.
Mostly submitted by: Mark A Gebert <geeb@thugsrus.org>
Notes
Notes:
svn path=/head/; revision=31137
Diffstat (limited to 'security/openssh')
| -rw-r--r-- | security/openssh/files/patch-ag | 14 | ||||
| -rw-r--r-- | security/openssh/files/patch-am | 16 |
2 files changed, 24 insertions, 6 deletions
diff --git a/security/openssh/files/patch-ag b/security/openssh/files/patch-ag index 12c47019780c..d9170272757b 100644 --- a/security/openssh/files/patch-ag +++ b/security/openssh/files/patch-ag @@ -1,5 +1,5 @@ ---- ssh/Makefile.orig Thu Apr 27 06:31:58 2000 -+++ ssh/Makefile Fri May 12 07:23:01 2000 +--- ssh/Makefile.orig Wed Apr 26 17:31:58 2000 ++++ ssh/Makefile Sun Jul 30 15:09:14 2000 @@ -2,16 +2,10 @@ PROG= ssh @@ -20,14 +20,20 @@ LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MLINKS= ssh.1 slogin.1 -@@ -19,6 +13,7 @@ +@@ -19,10 +13,11 @@ sshconnect.c sshconnect1.c sshconnect2.c .include <bsd.own.mk> # for AFS +.include "../Makefile.inc" .if (${KERBEROS} == "yes") - CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV +-CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV +-LDADD+= -lkrb ++CFLAGS+= -DKRB4 -I/usr/include/kerberosIV ++LDADD+= -lkrb -lcom_err + DPADD+= ${LIBKRB} + .if (${AFS} == "yes") + CFLAGS+= -DAFS @@ -32,6 +27,7 @@ .endif # KERBEROS diff --git a/security/openssh/files/patch-am b/security/openssh/files/patch-am index 95eeb35accb6..fee853eadee2 100644 --- a/security/openssh/files/patch-am +++ b/security/openssh/files/patch-am @@ -1,5 +1,5 @@ ---- sshd/Makefile.orig Thu Apr 27 06:31:57 2000 -+++ sshd/Makefile Fri May 12 07:10:41 2000 +--- sshd/Makefile.orig Wed Apr 26 17:31:57 2000 ++++ sshd/Makefile Sun Jul 30 15:09:25 2000 @@ -3,14 +3,15 @@ PROG= sshd BINOWN= root @@ -18,6 +18,18 @@ .if (${KERBEROS} == "yes") .if (${AFS} == "yes") +@@ -18,9 +19,9 @@ + LDADD+= -lkafs + DPADD+= ${LIBKRBAFS} + .endif # AFS +-CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV ++CFLAGS+= -DKRB4 -I/usr/include/kerberosIV + SRCS+= auth-krb4.c +-LDADD+= -lkrb ++LDADD+= -lkrb -lcom_err + DPADD+= ${LIBKRB} + .endif # KERBEROS + @@ -30,7 +31,7 @@ .include <bsd.prog.mk> |