Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
20373507 migrate sendmail & friends to 64-bit
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 19 Jan 2015 20:04:39 -0800
changeset 3651 1ca146aae014
parent 3650 9542243c8771
child 3652 7e731a1b0b39
20373507 migrate sendmail & friends to 64-bit
components/sendmail/Makefile file | annotate | diff | comparison | revisions
components/sendmail/files/aux/Makefile file | annotate | diff | comparison | revisions
components/sendmail/libmilter.p5m file | annotate | diff | comparison | revisions
components/sendmail/patches/shared-library.m4.patch file | annotate | diff | comparison | revisions
components/sendmail/patches/site.SunOS.5.12.m4.patch file | annotate | diff | comparison | revisions
components/sendmail/test/results-32.master file | annotate | diff | comparison | revisions
components/sendmail/test/results-all.master file | annotate | diff | comparison | revisions 
--- a/components/sendmail/Makefile	Mon Jan 19 09:50:38 2015 -0800
+++ b/components/sendmail/Makefile	Mon Jan 19 20:04:39 2015 -0800
@@ -40,8 +40,11 @@
 include ../../make-rules/ips.mk
 include ../../make-rules/lint-libraries.mk
 
-PKG_PROTO_DIRS += $(BUILD_DIR_32)
-PKG_PROTO_DIRS += $(BUILD_DIR_32)/obj.SunOS.$(OS_VERSION).$(ARCH)
+# Although we build 32_and_64, everything except libmilter just wants 64,
+# which is why the macros just below only have values for 64.  libmilter
+# is dealt with further below.
+PKG_PROTO_DIRS += $(BUILD_DIR_64)
+PKG_PROTO_DIRS += $(BUILD_DIR_64)/obj.SunOS.$(OS_VERSION).$(ARCH)
 PKG_PROTO_DIRS += $(COMPONENT_DIR)/files
 PKG_PROTO_DIRS += $(COMPONENT_DIR)/files/man
 
@@ -59,6 +62,11 @@
 SM_BUILD_SUB_DIR=obj.SunOS.$(OS_VERSION).$(ARCH)
 SM_BUILD_DIR=$(@D)/$(SM_BUILD_SUB_DIR)
 
+# libmilter is built 32- and 64-bit, but its Makefile installs into a common
+# location, so we use the macro below in its manifest to distinguish between
+# the different built objects.
+PKG_MACROS += LIBMILTER_BUILD_DIR=$(SM_BUILD_SUB_DIR)
+
 CLEAN_PATHS += $(FILE_DIR)/aux/mailq
 
 # This appends "+Sun" to the version string, which we do for historical
@@ -77,10 +85,15 @@
 
 COMPONENT_BUILD_ARGS += CC="$(CC)"
 COMPONENT_BUILD_ARGS += CCOPTS="$(CCOPTS)"
-COMPONENT_BUILD_ARGS += CCLINK="$(LD)"
+COMPONENT_BUILD_ARGS += CCLINK="$(CC)"
+COMPONENT_BUILD_ARGS += CC_PIC="$(CC_PIC)"
 COMPONENT_BUILD_ARGS += LDOPTS="$(CC_BITS)"
 
-COMPONENT_POST_BUILD_ACTION = cd $(FILE_DIR)/aux ; $(GMAKE) build
+# mailq's Makefile doesn't grok the 32- and 64-bit build. We just want 64.
+# So we clean before we build, and the last build (64) wins, which is what
+# we want.
+COMPONENT_POST_BUILD_ACTION = cd $(FILE_DIR)/aux ; \
+    $(GMAKE) BITS=$(BITS) clean build
 
 COMPONENT_POST_INSTALL_ACTION += cd $(FILE_DIR)/aux ; $(GMAKE) install ;
 COMPONENT_POST_INSTALL_ACTION += \
@@ -95,27 +108,33 @@
 
 COMPONENT_TEST_ARGS += CC="$(CC)"
 COMPONENT_TEST_ARGS += CCOPTS="$(CCOPTS)"
-COMPONENT_TEST_ARGS += CCLINK="$(LD)"
+COMPONENT_TEST_ARGS += CCLINK="$(CC)"
+COMPONENT_TEST_ARGS += CC_PIC="$(CC_PIC)"
 COMPONENT_TEST_ARGS += LDOPTS="$(CC_BITS)"
 
 COMPONENT_TEST_ENV +=	PATH=/usr/gnu/bin:/usr/bin
 
+# The transforms below abstract out the 32- or 64-bit specific parts of
+# the results, so we can use a common "all" master file.
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
 COMPONENT_TEST_TRANSFORMS += \
     '-e "s|$(SM_BUILD_SUB_DIR)|\\$$(SM_BUILD_SUB_DIR)|g" ' \
     '-e "s|$(OS_VERSION)|\\$$(OS_VERSION)|g" ' \
     '-e "s|$(ARCH)|\\$$(ARCH)|g" ' \
-    '-e "s|$(CC)|\\$$(CC)|g" '
+    '-e "s|$(CC)|\\$$(CC)|g" ' \
+    '-e "s|$(CC_BITS)|\\$$(CC_BITS)|g" '
 
 ASLR_MODE = $(ASLR_ENABLE)
 
-INSTALL_32=
+INSTALL_64=
 
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_32_and_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_32_and_64)
 
-test:		$(TEST_32)
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/sendmail/files/aux/Makefile	Mon Jan 19 09:50:38 2015 -0800
+++ b/components/sendmail/files/aux/Makefile	Mon Jan 19 20:04:39 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../../make-rules/shared-macros.mk
@@ -32,7 +32,7 @@
 INSTALLPROG=	$(PROG:%=$(PROTOUSRBINDIR)/%)
 
 %:		%.c
-		$(CC) -o [email protected] $(ASLR_ENABLE) $<
+		$(CC) $(CFLAGS) -o [email protected] $(ASLR_ENABLE) $<
 
 install:	$(INSTALLPROG) build
 
--- a/components/sendmail/libmilter.p5m	Mon Jan 19 09:50:38 2015 -0800
+++ b/components/sendmail/libmilter.p5m	Mon Jan 19 20:04:39 2015 -0800
@@ -40,8 +40,13 @@
 file libmilter/README path=usr/include/libmilter/README
 file include/libmilter/mfapi.h path=usr/include/libmilter/mfapi.h
 file include/libmilter/mfdef.h path=usr/include/libmilter/mfdef.h
+link path=usr/lib/$(MACH64)/libmilter.so target=libmilter.so.1
+file $(MACH64)/$(LIBMILTER_BUILD_DIR)/libmilter/libmilter.so \
+    path=usr/lib/$(MACH64)/libmilter.so.1
+file $(MACH64)/llib-lmilter.ln path=usr/lib/$(MACH64)/llib-lmilter.ln
 link path=usr/lib/libmilter.so target=libmilter.so.1
-file libmilter/libmilter.so path=usr/lib/libmilter.so.1
+file $(MACH32)/$(LIBMILTER_BUILD_DIR)/libmilter/libmilter.so \
+    path=usr/lib/libmilter.so.1
 file llib-lmilter path=usr/lib/llib-lmilter
-file llib-lmilter.ln path=usr/lib/llib-lmilter.ln
+file $(MACH32)/llib-lmilter.ln path=usr/lib/llib-lmilter.ln
 license LICENSE license=sendmail
--- a/components/sendmail/patches/shared-library.m4.patch	Mon Jan 19 09:50:38 2015 -0800
+++ b/components/sendmail/patches/shared-library.m4.patch	Mon Jan 19 20:04:39 2015 -0800
@@ -1,7 +1,7 @@
 # This patch has been fed upstream.
 --- /dev/null						2013-06-18 19:31:00.000000000 -0700
 +++ sendmail-8.14.7/devtools/M4/UNIX/shared-library.m4	2013-06-18 20:02:40.335623219 -0700
[email protected]@ -0,0 +1,36 @@
[email protected]@ -0,0 +1,35 @@
 +divert(-1)
 +#
 +# Copyright (c) 1999-2001, 2006 Sendmail, Inc. and its suppliers.
@@ -26,8 +26,7 @@
 +include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4')
 +divert(bldTARGETS_SECTION)
 +bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
-+	${AR} ${AROPTS} bldCURRENT_PRODUCT.so ${bldCURRENT_PRODUCT`OBJS'}
-+	${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.so
++	${CCLINK} ${LDOPTS} -G -o bldCURRENT_PRODUCT.so ${bldCURRENT_PRODUCT`OBJS'} -lc
 +ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
 +
 +install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so
--- a/components/sendmail/patches/site.SunOS.5.12.m4.patch	Mon Jan 19 09:50:38 2015 -0800
+++ b/components/sendmail/patches/site.SunOS.5.12.m4.patch	Mon Jan 19 20:04:39 2015 -0800
@@ -2,11 +2,12 @@
 
 --- /dev/null						2013-06-18 15:31:00.000000000 -0700
 +++ sendmail-8.14.9/devtools/Site/site.SunOS.5.12.m4	2013-03-26 07:18:05.675345928 -0700
[email protected]@ -0,0 +1,7 @@
[email protected]@ -0,0 +1,8 @@
 +APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS -DSTARTTLS -D_FFR_LOCAL_DAEMON -DSUN_EXTENSIONS -DVENDOR_DEFAULT=VENDOR_SUN')
 +APPENDDEF(`conf_sendmail_LIBS', `-lwrap -lssl -lcrypto')
 +APPENDDEF(`confMAPDEF', `-DLDAPMAP')
 +define(`confDEPEND_TYPE', `Solaris')
 +define(`confLIBS', `-lldap -lc')
 +define(`confMKDIR', `/usr/bin/mkdir')
++define(`confMTCFLAGS', `$(CC_PIC)')
 +define(`sendmailTARGET_LINKS', `')
--- a/components/sendmail/test/results-32.master	Mon Jan 19 09:50:38 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,195 +0,0 @@
-make[1]: Entering directory `$(@D)'
-Making check in:
-$(@D)/libsm
-Configuration: pfx=, os=SunOS, rel=$(OS_VERSION), rbase=5, rroot=$(OS_VERSION), arch=$(ARCH), sfx=, variant=optimized
-Making in $(@D)/$(SM_BUILD_SUB_DIR)/libsm
-make[2]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/libsm'
-make t-event  t-exc  t-rpool  t-string  t-smstdio  t-fget  t-match  t-strio  t-heap  t-fopen  t-strl  t-strrevcmp  t-types  t-path  t-float  t-scanf  t-shm  t-sem  t-inet6_ntop  t-qic 
-make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/libsm'
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-event.o t-event.c
-$(CC) -o t-event -m32  t-event.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-exc.o t-exc.c
-$(CC) -o t-exc -m32  t-exc.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-rpool.o t-rpool.c
-$(CC) -o t-rpool -m32  t-rpool.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-string.o t-string.c
-$(CC) -o t-string -m32  t-string.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-smstdio.o t-smstdio.c
-$(CC) -o t-smstdio -m32  t-smstdio.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-fget.o t-fget.c
-$(CC) -o t-fget -m32  t-fget.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-match.o t-match.c
-$(CC) -o t-match -m32  t-match.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-strio.o t-strio.c
-$(CC) -o t-strio -m32  t-strio.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-heap.o t-heap.c
-$(CC) -o t-heap -m32  t-heap.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-fopen.o t-fopen.c
-$(CC) -o t-fopen -m32  t-fopen.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-strl.o t-strl.c
-$(CC) -o t-strl -m32  t-strl.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-strrevcmp.o t-strrevcmp.c
-$(CC) -o t-strrevcmp -m32  t-strrevcmp.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-types.o t-types.c
-"t-types.c", line 64: warning: integer overflow detected: op "-"
-$(CC) -o t-types -m32  t-types.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-path.o t-path.c
-$(CC) -o t-path -m32  t-path.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-float.o t-float.c
-$(CC) -o t-float -m32  t-float.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-scanf.o t-scanf.c
-$(CC) -o t-scanf -m32  t-scanf.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-shm.o t-shm.c
-$(CC) -o t-shm -m32  t-shm.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-sem.o t-sem.c
-$(CC) -o t-sem -m32  t-sem.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-inet6_ntop.o t-inet6_ntop.c
-$(CC) -o t-inet6_ntop -m32  t-inet6_ntop.o libsm.a   -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t-qic.o t-qic.c
-$(CC) -o t-qic -m32  t-qic.o libsm.a   -ldb -lresolv -lldap -lc 
-make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/libsm'
-make check-TESTS
-make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/libsm'
-8 of 8 tests completed successfully
-This test may hang. If there is no output within twelve seconds, abort it
-and recompile with -DSM_CONF_SETITIMER=0
-PASS: t-event
-4 of 4 tests completed successfully
-PASS: t-exc
-2 of 2 tests completed successfully
-PASS: t-rpool
-4 of 4 tests completed successfully
-PASS: t-string
-6 of 6 tests completed successfully
-PASS: t-smstdio
-78 of 78 tests completed successfully
-PASS: t-fget
-12 of 12 tests completed successfully
-PASS: t-match
-1 of 1 tests completed successfully
-PASS: t-strio
-3 of 3 tests completed successfully
-PASS: t-heap
-3 of 3 tests completed successfully
-PASS: t-fopen
-44 of 44 tests completed successfully
-PASS: t-strl
-6 of 6 tests completed successfully
-PASS: t-strrevcmp
-Your C compiler maybe issued a warning during compilation,
-please IGNORE the compiler warning!.
-12 of 12 tests completed successfully
-PASS: t-types
-4 of 4 tests completed successfully
-PASS: t-path
-4 of 4 tests completed successfully
-PASS: t-float
-If tests for "h == 2" fail, check whether size_t is signed on your OS.
-If that is the case, add -DSM_CONF_BROKEN_SIZE_T to confENVDEF
-and start over. Otherwise contact sendmail.org.
-6 of 6 tests completed successfully
-PASS: t-scanf
-2 of 2 tests completed successfully
-5 of 5 tests completed successfully
-PASS: t-shm
-3 of 3 tests completed successfully
-This test takes about 8 seconds.
-If it takes longer than 30 seconds, please interrupt it
-and compile again without semaphore support, i.e.,-DSM_CONF_SEM=0
-6 of 6 tests completed successfully
-This test takes about 8 seconds.
-If it takes longer than 30 seconds, please interrupt it
-and compile again without semaphore support, i.e.,-DSM_CONF_SEM=0
-PASS: t-sem
-39 of 39 tests completed successfully
-PASS: t-inet6_ntop
-114 of 114 tests completed successfully
-PASS: t-qic
-===================
-All 20 tests passed
-===================
-make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/libsm'
-make[2]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/libsm'
-Making check in:
-$(@D)/libmilter
-Configuration: pfx=, os=SunOS, rel=$(OS_VERSION), rbase=5, rroot=$(OS_VERSION), arch=$(ARCH), sfx=, variant=optimized
-Making in $(@D)/$(SM_BUILD_SUB_DIR)/libmilter
-make[2]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/libmilter'
-make 
-make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/libmilter'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/libmilter'
-make check-TESTS
-make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/libmilter'
-make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/libmilter'
-make[2]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/libmilter'
-Making check in:
-$(@D)/sendmail
-Configuration: pfx=, os=SunOS, rel=$(OS_VERSION), rbase=5, rroot=$(OS_VERSION), arch=$(ARCH), sfx=, variant=optimized
-Making in $(@D)/$(SM_BUILD_SUB_DIR)/sendmail
-make[2]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/sendmail'
-make 
-make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/sendmail'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/sendmail'
-make check-TESTS
-make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/sendmail'
-make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/sendmail'
-make[2]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/sendmail'
-Making check in:
-$(@D)/test
-Configuration: pfx=, os=SunOS, rel=$(OS_VERSION), rbase=5, rroot=$(OS_VERSION), arch=$(ARCH), sfx=, variant=optimized
-Using M4=/usr/bin/gm4
-Creating $(@D)/$(SM_BUILD_SUB_DIR)/test using $(@D)/devtools/OS/SunOS.$(OS_VERSION)
-Including $(@D)/devtools/Site/site.SunOS.$(OS_VERSION).m4
-Making dependencies in $(@D)/$(SM_BUILD_SUB_DIR)/test
-make[2]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
-if [ -r /usr/include/sysexits.h ]; \
-then \
-	ln -s /usr/include/sysexits.h; \
-fi
-$(CC) -xM -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32 t_dropgid.c   t_dropgid.c t_exclopen.c t_pathconf.c t_seteuid.c t_setgid.c t_setreuid.c t_setuid.c  >> Makefile
-t_dropgid.c:
-t_dropgid.c:
-t_exclopen.c:
-t_pathconf.c:
-t_seteuid.c:
-t_setgid.c:
-t_setreuid.c:
-t_setuid.c:
-make[2]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
-Making in $(@D)/$(SM_BUILD_SUB_DIR)/test
-make[2]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
-$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t_dropgid.o t_dropgid.c
-"t_dropgid.c", line 73: warning: implicit function declaration: exit
-/usr/bin/ld -o test -m32  t_dropgid.o       -ldb -lresolv -lldap -lc 
-$(CC) -o t_dropgid -m32  t_dropgid.o    -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t_exclopen.o t_exclopen.c
-"t_exclopen.c", line 61: warning: implicit function declaration: exit
-$(CC) -o t_exclopen -m32  t_exclopen.o    -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t_pathconf.o t_pathconf.c
-"t_pathconf.c", line 45: warning: implicit function declaration: exit
-"t_pathconf.c", line 48: warning: implicit function declaration: strcpy
-"t_pathconf.c", line 49: warning: implicit function declaration: mkstemp
-$(CC) -o t_pathconf -m32  t_pathconf.o    -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t_seteuid.o t_seteuid.c
-"t_seteuid.c", line 58: warning: implicit function declaration: exit
-$(CC) -o t_seteuid -m32  t_seteuid.o    -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t_setgid.o t_setgid.c
-"t_setgid.c", line 52: warning: implicit function declaration: exit
-$(CC) -o t_setgid -m32  t_setgid.o    -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t_setreuid.o t_setreuid.c
-"t_setreuid.c", line 55: warning: implicit function declaration: exit
-$(CC) -o t_setreuid -m32  t_setreuid.o    -ldb -lresolv -lldap -lc 
-$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED -m32    -c -o t_setuid.o t_setuid.c
-"t_setuid.c", line 53: warning: implicit function declaration: exit
-$(CC) -o t_setuid -m32  t_setuid.o    -ldb -lresolv -lldap -lc 
-make 
-make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
-make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
-make check-TESTS
-make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
-make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
-make[2]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
-make[1]: Leaving directory `$(@D)'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sendmail/test/results-all.master	Mon Jan 19 20:04:39 2015 -0800
@@ -0,0 +1,195 @@
+make[1]: Entering directory `$(@D)'
+Making check in:
+$(@D)/libsm
+Configuration: pfx=, os=SunOS, rel=$(OS_VERSION), rbase=5, rroot=$(OS_VERSION), arch=$(ARCH), sfx=, variant=optimized
+Making in $(@D)/$(SM_BUILD_SUB_DIR)/libsm
+make[2]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/libsm'
+make t-event  t-exc  t-rpool  t-string  t-smstdio  t-fget  t-match  t-strio  t-heap  t-fopen  t-strl  t-strrevcmp  t-types  t-path  t-float  t-scanf  t-shm  t-sem  t-inet6_ntop  t-qic 
+make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/libsm'
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-event.o t-event.c
+$(CC) -o t-event $(CC_BITS)  t-event.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-exc.o t-exc.c
+$(CC) -o t-exc $(CC_BITS)  t-exc.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-rpool.o t-rpool.c
+$(CC) -o t-rpool $(CC_BITS)  t-rpool.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-string.o t-string.c
+$(CC) -o t-string $(CC_BITS)  t-string.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-smstdio.o t-smstdio.c
+$(CC) -o t-smstdio $(CC_BITS)  t-smstdio.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-fget.o t-fget.c
+$(CC) -o t-fget $(CC_BITS)  t-fget.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-match.o t-match.c
+$(CC) -o t-match $(CC_BITS)  t-match.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-strio.o t-strio.c
+$(CC) -o t-strio $(CC_BITS)  t-strio.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-heap.o t-heap.c
+$(CC) -o t-heap $(CC_BITS)  t-heap.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-fopen.o t-fopen.c
+$(CC) -o t-fopen $(CC_BITS)  t-fopen.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-strl.o t-strl.c
+$(CC) -o t-strl $(CC_BITS)  t-strl.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-strrevcmp.o t-strrevcmp.c
+$(CC) -o t-strrevcmp $(CC_BITS)  t-strrevcmp.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-types.o t-types.c
+"t-types.c", line 64: warning: integer overflow detected: op "-"
+$(CC) -o t-types $(CC_BITS)  t-types.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-path.o t-path.c
+$(CC) -o t-path $(CC_BITS)  t-path.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-float.o t-float.c
+$(CC) -o t-float $(CC_BITS)  t-float.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-scanf.o t-scanf.c
+$(CC) -o t-scanf $(CC_BITS)  t-scanf.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-shm.o t-shm.c
+$(CC) -o t-shm $(CC_BITS)  t-shm.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-sem.o t-sem.c
+$(CC) -o t-sem $(CC_BITS)  t-sem.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-inet6_ntop.o t-inet6_ntop.c
+$(CC) -o t-inet6_ntop $(CC_BITS)  t-inet6_ntop.o libsm.a   -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DNEWDB -DNDBM -DNIS -DMAP_REGEX -DLDAPMAP -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t-qic.o t-qic.c
+$(CC) -o t-qic $(CC_BITS)  t-qic.o libsm.a   -ldb -lresolv -lldap -lc 
+make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/libsm'
+make check-TESTS
+make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/libsm'
+8 of 8 tests completed successfully
+This test may hang. If there is no output within twelve seconds, abort it
+and recompile with -DSM_CONF_SETITIMER=0
+PASS: t-event
+4 of 4 tests completed successfully
+PASS: t-exc
+2 of 2 tests completed successfully
+PASS: t-rpool
+4 of 4 tests completed successfully
+PASS: t-string
+6 of 6 tests completed successfully
+PASS: t-smstdio
+78 of 78 tests completed successfully
+PASS: t-fget
+12 of 12 tests completed successfully
+PASS: t-match
+1 of 1 tests completed successfully
+PASS: t-strio
+3 of 3 tests completed successfully
+PASS: t-heap
+3 of 3 tests completed successfully
+PASS: t-fopen
+44 of 44 tests completed successfully
+PASS: t-strl
+6 of 6 tests completed successfully
+PASS: t-strrevcmp
+Your C compiler maybe issued a warning during compilation,
+please IGNORE the compiler warning!.
+12 of 12 tests completed successfully
+PASS: t-types
+4 of 4 tests completed successfully
+PASS: t-path
+4 of 4 tests completed successfully
+PASS: t-float
+If tests for "h == 2" fail, check whether size_t is signed on your OS.
+If that is the case, add -DSM_CONF_BROKEN_SIZE_T to confENVDEF
+and start over. Otherwise contact sendmail.org.
+6 of 6 tests completed successfully
+PASS: t-scanf
+2 of 2 tests completed successfully
+5 of 5 tests completed successfully
+PASS: t-shm
+3 of 3 tests completed successfully
+This test takes about 8 seconds.
+If it takes longer than 30 seconds, please interrupt it
+and compile again without semaphore support, i.e.,-DSM_CONF_SEM=0
+6 of 6 tests completed successfully
+This test takes about 8 seconds.
+If it takes longer than 30 seconds, please interrupt it
+and compile again without semaphore support, i.e.,-DSM_CONF_SEM=0
+PASS: t-sem
+39 of 39 tests completed successfully
+PASS: t-inet6_ntop
+114 of 114 tests completed successfully
+PASS: t-qic
+===================
+All 20 tests passed
+===================
+make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/libsm'
+make[2]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/libsm'
+Making check in:
+$(@D)/libmilter
+Configuration: pfx=, os=SunOS, rel=$(OS_VERSION), rbase=5, rroot=$(OS_VERSION), arch=$(ARCH), sfx=, variant=optimized
+Making in $(@D)/$(SM_BUILD_SUB_DIR)/libmilter
+make[2]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/libmilter'
+make 
+make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/libmilter'
+make[3]: Nothing to be done for `all'.
+make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/libmilter'
+make check-TESTS
+make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/libmilter'
+make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/libmilter'
+make[2]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/libmilter'
+Making check in:
+$(@D)/sendmail
+Configuration: pfx=, os=SunOS, rel=$(OS_VERSION), rbase=5, rroot=$(OS_VERSION), arch=$(ARCH), sfx=, variant=optimized
+Making in $(@D)/$(SM_BUILD_SUB_DIR)/sendmail
+make[2]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/sendmail'
+make 
+make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/sendmail'
+make[3]: Nothing to be done for `all'.
+make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/sendmail'
+make check-TESTS
+make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/sendmail'
+make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/sendmail'
+make[2]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/sendmail'
+Making check in:
+$(@D)/test
+Configuration: pfx=, os=SunOS, rel=$(OS_VERSION), rbase=5, rroot=$(OS_VERSION), arch=$(ARCH), sfx=, variant=optimized
+Using M4=/usr/bin/gm4
+Creating $(@D)/$(SM_BUILD_SUB_DIR)/test using $(@D)/devtools/OS/SunOS.$(OS_VERSION)
+Including $(@D)/devtools/Site/site.SunOS.$(OS_VERSION).m4
+Making dependencies in $(@D)/$(SM_BUILD_SUB_DIR)/test
+make[2]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
+if [ -r /usr/include/sysexits.h ]; \
+then \
+	ln -s /usr/include/sysexits.h; \
+fi
+$(CC) -xM -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS) t_dropgid.c   t_dropgid.c t_exclopen.c t_pathconf.c t_seteuid.c t_setgid.c t_setreuid.c t_setuid.c  >> Makefile
+t_dropgid.c:
+t_dropgid.c:
+t_exclopen.c:
+t_pathconf.c:
+t_seteuid.c:
+t_setgid.c:
+t_setreuid.c:
+t_setuid.c:
+make[2]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
+Making in $(@D)/$(SM_BUILD_SUB_DIR)/test
+make[2]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
+$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t_dropgid.o t_dropgid.c
+"t_dropgid.c", line 73: warning: implicit function declaration: exit
+$(CC) -o test $(CC_BITS)  t_dropgid.o       -ldb -lresolv -lldap -lc 
+$(CC) -o t_dropgid $(CC_BITS)  t_dropgid.o    -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t_exclopen.o t_exclopen.c
+"t_exclopen.c", line 61: warning: implicit function declaration: exit
+$(CC) -o t_exclopen $(CC_BITS)  t_exclopen.o    -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t_pathconf.o t_pathconf.c
+"t_pathconf.c", line 45: warning: implicit function declaration: exit
+"t_pathconf.c", line 48: warning: implicit function declaration: strcpy
+"t_pathconf.c", line 49: warning: implicit function declaration: mkstemp
+$(CC) -o t_pathconf $(CC_BITS)  t_pathconf.o    -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t_seteuid.o t_seteuid.c
+"t_seteuid.c", line 58: warning: implicit function declaration: exit
+$(CC) -o t_seteuid $(CC_BITS)  t_seteuid.o    -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t_setgid.o t_setgid.c
+"t_setgid.c", line 52: warning: implicit function declaration: exit
+$(CC) -o t_setgid $(CC_BITS)  t_setgid.o    -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t_setreuid.o t_setreuid.c
+"t_setreuid.c", line 55: warning: implicit function declaration: exit
+$(CC) -o t_setreuid $(CC_BITS)  t_setreuid.o    -ldb -lresolv -lldap -lc 
+$(CC) -O -I. -I../../include  -DSOLARIS=21200 -DNETINET6  -erroff=E_STATEMENT_NOT_REACHED $(CC_BITS)    -c -o t_setuid.o t_setuid.c
+"t_setuid.c", line 53: warning: implicit function declaration: exit
+$(CC) -o t_setuid $(CC_BITS)  t_setuid.o    -ldb -lresolv -lldap -lc 
+make 
+make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
+make[3]: Nothing to be done for `all'.
+make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
+make check-TESTS
+make[3]: Entering directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
+make[3]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
+make[2]: Leaving directory `$(@D)/$(SM_BUILD_SUB_DIR)/test'
+make[1]: Leaving directory `$(@D)'
upstream/oracle/userland-gate