Date: Mon, 9 Oct 2006 17:31:53 +0400 From: Ruslan Ermilov <ru@FreeBSD.org> To: Randy Bush <randy@psg.com>, Tobias Roth <roth@iam.unibe.ch> Cc: stable@FreeBSD.org, Dag-Erling Smorgrav <des@FreeBSD.org> Subject: Re: buildworld fails in openssh Message-ID: <20061009133153.GF91645@rambler-co.ru> In-Reply-To: <452A82FC.6040202@psg.com> References: <17706.12909.745726.829481@roam.psg.com> <20061009114835.GA7398@droopy.unibe.ch> <452A82FC.6040202@psg.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--m972NQjnE83KvVa/
Content-Type: multipart/mixed; boundary="GV0iVqYguTV4Q9ER"
Content-Disposition: inline
--GV0iVqYguTV4Q9ER
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Mon, Oct 09, 2006 at 07:12:28AM -1000, Randy Bush wrote:
> >Please double-check if this is really a problem with -current, and not
> >with -stable. Afaik, -current is not affected.
>=20
> doh. with eight -current systems and one -stable, my mind is stuck in=20
> -current. but indeed, this was in -stable. <blush>
>=20
I fixed the list.
> >The workaround is to re-enable the build of kerberos in /etc/make.conf.
> >A proper solution is underway, it's ru@ who handles this.
>=20
> i will probably wait.
>=20
Actually it's now in des@'s hands. :-)
A patch is attached if you want it immediately.
Cheers,
--=20
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer
--GV0iVqYguTV4Q9ER
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=p
Content-Transfer-Encoding: quoted-printable
Index: secure/lib/libssh/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/secure/lib/libssh/Makefile,v
retrieving revision 1.34.2.4
diff -u -p -r1.34.2.4 Makefile
--- secure/lib/libssh/Makefile 6 Oct 2006 14:07:23 -0000 1.34.2.4
+++ secure/lib/libssh/Makefile 7 Oct 2006 15:43:13 -0000
@@ -32,14 +32,14 @@ LDADD=3D -lz
=20
.if !defined(NO_KERBEROS)
CFLAGS+=3D -DGSSAPI -DHAVE_GSSAPI_H=3D1 -DKRB5 -DHEIMDAL
-DPADD+=3D ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBR=
OKEN}
-LDADD+=3D -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
+DPADD+=3D ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
+LDADD+=3D -lgssapi -lkrb5 -lasn1 -lcom_err -lroken
.endif
=20
NO_LINT=3D
=20
-DPADD+=3D ${LIBCRYPTO} ${LIBCRYPT}
-LDADD+=3D -lcrypto -lcrypt
+DPADD+=3D ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD}
+LDADD+=3D -lcrypto -lcrypt -lmd
=20
.include <bsd.lib.mk>
=20
Index: secure/libexec/ssh-keysign/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/secure/libexec/ssh-keysign/Makefile,v
retrieving revision 1.6.2.1
diff -u -p -r1.6.2.1 Makefile
--- secure/libexec/ssh-keysign/Makefile 8 Jul 2006 14:37:18 -0000 1.6.2.1
+++ secure/libexec/ssh-keysign/Makefile 8 Oct 2006 00:42:40 -0000
@@ -8,8 +8,8 @@ CFLAGS+=3D-I${SSHDIR} -include ssh_namespa
BINMODE=3D4511
.endif
=20
-DPADD=3D ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
-LDADD=3D -lssh -lcrypt -lcrypto -lz
+DPADD=3D ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBMD} ${LIBZ}
+LDADD=3D -lssh -lcrypt -lcrypto -lmd -lz
=20
.include <bsd.prog.mk>
=20
Index: secure/usr.bin/sftp/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/secure/usr.bin/sftp/Makefile,v
retrieving revision 1.12.2.1
diff -u -p -r1.12.2.1 Makefile
--- secure/usr.bin/sftp/Makefile 8 Jul 2006 14:37:18 -0000 1.12.2.1
+++ secure/usr.bin/sftp/Makefile 7 Oct 2006 15:29:30 -0000
@@ -4,8 +4,8 @@ PROG=3D sftp
SRCS=3D sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
CFLAGS+=3D-I${SSHDIR} -include ssh_namespace.h
=20
-DPADD=3D ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT}
-LDADD=3D -lssh -lcrypt -lcrypto -lz -ledit
+DPADD=3D ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} ${LIBEDIT} ${LIBNCURSE=
S}
+LDADD=3D -lssh -lcrypt -lcrypto -lz -ledit -lncurses
=20
.include <bsd.prog.mk>
=20
Index: secure/usr.bin/ssh/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/secure/usr.bin/ssh/Makefile,v
retrieving revision 1.31.2.1
diff -u -p -r1.31.2.1 Makefile
--- secure/usr.bin/ssh/Makefile 8 Jul 2006 14:37:18 -0000 1.31.2.1
+++ secure/usr.bin/ssh/Makefile 7 Oct 2006 17:26:38 -0000
@@ -11,13 +11,15 @@ SRCS=3D ssh.c readconf.c clientloop.c ssht
sshconnect.c sshconnect1.c sshconnect2.c \
gss-genr.c
=20
+DPADD=3D ${LIBSSH} ${LIBMD} ${LIBUTIL} ${LIBZ}
+LDADD=3D -lssh -lmd -lutil -lz
DPADD=3D ${LIBSSH} ${LIBUTIL} ${LIBZ}
LDADD=3D -lssh -lutil -lz
=20
.if !defined(NO_KERBEROS)
CFLAGS+=3D -DGSSAPI -DHAVE_GSSAPI_H=3D1 -DKRB5 -DHEIMDAL
-DPADD+=3D ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIB=
ROKEN}
-LDADD+=3D -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
+DPADD+=3D ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
+LDADD+=3D -lgssapi -lkrb5 -lasn1 -lcom_err -lroken
.endif
=20
.if defined(X11BASE)
Index: secure/usr.bin/ssh-keyscan/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/secure/usr.bin/ssh-keyscan/Makefile,v
retrieving revision 1.9.2.1
diff -u -p -r1.9.2.1 Makefile
--- secure/usr.bin/ssh-keyscan/Makefile 8 Jul 2006 14:37:19 -0000 1.9.2.1
+++ secure/usr.bin/ssh-keyscan/Makefile 7 Oct 2006 15:29:58 -0000
@@ -3,8 +3,8 @@
PROG=3D ssh-keyscan
CFLAGS+=3D-I${SSHDIR} -include ssh_namespace.h
=20
-DPADD=3D ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
-LDADD=3D -lssh -lcrypt -lcrypto -lz
+DPADD=3D ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBMD} ${LIBZ}
+LDADD=3D -lssh -lcrypt -lcrypto -lmd -lz
=20
.include <bsd.prog.mk>
=20
--GV0iVqYguTV4Q9ER--
--m972NQjnE83KvVa/
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (FreeBSD)
iD8DBQFFKk9JqRfpzJluFF4RAnDRAJ4hmqADhfEwVrvUFy5cb38pmsaUWQCglYWd
bARn8TYrC5qOO9YzwF7Q0+w=
=03LT
-----END PGP SIGNATURE-----
--m972NQjnE83KvVa/--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061009133153.GF91645>