Module Name: src
Committed By: snj
Date: Mon Aug 21 02:24:17 UTC 2017
Modified Files:
src/crypto/external/bsd/openssh/bin/ssh [netbsd-7]: Makefile
src/crypto/external/bsd/openssh/bin/sshd [netbsd-7]: Makefile
src/external/bsd/dhcp [netbsd-7]: Makefile.inc
src/libexec/telnetd [netbsd-7]: Makefile
src/usr.bin/passwd [netbsd-7]: Makefile
src/usr.bin/telnet [netbsd-7]: Makefile
src/usr.sbin/racoon [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1493):
crypto/external/bsd/openssh/bin/ssh/Makefile: revision 1.11
usr.bin/passwd/Makefile: revision 1.45
external/bsd/dhcp/Makefile.inc: revision 1.17
crypto/external/bsd/openssh/bin/sshd/Makefile: revision 1.15
usr.bin/telnet/Makefile: revision 1.51
usr.sbin/racoon/Makefile: revision 1.28
libexec/telnetd/Makefile: revision 1.50
krb5 needs sqlite3 now
kerberos needs sqlite3
add sqlite3
add sqlite3
add sqlite3
add sqlite3
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.12.1 \
src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.9.12.1 -r1.9.12.2 \
src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.11.2.1 -r1.11.2.2 src/external/bsd/dhcp/Makefile.inc
cvs rdiff -u -r1.49 -r1.49.18.1 src/libexec/telnetd/Makefile
cvs rdiff -u -r1.44 -r1.44.8.1 src/usr.bin/passwd/Makefile
cvs rdiff -u -r1.50 -r1.50.10.1 src/usr.bin/telnet/Makefile
cvs rdiff -u -r1.27 -r1.27.4.1 src/usr.sbin/racoon/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.8 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.8.12.1
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.8 Fri Aug 10 12:20:12 2012
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Mon Aug 21 02:24:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/08/10 12:20:12 joerg Exp $
+# $NetBSD: Makefile,v 1.8.12.1 2017/08/21 02:24:16 snj Exp $
.include <bsd.own.mk>
@@ -29,8 +29,8 @@ DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBHEIM
LDADD+= -lkafs -lasn1 -lcrypt
DPADD+= ${LIBKAFS} ${LIBASN1} ${LIBCRYPT}
-LDADD+= -lcom_err -lroken -lutil
-DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBUTIL}
+LDADD+= -lcom_err -lroken -lsqlite3 -lutil
+DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3} ${LIBUTIL}
.endif
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/bin/sshd/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.9.12.1 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.9.12.2
--- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.9.12.1 Thu Apr 30 06:07:29 2015
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Mon Aug 21 02:24:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9.12.1 2015/04/30 06:07:29 riz Exp $
+# $NetBSD: Makefile,v 1.9.12.2 2017/08/21 02:24:16 snj Exp $
.include <bsd.own.mk>
@@ -51,8 +51,8 @@ SRCS+= auth-krb5.c auth2-krb5.c
LDADD+= -lkrb5 -lasn1
DPADD+= ${LIBKRB5} ${LIBASN1}
-LDADD+= -lcom_err -lroken
-DPADD+= ${LIBCOM_ERR} ${LIBROKEN}
+LDADD+= -lcom_err -lroken -lsqlite3
+DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3}
.endif
.if (${USE_LDAP} != "no")
Index: src/external/bsd/dhcp/Makefile.inc
diff -u src/external/bsd/dhcp/Makefile.inc:1.11.2.1 src/external/bsd/dhcp/Makefile.inc:1.11.2.2
--- src/external/bsd/dhcp/Makefile.inc:1.11.2.1 Sat Oct 11 16:22:28 2014
+++ src/external/bsd/dhcp/Makefile.inc Mon Aug 21 02:24:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11.2.1 2014/10/11 16:22:28 snj Exp $
+# $NetBSD: Makefile.inc,v 1.11.2.2 2017/08/21 02:24:16 snj Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -39,9 +39,9 @@ LDADD+=-lpthread
.if (${MKCRYPTO} != "no")
.if (${MKKERBEROS} != "no")
LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \
- -lcom_err -lroken -lasn1 -lwind
+ -lcom_err -lroken -lasn1 -lwind -lsqlite3
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
- ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND}
+ ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND} ${LIBSQLITE3}
.endif
.if defined(PROG) && ${PROG} == "dhclient"
LDADD+=-Wl,-Bdynamic
Index: src/libexec/telnetd/Makefile
diff -u src/libexec/telnetd/Makefile:1.49 src/libexec/telnetd/Makefile:1.49.18.1
--- src/libexec/telnetd/Makefile:1.49 Mon Jan 9 16:36:48 2012
+++ src/libexec/telnetd/Makefile Mon Aug 21 02:24:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/01/09 16:36:48 christos Exp $
+# $NetBSD: Makefile,v 1.49.18.1 2017/08/21 02:24:16 snj Exp $
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
WARNS?= 4 # XXX: const issues in sys_term.c
@@ -22,8 +22,8 @@ LIBTELNETDIR!= cd ${.CURDIR}/../../lib/l
.if (${USE_KERBEROS} != "no")
CPPFLAGS+=-DKRB5 -DAUTHENTICATION -DENCRYPTION
-LDADD+= -lkrb5 -lasn1 -lcom_err -lroken
-DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
+LDADD+= -lkrb5 -lasn1 -lcom_err -lroken -lsqlite3
+DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3}
.endif
.if (${MKCRYPTO} != "no")
Index: src/usr.bin/passwd/Makefile
diff -u src/usr.bin/passwd/Makefile:1.44 src/usr.bin/passwd/Makefile:1.44.8.1
--- src/usr.bin/passwd/Makefile:1.44 Wed Feb 13 23:19:14 2013
+++ src/usr.bin/passwd/Makefile Mon Aug 21 02:24:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2013/02/13 23:19:14 christos Exp $
+# $NetBSD: Makefile,v 1.44.8.1 2017/08/21 02:24:17 snj Exp $
# from: @(#)Makefile 8.3 (Berkeley) 4/2/94
.include <bsd.own.mk>
@@ -30,7 +30,9 @@ CPPFLAGS+= -DKERBEROS5
SRCS+= krb5_passwd.c
DPADD+= ${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT}
+DPADD+= ${LIBSQLITE3}
LDADD+= -lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lcrypt
+LDADD+= -lsqlite3
.ifdef OVERRIDE_HEIMDAL_KPASSWD
LINKS+= ${BINDIR}/passwd ${BINDIR}/kpasswd
MAN+= kpasswd.1
Index: src/usr.bin/telnet/Makefile
diff -u src/usr.bin/telnet/Makefile:1.50 src/usr.bin/telnet/Makefile:1.50.10.1
--- src/usr.bin/telnet/Makefile:1.50 Fri Aug 10 12:10:27 2012
+++ src/usr.bin/telnet/Makefile Mon Aug 21 02:24:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2012/08/10 12:10:27 joerg Exp $
+# $NetBSD: Makefile,v 1.50.10.1 2017/08/21 02:24:17 snj Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@@ -65,8 +65,8 @@ LIBTELNETDIR!= cd ${.CURDIR}/../../lib/l
.if (${USE_KERBEROS} != "no")
CPPFLAGS+=-DKRB5 -DFORWARD
-LDADD+= -lkrb5 -lasn1 -lcom_err -lroken
-DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
+LDADD+= -lkrb5 -lasn1 -lcom_err -lroken -lsqlite3
+DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBSQLITE3}
.endif
.if (${MKCRYPTO} != "no")
Index: src/usr.sbin/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.27 src/usr.sbin/racoon/Makefile:1.27.4.1
--- src/usr.sbin/racoon/Makefile:1.27 Sat Nov 9 00:33:48 2013
+++ src/usr.sbin/racoon/Makefile Mon Aug 21 02:24:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2013/11/09 00:33:48 christos Exp $
+# $NetBSD: Makefile,v 1.27.4.1 2017/08/21 02:24:17 snj Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -47,9 +47,9 @@ DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
.if (${USE_KERBEROS} != "no")
CPPFLAGS+=-DHAVE_GSSAPI
LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lcom_err \
- -lroken -lasn1
+ -lroken -lasn1 -lsqlite3
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBCOM_ERR} \
- ${LIBROKEN} ${LIBASN1}
+ ${LIBROKEN} ${LIBASN1} ${LIBSQLITE3}
.endif
CPPFLAGS+=-DHAVE_OPENSSL_IDEA_H
.if (${MKCRYPTO_RC5} != "no")
