vendor/sendmail/8.16.1

9 files changed, 127 insertions, 5 deletions

diff --git a/devtools/M4/header.m4 b/devtools/M4/header.m4
index 4ecc4f01f2de..bc19392bba2a 100644
--- a/devtools/M4/header.m4
+++ b/devtools/M4/header.m4
@@ -25,7 +25,7 @@ define(`confSHELL', `/bin/sh')
 define(`confBEFORE', `')
 define(`confLIBDIRS', `')
 define(`confINCDIRS', `')
-define(`confLIBSEARCH', `db bind resolv 44bsd')
+define(`confLIBSEARCH', `db bind resolv 44bsd cdb')
 define(`confLIBSEARCHPATH', `/lib /usr/lib /usr/shlib')
 define(`confSHAREDLIB_EXT', `.so')
 define(`confSITECONFIG', `site.config')
diff --git a/devtools/OS/Darwin.14.x b/devtools/OS/Darwin.14.x
new file mode 100644
index 000000000000..a34e90146e37
--- /dev/null
+++ b/devtools/OS/Darwin.14.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=140000 -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.15.x b/devtools/OS/Darwin.15.x
new file mode 100644
index 000000000000..c2de69c8266a
--- /dev/null
+++ b/devtools/OS/Darwin.15.x
@@ -0,0 +1,23 @@
+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=150000 -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.16.x b/devtools/OS/Darwin.16.x
new file mode 100644
index 000000000000..e153e1d52239
--- /dev/null
+++ b/devtools/OS/Darwin.16.x
@@ -0,0 +1,23 @@
+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=160000 -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.17.x b/devtools/OS/Darwin.17.x
new file mode 100644
index 000000000000..ef3ab555c4d9
--- /dev/null
+++ b/devtools/OS/Darwin.17.x
@@ -0,0 +1,23 @@
+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=170000 -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.18.x b/devtools/OS/Darwin.18.x
new file mode 100644
index 000000000000..9a93b96cb0fb
--- /dev/null
+++ b/devtools/OS/Darwin.18.x
@@ -0,0 +1,23 @@
+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=180000 -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/README b/devtools/README
index 04f808e640e3..986e2461bd6b 100644
--- a/devtools/README
+++ b/devtools/README
@@ -137,7 +137,7 @@ confLIBGRP	    bin			The group for libraries.
 confLIBMODE	    444			The mode of installed libraries.
 confLIBOWN	    root		The owner for libraries.
 confLIBS	    [varies]		-l flags passed to ld.
-confLIBSEARCH	    db bind resolv 44bsd
+confLIBSEARCH	    db bind resolv 44bsd cdb
 					Search for these libraries for
 					linking with programs.
 confLIBSEARCHPATH   /lib /usr/lib /usr/shlib
@@ -177,7 +177,8 @@ confMANROOTMAN	    /usr/share/man/man	The root of the man subtree, for
 					unformatted manual pages.
 confMAPDEF	    [varies]		The map definitions, e.g.,
 					-DNDBM -DNEWDB.  -DNEWDB is always
-					added if libdb.* can be found.
+					added if libdb.* can be found,
+					-DCDB is added if libcdb.* is found.
 confMBINDIR	    /usr/sbin		The location of the MTA (sm-mta,
 					sendmail) binary.
 confMBINGRP	    bin			The group of the MTA binary (sm-mta).
diff --git a/devtools/bin/Build b/devtools/bin/Build
index 4a1604c489f1..5f03a02e10cf 100755
--- a/devtools/bin/Build
+++ b/devtools/bin/Build
@@ -543,6 +543,8 @@ elif [ -r ${OBJ_ROOT}/obj${prefix}.$rel$sfx ]; then
 	abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$rel$sfx
 elif [ -r ${OBJ_ROOT}/obj${prefix}.$sfx ]; then
 	abs_obj_dir=${OBJ_ROOT}/obj${prefix}.$sfx
+elif [ -r ${OBJ_ROOT}/obj${prefix}$sfx ]; then
+	abs_obj_dir=${OBJ_ROOT}/obj${prefix}$sfx
 fi
 
 if [ -n "$abs_obj_dir" ]
diff --git a/devtools/bin/configure.sh b/devtools/bin/configure.sh
index daa951551bc4..db85c9df2862 100755
--- a/devtools/bin/configure.sh
+++ b/devtools/bin/configure.sh
@@ -115,11 +115,13 @@ do
 		fi
 		if [ -f $p/lib$l.a -o -f $p/lib$l$SOEXT ]
 		then
-			case $l
-			in
+			case $l in
 			  db)
 				mapdef="$mapdef -DNEWDB"
 				;;
+			  cdb)
+				mapdef="$mapdef -DCDB"
+				;;
 			  bind|resolv)
 				if [ -n "$resolver" ]
 				then