New files that were missed in the sendmail commit

2 files changed, 76 insertions, 0 deletions

diff --git a/gnu/usr.sbin/sendmail/cf/mailer/cyrusv2.m4 b/gnu/usr.sbin/sendmail/cf/mailer/cyrusv2.m4
new file mode 100644
index 00000000000..08fb619ab89
--- /dev/null
+++ b/gnu/usr.sbin/sendmail/cf/mailer/cyrusv2.m4
@@ -0,0 +1,29 @@
+PUSHDIVERT(-1)
+#
+# Copyright (c) 2002 Sendmail, Inc. and its suppliers.
+#	All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#	Contributed by Kenneth Murchison.
+#
+
+_DEFIFNOT(`_DEF_CYRUSV2_MAILER_FLAGS', `lsDFMnqXz')
+_DEFIFNOT(`CYRUSV2_MAILER_FLAGS', `A@/:|m')
+ifdef(`CYRUSV2_MAILER_ARGS',, `define(`CYRUSV2_MAILER_ARGS', `FILE /var/imap/socket/lmtp')')
+define(`_CYRUSV2_QGRP', `ifelse(defn(`CYRUSV2_MAILER_QGRP'),`',`', ` Q=CYRUSV2_MAILER_QGRP,')')dnl
+
+POPDIVERT
+
+#########################################
+###   Cyrus V2 Mailer specification   ###
+#########################################
+
+VERSIONID(`$Sendmail: cyrusv2.m4,v 1.1 2002/06/01 21:14:57 ca Exp $')
+
+Mcyrusv2,	P=[IPC], F=_MODMF_(CONCAT(_DEF_CYRUSV2_MAILER_FLAGS, CYRUSV2_MAILER_FLAGS), `CYRUSV2'),
+		S=EnvFromSMTP/HdrFromL, R=EnvToL/HdrToL, E=\r\n,
+		_OPTINS(`CYRUSV2_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`CYRUSV2_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`CYRUSV2_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,_CYRUSV2_QGRP
+		A=CYRUSV2_MAILER_ARGS
diff --git a/gnu/usr.sbin/sendmail/include/sm/bdb.h b/gnu/usr.sbin/sendmail/include/sm/bdb.h
new file mode 100644
index 00000000000..8d9001eb524
--- /dev/null
+++ b/gnu/usr.sbin/sendmail/include/sm/bdb.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2002 Sendmail, Inc. and its suppliers.
+ *	All rights reserved.
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the sendmail distribution.
+ *
+ *
+ *	$Sendmail: bdb.h,v 1.1.2.3 2002/12/05 05:07:44 ca Exp $
+ */
+
+#ifndef	SM_BDB_H
+#define SM_BDB_H
+
+#if NEWDB
+# include <db.h>
+# ifndef DB_VERSION_MAJOR
+#  define DB_VERSION_MAJOR 1
+# endif /* ! DB_VERSION_MAJOR */
+
+# if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
+
+#  define DBTXN	NULL ,
+
+/*
+**  Always turn on DB_FCNTL_LOCKING for DB 4.1.x since its
+**  "workaround" for accepting an empty (locked) file depends on
+**  this flag. Notice: this requires 4.1.24 + patch (which should be
+**  part of 4.1.25).
+*/
+
+#  define SM_DB_FLAG_ADD(flag)	(flag) |= DB_FCNTL_LOCKING
+
+# else /* DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 */
+
+#  define DBTXN
+#  if !HASFLOCK
+#   define SM_DB_FLAG_ADD(flag)	(flag) |= DB_FCNTL_LOCKING
+#  else /* !HASFLOCK */
+#   define SM_DB_FLAG_ADD(flag)	((void) 0)
+#  endif /* !HASFLOCK */
+
+# endif /* DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 */
+#endif /* NEWDB */
+
+#endif /* ! SM_BDB_H */