Imported Upstream version 8.12.3upstream/8.12.3

10 files changed, 0 insertions, 610 deletions

diff --git a/cf/mailer/cyrus.m4 b/cf/mailer/cyrus.m4
deleted file mode 100644
index 567025f..0000000
--- a/cf/mailer/cyrus.m4
+++ /dev/null
@@ -1,58 +0,0 @@
-PUSHDIVERT(-1)
-#
-# Copyright (c) 1998 Sendmail, Inc.  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.
-#
-#
-# This code incorporates code from Carnegie Mellon University, whose
-# copyright notice and conditions of redistribution are as follows:
-#
-#***************************************************************************
-#	(C) Copyright 1995 by Carnegie Mellon University
-# 
-#                      All Rights Reserved
-# 
-# Permission to use, copy, modify, and distribute this software and its 
-# documentation for any purpose and without fee is hereby granted, 
-# provided that the above copyright notice appear in all copies and that
-# both that copyright notice and this permission notice appear in 
-# supporting documentation, and that the name of CMU not be
-# used in advertising or publicity pertaining to distribution of the
-# software without specific, written prior permission.  
-# 
-# CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-# ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-# CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-# ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-# ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-# SOFTWARE.
-#
-#	Contributed to Berkeley by John Gardiner Myers <jgm+@CMU.EDU>.
-# 
-
-ifdef(`CYRUS_MAILER_FLAGS',, `define(`CYRUS_MAILER_FLAGS', `A5@/:|')')
-ifdef(`CYRUS_MAILER_PATH',, `define(`CYRUS_MAILER_PATH', /usr/cyrus/bin/deliver)')
-ifdef(`CYRUS_MAILER_ARGS',, `define(`CYRUS_MAILER_ARGS', `deliver -e -m $h -- $u')')
-ifdef(`CYRUS_MAILER_USER',, `define(`CYRUS_MAILER_USER', `cyrus:mail')')
-ifdef(`CYRUS_BB_MAILER_FLAGS',, `define(`CYRUS_BB_MAILER_FLAGS', `')')
-ifdef(`CYRUS_BB_MAILER_ARGS',, `define(`CYRUS_BB_MAILER_ARGS', `deliver -e -m $u')')
-
-POPDIVERT
-
-##################################################
-###   Cyrus Mailer specification               ###
-##################################################
-
-VERSIONID(`@(#)cyrus.m4	8.9 (Carnegie Mellon) 5/19/1998')
-
-Mcyrus,		P=CYRUS_MAILER_PATH, F=CONCAT(`lsDFMnPq', CYRUS_MAILER_FLAGS), S=10, R=20/40, T=X-Unix,
-		ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER,
-		A=CYRUS_MAILER_ARGS
-
-Mcyrusbb,	P=CYRUS_MAILER_PATH, F=CONCAT(`lsDFMnP', CYRUS_BB_MAILER_FLAGS), S=10, R=20/40, T=X-Unix,
-		ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER,
-		A=CYRUS_BB_MAILER_ARGS
diff --git a/cf/mailer/fax.m4 b/cf/mailer/fax.m4
deleted file mode 100644
index 3ee94bd..0000000
--- a/cf/mailer/fax.m4
+++ /dev/null
@@ -1,35 +0,0 @@
-PUSHDIVERT(-1)
-#
-# Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
-# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
-# Copyright (c) 1988, 1993
-#	The Regents of the University of California.  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.
-#
-#
-#  This assumes you already have Sam Leffler's HylaFAX software.
-#
-#  Tested with HylaFAX 4.0pl1
-#
-
-ifdef(`FAX_MAILER_ARGS',,
-	`define(`FAX_MAILER_ARGS', faxmail -d $u@$h $f)')
-ifdef(`FAX_MAILER_PATH',,
-	`define(`FAX_MAILER_PATH', /usr/local/bin/faxmail)')
-ifdef(`FAX_MAILER_MAX',,
-	`define(`FAX_MAILER_MAX', 100000)')
-POPDIVERT
-####################################
-###   FAX Mailer specification   ###
-####################################
-
-VERSIONID(`@(#)fax.m4	8.11 (Berkeley) 5/19/1998')
-
-Mfax,		P=FAX_MAILER_PATH, F=DFMhu, S=14, R=24, M=FAX_MAILER_MAX, T=X-Phone/X-FAX/X-Unix,
-		A=FAX_MAILER_ARGS
-
-LOCAL_CONFIG
-CPFAX
diff --git a/cf/mailer/local.m4 b/cf/mailer/local.m4
deleted file mode 100644
index 6b4b679..0000000
--- a/cf/mailer/local.m4
+++ /dev/null
@@ -1,74 +0,0 @@
-PUSHDIVERT(-1)
-#
-# Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
-# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
-# Copyright (c) 1988, 1993
-#	The Regents of the University of California.  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.
-#
-#
-ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `rmn9')')
-ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /bin/mail)')
-ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -d $u')')
-ifdef(`LOCAL_SHELL_FLAGS',, `define(`LOCAL_SHELL_FLAGS', `eu9')')
-ifdef(`LOCAL_SHELL_PATH',, `define(`LOCAL_SHELL_PATH', /bin/sh)')
-ifdef(`LOCAL_SHELL_ARGS',, `define(`LOCAL_SHELL_ARGS', `sh -c $u')')
-ifdef(`LOCAL_SHELL_DIR',, `define(`LOCAL_SHELL_DIR', `$z:/')')
-POPDIVERT
-
-##################################################
-###   Local and Program Mailer specification   ###
-##################################################
-
-VERSIONID(`@(#)local.m4	8.30 (Berkeley) 6/30/1998')
-
-Mlocal,		P=LOCAL_MAILER_PATH, F=CONCAT(`lsDFMAw5:/|@q', LOCAL_MAILER_FLAGS), S=10/30, R=20/40,
-		_OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')_OPTINS(`LOCAL_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/X-Unix,
-		A=LOCAL_MAILER_ARGS
-Mprog,		P=LOCAL_SHELL_PATH, F=CONCAT(`lsDFMoq', LOCAL_SHELL_FLAGS), S=10/30, R=20/40, D=LOCAL_SHELL_DIR,
-		_OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')T=X-Unix,
-		A=LOCAL_SHELL_ARGS
-
-#
-#  Envelope sender rewriting
-#
-S10
-R<@>			$n			errors to mailer-daemon
-R@ <@ $*>		$n			temporarily bypass Sun bogosity
-R$+			$: $>50 $1		add local domain if needed
-R$*			$: $>94 $1		do masquerading
-
-#
-#  Envelope recipient rewriting
-#
-S20
-R$+ < @ $* >		$: $1			strip host part
-
-#
-#  Header sender rewriting
-#
-S30
-R<@>			$n			errors to mailer-daemon
-R@ <@ $*>		$n			temporarily bypass Sun bogosity
-R$+			$: $>50 $1		add local domain if needed
-R$*			$: $>93 $1		do masquerading
-
-#
-#  Header recipient rewriting
-#
-S40
-R$+			$: $>50 $1		add local domain if needed
-ifdef(`_ALL_MASQUERADE_', `dnl
-R$*			$: $>93 $1		do all-masquerading', `dnl')
-
-#
-#  Common code to add local domain name (only if always-add-domain)
-#
-S50
-ifdef(`_ALWAYS_ADD_DOMAIN_', `dnl
-R$* < @ $* > $* 	$@ $1 < @ $2 > $3		already fully qualified
-R$+			$@ $1 < @ *LOCAL* >		add local qualification',
-`dnl')
diff --git a/cf/mailer/mail11.m4 b/cf/mailer/mail11.m4
deleted file mode 100644
index 222b53f..0000000
--- a/cf/mailer/mail11.m4
+++ /dev/null
@@ -1,58 +0,0 @@
-PUSHDIVERT(-1)
-#
-# Copyright (c) 1998 Sendmail, Inc.  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.
-#
-#
-# Not exciting enough to bother with copyrights and most of the
-# rulesets are based from those provided by DEC.
-# Barb Dijker, Labyrinth Computer Services, barb@labyrinth.com
-#
-# This mailer is only useful if you have DECNET and the
-# mail11 program - gatekeeper.dec.com:/pub/DEC/gwtools.
-# 
-# For local delivery of DECNET style addresses to the local
-# DECNET node, you will need feature(use_cw_file) and put
-# your DECNET nodename in in the cw file.
-#
-ifdef(`MAIL11_MAILER_PATH',, `define(`MAIL11_MAILER_PATH', /usr/etc/mail11)')
-ifdef(`MAIL11_MAILER_FLAGS',, `define(`MAIL11_MAILER_FLAGS', nsFx)')
-ifdef(`MAIL11_MAILER_ARGS',, `define(`MAIL11_MAILER_ARGS', mail11 $g $x $h $u)')
-define(`_USE_DECNET_SYNTAX_')
-define(`_LOCAL_', ifdef(`confLOCAL_MAILER', confLOCAL_MAILER, `local'))
-
-POPDIVERT
-
-PUSHDIVERT(3)
-# DECNET delivery
-R$* < @ $=w .DECNET. >		$#_LOCAL_ $: $1			local DECnet
-R$+ < @ $+ .DECNET. >		$#mail11 $@ $2 $: $1		DECnet user
-POPDIVERT
-
-PUSHDIVERT(6)
-CPDECNET
-POPDIVERT
-
-###########################################
-###   UTK-MAIL11 Mailer specification   ###
-###########################################
-
-VERSIONID(`@(#)mail11.m4	8.8 (Berkeley) 5/19/1998')
-
-Mmail11, P=MAIL11_MAILER_PATH, F=MAIL11_MAILER_FLAGS, S=15, R=25,
-	A=MAIL11_MAILER_ARGS
-
-S15
-R$+			$: $>25 $1		preprocess
-R$w :: $+		$@ $w :: $1		ready to go
-
-S25
-R$+ < @ $- .UUCP >	$: $2 ! $1		back to old style
-R$+ < @ $- .DECNET >	$: $2 :: $1		convert to DECnet style
-R$+ < @ $- .LOCAL >	$: $2 :: $1		convert to DECnet style
-R$+ < @ $=w. >		$: $2 :: $1		convert to DECnet style
-R$=w :: $+		$2			strip local names
-R$+ :: $+		$@ $1 :: $2		already qualified
diff --git a/cf/mailer/phquery.m4 b/cf/mailer/phquery.m4
deleted file mode 100644
index 3e0891a..0000000
--- a/cf/mailer/phquery.m4
+++ /dev/null
@@ -1,29 +0,0 @@
-PUSHDIVERT(-1)
-#
-# Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
-# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
-# Copyright (c) 1988, 1993
-#	The Regents of the University of California.  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 Kimmo Suominen <kim@tac.nyc.ny.us>.
-#
-
-ifdef(`PH_MAILER_PATH',, `define(`PH_MAILER_PATH', /usr/local/etc/phquery)')
-ifdef(`PH_MAILER_FLAGS',, `define(`PH_MAILER_FLAGS', `ehmu')')
-ifdef(`PH_MAILER_ARGS',, `define(`PH_MAILER_ARGS', `phquery -- $u')')
-
-POPDIVERT
-
-####################################
-###   PH Mailer specification   ###
-####################################
-
-VERSIONID(`@(#)phquery.m4	8.6 (Berkeley) 5/19/1998')
-
-Mph,		P=PH_MAILER_PATH, F=CONCAT(`nrDFM', PH_MAILER_FLAGS), S=10, R=20/40,
-		A=PH_MAILER_ARGS
diff --git a/cf/mailer/pop.m4 b/cf/mailer/pop.m4
deleted file mode 100644
index 0acea7d..0000000
--- a/cf/mailer/pop.m4
+++ /dev/null
@@ -1,31 +0,0 @@
-PUSHDIVERT(-1)
-#
-# Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
-# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
-# Copyright (c) 1988, 1993
-#	The Regents of the University of California.  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.
-#
-#
-
-ifdef(`POP_MAILER_PATH',, `define(`POP_MAILER_PATH', /usr/lib/mh/spop)')
-ifdef(`POP_MAILER_FLAGS',, `define(`POP_MAILER_FLAGS', `Penu')')
-ifdef(`POP_MAILER_ARGS',, `define(`POP_MAILER_ARGS', `pop $u')')
-
-POPDIVERT
-
-####################################
-###   POP Mailer specification   ###
-####################################
-
-VERSIONID(`@(#)pop.m4	8.11 (Berkeley) 5/19/1998')
-
-Mpop,		P=POP_MAILER_PATH, F=CONCAT(`lsDFMq', POP_MAILER_FLAGS), S=10, R=20/40, T=DNS/RFC822/X-Unix,
-		A=POP_MAILER_ARGS
-
-LOCAL_CONFIG
-# POP mailer is a pseudo-domain
-CPPOP
diff --git a/cf/mailer/procmail.m4 b/cf/mailer/procmail.m4
deleted file mode 100644
index 38b6d20..0000000
--- a/cf/mailer/procmail.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-PUSHDIVERT(-1)
-#
-# Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
-# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
-# Copyright (c) 1988, 1993
-#	The Regents of the University of California.  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.
-#
-#
-
-ifdef(`PROCMAIL_MAILER_PATH',,
-	`ifdef(`PROCMAIL_PATH',
-		`define(`PROCMAIL_MAILER_PATH', PROCMAIL_PATH)',
-		`define(`PROCMAIL_MAILER_PATH', /usr/local/bin/procmail)')')
-ifdef(`PROCMAIL_MAILER_FLAGS',,
-	`define(`PROCMAIL_MAILER_FLAGS', `SPhnu9')')
-ifdef(`PROCMAIL_MAILER_ARGS',,
-	`define(`PROCMAIL_MAILER_ARGS', `procmail -Y -m $h $f $u')')
-
-POPDIVERT
-
-######################*****##############
-###   PROCMAIL Mailer specification   ###
-##################*****##################
-
-VERSIONID(`@(#)procmail.m4	8.11 (Berkeley) 5/19/1998')
-
-Mprocmail,	P=PROCMAIL_MAILER_PATH, F=CONCAT(`DFM', PROCMAIL_MAILER_FLAGS), S=11/31, R=21/31, T=DNS/RFC822/X-Unix,
-		ifdef(`PROCMAIL_MAILER_MAX', `M=PROCMAIL_MAILER_MAX, ')A=PROCMAIL_MAILER_ARGS
diff --git a/cf/mailer/smtp.m4 b/cf/mailer/smtp.m4
deleted file mode 100644
index 7545597..0000000
--- a/cf/mailer/smtp.m4
+++ /dev/null
@@ -1,115 +0,0 @@
-PUSHDIVERT(-1)
-#
-# Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
-# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
-# Copyright (c) 1988, 1993
-#	The Regents of the University of California.  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.
-#
-#
-ifdef(`SMTP_MAILER_FLAGS',, `define(`SMTP_MAILER_FLAGS', `')')
-ifdef(`SMTP_MAILER_ARGS',, `define(`SMTP_MAILER_ARGS', `IPC $h')')
-ifdef(`ESMTP_MAILER_ARGS',, `define(`ESMTP_MAILER_ARGS', `IPC $h')')
-ifdef(`SMTP8_MAILER_ARGS',, `define(`SMTP8_MAILER_ARGS', `IPC $h')')
-ifdef(`RELAY_MAILER_ARGS',, `define(`RELAY_MAILER_ARGS', `IPC $h')')
-ifdef(`_MAILER_uucp_',
-	`errprint(`*** MAILER(smtp) must appear before MAILER(uucp)')')dnl
-POPDIVERT
-#####################################
-###   SMTP Mailer specification   ###
-#####################################
-
-VERSIONID(`@(#)smtp.m4	8.38 (Berkeley) 5/19/1998')
-
-Msmtp,		P=[IPC], F=CONCAT(mDFMuX, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=990,
-		_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
-		A=SMTP_MAILER_ARGS
-Mesmtp,		P=[IPC], F=CONCAT(mDFMuXa, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=990,
-		_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
-		A=ESMTP_MAILER_ARGS
-Msmtp8,		P=[IPC], F=CONCAT(mDFMuX8, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=990,
-		_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
-		A=SMTP8_MAILER_ARGS
-Mrelay,		P=[IPC], F=CONCAT(mDFMuXa8, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `61/71', `61'), E=\r\n, L=2040,
-		_OPTINS(`RELAY_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
-		A=RELAY_MAILER_ARGS
-
-#
-#  envelope sender rewriting
-#
-S11
-R$+			$: $>51 $1			sender/recipient common
-R$* :; <@>		$@				list:; special case
-R$*			$: $>61 $1			qualify unqual'ed names
-R$+			$: $>94 $1			do masquerading
-
-
-#
-#  envelope recipient rewriting --
-#  also header recipient if not masquerading recipients
-#
-S21
-R$+			$: $>51 $1			sender/recipient common
-R$+			$: $>61 $1			qualify unqual'ed names
-
-
-#
-#  header sender and masquerading header recipient rewriting
-#
-S31
-R$+			$: $>51 $1			sender/recipient common
-R:; <@>			$@				list:; special case
-
-# do special header rewriting
-R$* <@> $*		$@ $1 <@> $2			pass null host through
-R< @ $* > $*		$@ < @ $1 > $2			pass route-addr through
-R$*			$: $>61 $1			qualify unqual'ed names
-R$+			$: $>93 $1			do masquerading
-
-
-#
-#  convert pseudo-domain addresses to real domain addresses
-#
-S51
-
-# pass <route-addr>s through
-R< @ $+ > $*		$@ < @ $1 > $2			resolve <route-addr>
-
-# output fake domains as user%fake@relay
-ifdef(`BITNET_RELAY',
-`R$+ <@ $+ .BITNET. >	$: $1 % $2 .BITNET < @ $B >	user@host.BITNET
-R$+.BITNET <@ $+:$+ >	$: $1 .BITNET < @ $3 >		strip mailer: part',
-	`dnl')
-ifdef(`_NO_UUCP_', `dnl', `
-# do UUCP heuristics; note that these are shared with UUCP mailers
-R$+ < @ $+ .UUCP. >	$: < $2 ! > $1			convert to UUCP form
-R$+ < @ $* > $*		$@ $1 < @ $2 > $3		not UUCP form
-
-# leave these in .UUCP form to avoid further tampering
-R< $&h ! > $- ! $+	$@ $2 < @ $1 .UUCP. >
-R< $&h ! > $-.$+ ! $+	$@ $3 < @ $1.$2 >
-R< $&h ! > $+		$@ $1 < @ $&h .UUCP. >
-R< $+ ! > $+		$: $1 ! $2 < @ $Y >		use UUCP_RELAY
-R$+ < @ $+ : $+ >	$@ $1 < @ $3 >			strip mailer: part
-R$+ < @ >		$: $1 < @ *LOCAL* >		if no UUCP_RELAY')
-
-
-#
-#  common sender and masquerading recipient rewriting
-#
-S61
-
-R$* < @ $* > $*		$@ $1 < @ $2 > $3		already fully qualified
-R$+			$@ $1 < @ *LOCAL* >		add local qualification
-
-
-#
-#  relay mailer header masquerading recipient rewriting
-#
-S71
-
-R$+			$: $>61 $1
-R$+			$: $>93 $1
diff --git a/cf/mailer/usenet.m4 b/cf/mailer/usenet.m4
deleted file mode 100644
index 1535751..0000000
--- a/cf/mailer/usenet.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-PUSHDIVERT(-1)
-#
-# Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
-# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
-# Copyright (c) 1988, 1993
-#	The Regents of the University of California.  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.
-#
-#
-
-ifdef(`USENET_MAILER_PATH',, `define(`USENET_MAILER_PATH', /usr/lib/news/inews)')
-ifdef(`USENET_MAILER_FLAGS',, `define(`USENET_MAILER_FLAGS', `rlsDFMmn')')
-ifdef(`USENET_MAILER_ARGS',, `define(`USENET_MAILER_ARGS', `inews -m -h -n')')
-POPDIVERT
-####################################
-###  USENET Mailer specification ###
-####################################
-
-VERSIONID(`@(#)usenet.m4	8.10 (Berkeley) 5/19/1998')
-
-Musenet,	P=USENET_MAILER_PATH, F=USENET_MAILER_FLAGS, S=10, R=20,
-		_OPTINS(`USENET_MAILER_MAX', `M=', `, ')T=X-Usenet/X-Usenet/X-Unix,
-		A=USENET_MAILER_ARGS $u
diff --git a/cf/mailer/uucp.m4 b/cf/mailer/uucp.m4
deleted file mode 100644
index badd307..0000000
--- a/cf/mailer/uucp.m4
+++ /dev/null
@@ -1,152 +0,0 @@
-PUSHDIVERT(-1)
-#
-# Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
-# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
-# Copyright (c) 1988, 1993
-#	The Regents of the University of California.  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.
-#
-#
-
-ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')
-ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$g -gC $h!rmail ($u)')')
-ifdef(`UUCP_MAILER_FLAGS',, `define(`UUCP_MAILER_FLAGS', `')')
-ifdef(`UUCP_MAILER_MAX',,
-	`define(`UUCP_MAILER_MAX',
-		`ifdef(`UUCP_MAX_SIZE', `UUCP_MAX_SIZE', 100000)')')
-POPDIVERT
-#####################################
-###   UUCP Mailer specification   ###
-#####################################
-
-VERSIONID(`@(#)uucp.m4	8.30 (Berkeley) 5/19/1998')
-
-#
-#  There are innumerable variations on the UUCP mailer.  It really
-#  is rather absurd.
-#
-
-# old UUCP mailer (two names)
-Muucp,		P=UUCP_MAILER_PATH, F=CONCAT(DFMhuUd, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAILER_MAX,
-		_OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix,
-		A=UUCP_MAILER_ARGS
-Muucp-old,	P=UUCP_MAILER_PATH, F=CONCAT(DFMhuUd, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAILER_MAX,
-		_OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix,
-		A=UUCP_MAILER_ARGS
-
-# smart UUCP mailer (handles multiple addresses) (two names)
-Msuucp,		P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuUd, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAILER_MAX,
-		_OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix,
-		A=UUCP_MAILER_ARGS
-Muucp-new,	P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuUd, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAILER_MAX,
-		_OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix,
-		A=UUCP_MAILER_ARGS
-
-ifdef(`_MAILER_smtp_',
-`# domain-ized UUCP mailer
-Muucp-dom,	P=UUCP_MAILER_PATH, F=CONCAT(mDFMhud, UUCP_MAILER_FLAGS), S=52/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), M=UUCP_MAILER_MAX,
-		_OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix,
-		A=UUCP_MAILER_ARGS
-
-# domain-ized UUCP mailer with UUCP-style sender envelope
-Muucp-uudom,	P=UUCP_MAILER_PATH, F=CONCAT(mDFMhud, UUCP_MAILER_FLAGS), S=72/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), M=UUCP_MAILER_MAX,
-		_OPTINS(`UUCP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/X-UUCP/X-Unix,
-		A=UUCP_MAILER_ARGS')
-
-
-#
-#  envelope and header sender rewriting
-#
-S12
-
-# handle error address as a special case
-R<@>				$n			errors to mailer-daemon
-
-# list:; syntax should disappear
-R:; <@>				$@
-
-R$* < @ $* . > $*		$1 < @ $2 > $3		strip trailing dots
-R$* < @ $=w >			$1			strip local name
-R<@ $- . UUCP > : $+		$1 ! $2			convert to UUCP format
-R<@ $+ > : $+			$1 ! $2			convert to UUCP format
-R$* < @ $- . UUCP >		$2 ! $1			convert to UUCP format
-R$* < @ $+ >			$2 ! $1			convert to UUCP format
-R$&h ! $+ ! $+			$@ $1 ! $2		$h!...!user => ...!user
-R$&h ! $+			$@ $&h ! $1		$h!user => $h!user
-R$+				$: $U ! $1		prepend our name
-R! $+				$: $k ! $1		in case $U undefined
-
-#
-#  envelope recipient rewriting
-#
-S22
-
-# list:; should disappear
-R:; <@>				$@
-
-R$* < @ $* . > $*		$1 < @ $2 > $3		strip trailing dots
-R$* < @ $=w >			$1			strip local name
-R<@ $- . UUCP > : $+		$1 ! $2			convert to UUCP format
-R<@ $+ > : $+			$1 ! $2			convert to UUCP format
-R$* < @ $- . UUCP >		$2 ! $1			convert to UUCP format
-R$* < @ $+ >			$2 ! $1			convert to UUCP format
-
-#
-#  header recipient rewriting
-#
-S42
-
-# list:; syntax should disappear
-R:; <@>				$@
-
-R$* < @ $* . > $*		$1 < @ $2 > $3		strip trailing dots
-R$* < @ $=w >			$1			strip local name
-R<@ $- . UUCP > : $+		$1 ! $2			convert to UUCP format
-R<@ $+ > : $+			$1 ! $2			convert to UUCP format
-R$* < @ $- . UUCP >		$2 ! $1			convert to UUCP format
-R$* < @ $+ >			$2 ! $1			convert to UUCP format
-R$&h ! $+ ! $+			$@ $1 ! $2		$h!...!user => ...!user
-R$&h ! $+			$@ $&h ! $1		$h!user => $h!user
-R$+				$: $U ! $1		prepend our name
-R! $+				$: $k ! $1		in case $U undefined
-
-
-ifdef(`_MAILER_smtp_',
-`#
-#  envelope sender rewriting for uucp-dom mailer
-#
-S52
-
-# handle error address as a special case
-R<@>				$n			errors to mailer-daemon
-
-# pass everything to standard SMTP mailer rewriting
-R$*				$@ $>11 $1
-
-#
-#  envelope sender rewriting for uucp-uudom mailer
-#
-S72
-
-# handle error address as a special case
-R<@>				$n			errors to mailer-daemon
-
-# do standard SMTP mailer rewriting
-R$*				$: $>11 $1
-
-R$* < @ $* . > $*		$1 < @ $2 > $3		strip trailing dots
-R<@ $- . UUCP > : $+		$@ $1 ! $2		convert to UUCP format
-R<@ $+ > : $+			$@ $1 ! $2		convert to UUCP format
-R$* < @ $- . UUCP >		$@ $2 ! $1		convert to UUCP format
-R$* < @ $+ >			$@ $2 ! $1		convert to UUCP format')
-
-
-PUSHDIVERT(4)
-# resolve locally connected UUCP links
-R$* < @ $=Z . UUCP. > $*	$#uucp-uudom $@ $2 $: $1 < @ $2 .UUCP. > $3
-R$* < @ $=Y . UUCP. > $*	$#uucp-new $@ $2 $: $1 < @ $2 .UUCP. > $3
-R$* < @ $=U . UUCP. > $*	$#uucp-old $@ $2 $: $1 < @ $2 .UUCP. > $3
-POPDIVERT