From owner-freebsd-current Fri Mar 3 8:53:14 2000 Delivered-To: freebsd-current@freebsd.org Received: from zibbi.mikom.csir.co.za (zibbi.mikom.csir.co.za [146.64.24.58]) by hub.freebsd.org (Postfix) with ESMTP id E87B237B5BE; Fri, 3 Mar 2000 08:53:06 -0800 (PST) (envelope-from jhay@zibbi.mikom.csir.co.za) Received: (from jhay@localhost) by zibbi.mikom.csir.co.za (8.9.3/8.9.3) id SAA19425; Fri, 3 Mar 2000 18:53:02 +0200 (SAT) (envelope-from jhay) From: John Hay Message-Id: <200003031653.SAA19425@zibbi.mikom.csir.co.za> Subject: Re: make release - usr.bin/ssh error In-Reply-To: <200003031641.LAA00742@server.baldwin.cx> from John Baldwin at "Mar 3, 2000 11:41:09 am" To: jhb@FreeBSD.ORG (John Baldwin) Date: Fri, 3 Mar 2000 18:53:02 +0200 (SAT) Cc: jwd@unx.sas.com (John W. DeBoskey), freebsd-current@FreeBSD.ORG X-Mailer: ELM [version 2.4ME+ PL54 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG > > I'm getting this error as well. :( > > At this rate RC#3 isn't going to be going out the door anytime soon. > > > ===> usr.sbin/ktutil > > install -c -s -o root -g wheel -m 555 ktutil /usr/sbin > > install -c -o root -g wheel -m 444 ktutil.8.gz /usr/share/man/man8 > > cd /pub/FreeBSD/usr.bin/ssh; make MAKE_KERBEROS5=yes cleandir && make MAKE_KERBEROS5=yes obj && > > make MAKE_KERBEROS5=yes depend all install > > cd: can't cd to /pub/FreeBSD/usr.bin/ssh > > *** Error code 2 > > > > I'm in the process of tracking this down. If anyone has any > > pointers, I'd appreciate the help. > > This set of patches got make release going for me. I sent them to Mark a little earlier this afternoon, because most of it is in his area. John -- John Hay -- John.Hay@mikom.csir.co.za Index: kerberos5/Makefile =================================================================== RCS file: /home/ncvs/src/kerberos5/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- kerberos5/Makefile 2000/03/02 11:16:25 1.7 +++ kerberos5/Makefile 2000/03/03 04:16:17 @@ -2,7 +2,7 @@ SUBDIR= lib libexec usr.bin usr.sbin -SDIR= ${.CURDIR}/.. +SDIR= ${.CURDIR}/../secure bootstrap: cleandir obj depend all install kprog Index: secure/usr.bin/ssh/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/ssh/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- secure/usr.bin/ssh/Makefile 2000/02/28 19:27:31 1.3 +++ secure/usr.bin/ssh/Makefile 2000/03/03 07:52:28 @@ -29,8 +29,8 @@ ((${MAKE_KERBEROS5} == "yes") || (${MAKE_KERBEROS5} == "YES")) DISTRIBUTION=krb5 CFLAGS+= -DKRB5 -LDADD+= -lkrb5 -lkafs -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBKAFS} ${LIBASN1} ${LIBMD} +LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt +DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT} .endif # MAKE_KERBEROS5 .include Index: secure/usr.sbin/sshd/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.sbin/sshd/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- secure/usr.sbin/sshd/Makefile 2000/02/28 19:27:31 1.3 +++ secure/usr.sbin/sshd/Makefile 2000/03/03 07:55:41 @@ -31,8 +31,8 @@ DISTRIBUTION=krb5 CFLAGS+= -DKRB5 SRCS+= auth-krb5.c -LDADD+= -lkrb5 -lkafs -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBKAFS} ${LIBASN1} ${LIBMD} +LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken +DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} .endif # MAKE_KERBEROS5 .include Index: crypto/openssh/auth-krb5.c =================================================================== RCS file: /home/ncvs/src/crypto/openssh/auth-krb5.c,v retrieving revision 1.1 diff -u -r1.1 auth-krb5.c --- crypto/openssh/auth-krb5.c 2000/02/28 19:03:51 1.1 +++ crypto/openssh/auth-krb5.c 2000/03/03 07:54:18 @@ -240,7 +240,7 @@ } if (!cleanup_registered) { - fatal_add_cleanup(krb4_cleanup_proc, NULL); + fatal_add_cleanup(krb5_cleanup_proc, NULL); cleanup_registered = 1; } return 0; Index: release/Makefile =================================================================== RCS file: /home/ncvs/src/release/Makefile,v retrieving revision 1.534 diff -u -r1.534 Makefile --- release/Makefile 2000/02/29 11:26:24 1.534 +++ release/Makefile 2000/03/03 12:05:47 @@ -430,8 +430,8 @@ if [ -d ${RD}/dists/crypto ] ; then ( cd ${RD}/dists/src && \ if [ -f ssecure.aa ] ; then mv ssecure.* ../crypto ; fi && \ if [ -f scrypto.aa ] ; then mv scrypto.* ../crypto ; fi && \ - if [ -f skrb4.aa ] ; then mv skrb4.* ../crypto ; fi ; ) ; fi - if [ -f skrb5.aa ] ; then mv skrb5.* ../crypto ; fi ; ) ; fi + if [ -f skrb4.aa ] ; then mv skrb4.* ../crypto ; fi && \ + if [ -f skrb5.aa ] ; then mv skrb5.* ../crypto ; fi ; ) fi @echo "src distribution is finished." .endif touch release.7 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message