Date: 23 Jan 2002 00:35:55 +0100 From: Dag-Erling Smorgrav <des@ofug.org> To: Mark Murray <mark@grondar.za> Cc: Ruslan Ermilov <ru@FreeBSD.org>, Mark Murray <markm@FreeBSD.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/share/mk bsd.libnames.mk Message-ID: <xzp8zaqklgk.fsf@flood.ping.uio.no> In-Reply-To: <xzpit9ukmyb.fsf@flood.ping.uio.no> References: <xzppu42ko4l.fsf@flood.ping.uio.no> <200201222247.g0MMlKt62109@grimreaper.grondar.org> <xzpit9ukmyb.fsf@flood.ping.uio.no>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Dag-Erling Smorgrav <des@ofug.org> writes:
> 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) [...]
Sorry, that patch was incomplete. Here's the complete version. It's
way past my bedtime...
DES
--
Dag-Erling Smorgrav - des@ofug.org
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=libssh.diff
Index: crypto/openssh/channels.c
===================================================================
RCS file: /home/ncvs/src/crypto/openssh/channels.c,v
retrieving revision 1.6
diff -u -r1.6 channels.c
--- crypto/openssh/channels.c 26 Jun 2001 15:15:22 -0000 1.6
+++ crypto/openssh/channels.c 22 Jan 2002 22:42:08 -0000
@@ -133,7 +133,7 @@
static int have_hostname_in_open = 0;
/* AF_UNSPEC or AF_INET or AF_INET6 */
-extern int IPv4or6;
+int IPv4or6 = AF_UNSPEC;
void port_open_helper(Channel *c, char *rtype);
Index: crypto/openssh/ssh.c
===================================================================
RCS file: /home/ncvs/src/crypto/openssh/ssh.c,v
retrieving revision 1.16
diff -u -r1.16 ssh.c
--- crypto/openssh/ssh.c 27 Sep 2001 18:54:42 -0000 1.16
+++ crypto/openssh/ssh.c 22 Jan 2002 22:42:08 -0000
@@ -74,7 +74,7 @@
/* Flag indicating whether IPv4 or IPv6. This can be set on the command line.
Default value is AF_UNSPEC means both IPv4 and IPv6. */
-int IPv4or6 = AF_UNSPEC;
+extern int IPv4or6;
/* Flag indicating whether debug mode is on. This can be set on the command line. */
int debug_flag = 0;
Index: crypto/openssh/sshd.c
===================================================================
RCS file: /home/ncvs/src/crypto/openssh/sshd.c,v
retrieving revision 1.25
diff -u -r1.25 sshd.c
--- crypto/openssh/sshd.c 4 Sep 2001 13:27:04 -0000 1.25
+++ crypto/openssh/sshd.c 22 Jan 2002 22:42:08 -0000
@@ -103,7 +103,7 @@
* Flag indicating whether IPv4 or IPv6. This can be set on the command line.
* Default value is AF_UNSPEC means both IPv4 and IPv6.
*/
-int IPv4or6 = AF_UNSPEC;
+extern int IPv4or6;
/*
* Debug mode flag. This can be set on the command line. If debug
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 <bsd.prog.mk>
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 <bsd.prog.mk>
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 <bsd.prog.mk>
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 <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.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 <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.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 <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.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 <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.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 <bsd.prog.mk>
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 <bsd.prog.mk>
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 23:19:54 -0000
@@ -73,12 +73,13 @@
LIBPAM+= ${LIBCOM_ERR}
MINUSLPAM+= -lcom_err
.endif
-LIBPAM+=
+.ifndef NO_OPENSSH
+LIBPAM+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+MINUSLPAM+= -lssh -lcrypto -lz
+.endif
LIBPAM+= ${LIBRADIUS} ${LIBRPCSVC} ${LIBTACPLUS} \
- ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} \
- ${LIBUTIL} ${LIBOPIE} ${LIBMD} ${LIBZ}
-MINUSLPAM+= -lradius -lrpcsvc -ltacplus -lssh -lcrypto -lcrypt \
- -lutil -lopie -lmd -lz
+ ${LIBCRYPT} ${LIBUTIL} ${LIBOPIE} ${LIBMD}
+MINUSLPAM+= -lradius -lrpcsvc -ltacplus -lcrypt -lutil -lopie -lmd
.endif
LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a
@@ -93,6 +94,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzp8zaqklgk.fsf>