[src/netbsd-7]: src Pull up following revision(s) (requested by mrg in ticket...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/netbsd-7]: src Pull up following revision(s) (requested by mrg in ticket...
From: snj <snj%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 03:20:05 +0000

details:   https://anonhg.NetBSD.org/src/rev/5a737040dff7
branches:  netbsd-7
changeset: 800316:5a737040dff7
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Aug 21 02:24:16 2017 +0000

description:
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

diffstat:

 crypto/external/bsd/openssh/bin/ssh/Makefile  |  6 +++---
 crypto/external/bsd/openssh/bin/sshd/Makefile |  6 +++---
 external/bsd/dhcp/Makefile.inc                |  6 +++---
 libexec/telnetd/Makefile                      |  6 +++---
 usr.bin/passwd/Makefile                       |  4 +++-
 usr.bin/telnet/Makefile                       |  6 +++---
 usr.sbin/racoon/Makefile                      |  6 +++---
 7 files changed, 21 insertions(+), 19 deletions(-)

diffs (141 lines):

diff -r 3d3f4f6a8d2b -r 5a737040dff7 crypto/external/bsd/openssh/bin/ssh/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh/Makefile      Sun Aug 20 05:48:00 2017 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh/Makefile      Mon Aug 21 02:24:16 2017 +0000
@@ -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 @@
 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>
diff -r 3d3f4f6a8d2b -r 5a737040dff7 crypto/external/bsd/openssh/bin/sshd/Makefile
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile     Sun Aug 20 05:48:00 2017 +0000
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile     Mon Aug 21 02:24:16 2017 +0000
@@ -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 @@
 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")
diff -r 3d3f4f6a8d2b -r 5a737040dff7 external/bsd/dhcp/Makefile.inc
--- a/external/bsd/dhcp/Makefile.inc    Sun Aug 20 05:48:00 2017 +0000
+++ b/external/bsd/dhcp/Makefile.inc    Mon Aug 21 02:24:16 2017 +0000
@@ -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 @@
 .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
diff -r 3d3f4f6a8d2b -r 5a737040dff7 libexec/telnetd/Makefile
--- a/libexec/telnetd/Makefile  Sun Aug 20 05:48:00 2017 +0000
+++ b/libexec/telnetd/Makefile  Mon Aug 21 02:24:16 2017 +0000
@@ -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 @@
 
 .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")
diff -r 3d3f4f6a8d2b -r 5a737040dff7 usr.bin/passwd/Makefile
--- a/usr.bin/passwd/Makefile   Sun Aug 20 05:48:00 2017 +0000
+++ b/usr.bin/passwd/Makefile   Mon Aug 21 02:24:16 2017 +0000
@@ -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 @@
 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
diff -r 3d3f4f6a8d2b -r 5a737040dff7 usr.bin/telnet/Makefile
--- a/usr.bin/telnet/Makefile   Sun Aug 20 05:48:00 2017 +0000
+++ b/usr.bin/telnet/Makefile   Mon Aug 21 02:24:16 2017 +0000
@@ -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 @@
 
 .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")
diff -r 3d3f4f6a8d2b -r 5a737040dff7 usr.sbin/racoon/Makefile
--- a/usr.sbin/racoon/Makefile  Sun Aug 20 05:48:00 2017 +0000
+++ b/usr.sbin/racoon/Makefile  Mon Aug 21 02:24:16 2017 +0000
@@ -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 @@
 .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")

Prev by Date: [src/netbsd-7]: src Pull up following revision(s) (requested by mrg in ticket...
Next by Date: [src/netbsd-7]: src/sys/arch/i386/conf Apply patch (requested by maxv in tick...
Previous by Thread: [src/netbsd-7]: src Pull up following revision(s) (requested by mrg in ticket...
Next by Thread: [src/netbsd-7]: src/sys/arch/i386/conf Apply patch (requested by maxv in tick...
Indexes:

Home | Main Index | Thread Index | Old Index