svn commit: r206518 - in user/imp/tbemd: lib lib/bind lib/csu lib/csu/amd64 lib/csu/arm lib/csu/i386-elf lib/csu/ia64 lib/csu/mips lib/csu/powerpc lib/csu/sparc64 lib/libc/compat-43 lib/libc/db/has...

Warner Losh imp at FreeBSD.org
Mon Apr 12 23:06:15 UTC 2010


Author: imp
Date: Mon Apr 12 23:06:14 2010
New Revision: 206518
URL: http://svn.freebsd.org/changeset/base/206518

Log:
  merge from head: part 4 of many

Added:
  user/imp/tbemd/lib/libcompat/4.3/re_comp.c
     - copied unchanged from r206514, head/lib/libcompat/4.3/re_comp.c
  user/imp/tbemd/lib/libpmc/pmc.corei7.3
     - copied unchanged from r206514, head/lib/libpmc/pmc.corei7.3
  user/imp/tbemd/lib/libpmc/pmc.corei7uc.3
     - copied unchanged from r206514, head/lib/libpmc/pmc.corei7uc.3
  user/imp/tbemd/lib/libpmc/pmc.ucf.3
     - copied unchanged from r206514, head/lib/libpmc/pmc.ucf.3
  user/imp/tbemd/lib/libpmc/pmc.westmere.3
     - copied unchanged from r206514, head/lib/libpmc/pmc.westmere.3
  user/imp/tbemd/lib/libpmc/pmc.westmereuc.3
     - copied unchanged from r206514, head/lib/libpmc/pmc.westmereuc.3
  user/imp/tbemd/lib/libz/Symbol.map
     - copied unchanged from r206514, head/lib/libz/Symbol.map
  user/imp/tbemd/lib/libz/Versions.def
     - copied unchanged from r206514, head/lib/libz/Versions.def
  user/imp/tbemd/lib/libz/contrib/
     - copied from r206514, head/lib/libz/contrib/
  user/imp/tbemd/lib/libz/doc/
     - copied from r206514, head/lib/libz/doc/
  user/imp/tbemd/lib/libz/gzclose.c
     - copied unchanged from r206514, head/lib/libz/gzclose.c
  user/imp/tbemd/lib/libz/gzguts.h
     - copied unchanged from r206514, head/lib/libz/gzguts.h
  user/imp/tbemd/lib/libz/gzlib.c
     - copied unchanged from r206514, head/lib/libz/gzlib.c
  user/imp/tbemd/lib/libz/gzread.c
     - copied unchanged from r206514, head/lib/libz/gzread.c
  user/imp/tbemd/lib/libz/gzwrite.c
     - copied unchanged from r206514, head/lib/libz/gzwrite.c
Deleted:
  user/imp/tbemd/lib/libcompat/4.3/regex.c
  user/imp/tbemd/lib/libcompat/regexp/
  user/imp/tbemd/lib/libz/algorithm.txt
  user/imp/tbemd/lib/libz/gzio.c
Modified:
  user/imp/tbemd/lib/Makefile
  user/imp/tbemd/lib/bind/config.h
  user/imp/tbemd/lib/csu/Makefile.inc
  user/imp/tbemd/lib/csu/amd64/crt1.c
  user/imp/tbemd/lib/csu/arm/Makefile
  user/imp/tbemd/lib/csu/arm/crt1.c
  user/imp/tbemd/lib/csu/i386-elf/Makefile
  user/imp/tbemd/lib/csu/ia64/Makefile
  user/imp/tbemd/lib/csu/mips/Makefile
  user/imp/tbemd/lib/csu/mips/crt1.c
  user/imp/tbemd/lib/csu/mips/crti.S
  user/imp/tbemd/lib/csu/powerpc/Makefile
  user/imp/tbemd/lib/csu/powerpc/crt1.c
  user/imp/tbemd/lib/csu/sparc64/crt1.c
  user/imp/tbemd/lib/libc/compat-43/sigpause.2
  user/imp/tbemd/lib/libc/db/hash/hash.c
  user/imp/tbemd/lib/libc/db/hash/hash.h
  user/imp/tbemd/lib/libc/db/man/hash.3
  user/imp/tbemd/lib/libc/gen/__getosreldate.c
  user/imp/tbemd/lib/libc/gen/_spinlock_stub.c
  user/imp/tbemd/lib/libc/gen/_thread_init.c
  user/imp/tbemd/lib/libc/gen/daemon.c
  user/imp/tbemd/lib/libc/gen/dlfcn.c
  user/imp/tbemd/lib/libc/gen/dlopen.3
  user/imp/tbemd/lib/libc/gen/opendir.c
  user/imp/tbemd/lib/libc/net/getservent.c
  user/imp/tbemd/lib/libc/net/nsdispatch.3
  user/imp/tbemd/lib/libc/posix1e/acl_add_flag_np.3
  user/imp/tbemd/lib/libc/posix1e/acl_clear_flags_np.3
  user/imp/tbemd/lib/libc/posix1e/acl_delete_flag_np.3
  user/imp/tbemd/lib/libc/posix1e/acl_get_brand_np.3
  user/imp/tbemd/lib/libc/posix1e/acl_get_entry_type_np.3
  user/imp/tbemd/lib/libc/posix1e/acl_get_flag_np.3
  user/imp/tbemd/lib/libc/posix1e/acl_get_flagset_np.3
  user/imp/tbemd/lib/libc/posix1e/acl_set_entry_type_np.3
  user/imp/tbemd/lib/libc/posix1e/acl_set_flagset_np.3
  user/imp/tbemd/lib/libc/posix1e/acl_strip.c
  user/imp/tbemd/lib/libc/posix1e/acl_to_text_nfs4.c
  user/imp/tbemd/lib/libc/rpc/Symbol.map
  user/imp/tbemd/lib/libc/rpc/clnt_simple.c
  user/imp/tbemd/lib/libc/rpc/getnetconfig.c
  user/imp/tbemd/lib/libc/rpc/key_call.c
  user/imp/tbemd/lib/libc/rpc/mt_misc.c
  user/imp/tbemd/lib/libc/rpc/mt_misc.h
  user/imp/tbemd/lib/libc/rpc/rpc_generic.c
  user/imp/tbemd/lib/libc/rpc/rpc_soc.c
  user/imp/tbemd/lib/libc/softfloat/softfloat-specialize
  user/imp/tbemd/lib/libc/sparc64/fpu/fpu.c
  user/imp/tbemd/lib/libc/sparc64/fpu/fpu_div.c
  user/imp/tbemd/lib/libc/sparc64/fpu/fpu_emu.h
  user/imp/tbemd/lib/libc/sparc64/fpu/fpu_explode.c
  user/imp/tbemd/lib/libc/sparc64/fpu/fpu_extern.h
  user/imp/tbemd/lib/libc/sparc64/fpu/fpu_implode.c
  user/imp/tbemd/lib/libc/stdio/findfp.c
  user/imp/tbemd/lib/libc/stdio/local.h
  user/imp/tbemd/lib/libc/stdio/printf.3
  user/imp/tbemd/lib/libc/stdio/snprintf.c
  user/imp/tbemd/lib/libc/stdio/vasprintf.c
  user/imp/tbemd/lib/libc/stdio/vdprintf.c
  user/imp/tbemd/lib/libc/stdio/vfprintf.c
  user/imp/tbemd/lib/libc/stdio/vsnprintf.c
  user/imp/tbemd/lib/libc/stdio/vsprintf.c
  user/imp/tbemd/lib/libc/stdio/vsscanf.c
  user/imp/tbemd/lib/libc/stdio/vswprintf.c
  user/imp/tbemd/lib/libc/stdio/vswscanf.c
  user/imp/tbemd/lib/libc/stdio/xprintf.c
  user/imp/tbemd/lib/libc/string/strlen.c
  user/imp/tbemd/lib/libc/sys/mmap.2
  user/imp/tbemd/lib/libc/sys/open.2
  user/imp/tbemd/lib/libc/sys/stat.2
  user/imp/tbemd/lib/libcompat/4.1/ascftime.c
  user/imp/tbemd/lib/libcompat/4.1/cftime.c
  user/imp/tbemd/lib/libcompat/4.1/ftime.c
  user/imp/tbemd/lib/libcompat/4.1/getpw.c
  user/imp/tbemd/lib/libcompat/4.3/cfree.c
  user/imp/tbemd/lib/libcompat/4.3/re_comp.3
  user/imp/tbemd/lib/libcompat/Makefile
  user/imp/tbemd/lib/libgssapi/gss_init_sec_context.3
  user/imp/tbemd/lib/libgssapi/gss_unwrap.3
  user/imp/tbemd/lib/libkvm/kvm_getpcpu.3
  user/imp/tbemd/lib/libpam/modules/pam_ssh/pam_ssh.c
  user/imp/tbemd/lib/libpmc/Makefile
  user/imp/tbemd/lib/libpmc/libpmc.c
  user/imp/tbemd/lib/libpmc/pmc.xscale.3
  user/imp/tbemd/lib/librpcsec_gss/rpcsec_gss.3
  user/imp/tbemd/lib/libstand/assert.c
  user/imp/tbemd/lib/libstand/bzipfs.c
  user/imp/tbemd/lib/libstand/gzipfs.c
  user/imp/tbemd/lib/libusbhid/data.c
  user/imp/tbemd/lib/libusbhid/descr.c
  user/imp/tbemd/lib/libusbhid/parse.c
  user/imp/tbemd/lib/libusbhid/usage.c
  user/imp/tbemd/lib/libusbhid/usbhid.h
  user/imp/tbemd/lib/libusbhid/usbvar.h
  user/imp/tbemd/lib/libz/ChangeLog
  user/imp/tbemd/lib/libz/FAQ
  user/imp/tbemd/lib/libz/Makefile
  user/imp/tbemd/lib/libz/README
  user/imp/tbemd/lib/libz/adler32.c
  user/imp/tbemd/lib/libz/compress.c
  user/imp/tbemd/lib/libz/crc32.c
  user/imp/tbemd/lib/libz/deflate.c
  user/imp/tbemd/lib/libz/deflate.h
  user/imp/tbemd/lib/libz/example.c
  user/imp/tbemd/lib/libz/infback.c
  user/imp/tbemd/lib/libz/inffast.c
  user/imp/tbemd/lib/libz/inflate.c
  user/imp/tbemd/lib/libz/inflate.h
  user/imp/tbemd/lib/libz/inftrees.c
  user/imp/tbemd/lib/libz/inftrees.h
  user/imp/tbemd/lib/libz/minigzip.c   (contents, props changed)
  user/imp/tbemd/lib/libz/trees.c
  user/imp/tbemd/lib/libz/uncompr.c
  user/imp/tbemd/lib/libz/zconf.h
  user/imp/tbemd/lib/libz/zlib.3
  user/imp/tbemd/lib/libz/zlib.h
  user/imp/tbemd/lib/libz/zutil.c
  user/imp/tbemd/lib/libz/zutil.h
  user/imp/tbemd/lib/msun/man/cimag.3
  user/imp/tbemd/libexec/fingerd/fingerd.8
  user/imp/tbemd/libexec/fingerd/fingerd.c
  user/imp/tbemd/libexec/ftpd/popen.c
  user/imp/tbemd/libexec/rtld-elf/rtld.c
  user/imp/tbemd/libexec/tftpd/tftpd.8
  user/imp/tbemd/release/Makefile
  user/imp/tbemd/release/Makefile.inc.docports
Directory Properties:
  user/imp/tbemd/lib/libz/   (props changed)

Modified: user/imp/tbemd/lib/Makefile
==============================================================================
--- user/imp/tbemd/lib/Makefile	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/Makefile	Mon Apr 12 23:06:14 2010	(r206518)
@@ -9,8 +9,8 @@
 # csu must be built before all shared libaries for ELF.
 # libc must be built before all other shared libraries.
 # libbsm must be built before ibauditd.
-# libcom_err must be built before libkrb5 and libpam.
-# libcrypt must be built before libkrb5 and libpam.
+# libcom_err must be built before libpam.
+# libcrypt must be built before libpam.
 # libkvm must be built before libdevstat.
 # msun must be built before libg++ and libstdc++.
 # libmd must be built before libatm, libopie, libradius, and libtacplus.
@@ -26,21 +26,86 @@
 # libgssapi must be built before librpcsec_gss
 #
 # Otherwise, the SUBDIR list should be in alphabetical order.
+#
+# Except it appears bind needs to be compiled last
 
-SUBDIR=	${_csu} libc libbsm libauditd libcom_err libcrypt libelf libkvm msun \
+SUBDIR_ORDERED=	${_csu} \
+	libc \
+	libbsm \
+	libauditd \
+	libcom_err \
+	libcrypt \
+	libelf \
+	libkvm \
+	msun \
 	libmd \
-	ncurses ${_libnetgraph} libradius librpcsvc libsbuf \
-	libtacplus libutil ${_libypclnt} libalias libarchive \
-	${_libatm} libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \
-	libcalendar libcam libcompat libdevinfo libdevstat libdisk \
-	libdwarf libedit ${_libefi} libexpat libfetch libftpio libgeom \
-	${_libgpib} ${_libgssapi} ${_librpcsec_gss} libipsec \
-	${_libipx} libjail libkiconv libmagic libmemstat ${_libmilter} \
-	${_libmp} ${_libncp} ${_libngatm} libopie libpam libpcap \
-	${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
-	${_libsmdb} ${_libsmutil} libstand \
-	${_libtelnet} ${_libthr} libthread_db libufs libugidfw libulog \
-	${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \
+	ncurses \
+	${_libnetgraph} \
+	libradius \
+	librpcsvc \
+	libsbuf \
+	libtacplus \
+	libutil \
+	${_libypclnt}
+
+SUBDIR=	${SUBDIR_ORDERED} \
+	libalias \
+	libarchive \
+	${_libatm} \
+	libbegemot \
+	${_libbluetooth} \
+	${_libbsnmp} \
+	libbz2 \
+	libcalendar \
+	libcam \
+	libcompat \
+	libdevinfo \
+	libdevstat \
+	libdisk \
+	libdwarf \
+	libedit \
+	${_libefi} \
+	libexpat \
+	libfetch \
+	libftpio \
+	libgeom \
+	${_libgpib} \
+	${_libgssapi} \
+	${_librpcsec_gss} \
+	libipsec \
+	${_libipx} \
+	libjail \
+	libkiconv \
+	libmagic \
+	libmemstat \
+	${_libmilter} \
+	${_libmp} \
+	${_libncp} \
+	${_libngatm} \
+	libopie \
+	libpam \
+	libpcap \
+	${_libpmc} \
+	libproc \
+	librt \
+	${_libsdp} \
+	${_libsm} \
+	${_libsmb} \
+	${_libsmdb} \
+	${_libsmutil} \
+	libstand \
+	${_libtelnet} \
+	${_libthr} \
+	libthread_db \
+	libufs \
+	libugidfw \
+	libulog \
+	${_libusbhid} \
+	${_libusb} \
+	${_libvgl} \
+	libwrap \
+	liby \
+	libz \
 	${_bind}
 
 .if exists(${.CURDIR}/csu/${MACHINE_CPUARCH}-elf)

Modified: user/imp/tbemd/lib/bind/config.h
==============================================================================
--- user/imp/tbemd/lib/bind/config.h	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/bind/config.h	Mon Apr 12 23:06:14 2010	(r206518)
@@ -283,6 +283,10 @@ int sigwait(const unsigned int *set, int
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
 /* Defined if extern char *optarg is not declared. */
 /* #undef NEED_OPTARG */
 

Modified: user/imp/tbemd/lib/csu/Makefile.inc
==============================================================================
--- user/imp/tbemd/lib/csu/Makefile.inc	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/csu/Makefile.inc	Mon Apr 12 23:06:14 2010	(r206518)
@@ -2,4 +2,4 @@
 
 SSP_CFLAGS=
 
-WARNS?=	6
+.include "../Makefile.inc"

Modified: user/imp/tbemd/lib/csu/amd64/crt1.c
==============================================================================
--- user/imp/tbemd/lib/csu/amd64/crt1.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/csu/amd64/crt1.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -43,7 +43,6 @@ typedef void (*fptr)(void);
 extern void _fini(void);
 extern void _init(void);
 extern int main(int, char **, char **);
-extern void _start(char **, void (*)(void));
 
 #ifdef GCRT
 extern void _mcleanup(void);
@@ -55,6 +54,8 @@ extern int etext;
 char **environ;
 const char *__progname = "";
 
+void _start(char **, void (*)(void));
+
 /* The entry function. */
 void
 _start(char **ap, void (*cleanup)(void))

Modified: user/imp/tbemd/lib/csu/arm/Makefile
==============================================================================
--- user/imp/tbemd/lib/csu/arm/Makefile	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/csu/arm/Makefile	Mon Apr 12 23:06:14 2010	(r206518)
@@ -5,12 +5,9 @@
 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-Wall -Wno-unused \
-		-I${.CURDIR}/../common \
+CFLAGS+=	-I${.CURDIR}/../common \
 		-I${.CURDIR}/../../libc/include
 
-WARNS?=		2
-
 all: ${OBJS}
 
 CLEANFILES=	${OBJS}

Modified: user/imp/tbemd/lib/csu/arm/crt1.c
==============================================================================
--- user/imp/tbemd/lib/csu/arm/crt1.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/csu/arm/crt1.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -74,6 +74,9 @@ char **environ;
 const char *__progname = "";
 struct ps_strings *__ps_strings;
 
+void __start(int, char **, char **, struct ps_strings *,
+    const struct Struct_Obj_Entry *, void (*)(void));
+
 /* The entry function. */
 __asm("	.text			\n"
 "	.align	0		\n"

Modified: user/imp/tbemd/lib/csu/i386-elf/Makefile
==============================================================================
--- user/imp/tbemd/lib/csu/i386-elf/Makefile	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/csu/i386-elf/Makefile	Mon Apr 12 23:06:14 2010	(r206518)
@@ -23,7 +23,7 @@ crt1.o:	crt1_c.o crt1_s.o
 	objcopy --localize-symbol _start1 crt1.o
 
 Scrt1_c.o:	crt1_c.c
-	${CC} ${CFLAGS} -DGCRT -fPIC -DPIC -c -o Scrt1_c.o ${.CURDIR}/crt1_c.c
+	${CC} ${CFLAGS} -fPIC -DPIC -c -o Scrt1_c.o ${.CURDIR}/crt1_c.c
 
 Scrt1.o: Scrt1_c.o crt1_s.o
 	${LD} ${LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o

Modified: user/imp/tbemd/lib/csu/ia64/Makefile
==============================================================================
--- user/imp/tbemd/lib/csu/ia64/Makefile	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/csu/ia64/Makefile	Mon Apr 12 23:06:14 2010	(r206518)
@@ -5,8 +5,7 @@
 SRCS=		crt1.S crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-Wall -Wno-unused \
-		-I${.CURDIR}/../common \
+CFLAGS+=	-I${.CURDIR}/../common \
 		-I${.CURDIR}/../../libc/include
 
 all: ${OBJS}

Modified: user/imp/tbemd/lib/csu/mips/Makefile
==============================================================================
--- user/imp/tbemd/lib/csu/mips/Makefile	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/csu/mips/Makefile	Mon Apr 12 23:06:14 2010	(r206518)
@@ -5,12 +5,9 @@
 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-Wall -Wno-unused \
-		-I${.CURDIR}/../common \
+CFLAGS+=	-I${.CURDIR}/../common \
 		-I${.CURDIR}/../../libc/include
 
-WARNS?=		2
-
 all: ${OBJS}
 
 CLEANFILES=	${OBJS}

Modified: user/imp/tbemd/lib/csu/mips/crt1.c
==============================================================================
--- user/imp/tbemd/lib/csu/mips/crt1.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/csu/mips/crt1.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -66,12 +66,14 @@ extern int etext;
 char **environ;
 const char *__progname = "";
 
+void __start(char **, void (*)(void), struct Struct_Obj_Entry *, struct ps_strings *);
+
 /* The entry function. */
 void
 __start(char **ap,
 	void (*cleanup)(void),			/* from shared loader */
-	struct Struct_Obj_Entry *obj,		/* from shared loader */
-	struct ps_strings *ps_strings)
+	struct Struct_Obj_Entry *obj __unused,	/* from shared loader */
+	struct ps_strings *ps_strings __unused)
 {
 	int argc;
 	char **argv;

Modified: user/imp/tbemd/lib/csu/mips/crti.S
==============================================================================
--- user/imp/tbemd/lib/csu/mips/crti.S	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/csu/mips/crti.S	Mon Apr 12 23:06:14 2010	(r206518)
@@ -6,7 +6,7 @@ __FBSDID("$FreeBSD$");
 	.globl	_init
 	.type	_init,%function
 _init:
-	.set nreoorder
+	.set noreorder
 #if defined(__ABICALLS__) && (defined(__mips_o32) || defined(__mips_o64))
 	SETUP_GP
 #endif

Modified: user/imp/tbemd/lib/csu/powerpc/Makefile
==============================================================================
--- user/imp/tbemd/lib/csu/powerpc/Makefile	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/csu/powerpc/Makefile	Mon Apr 12 23:06:14 2010	(r206518)
@@ -5,8 +5,7 @@
 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
 OBJS+=		Scrt1.o gcrt1.o
-CFLAGS+=	-Wall -Wno-unused \
-		-I${.CURDIR}/../common \
+CFLAGS+=	-I${.CURDIR}/../common \
 		-I${.CURDIR}/../../libc/include
 
 all: ${OBJS}

Modified: user/imp/tbemd/lib/csu/powerpc/crt1.c
==============================================================================
--- user/imp/tbemd/lib/csu/powerpc/crt1.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/csu/powerpc/crt1.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -59,8 +59,6 @@ extern int _DYNAMIC;
 extern void _fini(void);
 extern void _init(void);
 extern int main(int, char **, char **);
-extern void _start(int, char **, char **, const struct Struct_Obj_Entry *,
-    void (*)(void), struct ps_strings *);
 
 #ifdef GCRT
 extern void _mcleanup(void);
@@ -73,6 +71,9 @@ char **environ;
 const char *__progname = "";
 struct ps_strings *__ps_strings;
 
+void _start(int, char **, char **, const struct Struct_Obj_Entry *,
+    void (*)(void), struct ps_strings *);
+
 /* The entry function. */
 /*
  * First 5 arguments are specified by the PowerPC SVR4 ABI.

Modified: user/imp/tbemd/lib/csu/sparc64/crt1.c
==============================================================================
--- user/imp/tbemd/lib/csu/sparc64/crt1.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/csu/sparc64/crt1.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -50,8 +50,6 @@ extern int _DYNAMIC;
 extern void _fini(void);
 extern void _init(void);
 extern int main(int, char **, char **);
-extern void _start(char **, void (*)(void), struct Struct_Obj_Entry *,
-    struct ps_strings *);
 extern void __sparc_utrap_setup(void);
 
 #ifdef GCRT
@@ -64,6 +62,9 @@ extern int etext;
 char **environ;
 const char *__progname = "";
 
+void _start(char **, void (*)(void), struct Struct_Obj_Entry *,
+    struct ps_strings *);
+
 /* The entry function. */
 /*
  * %o0 holds ps_strings pointer.

Modified: user/imp/tbemd/lib/libc/compat-43/sigpause.2
==============================================================================
--- user/imp/tbemd/lib/libc/compat-43/sigpause.2	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/compat-43/sigpause.2	Mon Apr 12 23:06:14 2010	(r206518)
@@ -195,6 +195,7 @@ functions, an attempt was made to catch 
 .Dv SIGKILL
 or
 .Dv SIGSTOP .
+.El
 .Sh SEE ALSO
 .Xr kill 2 ,
 .Xr sigaction 2 ,

Modified: user/imp/tbemd/lib/libc/db/hash/hash.c
==============================================================================
--- user/imp/tbemd/lib/libc/db/hash/hash.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/db/hash/hash.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -293,6 +293,8 @@ init_hash(HTAB *hashp, const char *file,
 		if (stat(file, &statbuf))
 			return (NULL);
 		hashp->BSIZE = statbuf.st_blksize;
+		if (hashp->BSIZE > MAX_BSIZE)
+			hashp->BSIZE = MAX_BSIZE;
 		hashp->BSHIFT = __log2(hashp->BSIZE);
 	}
 

Modified: user/imp/tbemd/lib/libc/db/hash/hash.h
==============================================================================
--- user/imp/tbemd/lib/libc/db/hash/hash.h	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/db/hash/hash.h	Mon Apr 12 23:06:14 2010	(r206518)
@@ -118,7 +118,7 @@ typedef struct htab	 {		/* Memory reside
 /*
  * Constants
  */
-#define	MAX_BSIZE		65536		/* 2^16 */
+#define	MAX_BSIZE		32768		/* 2^15 but should be 65536 */
 #define MIN_BUFFERS		6
 #define MINHDRSIZE		512
 #define DEF_BUFSIZE		65536		/* 64 K */

Modified: user/imp/tbemd/lib/libc/db/man/hash.3
==============================================================================
--- user/imp/tbemd/lib/libc/db/man/hash.3	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/db/man/hash.3	Mon Apr 12 23:06:14 2010	(r206518)
@@ -78,7 +78,7 @@ The
 element
 defines the
 .Nm
-table bucket size, and is, by default, 256 bytes.
+table bucket size, and is, by default, 4096 bytes.
 It may be preferable to increase the page size for disk-resident tables
 and tables with large data items.
 .It Va ffactor

Modified: user/imp/tbemd/lib/libc/gen/__getosreldate.c
==============================================================================
--- user/imp/tbemd/lib/libc/gen/__getosreldate.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/gen/__getosreldate.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/sysctl.h>
 
+int __getosreldate(void);
+
 /*
  * This is private to libc.  It is intended for wrapping syscall stubs in order
  * to avoid having to put SIGSYS signal handlers in place to test for presence

Modified: user/imp/tbemd/lib/libc/gen/_spinlock_stub.c
==============================================================================
--- user/imp/tbemd/lib/libc/gen/_spinlock_stub.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/gen/_spinlock_stub.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -34,6 +34,11 @@ __FBSDID("$FreeBSD$");
 
 #include "spinlock.h"
 
+long _atomic_lock_stub(volatile long *);
+void _spinlock_stub(spinlock_t *);
+void _spinunlock_stub(spinlock_t *);
+void _spinlock_debug_stub(spinlock_t *, char *, int);
+
 /*
  * Declare weak definitions in case the application is not linked
  * with libpthread.
@@ -43,12 +48,11 @@ __weak_reference(_spinlock_stub, _spinlo
 __weak_reference(_spinunlock_stub, _spinunlock);
 __weak_reference(_spinlock_debug_stub, _spinlock_debug);
 
-
 /*
  * This function is a stub for the _atomic_lock function in libpthread.
  */
 long
-_atomic_lock_stub(volatile long *lck)
+_atomic_lock_stub(volatile long *lck __unused)
 {
 	return (0L);
 }
@@ -58,7 +62,7 @@ _atomic_lock_stub(volatile long *lck)
  * This function is a stub for the spinlock function in libpthread.
  */
 void
-_spinlock_stub(spinlock_t *lck)
+_spinlock_stub(spinlock_t *lck __unused)
 {
 }
 
@@ -66,7 +70,7 @@ _spinlock_stub(spinlock_t *lck)
  * This function is a stub for the spinunlock function in libpthread.
  */
 void
-_spinunlock_stub(spinlock_t *lck)
+_spinunlock_stub(spinlock_t *lck __unused)
 {
 }
 
@@ -74,6 +78,6 @@ _spinunlock_stub(spinlock_t *lck)
  * This function is a stub for the debug spinlock function in libpthread.
  */
 void
-_spinlock_debug_stub(spinlock_t *lck, char *fname, int lineno)
+_spinlock_debug_stub(spinlock_t *lck __unused, char *fname __unused, int lineno __unused)
 {
 }

Modified: user/imp/tbemd/lib/libc/gen/_thread_init.c
==============================================================================
--- user/imp/tbemd/lib/libc/gen/_thread_init.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/gen/_thread_init.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -29,6 +29,8 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
+void _thread_init_stub(void);
+
 __weak_reference(_thread_init_stub, _thread_init);
 __weak_reference(_thread_autoinit_dummy_decl_stub, _thread_autoinit_dummy_decl);
 

Modified: user/imp/tbemd/lib/libc/gen/daemon.c
==============================================================================
--- user/imp/tbemd/lib/libc/gen/daemon.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/gen/daemon.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -64,6 +64,10 @@ daemon(nochdir, noclose)
 	case 0:
 		break;
 	default:
+		/*
+		 * A fine point:  _exit(0), not exit(0), to avoid triggering
+		 * atexit(3) processing
+		 */
 		_exit(0);
 	}
 

Modified: user/imp/tbemd/lib/libc/gen/dlfcn.c
==============================================================================
--- user/imp/tbemd/lib/libc/gen/dlfcn.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/gen/dlfcn.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <link.h>
 #include <stddef.h>
 
-static const char sorry[] = "Service unavailable";
+static char sorry[] = "Service unavailable";
 
 /*
  * For ELF, the dynamic linker directly resolves references to its
@@ -69,7 +69,7 @@ dlclose(void *handle)
 }
 
 #pragma weak dlerror
-const char *
+char *
 dlerror(void)
 {
 	return sorry;

Modified: user/imp/tbemd/lib/libc/gen/dlopen.3
==============================================================================
--- user/imp/tbemd/lib/libc/gen/dlopen.3	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/gen/dlopen.3	Mon Apr 12 23:06:14 2010	(r206518)
@@ -52,7 +52,7 @@
 .Fn dlsym "void * restrict handle" "const char * restrict symbol"
 .Ft dlfunc_t
 .Fn dlfunc "void * restrict handle" "const char * restrict symbol"
-.Ft const char *
+.Ft char *
 .Fn dlerror "void"
 .Ft int
 .Fn dlclose "void *handle"

Modified: user/imp/tbemd/lib/libc/gen/opendir.c
==============================================================================
--- user/imp/tbemd/lib/libc/gen/opendir.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/gen/opendir.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -86,7 +86,7 @@ __opendir2(const char *name, int flags)
 		errno = ENOTDIR;
 		return (NULL);
 	}
-	if ((fd = _open(name, O_RDONLY | O_NONBLOCK)) == -1)
+	if ((fd = _open(name, O_RDONLY | O_NONBLOCK | O_DIRECTORY)) == -1)
 		return (NULL);
 
 	return __opendir_common(fd, name, flags);
@@ -200,7 +200,7 @@ __opendir_common(int fd, const char *nam
 		 */
 		if (flags & DTF_REWIND) {
 			(void)_close(fd);
-			if ((fd = _open(name, O_RDONLY)) == -1) {
+			if ((fd = _open(name, O_RDONLY | O_DIRECTORY)) == -1) {
 				saved_errno = errno;
 				free(buf);
 				free(dirp);

Modified: user/imp/tbemd/lib/libc/net/getservent.c
==============================================================================
--- user/imp/tbemd/lib/libc/net/getservent.c	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/net/getservent.c	Mon Apr 12 23:06:14 2010	(r206518)
@@ -37,7 +37,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#include <db.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <limits.h>
 #include <netdb.h>
 #include <nsswitch.h>
@@ -94,6 +96,19 @@ NSS_TLS_HANDLING(files);
 static int files_servent(void *, void *, va_list);
 static int files_setservent(void *, void *, va_list);
 
+/* db backend declarations */
+struct db_state
+{
+        DB *db;
+	int stayopen;
+	int keynum;
+};
+static void db_endstate(void *);
+NSS_TLS_HANDLING(db);
+
+static int db_servent(void *, void *, va_list);
+static int db_setservent(void *, void *, va_list);
+
 #ifdef YP
 /* nis backend declarations */
 static 	int 	nis_servent(void *, void *, va_list);
@@ -207,6 +222,32 @@ servent_unpack(char *p, struct servent *
 	return 0;
 }
 
+static int
+parse_result(struct servent *serv, char *buffer, size_t bufsize,
+    char *resultbuf, size_t resultbuflen, int *errnop)
+{
+	char **aliases;
+	int aliases_size;
+
+	if (bufsize <= resultbuflen + _ALIGNBYTES + sizeof(char *)) {
+		*errnop = ERANGE;
+		return (NS_RETURN);
+	}
+	aliases = (char **)_ALIGN(&buffer[resultbuflen + 1]);
+	aliases_size = (buffer + bufsize - (char *)aliases) / sizeof(char *);
+	if (aliases_size < 1) {
+		*errnop = ERANGE;
+		return (NS_RETURN);
+	}
+
+	memcpy(buffer, resultbuf, resultbuflen);
+	buffer[resultbuflen] = '\0';
+
+	if (servent_unpack(buffer, serv, aliases, aliases_size, errnop) != 0)
+		return ((*errnop == 0) ? NS_NOTFOUND : NS_RETURN);
+	return (NS_SUCCESS);
+}
+
 /* files backend implementation */
 static	void
 files_endstate(void *p)
@@ -237,6 +278,8 @@ files_servent(void *retval, void *mdata,
 		{ NULL, 0 }
 	};
 	ns_dtab compat_dtab[] = {
+		{ NSSRC_DB, db_servent,
+			(void *)((struct servent_mdata *)mdata)->how },
 #ifdef YP
 		{ NSSRC_NIS, nis_servent,
 			(void *)((struct servent_mdata *)mdata)->how },
@@ -258,8 +301,6 @@ files_servent(void *retval, void *mdata,
 	size_t bufsize;
 	int *errnop;
 
-	char **aliases;
-	int aliases_size;
 	size_t linesize;
 	char *line;
 	char **cp;
@@ -315,28 +356,8 @@ files_servent(void *retval, void *mdata,
 				break;
 			}
 
-			if (*line=='+') {
-				if (serv_mdata->compat_mode != 0)
-					st->compat_mode_active = 1;
-			} else {
-				if (bufsize <= linesize + _ALIGNBYTES +
-				    sizeof(char *)) {
-					*errnop = ERANGE;
-					rv = NS_RETURN;
-					break;
-				}
-				aliases = (char **)_ALIGN(&buffer[linesize+1]);
-				aliases_size = (buffer + bufsize -
-				    (char *)aliases) / sizeof(char *);
-				if (aliases_size < 1) {
-					*errnop = ERANGE;
-					rv = NS_RETURN;
-					break;
-				}
-
-				memcpy(buffer, line, linesize);
-				buffer[linesize] = '\0';
-			}
+			if (*line=='+' && serv_mdata->compat_mode != 0)
+				st->compat_mode_active = 1;
 		}
 
 		if (st->compat_mode_active != 0) {
@@ -367,18 +388,12 @@ files_servent(void *retval, void *mdata,
 			continue;
 		}
 
-		rv = servent_unpack(buffer, serv, aliases, aliases_size,
+		rv = parse_result(serv, buffer, bufsize, line, linesize,
 		    errnop);
-		if (rv !=0 ) {
-			if (*errnop == 0) {
-				rv = NS_NOTFOUND;
-				continue;
-			}
-			else {
-				rv = NS_RETURN;
-				break;
-			}
-		}
+		if (rv == NS_NOTFOUND)
+			continue;
+		if (rv == NS_RETURN)
+			break;
 
 		rv = NS_NOTFOUND;
 		switch (serv_mdata->how) {
@@ -454,6 +469,183 @@ files_setservent(void *retval, void *mda
 	return (NS_UNAVAIL);
 }
 
+/* db backend implementation */
+static	void
+db_endstate(void *p)
+{
+	DB *db;
+
+	if (p == NULL)
+		return;
+
+	db = ((struct db_state *)p)->db;
+	if (db != NULL)
+		db->close(db);
+
+	free(p);
+}
+
+static int
+db_servent(void *retval, void *mdata, va_list ap)
+{
+	char buf[BUFSIZ];
+	DBT key, data, *result;
+	DB *db;
+
+	struct db_state *st;
+	int rv;
+	int stayopen;
+
+	enum nss_lookup_type how;
+	char *name;
+	char *proto;
+	int port;
+
+	struct servent *serv;
+	char *buffer;
+	size_t bufsize;
+	int *errnop;
+
+	name = NULL;
+	proto = NULL;
+	how = (enum nss_lookup_type)mdata;
+	switch (how) {
+	case nss_lt_name:
+		name = va_arg(ap, char *);
+		proto = va_arg(ap, char *);
+		break;
+	case nss_lt_id:
+		port = va_arg(ap, int);
+		proto = va_arg(ap, char *);
+		break;
+	case nss_lt_all:
+		break;
+	default:
+		return NS_NOTFOUND;
+	};
+
+	serv = va_arg(ap, struct servent *);
+	buffer  = va_arg(ap, char *);
+	bufsize = va_arg(ap, size_t);
+	errnop = va_arg(ap,int *);
+
+	*errnop = db_getstate(&st);
+	if (*errnop != 0)
+		return (NS_UNAVAIL);
+
+	if (how == nss_lt_all && st->keynum < 0)
+		return (NS_NOTFOUND);
+
+	if (st->db == NULL) {
+		st->db = dbopen(_PATH_SERVICES_DB, O_RDONLY, 0, DB_HASH, NULL);
+		if (st->db == NULL) {
+			*errnop = errno;
+			return (NS_UNAVAIL);
+		}
+	}
+
+	stayopen = (how == nss_lt_all) ? 1 : st->stayopen;
+	db = st->db;
+
+	do {
+		switch (how) {
+		case nss_lt_name:
+			key.data = buf;
+			if (proto == NULL)
+				key.size = snprintf(buf, sizeof(buf),
+				    "\376%s", name);
+			else
+				key.size = snprintf(buf, sizeof(buf),
+				    "\376%s/%s", name, proto);
+			key.size++;
+			if (db->get(db, &key, &data, 0) != 0 ||
+			    db->get(db, &data, &key, 0) != 0) {
+				rv = NS_NOTFOUND;
+				goto db_fin;
+			}
+			result = &key;
+			break;
+		case nss_lt_id:
+			key.data = buf;
+			port = htons(port);
+			if (proto == NULL)
+				key.size = snprintf(buf, sizeof(buf),
+				    "\377%d", port);
+			else
+				key.size = snprintf(buf, sizeof(buf),
+				    "\377%d/%s", port, proto);
+			key.size++;
+			if (db->get(db, &key, &data, 0) != 0 ||
+			    db->get(db, &data, &key, 0) != 0) {
+				rv = NS_NOTFOUND;
+				goto db_fin;
+			}
+			result = &key;
+			break;
+		case nss_lt_all:
+			key.data = buf;
+			key.size = snprintf(buf, sizeof(buf), "%d",
+			    st->keynum++);
+			key.size++;
+			if (db->get(db, &key, &data, 0) != 0) {
+				st->keynum = -1;
+				rv = NS_NOTFOUND;
+				goto db_fin;
+			}
+			result = &data;
+			break;
+		}
+
+		rv = parse_result(serv, buffer, bufsize, result->data,
+		    result->size - 1, errnop);
+
+	} while (!(rv & NS_TERMINATE) && how == nss_lt_all);
+
+db_fin:
+	if (!stayopen && st->db != NULL) {
+		db->close(db);
+		st->db = NULL;
+	}
+
+	if (rv == NS_SUCCESS && retval != NULL)
+		*(struct servent **)retval = serv;
+
+	return (rv);
+}
+
+static int
+db_setservent(void *retval, void *mdata, va_list ap)
+{
+	DB *db;
+	struct db_state *st;
+	int rv;
+	int f;
+
+	rv = db_getstate(&st);
+	if (rv != 0)
+		return (NS_UNAVAIL);
+
+	switch ((enum constants)mdata) {
+	case SETSERVENT:
+		f = va_arg(ap, int);
+		st->stayopen |= f;
+		st->keynum = 0;
+		break;
+	case ENDSERVENT:
+		db = st->db;
+		if (db != NULL) {
+			db->close(db);
+			st->db = NULL;
+		}
+		st->stayopen = 0;
+		break;
+	default:
+		break;
+	};
+
+	return (NS_UNAVAIL);
+}
+
 /* nis backend implementation */
 #ifdef YP
 static 	void
@@ -486,9 +678,6 @@ nis_servent(void *retval, void *mdata, v
 	size_t bufsize;
 	int *errnop;
 
-	char **aliases;
-	int aliases_size;
-
 	name = NULL;
 	proto = NULL;
 	how = (enum nss_lookup_type)mdata;
@@ -594,39 +783,8 @@ nis_servent(void *retval, void *mdata, v
 			break;
 		};
 
-		/* we need a room for additional \n symbol */
-		if (bufsize <=
-		    resultbuflen + 1 + _ALIGNBYTES + sizeof(char *)) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-
-		aliases = (char **)_ALIGN(&buffer[resultbuflen + 2]);
-		aliases_size =
-		    (buffer + bufsize - (char *)aliases) / sizeof(char *);
-		if (aliases_size < 1) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-
-		/*
-		 * servent_unpack expects lines terminated with \n --
-		 * make it happy
-		 */
-		memcpy(buffer, resultbuf, resultbuflen);
-		buffer[resultbuflen] = '\n';
-		buffer[resultbuflen + 1] = '\0';
-
-		if (servent_unpack(buffer, serv, aliases, aliases_size,
-		    errnop) != 0) {
-			if (*errnop == 0)
-				rv = NS_NOTFOUND;
-			else
-				rv = NS_RETURN;
-		} else
-			rv = NS_SUCCESS;
+		rv = parse_result(serv, buffer, bufsize, resultbuf,
+		    resultbuflen, errnop);
 		free(resultbuf);
 
 	} while (!(rv & NS_TERMINATE) && how == nss_lt_all);
@@ -674,6 +832,7 @@ compat_setservent(void *retval, void *md
 		{ NULL, 0 }
 	};
 	ns_dtab compat_dtab[] = {
+		{ NSSRC_DB, db_setservent, mdata },
 #ifdef YP
 		{ NSSRC_NIS, nis_setservent, mdata },
 #endif
@@ -960,6 +1119,7 @@ getservbyname_r(const char *name, const 
 #endif /* NS_CACHING */
 	static const ns_dtab dtab[] = {
 		{ NSSRC_FILES, files_servent, (void *)&mdata },
+		{ NSSRC_DB, db_servent, (void *)nss_lt_name },
 #ifdef YP
 		{ NSSRC_NIS, nis_servent, (void *)nss_lt_name },
 #endif
@@ -996,6 +1156,7 @@ getservbyport_r(int port, const char *pr
 #endif
 	static const ns_dtab dtab[] = {
 		{ NSSRC_FILES, files_servent, (void *)&mdata },
+		{ NSSRC_DB, db_servent, (void *)nss_lt_id },
 #ifdef YP
 		{ NSSRC_NIS, nis_servent, (void *)nss_lt_id },
 #endif
@@ -1031,6 +1192,7 @@ getservent_r(struct servent *serv, char 
 #endif
 	static const ns_dtab dtab[] = {
 		{ NSSRC_FILES, files_servent, (void *)&mdata },
+		{ NSSRC_DB, db_servent, (void *)nss_lt_all },
 #ifdef YP
 		{ NSSRC_NIS, nis_servent, (void *)nss_lt_all },
 #endif
@@ -1063,6 +1225,7 @@ setservent(int stayopen)
 #endif
 	static const ns_dtab dtab[] = {
 		{ NSSRC_FILES, files_setservent, (void *)SETSERVENT },
+		{ NSSRC_DB, db_setservent, (void *)SETSERVENT },
 #ifdef YP
 		{ NSSRC_NIS, nis_setservent, (void *)SETSERVENT },
 #endif
@@ -1087,6 +1250,7 @@ endservent()
 #endif
 	static const ns_dtab dtab[] = {
 		{ NSSRC_FILES, files_setservent, (void *)ENDSERVENT },
+		{ NSSRC_DB, db_setservent, (void *)ENDSERVENT },
 #ifdef YP
 		{ NSSRC_NIS, nis_setservent, (void *)ENDSERVENT },
 #endif

Modified: user/imp/tbemd/lib/libc/net/nsdispatch.3
==============================================================================
--- user/imp/tbemd/lib/libc/net/nsdispatch.3	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/net/nsdispatch.3	Mon Apr 12 23:06:14 2010	(r206518)
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 22, 2007
+.Dd April 4, 2010
 .Dt NSDISPATCH 3
 .Os
 .Sh NAME
@@ -176,6 +176,7 @@ While there is support for arbitrary sou
 .Bl -column NSSRC_COMPAT compat -offset indent
 .It Sy "#define	value"
 .It Dv NSSRC_FILES Ta """files""
+.It Dv NSSRC_DB Ta """db""
 .It Dv NSSRC_DNS Ta """dns""
 .It Dv NSSRC_NIS Ta """nis""
 .It Dv NSSRC_COMPAT Ta """compat""

Modified: user/imp/tbemd/lib/libc/posix1e/acl_add_flag_np.3
==============================================================================
--- user/imp/tbemd/lib/libc/posix1e/acl_add_flag_np.3	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/posix1e/acl_add_flag_np.3	Mon Apr 12 23:06:14 2010	(r206518)
@@ -14,14 +14,14 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
-.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
 .\"

Modified: user/imp/tbemd/lib/libc/posix1e/acl_clear_flags_np.3
==============================================================================
--- user/imp/tbemd/lib/libc/posix1e/acl_clear_flags_np.3	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/posix1e/acl_clear_flags_np.3	Mon Apr 12 23:06:14 2010	(r206518)
@@ -14,14 +14,14 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
-.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
 .\"

Modified: user/imp/tbemd/lib/libc/posix1e/acl_delete_flag_np.3
==============================================================================
--- user/imp/tbemd/lib/libc/posix1e/acl_delete_flag_np.3	Mon Apr 12 23:05:32 2010	(r206517)
+++ user/imp/tbemd/lib/libc/posix1e/acl_delete_flag_np.3	Mon Apr 12 23:06:14 2010	(r206518)
@@ -14,14 +14,14 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
-.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-user mailing list