diff -r -c --new-file sendmail.cf/m4/cfhead.m4 sendmail.cf.patched/m4/cfhead.m4
*** sendmail.cf/m4/cfhead.m4	Fri Dec 22 20:00:32 2000
--- sendmail.cf.patched/m4/cfhead.m4	Mon Dec 18 03:16:13 2000
***************
*** 63,70 ****
  define(`_ARG8_',`_ACC_ARG_8_(_ARGS_)')
  define(`_ARG9_',`_ACC_ARG_9_(_ARGS_)')
  define(`MAILER',
! `ifdef(`_MAILER_$1_', `dnl`'',
! `define(`_MAILER_$1_', `')PUSHDIVERT(7)include(_CF_DIR_`'mailer/$1.m4)POPDIVERT`'')')
  define(`DOMAIN', `PUSHDIVERT(-1)define(`_ARG_', `$2')include(_CF_DIR_`'domain/$1.m4)POPDIVERT`'')
  define(`FEATURE', `PUSHDIVERT(-1)define(`_ARG_', `$2')define(`_ARGS_', `shift($@)')include(_CF_DIR_`'feature/$1.m4)POPDIVERT`'')
  define(`HACK', `PUSHDIVERT(-1)define(`_ARG_', `$2')define(`_ARGS_', `shift($@)')include(_CF_DIR_`'hack/$1.m4)POPDIVERT`'')
--- 63,70 ----
  define(`_ARG8_',`_ACC_ARG_8_(_ARGS_)')
  define(`_ARG9_',`_ACC_ARG_9_(_ARGS_)')
  define(`MAILER',
! `ifdef(`_MAILER_$1$2_', `dnl`'',
! `define(`_MAILER_$1$2_', `')PUSHDIVERT(7)define(`_ARG_', `$2')include(_CF_DIR_`'mailer/$1.m4)POPDIVERT`'')')
  define(`DOMAIN', `PUSHDIVERT(-1)define(`_ARG_', `$2')include(_CF_DIR_`'domain/$1.m4)POPDIVERT`'')
  define(`FEATURE', `PUSHDIVERT(-1)define(`_ARG_', `$2')define(`_ARGS_', `shift($@)')include(_CF_DIR_`'feature/$1.m4)POPDIVERT`'')
  define(`HACK', `PUSHDIVERT(-1)define(`_ARG_', `$2')define(`_ARGS_', `shift($@)')include(_CF_DIR_`'hack/$1.m4)POPDIVERT`'')
diff -r -c --new-file sendmail.cf/mailer/portmixsmtp.m4 sendmail.cf.patched/mailer/portmixsmtp.m4
*** sendmail.cf/mailer/portmixsmtp.m4	Thu Jan  1 01:00:00 1970
--- sendmail.cf.patched/mailer/portmixsmtp.m4	Mon Dec 18 04:42:49 2000
***************
*** 0 ****
--- 1,28 ----
+ 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.
+ #
+ #
+ define(`PORTMIX_MAILER_ARGS', `IPC $h')
+ ifdef(`PORTMIX_PORT',,`define(`PORTMIX_PORT',986)')dnl
+ ifdef(`_ARG_',`define(`PORTMIX_PORT',_ARG_)')dnl
+ ifdef(`_MAILER_uucp_',
+ 	`errprint(`*** MAILER(smtp) must appear before MAILER(uucp)')')dnl
+ POPDIVERT
+ ######################################################
+ ###   Proprietary port SMTP Mailer specification   ###
+ ######################################################
+ 
+ VERSIONID(`@(#)portmixsmtp.m4	0.01 (aoe) 12/18/2000')
+ 
+ `Mportmixsmtp'PORTMIX_PORT,		P=[IPC], F=CONCAT(mDFMuXa08, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=2040,
+ 		_OPTINS(`RELAY_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,
+ 		A=PORTMIX_MAILER_ARGS PORTMIX_PORT
+