Pull up following revision(s) (requested by mrg in ticket #1174):

	tools/compat/configure.ac: revision 1.111 (patch)
	tools/compat/compat_defs.h: revision 1.126 (patch)
	tools/compat/compat_defs.h: revision 1.127 (patch)
	bin/pax/options.c: revision 1.120
	tools/compat/nbtool_config.h.in: revision 1.59 (patch)
	tools/compat/Makefile: revision 1.95 (patch)
	tools/compat/configure.ac: revision 1.110 (patch)

pax: need <strings.h> for ffs()

Fixes warning as host tool on NetBSD 9.99

Add more functions needed by mandoc

add vsyslog decl check

Author: MartinHusemann

bin/pax/options.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: options.c,v 1.119 2020/04/03 16:13:32 joerg Exp $	*/
+/*	$NetBSD: options.c,v 1.119.6.1 2025/10/19 09:48:29 martin Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: options.c,v 1.119 2020/04/03 16:13:32 joerg Exp $");
+__RCSID("$NetBSD: options.c,v 1.119.6.1 2025/10/19 09:48:29 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -61,6 +61,7 @@ __RCSID("$NetBSD: options.c,v 1.119 2020/04/03 16:13:32 joerg Exp $");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <paths.h>

tools/compat/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.90.2.1 2024/11/17 13:32:52 martin Exp $
+#	$NetBSD: Makefile,v 1.90.2.2 2025/10/19 09:48:29 martin Exp $
 
 HOSTLIB=	nbcompat
 
@@ -10,7 +10,7 @@ SRCS=		atoll.c basename.c cdbr.c cdbw.c dirname.c \
 		heapsort.c getsubopt.c \
 		issetugid.c lchflags.c lchmod.c lchown.c libyywrap.c \
 		md2.c md2hl.c md4c.c md4hl.c md5c.c md5hl.c \
-		mi_vector_hash.c mkdtemp.c \
+		mi_vector_hash.c mkdtemp.c mkstemps.c \
 		mkstemp.c pread.c putc_unlocked.c pwcache.c pwrite.c \
 		pw_scan.c \
 		raise_default_signal.c rb.c reallocarr.c reallocarray.c \
@@ -22,8 +22,8 @@ SRCS=		atoll.c basename.c cdbr.c cdbw.c dirname.c \
 		shquote.c \
 		snprintb.c snprintf.c \
 		stat_flags.c strlcat.c strlcpy.c strmode.c \
-		strcasecmp.c strncasecmp.c strndup.c strnlen.c \
-		strsep.c strsuftoll.c strtoll.c \
+		strcasecmp.c strncasecmp.c strcasestr.c strndup.c strnlen.c \
+		strsep.c strsuftoll.c strtonum.c strtoll.c \
 		strtoi.c strtou.c \
 		unvis.c vis.c err.c errx.c errc.c verr.c verrx.c verrc.c \
 		vwarn.c vwarnx.c vwarnc.c warn.c warnx.c warnc.c \

tools/compat/compat_defs.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_defs.h,v 1.120.4.1 2024/11/17 13:32:52 martin Exp $	*/
+/*	$NetBSD: compat_defs.h,v 1.120.4.2 2025/10/19 09:48:29 martin Exp $	*/
 
 #ifndef	__NETBSD_COMPAT_DEFS_H__
 #define	__NETBSD_COMPAT_DEFS_H__
@@ -448,6 +448,10 @@ int issetugid(void);
 int mkstemp(char *);
 #endif
 
+#if !HAVE_DECL_MKSTEMPS
+int mkstemps(char *, int);
+#endif
+
 #if !HAVE_DECL_MKDTEMP
 char *mkdtemp(char *);
 #endif
@@ -539,6 +543,9 @@ int		strcasecmp(const char *, const char *);
 #if !HAVE_DECL_STRNCASECMP
 int		strncasecmp(const char *, const char *, size_t);
 #endif
+#if !HAVE_DECL_STRCASESTR
+char		*strcasestr(const char *, const char *);
+#endif
 #if !HAVE_DECL_LCHFLAGS
 int		lchflags(const char *, unsigned long);
 #endif
@@ -615,6 +622,10 @@ long long strsuftollx(const char *, const char *,
 long long strtoll(const char *, char **, int);
 #endif
 
+#if !HAVE_DECL_STRTONUM
+long long strtonum(const char *, long long, long long, const char **);
+#endif
+
 #if !HAVE_DECL_STRTOI
 intmax_t strtoi(const char * __restrict, char ** __restrict, int,
     intmax_t, intmax_t, int *);
@@ -645,6 +656,10 @@ int vasnprintf(char **, size_t, const char *, va_list);
 int vsnprintf(char *, size_t, const char *, va_list);
 #endif
 
+#if !HAVE_DECL_VSYSLOG
+void vsyslog(int, const char *, va_list);
+#endif
+
 /*
  * getmode() and setmode() are always defined, as these function names
  * exist but with very different meanings on other OS's.  The compat

tools/compat/configure.ac

@@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.99.6.2 2024/11/17 13:32:52 martin Exp $
+#	$NetBSD: configure.ac,v 1.99.6.3 2025/10/19 09:48:29 martin Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
@@ -175,13 +175,14 @@ AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, [#include <time.h>])
 
 # Global variable decls.
 AC_CHECK_DECLS([asprintf, asnprintf, vasprintf, vasnprintf, vsnprintf, fgetln, fparseln,
-	fpurge, getdelim, getline, snprintf],,, [
+	fpurge, getdelim, getline, snprintf, vsyslog],,, [
 #include <stdio.h>
 ])
 
-AC_CHECK_DECLS([atoll, heapsort, mkdtemp, mkstemp, reallocarr, reallocarray,
-	getsubopt, setenv, strtoi, strtoll, strtou, setprogname, shquote,
-	getprogname],,, [
+AC_CHECK_DECLS([atoll, getsubopt, getprogname, heapsort,
+	mkdtemp, mkstemp, mkstemps,
+	reallocarr, reallocarray,
+	setenv, strtonum, strtoi, strtoll, strtou, setprogname, shquote],,, [
 #include <stdlib.h>
 ])
 
@@ -224,12 +225,13 @@ AC_CHECK_FUNCS(atoll asprintf asnprintf basename devname dirfd dirname \
 	dprintf esetfunc fgetln flock fpurge __fpurge futimes getline \
 	getopt getopt_long group_from_gid gid_from_group \
 	heapsort isblank issetugid lchflags lchmod lchown lutimes mkstemp \
-	mkdtemp poll pread putc_unlocked pwcache_userdb pwcache_groupdb \
+	mkstemps mkdtemp poll pread putc_unlocked pwcache_userdb \
+	pwcache_groupdb \
 	pwrite raise_default_signal random reallocarr reallocarray setenv \
 	setgroupent setprogname setpassent \
 	snprintb_m snprintf strlcat strlcpy strmode \
-	strcasecmp strncasecmp strndup strnlen strsep strsuftoll strtoi \
-	strtoll strtou \
+	strcasecmp strncasecmp strcasestr strndup strnlen strsep strsuftoll \
+	strtoi strtoll strtou strtonum \
 	user_from_uid uid_from_user vasprintf vasnprintf vsnprintf)
 
 AC_CHECK_DECLS([user_from_uid, uid_from_user, pwcache_userdb],,,[
@@ -238,7 +240,7 @@ AC_CHECK_DECLS([user_from_uid, uid_from_user, pwcache_userdb],,,[
 AC_CHECK_DECLS([group_from_gid, gid_from_group, pwcache_groupdb],,,[
 #include <grp.h>
 ])
-AC_CHECK_DECLS([strcasecmp, strncasecmp, strlcpy, strlcat, strndup,
+AC_CHECK_DECLS([strcasecmp, strncasecmp, strcasestr, strlcpy, strlcat, strndup,
 		strnlen, strsep],,,[
 #include <string.h>
 ])

tools/compat/nbtool_config.h.in

@@ -1,6 +1,6 @@
 /* nbtool_config.h.in.  Generated from configure.ac by autoheader.  */
 
-/*      $NetBSD: nbtool_config.h.in,v 1.53.6.2 2024/11/17 13:32:52 martin Exp $    */
+/*      $NetBSD: nbtool_config.h.in,v 1.53.6.3 2025/10/19 09:48:29 martin Exp $    */
 
 #ifndef __NETBSD_NBTOOL_CONFIG_H__
 #define __NETBSD_NBTOOL_CONFIG_H__
@@ -262,6 +262,10 @@
    don't. */
 #undef HAVE_DECL_MKSTEMP
 
+/* Define to 1 if you have the declaration of `mkstemps', and to 0 if you
+   don't. */
+#undef HAVE_DECL_MKSTEMPS
+
 /* Define to 1 if you have the declaration of `optind', and to 0 if you don't.
    */
 #undef HAVE_DECL_OPTIND
@@ -326,6 +330,10 @@
    don't. */
 #undef HAVE_DECL_STRCASECMP
 
+/* Define to 1 if you have the declaration of `strcasestr', and to 0 if you
+   don't. */
+#undef HAVE_DECL_STRCASESTR
+
 /* Define to 1 if you have the declaration of `strlcat', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRLCAT
@@ -366,6 +374,10 @@
    don't. */
 #undef HAVE_DECL_STRTOLL
 
+/* Define to 1 if you have the declaration of `strtonum', and to 0 if you
+   don't. */
+#undef HAVE_DECL_STRTONUM
+
 /* Define to 1 if you have the declaration of `strtou', and to 0 if you don't.
    */
 #undef HAVE_DECL_STRTOU
@@ -402,6 +414,10 @@
    don't. */
 #undef HAVE_DECL_VSNPRINTF
 
+/* Define to 1 if you have the declaration of `vsyslog', and to 0 if you
+   don't. */
+#undef HAVE_DECL_VSYSLOG
+
 /* Define to 1 if you have the declaration of `vwarnc', and to 0 if you don't.
    */
 #undef HAVE_DECL_VWARNC
@@ -570,6 +586,9 @@
 /* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 
+/* Define to 1 if you have the `mkstemps' function. */
+#undef HAVE_MKSTEMPS
+
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
@@ -669,6 +688,9 @@
 /* Define to 1 if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 
+/* Define to 1 if you have the `strcasestr' function. */
+#undef HAVE_STRCASESTR
+
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
@@ -705,6 +727,9 @@
 /* Define to 1 if you have the `strtoll' function. */
 #undef HAVE_STRTOLL
 
+/* Define to 1 if you have the `strtonum' function. */
+#undef HAVE_STRTONUM
+
 /* Define to 1 if you have the `strtou' function. */
 #undef HAVE_STRTOU