--- a/components/sendmail/Makefile Mon Feb 23 09:43:49 2015 -0800
+++ b/components/sendmail/Makefile Sat Feb 21 13:10:35 2015 -0800
@@ -122,8 +122,8 @@
'-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_BITS)|\\$$(CC_BITS)|g" '
+ '-e "s|^$(CC).*$$|XXX_CC_XXX|g" ' \
+ '-e "/^XXX_CC_XXX\\$$/d" '
ASLR_MODE = $(ASLR_ENABLE)
--- a/components/sendmail/patches/site.SunOS.5.12.m4.patch Mon Feb 23 09:43:49 2015 -0800
+++ b/components/sendmail/patches/site.SunOS.5.12.m4.patch Sat Feb 21 13:10:35 2015 -0800
@@ -2,12 +2,24 @@
--- /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
-@@ -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')
+@@ -0,0 +1,20 @@
++APPENDDEF(`conf_sendmail_ENVDEF', `-DSUN_EXTENSIONS')
++APPENDDEF(`conf_sendmail_ENVDEF', `-DVENDOR_DEFAULT=VENDOR_SUN')
++APPENDDEF(`conf_sendmail_ENVDEF', `-DSUN_INIT_DOMAIN')
++APPENDDEF(`conf_sendmail_ENVDEF', `-DSUN_SIMPLIFIED_LDAP')
++APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS')
++APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
++APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_LOCAL_DAEMON')
++APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_MAIL_MACRO')
++APPENDDEF(`conf_sendmail_LIBS', `-lsldap')
++APPENDDEF(`conf_sendmail_LIBS', `-lwrap')
++APPENDDEF(`conf_sendmail_LIBS', `-lumem')
++APPENDDEF(`conf_sendmail_LIBS', `-lssl')
++APPENDDEF(`conf_sendmail_LIBS', `-lcrypto')
+APPENDDEF(`confMAPDEF', `-DLDAPMAP')
+define(`confDEPEND_TYPE', `Solaris')
-+define(`confLIBS', `-lldap -lc')
++define(`confINCDIRS', `-I/usr/include/openldap')
++define(`confLIBS', `-lldap_r-2.4 -llber-2.4 -lc')
+define(`confMKDIR', `/usr/bin/mkdir')
+define(`confMTCFLAGS', `$(CC_PIC)')
+define(`sendmailTARGET_LINKS', `')
--- a/components/sendmail/test/results-all.master Mon Feb 23 09:43:49 2015 -0800
+++ b/components/sendmail/test/results-all.master Sat Feb 21 13:10:35 2015 -0800
@@ -6,47 +6,7 @@
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'
@@ -148,7 +108,6 @@
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:
@@ -160,30 +119,15 @@
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'.