From owner-cvs-all Tue Jan 22 15: 4:35 2002 Delivered-To: cvs-all@freebsd.org Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by hub.freebsd.org (Postfix) with ESMTP id 5695037B417; Tue, 22 Jan 2002 15:03:43 -0800 (PST) Received: by flood.ping.uio.no (Postfix, from userid 2602) id EB48D533B; Wed, 23 Jan 2002 00:03:41 +0100 (CET) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: Mark Murray Cc: Ruslan Ermilov , Mark Murray , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/share/mk bsd.libnames.mk References: <200201222247.g0MMlKt62109@grimreaper.grondar.org> From: Dag-Erling Smorgrav Date: 23 Jan 2002 00:03:40 +0100 In-Reply-To: <200201222247.g0MMlKt62109@grimreaper.grondar.org> Message-ID: Lines: 21 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --=-=-= Mark Murray writes: > > Dag-Erling Smorgrav writes: > > > BTW, I just noticed that the attached patch is necessary (as a > > > supplement to my commit) to make dependency tracking work correctly. > > Screw that patch, it breaks world because of IPv4or6. > Even after Ruslan's patch? The two aren't compatible, though part of Ruslan's patch is needed whichever way we choose to deal with this. I've integrated those parts and prepared a patch (attached to this message) that makes ssh and friend link dynamically with libssh, and fixes the dependency problem in my commit. I've successfully built the relevant bits of src/secure/ and src/lib/libpam/ with the patch applied, and am kicking of a buildworld to be on the safe side. DES -- Dag-Erling Smorgrav - des@ofug.org --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=libssh.diff Index: secure/Makefile.inc =================================================================== RCS file: /home/ncvs/src/secure/Makefile.inc,v retrieving revision 1.18 diff -u -r1.18 Makefile.inc --- secure/Makefile.inc 28 Mar 2001 12:08:18 -0000 1.18 +++ secure/Makefile.inc 22 Jan 2002 22:11:10 -0000 @@ -21,9 +21,4 @@ .if !defined(NO_OPENSSH) SSHDIR= ${.CURDIR}/../../../crypto/openssh -.if exists(${.OBJDIR}/../../lib/libssh) -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a -.else -LIBSSH= ${.CURDIR}/../../lib/libssh/libssh.a -.endif .endif Index: secure/lib/libssh/Makefile =================================================================== RCS file: /home/ncvs/src/secure/lib/libssh/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- secure/lib/libssh/Makefile 30 Oct 2001 19:45:00 -0000 1.11 +++ secure/lib/libssh/Makefile 22 Jan 2002 22:47:13 -0000 @@ -10,8 +10,6 @@ cli.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \ version.c -INSTALL_PIC_ARCHIVE= yes - .if defined(COMPAT_GETADDRINFO) SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c .endif Index: secure/libexec/sftp-server/Makefile =================================================================== RCS file: /home/ncvs/src/secure/libexec/sftp-server/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- secure/libexec/sftp-server/Makefile 4 May 2001 04:21:20 -0000 1.3 +++ secure/libexec/sftp-server/Makefile 22 Jan 2002 22:47:13 -0000 @@ -5,8 +5,8 @@ SRCS= sftp-server.c sftp-common.c MAN= sftp-server.8 -LDADD+= ${LIBSSH} -lcrypto -DPADD+= ${LIBSSH} ${LIBCRYPTO} +LDADD+= -lssh -lcrypto -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} .include Index: secure/usr.bin/scp/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/scp/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- secure/usr.bin/scp/Makefile 4 May 2001 04:21:21 -0000 1.5 +++ secure/usr.bin/scp/Makefile 22 Jan 2002 22:47:13 -0000 @@ -4,7 +4,7 @@ PROG= scp SRCS= scp.c scp-common.c -LDADD+= ${LIBSSH} -lcrypto -lutil -lz +LDADD+= -lssh -lcrypto -lutil -lz DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} .include Index: secure/usr.bin/sftp/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/sftp/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- secure/usr.bin/sftp/Makefile 4 May 2001 04:21:21 -0000 1.1 +++ secure/usr.bin/sftp/Makefile 22 Jan 2002 22:47:13 -0000 @@ -4,8 +4,8 @@ PROG= sftp SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c scp-common.c -LDADD+= ${LIBSSH} -lcrypto -DPADD+= ${LIBSSH} ${LIBCRYPTO} +LDADD+= -lssh -lcrypto -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} .include Index: secure/usr.bin/ssh/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/ssh/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- secure/usr.bin/ssh/Makefile 4 May 2001 04:21:21 -0000 1.13 +++ secure/usr.bin/ssh/Makefile 22 Jan 2002 22:47:13 -0000 @@ -31,7 +31,7 @@ CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\" .endif -LDADD+= ${LIBSSH} -lcrypto -lutil -lz +LDADD+= -lssh -lcrypto -lutil -lz DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} .include Index: secure/usr.bin/ssh-add/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/ssh-add/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- secure/usr.bin/ssh-add/Makefile 4 May 2001 04:21:22 -0000 1.5 +++ secure/usr.bin/ssh-add/Makefile 22 Jan 2002 22:47:13 -0000 @@ -4,8 +4,8 @@ PROG= ssh-add SRCS= ssh-add.c -LDADD+= ${LIBSSH} -lcrypto -DPADD+= ${LIBSSH} ${LIBCRYPTO} +LDADD+= -lssh -lcrypto -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} .include Index: secure/usr.bin/ssh-agent/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/ssh-agent/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- secure/usr.bin/ssh-agent/Makefile 4 May 2001 04:21:25 -0000 1.5 +++ secure/usr.bin/ssh-agent/Makefile 22 Jan 2002 22:47:13 -0000 @@ -4,8 +4,8 @@ PROG= ssh-agent SRCS= ssh-agent.c -LDADD+= ${LIBSSH} -lcrypto -DPADD+= ${LIBSSH} ${LIBCRYPTO} +LDADD+= -lssh -lcrypto -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} .include Index: secure/usr.bin/ssh-keygen/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/ssh-keygen/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- secure/usr.bin/ssh-keygen/Makefile 4 May 2001 04:21:25 -0000 1.6 +++ secure/usr.bin/ssh-keygen/Makefile 22 Jan 2002 22:47:13 -0000 @@ -4,8 +4,8 @@ PROG= ssh-keygen SRCS= ssh-keygen.c -LDADD+= ${LIBSSH} -lcrypto -DPADD+= ${LIBSSH} ${LIBCRYPTO} +LDADD+= -lssh -lcrypto -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} .include Index: secure/usr.bin/ssh-keyscan/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/ssh-keyscan/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- secure/usr.bin/ssh-keyscan/Makefile 4 May 2001 04:21:25 -0000 1.1 +++ secure/usr.bin/ssh-keyscan/Makefile 22 Jan 2002 22:47:13 -0000 @@ -4,8 +4,8 @@ PROG= ssh-keyscan SRCS= ssh-keyscan.c -LDADD+= ${LIBSSH} -lcrypto -DPADD+= ${LIBSSH} ${LIBCRYPTO} +LDADD+= -lssh -lcrypto -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} .include Index: secure/usr.sbin/sshd/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.sbin/sshd/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- secure/usr.sbin/sshd/Makefile 29 Aug 2001 07:07:48 -0000 1.19 +++ secure/usr.sbin/sshd/Makefile 22 Jan 2002 22:47:13 -0000 @@ -38,7 +38,7 @@ CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\" .endif -LDADD+= ${LIBSSH} -lcrypt -lcrypto -lutil -lz -lwrap ${MINUSLPAM} +LDADD+= -lssh -lcrypt -lcrypto -lutil -lz -lwrap ${MINUSLPAM} DPADD+= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM} .include Index: share/mk/bsd.libnames.mk =================================================================== RCS file: /home/ncvs/src/share/mk/bsd.libnames.mk,v retrieving revision 1.49 diff -u -r1.49 bsd.libnames.mk --- share/mk/bsd.libnames.mk 21 Jan 2002 20:42:25 -0000 1.49 +++ share/mk/bsd.libnames.mk 22 Jan 2002 22:58:26 -0000 @@ -93,6 +93,7 @@ LIBRPCSVC?= ${DESTDIR}${LIBDIR}/librpcsvc.a LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a +LIBSSH?= ${DESTDIR}${LIBDIR}/libssh.a # XXX in secure dist, not base LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a # XXX in secure dist, not base LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a LIBTACPLUS?= ${DESTDIR}${LIBDIR}/libtacplus.a --=-=-=-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message