Date: Wed, 23 Jan 2002 18:47:50 +0200 From: Ruslan Ermilov <ru@FreeBSD.org> To: Dag-Erling Smorgrav <des@FreeBSD.org>, Mark Murray <markm@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/share/mk bsd.libnames.mk src/lib/libpam/libpam Makefile src/lib/libpam/modules/pam_ssh Makefile src/secure Makefile.inc src/secure/lib/libssh Makefile src/secure/libexec/sftp-server Makefile src/secure/usr.bin/scp ... Message-ID: <20020123184750.B9922@sunbay.com> In-Reply-To: <20020123181404.A9922@sunbay.com> References: <200201231554.g0NFsIB59285@freefall.freebsd.org> <20020123181404.A9922@sunbay.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--bp/iNruPH9dso1Pn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Jan 23, 2002 at 06:14:04PM +0200, Ruslan Ermilov wrote: > On Wed, Jan 23, 2002 at 07:54:18AM -0800, Ruslan Ermilov wrote: > > ru 2002/01/23 07:54:18 PST > > > [...] > > Log: > > Add pam_ssh support to the static PAM library, libpam.a: > > > [...] > > - Add fake -lz dependency to secure/ makefiles needed for > > dynamic linkage with -lssh. > > > Blah, I know how to fix it. The patch will follow shortly. > Here's the patch. It unspams secure/ and pam_ssh/ makefiles from fake -lz and -lcrypto dependencies by moving them into libssh.so. Both static and dynamic linkage were tested. Only ssh(1) and sshd(8) actually needed -lz, and scp(1) also didn't need -lutil and -lcrypto. Please review. Cheers, -- Ruslan Ermilov Oracle Developer/DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --bp/iNruPH9dso1Pn Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p Index: secure/lib/libssh/Makefile =================================================================== RCS file: /home/ncvs/src/secure/lib/libssh/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- secure/lib/libssh/Makefile 23 Jan 2002 15:54:09 -0000 1.12 +++ secure/lib/libssh/Makefile 23 Jan 2002 16:40:23 -0000 @@ -24,6 +24,9 @@ CFLAGS+= -DKRB5 .endif # MAKE_KERBEROS5 +DPADD= ${LIBCRYPTO} ${LIBZ} +LDADD= -lcrypto -lz + .include <bsd.lib.mk> .PATH: ${SSHDIR} ${SSHDIR}/lib Index: secure/libexec/sftp-server/Makefile =================================================================== RCS file: /home/ncvs/src/secure/libexec/sftp-server/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- secure/libexec/sftp-server/Makefile 23 Jan 2002 15:54:09 -0000 1.4 +++ secure/libexec/sftp-server/Makefile 23 Jan 2002 16:40:23 -0000 @@ -5,8 +5,8 @@ SRCS= sftp-server.c sftp-common.c MAN= sftp-server.8 -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> Index: secure/usr.bin/scp/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/scp/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- secure/usr.bin/scp/Makefile 23 Jan 2002 15:54:10 -0000 1.6 +++ secure/usr.bin/scp/Makefile 23 Jan 2002 16:40:23 -0000 @@ -4,8 +4,8 @@ PROG= scp SRCS= scp.c scp-common.c -LDADD+= -lssh -lcrypto -lutil -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} +DPADD= ${LIBSSH} +LDADD= -lssh .include <bsd.prog.mk> Index: secure/usr.bin/sftp/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/sftp/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- secure/usr.bin/sftp/Makefile 23 Jan 2002 15:54:10 -0000 1.2 +++ secure/usr.bin/sftp/Makefile 23 Jan 2002 16:40:23 -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+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto +DPADD= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> Index: secure/usr.bin/ssh-add/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/ssh-add/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- secure/usr.bin/ssh-add/Makefile 23 Jan 2002 15:54:14 -0000 1.6 +++ secure/usr.bin/ssh-add/Makefile 23 Jan 2002 16:40:23 -0000 @@ -4,8 +4,8 @@ PROG= ssh-add SRCS= ssh-add.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> Index: secure/usr.bin/ssh-agent/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/ssh-agent/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- secure/usr.bin/ssh-agent/Makefile 23 Jan 2002 15:54:14 -0000 1.6 +++ secure/usr.bin/ssh-agent/Makefile 23 Jan 2002 16:40:23 -0000 @@ -4,8 +4,8 @@ PROG= ssh-agent SRCS= ssh-agent.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> Index: secure/usr.bin/ssh-keygen/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/ssh-keygen/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- secure/usr.bin/ssh-keygen/Makefile 23 Jan 2002 15:54:17 -0000 1.7 +++ secure/usr.bin/ssh-keygen/Makefile 23 Jan 2002 16:40:23 -0000 @@ -4,8 +4,8 @@ PROG= ssh-keygen SRCS= ssh-keygen.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> Index: secure/usr.bin/ssh-keyscan/Makefile =================================================================== RCS file: /home/ncvs/src/secure/usr.bin/ssh-keyscan/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- secure/usr.bin/ssh-keyscan/Makefile 23 Jan 2002 15:54:17 -0000 1.2 +++ secure/usr.bin/ssh-keyscan/Makefile 23 Jan 2002 16:40:23 -0000 @@ -4,8 +4,8 @@ PROG= ssh-keyscan SRCS= ssh-keyscan.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include <bsd.prog.mk> Index: lib/libpam/modules/pam_ssh/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libpam/modules/pam_ssh/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- lib/libpam/modules/pam_ssh/Makefile 23 Jan 2002 15:54:08 -0000 1.8 +++ lib/libpam/modules/pam_ssh/Makefile 23 Jan 2002 16:40:27 -0000 @@ -7,8 +7,8 @@ SHLIB_NAME= pam_ssh.so SRCS= pam_ssh.c CFLAGS+= -I${SSHSRC} -DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} -LDADD= -lssh -lcrypto -lcrypt -lutil -lz +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} +LDADD= -lssh -lcrypto -lcrypt -lutil MAN= pam_ssh.8 .include <bsd.lib.mk> --bp/iNruPH9dso1Pn-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020123184750.B9922>