MFH

Sponsored by:	The FreeBSD Foundation

12 files changed, 20 insertions, 25 deletions

diff --git a/lib/Makefile b/lib/Makefile
index cdcce90..0c8120c 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -173,7 +173,7 @@ _libbsnmp=	libbsnmp
 _libcasper=	libcasper
 .endif
 
-.if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT)
+.if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT) && !defined(COMPAT_SOFTFP)
 _clang=		clang
 .endif
 
diff --git a/lib/atf/Makefile b/lib/atf/Makefile
index 0772065..481bce9 100644
--- a/lib/atf/Makefile
+++ b/lib/atf/Makefile
@@ -35,6 +35,4 @@ SUBDIR=		libatf-c \
 _tests= 	tests
 .endif
 
-.ORDER: ${SUBDIR}
-
 .include <bsd.subdir.mk>
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index 8ab2399..5a3d169 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -240,11 +240,15 @@ Checkers.inc.h: ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td
 
-.if !make(depend)
-. for dep in ${TGHDRS:C/$/.inc.d/}
-.  sinclude "${dep}"
-. endfor
-.endif
+.for dep in ${TGHDRS:C/$/.inc.d/}
+. if ${MAKE_VERSION} < 20160220
+.  if !make(depend)
+.   sinclude "${dep}"
+.  endif
+. else
+.   dinclude "${dep}"
+. endif
+.endfor
 
 SRCS+=		${TGHDRS:C/$/.inc.h/}
 CLEANFILES+=	${TGHDRS:C/$/.inc.h/} ${TGHDRS:C/$/.inc.d/}
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index 7794928..e4d3bda 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -55,6 +55,7 @@ CXXRT_SRCS+=	libelftc_dem_gnu3.c\
 		guard.cc
 
 .for _S in ${CXXRT_SRCS}
+CLEANFILES+=	cxxrt_${_S}
 STATICOBJS+=	cxxrt_${_S:R}.o
 cxxrt_${_S}: ${_LIBCXXRTDIR}/${_S} .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map
index dc2ed0e..c1532ac 100644
--- a/lib/libc/sys/Symbol.map
+++ b/lib/libc/sys/Symbol.map
@@ -200,9 +200,6 @@ FBSD_1.0 {
 	nstat;
 	ntp_adjtime;
 	ntp_gettime;
-	oaio_read;
-	oaio_write;
-	olio_listio;
 	open;
 	pathconf;
 	pipe;
@@ -809,12 +806,6 @@ FBSDprivate_1.0 {
 	__sys_ntp_adjtime;
 	_ntp_gettime;
 	__sys_ntp_gettime;
-	_oaio_read;
-	__sys_oaio_read;
-	_oaio_write;
-	__sys_oaio_write;
-	_olio_listio;
-	__sys_olio_listio;
 	_open;
 	__sys_open;
 	_openat;
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile
index 8965018..8de1bdf 100644
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@@ -8,10 +8,7 @@ MAN=	pam_ssh.8
 SRCS=	pam_ssh.c
 PACKAGE=	ssh
 
-# required when linking with a dynamic libssh
-SRCS+=	roaming_dummy.c
-
-WARNS?=	3
+WARNS?=	5
 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
 SRCS+=	 ssh_namespace.h
 
diff --git a/lib/libpam/modules/pam_ssh/Makefile.depend b/lib/libpam/modules/pam_ssh/Makefile.depend
index 08fb149..6b7118b 100644
--- a/lib/libpam/modules/pam_ssh/Makefile.depend
+++ b/lib/libpam/modules/pam_ssh/Makefile.depend
@@ -5,13 +5,11 @@ DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
-	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libpam/libpam \
-	lib/libutil \
 	secure/lib/libcrypto \
 	secure/lib/libssh \
 
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c
index 8fc68fd..f95c737 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.c
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 
 #include <openssl/evp.h>
 
+#define __bounded__(x, y, z)
 #include "key.h"
 #include "buffer.h"
 #include "authfd.h"
@@ -84,7 +85,9 @@ static const char *pam_ssh_keyfiles[] = {
 };
 
 static const char *pam_ssh_agent = "/usr/bin/ssh-agent";
-static char *const pam_ssh_agent_argv[] = { "ssh_agent", "-s", NULL };
+static char str_ssh_agent[] = "ssh-agent";
+static char str_dash_s[] = "-s";
+static char *const pam_ssh_agent_argv[] = { str_ssh_agent, str_dash_s, NULL };
 static char *const pam_ssh_agent_envp[] = { NULL };
 
 /*
diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile
index f168244..aeb59095 100644
--- a/lib/libunbound/Makefile
+++ b/lib/libunbound/Makefile
@@ -12,7 +12,7 @@ LIB=	unbound
 PRIVATELIB=
 PACKAGE=	unbound
 
-CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR}
+CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR}
 
 SRCS=	alloc.c as112.c autotrust.c config_file.c configlexer.l configparser.y \
 	context.c dname.c dns.c dns64.c dnstree.c fptr_wlist.c infra.c \
diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index e780940..1c3cfee 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -199,6 +199,7 @@ notation may be used.
 .It "stacksize	size		Maximum stack size limit."
 .It "pseudoterminals	number		Maximum number of pseudo-terminals."
 .It "swapuse	size		Maximum swap space size limit."
+.It "umtxp	number		Maximum number of process-shared pthread locks."
 .El
 .Pp
 These resource limit entries actually specify both the maximum
diff --git a/lib/libutil/login_class.3 b/lib/libutil/login_class.3
index c87faae..ab2e8af 100644
--- a/lib/libutil/login_class.3
+++ b/lib/libutil/login_class.3
@@ -119,6 +119,7 @@ vmemoryuse       RLIMIT_VMEM
 pseudoterminals  RLIMIT_NPTS
 swapuse          RLIMIT_SWAP
 kqueues          RLIMIT_KQUEUES
+umtxp            RLIMIT_UMTXP
 .Ed
 .It LOGIN_SETPRIORITY
 Set the scheduling priority for the current process based on the
diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
index 9ffca8e..ceee5c8 100644
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -67,6 +67,7 @@ static struct login_res {
     { "pseudoterminals", login_getcapnum,  RLIMIT_NPTS    },
     { "swapuse",         login_getcapsize, RLIMIT_SWAP    },
     { "kqueues",         login_getcapsize, RLIMIT_KQUEUES },
+    { "umtxp",           login_getcapnum,  RLIMIT_UMTXP   },
     { NULL,              0,                0              }
 };