21 files changed, 101 insertions, 40 deletions
diff --git a/devtools/M4/UNIX/all.m4 b/devtools/M4/UNIX/all.m4
index 327c2bd0618f..bf266ebacff7 100644
--- a/devtools/M4/UNIX/all.m4
+++ b/devtools/M4/UNIX/all.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999-2000, 2006 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2000, 2006 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: all.m4,v 8.21 2006/06/14 20:18:27 ca Exp $
+#	$Id: all.m4,v 8.22 2013/11/22 20:51:22 ca Exp $
 #
 divert(0)dnl
 ALL=${BEFORE} ${LINKS} bldTARGETS
diff --git a/devtools/M4/UNIX/check.m4 b/devtools/M4/UNIX/check.m4
index 581a5aa889c7..0e4ba98cf352 100644
--- a/devtools/M4/UNIX/check.m4
+++ b/devtools/M4/UNIX/check.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2006 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2006 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@ divert(-1)
 #
 #	Compile/run a test program.
 #
-#	$Id: check.m4,v 8.5 2006/08/28 23:48:54 ca Exp $
+#	$Id: check.m4,v 8.6 2013/11/22 20:51:22 ca Exp $
 #
 define(`smcheck', `dnl
 ifelse(X`'$2, `X', `', `ifelse(index($2, `run'), `-1', `', `dnl
diff --git a/devtools/M4/UNIX/defines.m4 b/devtools/M4/UNIX/defines.m4
index 3b692ed692db..2fb93452e520 100644
--- a/devtools/M4/UNIX/defines.m4
+++ b/devtools/M4/UNIX/defines.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999-2001, 2006 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2001, 2006 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: defines.m4,v 8.48 2012/01/21 00:07:08 ashish Exp $
+#	$Id: defines.m4,v 8.49 2013/11/22 20:51:22 ca Exp $
 #
 # temporary hack: if confREQUIRE_LIBSM is set then also set confREQUIRE_SM_OS_H
 ifdef(`confREQUIRE_LIBSM',`
diff --git a/devtools/M4/UNIX/executable.m4 b/devtools/M4/UNIX/executable.m4
index 44d255890c38..35ddfe55798a 100644
--- a/devtools/M4/UNIX/executable.m4
+++ b/devtools/M4/UNIX/executable.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999, 2001, 2006 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999, 2001, 2006 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: executable.m4,v 8.24 2006/10/06 05:44:44 ca Exp $
+#	$Id: executable.m4,v 8.25 2013/11/22 20:51:22 ca Exp $
 #
 divert(0)dnl
 include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl
diff --git a/devtools/M4/UNIX/footer.m4 b/devtools/M4/UNIX/footer.m4
index 18b386eb34a4..f98dd4665ae9 100644
--- a/devtools/M4/UNIX/footer.m4
+++ b/devtools/M4/UNIX/footer.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: footer.m4,v 8.2 1999/05/13 16:16:35 gshapiro Exp $
+#	$Id: footer.m4,v 8.3 2013/11/22 20:51:22 ca Exp $
 #
 divert(0)dnl
 ################  Dependency scripts
diff --git a/devtools/M4/UNIX/library.m4 b/devtools/M4/UNIX/library.m4
index 77ed2104e905..8bd688f458c8 100644
--- a/devtools/M4/UNIX/library.m4
+++ b/devtools/M4/UNIX/library.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999-2001, 2006 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2001, 2006 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: library.m4,v 8.11 2006/09/05 22:56:53 ca Exp $
+#	$Id: library.m4,v 8.12 2013/11/22 20:51:23 ca Exp $
 #
 divert(0)dnl
 include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl
diff --git a/devtools/M4/UNIX/links.m4 b/devtools/M4/UNIX/links.m4
index 25ccce55fb26..7b7d6fad786e 100644
--- a/devtools/M4/UNIX/links.m4
+++ b/devtools/M4/UNIX/links.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: links.m4,v 8.6 2012/01/21 00:07:08 ashish Exp $
+#	$Id: links.m4,v 8.7 2013/11/22 20:51:23 ca Exp $
 #
 divert(0)dnl
 define(`bldMAKE_SOURCE_LINK',
diff --git a/devtools/M4/UNIX/manpage.m4 b/devtools/M4/UNIX/manpage.m4
index d1bdad499e09..8bc1e548a710 100644
--- a/devtools/M4/UNIX/manpage.m4
+++ b/devtools/M4/UNIX/manpage.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2001 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: manpage.m4,v 8.16 2012/01/21 00:07:08 ashish Exp $
+#	$Id: manpage.m4,v 8.17 2013/11/22 20:51:23 ca Exp $
 #
 divert(0)dnl
 
diff --git a/devtools/M4/UNIX/sm-test.m4 b/devtools/M4/UNIX/sm-test.m4
index 71ce3c6e3f3f..b7e14af7c27f 100644
--- a/devtools/M4/UNIX/sm-test.m4
+++ b/devtools/M4/UNIX/sm-test.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2001-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001-2002 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@ divert(-1)
 #
 #	Compile/run a test program for libsm.
 #
-#	$Id: sm-test.m4,v 1.7 2002/02/01 17:38:07 ca Exp $
+#	$Id: sm-test.m4,v 1.8 2013/11/22 20:51:23 ca Exp $
 #
 define(`smtest',
 `bldPUSH_TARGET($1)dnl
diff --git a/devtools/M4/UNIX/smlib.m4 b/devtools/M4/UNIX/smlib.m4
index 9720d7d7427c..6e57781474ec 100644
--- a/devtools/M4/UNIX/smlib.m4
+++ b/devtools/M4/UNIX/smlib.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2000 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: smlib.m4,v 8.3 2000/07/07 18:52:23 dmoen Exp $
+#	$Id: smlib.m4,v 8.4 2013/11/22 20:51:23 ca Exp $
 #
 divert(0)dnl
 
diff --git a/devtools/M4/header.m4 b/devtools/M4/header.m4
index 8c0ca189e7a6..2aba7e51cc92 100644
--- a/devtools/M4/header.m4
+++ b/devtools/M4/header.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: header.m4,v 8.27 2002/08/01 21:58:26 gshapiro Exp $
+#	$Id: header.m4,v 8.28 2013/11/22 20:51:18 ca Exp $
 #
 changecom(^A)
 undefine(`format')
diff --git a/devtools/M4/list.m4 b/devtools/M4/list.m4
index 53d4785aab75..a3fc6f99f72b 100644
--- a/devtools/M4/list.m4
+++ b/devtools/M4/list.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: list.m4,v 8.4 2012/01/21 00:07:07 ashish Exp $
+#	$Id: list.m4,v 8.5 2013/11/22 20:51:18 ca Exp $
 #
 divert(0)dnl
 define(`bldLIST_PUSH_ITEM',
diff --git a/devtools/M4/string.m4 b/devtools/M4/string.m4
index e4916d3bbed3..cc03cfffd7c5 100644
--- a/devtools/M4/string.m4
+++ b/devtools/M4/string.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: string.m4,v 8.2 1999/05/13 16:16:33 gshapiro Exp $
+#	$Id: string.m4,v 8.3 2013/11/22 20:51:18 ca Exp $
 #
 divert(0)dnl
 define(`bldRINDEX',
diff --git a/devtools/M4/subst_ext.m4 b/devtools/M4/subst_ext.m4
index 46f9b4d5cd3c..b6e3e9e57e8b 100644
--- a/devtools/M4/subst_ext.m4
+++ b/devtools/M4/subst_ext.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: subst_ext.m4,v 8.3 1999/05/24 18:29:46 rand Exp $
+#	$Id: subst_ext.m4,v 8.4 2013/11/22 20:51:18 ca Exp $
 #
 divert(0)dnl
 define(`bldSUBST_EXTENSION',
diff --git a/devtools/M4/switch.m4 b/devtools/M4/switch.m4
index c3684770f03f..a47460c688cf 100644
--- a/devtools/M4/switch.m4
+++ b/devtools/M4/switch.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2000 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: switch.m4,v 8.18 2012/01/21 00:07:07 ashish Exp $
+#	$Id: switch.m4,v 8.19 2013/11/22 20:51:18 ca Exp $
 #
 divert(0)dnl
 include(confBUILDTOOLSDIR`/M4/string.m4')dnl
diff --git a/devtools/OS/Darwin.12.x b/devtools/OS/Darwin.12.x
new file mode 100644
index 000000000000..69e3ada70458
--- /dev/null
+++ b/devtools/OS/Darwin.12.x
@@ -0,0 +1,25 @@
+#	$Id: Darwin.12.x,v 1.2 2013/12/02 22:11:06 gshapiro Exp $
+
+dnl	DO NOT EDIT THIS FILE.
+dnl	Place personal settings in devtools/Site/site.config.m4
+
+#
+define(`confCC', `cc -pipe ${Extra_CC_Flags}')
+define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
+define(`confENVDEF', `-DDARWIN=120000 -DBIND_8_COMPAT -DNETINET6')
+define(`confLDOPTS', `${Extra_LD_Flags}')
+define(`confMTLDOPTS', `-lpthread')
+define(`confMILTER_STATIC', `')
+define(`confDEPEND_TYPE', `CC-M')
+define(`confOPTIMIZE', `-O3')
+define(`confRANLIBOPTS', `-c')
+define(`confHFDIR', `/usr/share/sendmail')
+define(`confINSTALL_RAWMAN')
+define(`confMANOWN', `root')
+define(`confMANGRP', `wheel')
+define(`confUBINOWN', `root')
+define(`confUBINGRP', `wheel')
+define(`confSBINOWN', `root')
+define(`confSBINGRP', `wheel')
+define(`confLDOPTS_SO', `-dynamiclib -flat_namespace -undefined suppress -single_module')
+define(`confSHAREDLIB_EXT', `.dylib')
diff --git a/devtools/OS/Darwin.13.x b/devtools/OS/Darwin.13.x
new file mode 100644
index 000000000000..8cbfcdc13d1c
--- /dev/null
+++ b/devtools/OS/Darwin.13.x
@@ -0,0 +1,25 @@
+#	$Id: Darwin.13.x,v 1.1 2013/12/02 22:11:06 gshapiro Exp $
+
+dnl	DO NOT EDIT THIS FILE.
+dnl	Place personal settings in devtools/Site/site.config.m4
+
+#
+define(`confCC', `cc -pipe ${Extra_CC_Flags}')
+define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
+define(`confENVDEF', `-DDARWIN=130000 -DBIND_8_COMPAT -DNETINET6')
+define(`confLDOPTS', `${Extra_LD_Flags}')
+define(`confMTLDOPTS', `-lpthread')
+define(`confMILTER_STATIC', `')
+define(`confDEPEND_TYPE', `CC-M')
+define(`confOPTIMIZE', `-O3')
+define(`confRANLIBOPTS', `-c')
+define(`confHFDIR', `/usr/share/sendmail')
+define(`confINSTALL_RAWMAN')
+define(`confMANOWN', `root')
+define(`confMANGRP', `wheel')
+define(`confUBINOWN', `root')
+define(`confUBINGRP', `wheel')
+define(`confSBINOWN', `root')
+define(`confSBINGRP', `wheel')
+define(`confLDOPTS_SO', `-dynamiclib -flat_namespace -undefined suppress -single_module')
+define(`confSHAREDLIB_EXT', `.dylib')
diff --git a/devtools/bin/Build b/devtools/bin/Build
index 8d77581cd5df..4164a0f64b96 100755
--- a/devtools/bin/Build
+++ b/devtools/bin/Build
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 1998-2002, 2008 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2002, 2008 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1993, 1996-1997 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1993
@@ -11,7 +11,7 @@
 # the sendmail distribution.
 #
 #
-#	$Id: Build,v 8.187 2008/01/11 18:40:17 ca Exp $
+#	$Id: Build,v 8.189 2013/12/02 22:11:07 gshapiro Exp $
 #
 
 #
@@ -783,8 +783,13 @@ then
 		${M4} ${M4_BLDVARIANT_FLAGS} -DconfBUILDTOOLSDIR=$BUILDTOOLS - | \
 		grep "^_HCRSBIL_=" | \
 		sed -e 's/#_define_/#define/g' -e 's/_include_/include/g' -e "s/^_HCRSBIL_=//"`
+	soext=`(cat $obj/.settings$$; echo "_EMANOS_= confSHAREDLIB_EXT" ) | \
+		sed -e 's/\(.\)include/\1_include_/g' -e 's/#define/#_define_/g' | \
+		${M4} ${M4_BLDVARIANT_FLAGS} -DconfBUILDTOOLSDIR=$BUILDTOOLS - | \
+		grep "^_EMANOS_=" | \
+		sed -e 's/#_define_/#define/g' -e 's/_include_/include/g' -e "s/^_EMANOS_=//" -e 's/^ //'`
 	echo 'divert(-1)' >> $obj/.settings$$
-	LIBDIRS="$libdirs" LIBSRCH="$libsrch" LIBPATH="$libpath" SITECONFIG="$siteconfig" $SHELL $BUILDTOOLS/bin/configure.sh $sflag $oscf >> $obj/.settings$$
+	LIBDIRS="$libdirs" LIBSRCH="$libsrch" LIBPATH="$libpath" SITECONFIG="$siteconfig" SOEXT="$soext" $SHELL $BUILDTOOLS/bin/configure.sh $sflag $oscf >> $obj/.settings$$
 	echo 'divert(0)dnl' >> $obj/.settings$$
 	sed -e 's/\(.\)include/\1_include_/g' -e 's/#define/#_define_/g' -e 's/
 //g' $obj/.settings$$ | \
 		${M4}  ${M4_BLDVARIANT_FLAGS} -DconfBUILDTOOLSDIR=$BUILDTOOLS - Makefile.m4 | \
diff --git a/devtools/bin/configure.sh b/devtools/bin/configure.sh
index a253b1c8f162..e3171708994f 100755
--- a/devtools/bin/configure.sh
+++ b/devtools/bin/configure.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
 # the sendmail distribution.
 #
 #
-#	$Id: configure.sh,v 8.46 2003/08/20 18:08:35 gshapiro Exp $
+#	$Id: configure.sh,v 8.48 2013/12/02 22:11:07 gshapiro Exp $
 
 #
 #  Special script to autoconfigure for M4 generation of Makefile
@@ -79,6 +79,12 @@ then
 else
 	host=`uname -n`
 fi
+
+if [ -z "$SOEXT" ]
+then
+	SOEXT=".so"
+fi
+
 echo "PUSHDIVERT(0)"
 echo "####################################################################"
 echo "##### This file is automatically generated -- edit at your own risk"
@@ -107,7 +113,7 @@ do
 		then
 			p = "."
 		fi
-		if [ -f $p/lib$l.a -o -f $p/lib$l.so ]
+		if [ -f $p/lib$l.a -o -f $p/lib$l$SOEXT ]
 		then
 			case $l
 			in
diff --git a/devtools/bin/find_m4.sh b/devtools/bin/find_m4.sh
index d83073715a7d..4231ae98504a 100755
--- a/devtools/bin/find_m4.sh
+++ b/devtools/bin/find_m4.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
 # the sendmail distribution.
 #
 #
-#       $Id: find_m4.sh,v 8.13 2001/01/23 01:47:45 gshapiro Exp $
+#       $Id: find_m4.sh,v 8.14 2013/11/22 20:51:24 ca Exp $
 #
 
 # Try to find a working M4 program.
diff --git a/devtools/bin/install.sh b/devtools/bin/install.sh
index 59a3771b6dad..18d006366e01 100755
--- a/devtools/bin/install.sh
+++ b/devtools/bin/install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -8,7 +8,7 @@
 # the sendmail distribution.
 #
 #
-#	$Id: install.sh,v 8.14 2001/03/16 23:37:31 gshapiro Exp $
+#	$Id: install.sh,v 8.15 2013/11/22 20:51:25 ca Exp $
 
 # Set default program
 program=mv