 @@ -1,29 +1,29 @@
-#	$NetBSD: Makefile,v 1.73 2015/01/18 18:09:10 christos Exp $
+#	$NetBSD: Makefile,v 1.74 2015/07/26 14:01:53 kamil Exp $
 HOSTLIB=	nbcompat
 .include <bsd.own.mk>
 SRCS=		atoll.c basename.c cdbr.c cdbw.c dirname.c \
 		dprintf.c fgetln.c flock.c fparseln.c fpurge.c \
 		getcap.c getline.c getmode.c getopt_long.c gettemp.c \
 		heapsort.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 \
 		mkstemp.c pread.c putc_unlocked.c pwcache.c pwrite.c \
 		pw_scan.c \
-		raise_default_signal.c rmd160.c rmd160hl.c \
+		raise_default_signal.c reallocarr.c rmd160.c rmd160hl.c \
 		setenv.c setgroupent.c \
 		setpassent.c setprogname.c sha1.c sha1hl.c sha2.c \
 		sha256hl.c sha384hl.c sha512hl.c snprintb.c snprintf.c \
 		stat_flags.c strlcat.c strlcpy.c strmode.c \
 		strndup.c strnlen.c \
 		strsep.c strsuftoll.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 \
 		fts.c glob.c efun.c
 BUILD_OSTYPE!=  uname -s

 @@ -1,14 +1,14 @@
-/*	$NetBSD: compat_defs.h,v 1.101 2015/01/16 18:44:06 christos Exp $	*/
+/*	$NetBSD: compat_defs.h,v 1.102 2015/07/26 14:01:53 kamil Exp $	*/
 #ifndef	__NETBSD_COMPAT_DEFS_H__
 #define	__NETBSD_COMPAT_DEFS_H__
 /*
  * On NetBSD, ensure that _NETBSD_SOURCE does not get defined, so that
  * accidental attempts to use NetBSD-specific features instead of more
  * portable features is likely to be noticed when the tools are built
  * on NetBSD.  Define enough other feature test macros to expose the
  * features we need.
  */
 #ifdef __NetBSD__
 #define	_ISOC99_SOURCE
 @@ -459,26 +459,30 @@ int		lchmod(const char *, mode_t);
 #endif
 #if !HAVE_DECL_LCHOWN
 int		lchown(const char *, uid_t, gid_t);
 #endif
 #if !HAVE_PWRITE
 ssize_t pwrite(int, const void *, size_t, off_t);
 #endif
 #if !HAVE_RAISE_DEFAULT_SIGNAL
 int raise_default_signal(int);
 #endif
 #if !HAVE_REALLOCARR
 int reallocarr(void *, size_t, size_t);
 #endif
 #if !HAVE_SETENV
 int setenv(const char *, const char *, int);
 #endif
 #if !HAVE_DECL_SETGROUPENT
 int setgroupent(int);
 #endif
 #if !HAVE_DECL_SETPASSENT
 int setpassent(int);
 #endif
 #if !HAVE_SETPROGNAME || defined(__NetBSD__)

 @@ -5034,27 +5034,27 @@ echo "$as_me:5033: result: $ac_cv_c_stac
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 cat >>confdefs.h <<EOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
 EOF
 fi
 for ac_func in 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 \
-	pwrite raise_default_signal random setenv \
+	pwrite raise_default_signal random reallocarr setenv \
 	setgroupent setprogname setpassent \
 	snprintb_m snprintf strlcat strlcpy strmode \
 	strndup strnlen strsep strsuftoll strtoi strtoll strtou \
 	user_from_uid uid_from_user vasprintf vasnprintf vsnprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:5054: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 #line 5060 "configure"

 @@ -1,14 +1,14 @@
-#	$NetBSD: configure.ac,v 1.83 2015/01/16 18:44:06 christos Exp $
+#	$NetBSD: configure.ac,v 1.84 2015/07/26 14:01:53 kamil Exp $
+#
 # Autoconf definition file for libnbcompat.
+#
 # When you edit configure.ac:
 # 0. Create the tools versions of autoconf and autoheader:
 #        cd ${SRCDIR} && build.sh -V MKMAINTAINERTOOLS=yes tools
 #    (This might not work if you try it after editing configure.ac.)
 # 1. edit configure.ac
 # 2. Regenerate "configure" and "nbtool_config.h.in" from "configure.ac":
 #        cd ${SRCDIR}/tools/compat && ${TOOLDIR}/bin/nbmake-${MACHINE} regen
 #    (Please don't use a non-tools version of autoconf or autoheader.)
 # 3. Test that the tools still build:
 #        mv ${TOOLDIR} ${TOOLDIR}.bak
 @@ -147,27 +147,27 @@ AC_CHECK_DECLS([optind, optreset],,, [
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
 ])
 AC_CHECK_DECLS(sys_signame,,, [#include <signal.h>])
 # Library functions (where a .h check isn't enough).
 AC_FUNC_ALLOCA
 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 \
-	pwrite raise_default_signal random setenv \
+	pwrite raise_default_signal random reallocarr setenv \
 	setgroupent setprogname setpassent \
 	snprintb_m snprintf strlcat strlcpy strmode \
 	strndup strnlen strsep strsuftoll strtoi strtoll strtou \
 	user_from_uid uid_from_user vasprintf vasnprintf vsnprintf)
 AC_CHECK_DECLS([user_from_uid, uid_from_user, pwcache_userdb],,,[
 #include <pwd.h>
 ])
 AC_CHECK_DECLS([group_from_gid, gid_from_group, pwcache_groupdb],,,[
 #include <grp.h>
 ])
 AC_CHECK_DECLS([strndup, strnlen],,,[#include <string.h>])
 AC_CHECK_DECLS([strsuftoll],,,[#include <stdlib.h>])

 @@ -1,16 +1,16 @@
 /* nbtool_config.h.in.  Generated automatically from configure.ac by autoheader.  */
-/*      $NetBSD: nbtool_config.h.in,v 1.36 2015/01/16 18:44:31 christos Exp $    */
+/*      $NetBSD: nbtool_config.h.in,v 1.37 2015/07/26 14:01:53 kamil Exp $    */
 #ifndef __NETBSD_NBTOOL_CONFIG_H__
 #define __NETBSD_NBTOOL_CONFIG_H__
 /* Define to 1 if your `fparseln' function is broken. */
 #undef BROKEN_FPARSELN
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
 #undef CRAY_STACKSEG_END
 /* Define if using `alloca.c'. */
 @@ -409,26 +409,29 @@
 /* Define if you have the <pwd.h> header file. */
 #undef HAVE_PWD_H
 /* Define if you have the `pwrite' function. */
 #undef HAVE_PWRITE
 /* Define if you have the `raise_default_signal' function. */
 #undef HAVE_RAISE_DEFAULT_SIGNAL
 /* Define if you have the `random' function. */
 #undef HAVE_RANDOM
 /* Define if you have the `reallocarr' function. */
 #undef HAVE_REALLOCARR
 /* Define if you have the <resolv.h> header file. */
 #undef HAVE_RESOLV_H
 /* Define if you have the <rpc/types.h> header file. */
 #undef HAVE_RPC_TYPES_H
 /* Define if you have the `setenv' function. */
 #undef HAVE_SETENV
 /* Define if you have the `setgroupent' function. */
 #undef HAVE_SETGROUPENT
 /* Define if you have the `setpassent' function. */