svn commit: r261370 - in stable/9/contrib/sendmail: . cf cf/cf cf/domain cf/feature cf/hack cf/m4 cf/mailer cf/ostype cf/sh contrib doc/op editmap include/libmilter include/libsmdb include/sendmail...

Gregory Neil Shapiro gshapiro at FreeBSD.org
Sat Feb 1 23:37:11 UTC 2014 

Author: gshapiro
Date: Sat Feb  1 23:37:03 2014
New Revision: 261370
URL: http://svnweb.freebsd.org/changeset/base/261370

Log:
  MFC: Merge sendmail 8.14.8

Added:
  stable/9/contrib/sendmail/libsm/inet6_ntop.c
     - copied unchanged from r261194, head/contrib/sendmail/libsm/inet6_ntop.c
  stable/9/contrib/sendmail/libsm/t-inet6_ntop.c
     - copied unchanged from r261194, head/contrib/sendmail/libsm/t-inet6_ntop.c
Modified:
  stable/9/contrib/sendmail/LICENSE
  stable/9/contrib/sendmail/PGPKEYS
  stable/9/contrib/sendmail/README
  stable/9/contrib/sendmail/RELEASE_NOTES
  stable/9/contrib/sendmail/cf/README
  stable/9/contrib/sendmail/cf/cf/chez.cs.mc
  stable/9/contrib/sendmail/cf/cf/clientproto.mc
  stable/9/contrib/sendmail/cf/cf/cs-hpux10.mc
  stable/9/contrib/sendmail/cf/cf/cs-hpux9.mc
  stable/9/contrib/sendmail/cf/cf/cs-osf1.mc
  stable/9/contrib/sendmail/cf/cf/cs-solaris2.mc
  stable/9/contrib/sendmail/cf/cf/cs-sunos4.1.mc
  stable/9/contrib/sendmail/cf/cf/cs-ultrix4.mc
  stable/9/contrib/sendmail/cf/cf/generic-bsd4.4.mc
  stable/9/contrib/sendmail/cf/cf/generic-hpux10.mc
  stable/9/contrib/sendmail/cf/cf/generic-hpux9.mc
  stable/9/contrib/sendmail/cf/cf/generic-linux.mc
  stable/9/contrib/sendmail/cf/cf/generic-mpeix.mc
  stable/9/contrib/sendmail/cf/cf/generic-nextstep3.3.mc
  stable/9/contrib/sendmail/cf/cf/generic-osf1.mc
  stable/9/contrib/sendmail/cf/cf/generic-solaris.mc
  stable/9/contrib/sendmail/cf/cf/generic-sunos4.1.mc
  stable/9/contrib/sendmail/cf/cf/generic-ultrix4.mc
  stable/9/contrib/sendmail/cf/cf/huginn.cs.mc
  stable/9/contrib/sendmail/cf/cf/knecht.mc
  stable/9/contrib/sendmail/cf/cf/mail.cs.mc
  stable/9/contrib/sendmail/cf/cf/mail.eecs.mc
  stable/9/contrib/sendmail/cf/cf/mailspool.cs.mc
  stable/9/contrib/sendmail/cf/cf/python.cs.mc
  stable/9/contrib/sendmail/cf/cf/s2k-osf1.mc
  stable/9/contrib/sendmail/cf/cf/s2k-ultrix4.mc
  stable/9/contrib/sendmail/cf/cf/submit.cf
  stable/9/contrib/sendmail/cf/cf/submit.mc
  stable/9/contrib/sendmail/cf/cf/tcpproto.mc
  stable/9/contrib/sendmail/cf/cf/ucbarpa.mc
  stable/9/contrib/sendmail/cf/cf/ucbvax.mc
  stable/9/contrib/sendmail/cf/cf/uucpproto.mc
  stable/9/contrib/sendmail/cf/cf/vangogh.cs.mc
  stable/9/contrib/sendmail/cf/domain/Berkeley.EDU.m4
  stable/9/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4
  stable/9/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4
  stable/9/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4
  stable/9/contrib/sendmail/cf/domain/berkeley-only.m4
  stable/9/contrib/sendmail/cf/domain/generic.m4
  stable/9/contrib/sendmail/cf/feature/accept_unqualified_senders.m4
  stable/9/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4
  stable/9/contrib/sendmail/cf/feature/access_db.m4
  stable/9/contrib/sendmail/cf/feature/allmasquerade.m4
  stable/9/contrib/sendmail/cf/feature/always_add_domain.m4
  stable/9/contrib/sendmail/cf/feature/authinfo.m4
  stable/9/contrib/sendmail/cf/feature/badmx.m4
  stable/9/contrib/sendmail/cf/feature/bestmx_is_local.m4
  stable/9/contrib/sendmail/cf/feature/bitdomain.m4
  stable/9/contrib/sendmail/cf/feature/blacklist_recipients.m4
  stable/9/contrib/sendmail/cf/feature/block_bad_helo.m4
  stable/9/contrib/sendmail/cf/feature/compat_check.m4
  stable/9/contrib/sendmail/cf/feature/conncontrol.m4
  stable/9/contrib/sendmail/cf/feature/delay_checks.m4
  stable/9/contrib/sendmail/cf/feature/dnsbl.m4
  stable/9/contrib/sendmail/cf/feature/domaintable.m4
  stable/9/contrib/sendmail/cf/feature/enhdnsbl.m4
  stable/9/contrib/sendmail/cf/feature/generics_entire_domain.m4
  stable/9/contrib/sendmail/cf/feature/genericstable.m4
  stable/9/contrib/sendmail/cf/feature/greet_pause.m4
  stable/9/contrib/sendmail/cf/feature/ldap_routing.m4
  stable/9/contrib/sendmail/cf/feature/limited_masquerade.m4
  stable/9/contrib/sendmail/cf/feature/local_lmtp.m4
  stable/9/contrib/sendmail/cf/feature/local_no_masquerade.m4
  stable/9/contrib/sendmail/cf/feature/local_procmail.m4
  stable/9/contrib/sendmail/cf/feature/lookupdotdomain.m4
  stable/9/contrib/sendmail/cf/feature/loose_relay_check.m4
  stable/9/contrib/sendmail/cf/feature/mailertable.m4
  stable/9/contrib/sendmail/cf/feature/masquerade_entire_domain.m4
  stable/9/contrib/sendmail/cf/feature/masquerade_envelope.m4
  stable/9/contrib/sendmail/cf/feature/msp.m4
  stable/9/contrib/sendmail/cf/feature/mtamark.m4
  stable/9/contrib/sendmail/cf/feature/no_default_msa.m4
  stable/9/contrib/sendmail/cf/feature/nocanonify.m4
  stable/9/contrib/sendmail/cf/feature/notsticky.m4
  stable/9/contrib/sendmail/cf/feature/nouucp.m4
  stable/9/contrib/sendmail/cf/feature/nullclient.m4
  stable/9/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4
  stable/9/contrib/sendmail/cf/feature/preserve_luser_host.m4
  stable/9/contrib/sendmail/cf/feature/promiscuous_relay.m4
  stable/9/contrib/sendmail/cf/feature/queuegroup.m4
  stable/9/contrib/sendmail/cf/feature/ratecontrol.m4
  stable/9/contrib/sendmail/cf/feature/redirect.m4
  stable/9/contrib/sendmail/cf/feature/relay_based_on_MX.m4
  stable/9/contrib/sendmail/cf/feature/relay_entire_domain.m4
  stable/9/contrib/sendmail/cf/feature/relay_hosts_only.m4
  stable/9/contrib/sendmail/cf/feature/relay_local_from.m4
  stable/9/contrib/sendmail/cf/feature/relay_mail_from.m4
  stable/9/contrib/sendmail/cf/feature/require_rdns.m4
  stable/9/contrib/sendmail/cf/feature/smrsh.m4
  stable/9/contrib/sendmail/cf/feature/stickyhost.m4
  stable/9/contrib/sendmail/cf/feature/use_client_ptr.m4
  stable/9/contrib/sendmail/cf/feature/use_ct_file.m4
  stable/9/contrib/sendmail/cf/feature/use_cw_file.m4
  stable/9/contrib/sendmail/cf/feature/uucpdomain.m4
  stable/9/contrib/sendmail/cf/feature/virtuser_entire_domain.m4
  stable/9/contrib/sendmail/cf/feature/virtusertable.m4
  stable/9/contrib/sendmail/cf/hack/cssubdomain.m4
  stable/9/contrib/sendmail/cf/m4/cf.m4
  stable/9/contrib/sendmail/cf/m4/cfhead.m4
  stable/9/contrib/sendmail/cf/m4/proto.m4
  stable/9/contrib/sendmail/cf/m4/version.m4
  stable/9/contrib/sendmail/cf/mailer/cyrus.m4
  stable/9/contrib/sendmail/cf/mailer/cyrusv2.m4
  stable/9/contrib/sendmail/cf/mailer/fax.m4
  stable/9/contrib/sendmail/cf/mailer/local.m4
  stable/9/contrib/sendmail/cf/mailer/mail11.m4
  stable/9/contrib/sendmail/cf/mailer/phquery.m4
  stable/9/contrib/sendmail/cf/mailer/pop.m4
  stable/9/contrib/sendmail/cf/mailer/procmail.m4
  stable/9/contrib/sendmail/cf/mailer/qpage.m4
  stable/9/contrib/sendmail/cf/mailer/smtp.m4
  stable/9/contrib/sendmail/cf/mailer/usenet.m4
  stable/9/contrib/sendmail/cf/mailer/uucp.m4
  stable/9/contrib/sendmail/cf/ostype/a-ux.m4
  stable/9/contrib/sendmail/cf/ostype/aix3.m4
  stable/9/contrib/sendmail/cf/ostype/aix4.m4
  stable/9/contrib/sendmail/cf/ostype/aix5.m4
  stable/9/contrib/sendmail/cf/ostype/altos.m4
  stable/9/contrib/sendmail/cf/ostype/amdahl-uts.m4
  stable/9/contrib/sendmail/cf/ostype/bsd4.3.m4
  stable/9/contrib/sendmail/cf/ostype/bsd4.4.m4
  stable/9/contrib/sendmail/cf/ostype/bsdi.m4
  stable/9/contrib/sendmail/cf/ostype/bsdi1.0.m4
  stable/9/contrib/sendmail/cf/ostype/bsdi2.0.m4
  stable/9/contrib/sendmail/cf/ostype/darwin.m4
  stable/9/contrib/sendmail/cf/ostype/dgux.m4
  stable/9/contrib/sendmail/cf/ostype/domainos.m4
  stable/9/contrib/sendmail/cf/ostype/dragonfly.m4
  stable/9/contrib/sendmail/cf/ostype/dynix3.2.m4
  stable/9/contrib/sendmail/cf/ostype/freebsd4.m4
  stable/9/contrib/sendmail/cf/ostype/freebsd5.m4
  stable/9/contrib/sendmail/cf/ostype/freebsd6.m4
  stable/9/contrib/sendmail/cf/ostype/gnu.m4
  stable/9/contrib/sendmail/cf/ostype/hpux10.m4
  stable/9/contrib/sendmail/cf/ostype/hpux11.m4
  stable/9/contrib/sendmail/cf/ostype/hpux9.m4
  stable/9/contrib/sendmail/cf/ostype/irix4.m4
  stable/9/contrib/sendmail/cf/ostype/irix5.m4
  stable/9/contrib/sendmail/cf/ostype/irix6.m4
  stable/9/contrib/sendmail/cf/ostype/isc4.1.m4
  stable/9/contrib/sendmail/cf/ostype/linux.m4
  stable/9/contrib/sendmail/cf/ostype/maxion.m4
  stable/9/contrib/sendmail/cf/ostype/mklinux.m4
  stable/9/contrib/sendmail/cf/ostype/mpeix.m4
  stable/9/contrib/sendmail/cf/ostype/nextstep.m4
  stable/9/contrib/sendmail/cf/ostype/openbsd.m4
  stable/9/contrib/sendmail/cf/ostype/osf1.m4
  stable/9/contrib/sendmail/cf/ostype/powerux.m4
  stable/9/contrib/sendmail/cf/ostype/ptx2.m4
  stable/9/contrib/sendmail/cf/ostype/qnx.m4
  stable/9/contrib/sendmail/cf/ostype/riscos4.5.m4
  stable/9/contrib/sendmail/cf/ostype/sco-uw-2.1.m4
  stable/9/contrib/sendmail/cf/ostype/sco3.2.m4
  stable/9/contrib/sendmail/cf/ostype/sinix.m4
  stable/9/contrib/sendmail/cf/ostype/solaris11.m4
  stable/9/contrib/sendmail/cf/ostype/solaris2.m4
  stable/9/contrib/sendmail/cf/ostype/solaris2.ml.m4
  stable/9/contrib/sendmail/cf/ostype/solaris2.pre5.m4
  stable/9/contrib/sendmail/cf/ostype/solaris8.m4
  stable/9/contrib/sendmail/cf/ostype/sunos3.5.m4
  stable/9/contrib/sendmail/cf/ostype/sunos4.1.m4
  stable/9/contrib/sendmail/cf/ostype/svr4.m4
  stable/9/contrib/sendmail/cf/ostype/ultrix4.m4
  stable/9/contrib/sendmail/cf/ostype/unicos.m4
  stable/9/contrib/sendmail/cf/ostype/unicosmk.m4
  stable/9/contrib/sendmail/cf/ostype/unicosmp.m4
  stable/9/contrib/sendmail/cf/ostype/unixware7.m4
  stable/9/contrib/sendmail/cf/ostype/unknown.m4
  stable/9/contrib/sendmail/cf/ostype/uxpds.m4
  stable/9/contrib/sendmail/cf/sendmail.schema
  stable/9/contrib/sendmail/cf/sh/makeinfo.sh
  stable/9/contrib/sendmail/contrib/dnsblaccess.m4
  stable/9/contrib/sendmail/contrib/link_hash.sh
  stable/9/contrib/sendmail/contrib/qtool.8
  stable/9/contrib/sendmail/contrib/qtool.pl
  stable/9/contrib/sendmail/doc/op/op.me
  stable/9/contrib/sendmail/editmap/editmap.8
  stable/9/contrib/sendmail/editmap/editmap.c
  stable/9/contrib/sendmail/include/libmilter/mfapi.h
  stable/9/contrib/sendmail/include/libmilter/mfdef.h
  stable/9/contrib/sendmail/include/libmilter/milter.h
  stable/9/contrib/sendmail/include/libsmdb/smdb.h
  stable/9/contrib/sendmail/include/sendmail/mailstats.h
  stable/9/contrib/sendmail/include/sendmail/pathnames.h
  stable/9/contrib/sendmail/include/sendmail/sendmail.h
  stable/9/contrib/sendmail/include/sm/assert.h
  stable/9/contrib/sendmail/include/sm/bdb.h
  stable/9/contrib/sendmail/include/sm/bitops.h
  stable/9/contrib/sendmail/include/sm/cdefs.h
  stable/9/contrib/sendmail/include/sm/cf.h
  stable/9/contrib/sendmail/include/sm/clock.h
  stable/9/contrib/sendmail/include/sm/conf.h
  stable/9/contrib/sendmail/include/sm/config.h
  stable/9/contrib/sendmail/include/sm/debug.h
  stable/9/contrib/sendmail/include/sm/errstring.h
  stable/9/contrib/sendmail/include/sm/exc.h
  stable/9/contrib/sendmail/include/sm/fdset.h
  stable/9/contrib/sendmail/include/sm/gen.h
  stable/9/contrib/sendmail/include/sm/heap.h
  stable/9/contrib/sendmail/include/sm/io.h
  stable/9/contrib/sendmail/include/sm/ldap.h
  stable/9/contrib/sendmail/include/sm/limits.h
  stable/9/contrib/sendmail/include/sm/mbdb.h
  stable/9/contrib/sendmail/include/sm/misc.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_aix.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_dragonfly.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_freebsd.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_hp.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_irix.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_linux.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_mpeix.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_next.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_openbsd.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_openunix.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_osf1.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_qnx.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_sunos.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_ultrix.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_unicos.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_unicosmk.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_unicosmp.h
  stable/9/contrib/sendmail/include/sm/os/sm_os_unixware.h
  stable/9/contrib/sendmail/include/sm/path.h
  stable/9/contrib/sendmail/include/sm/rpool.h
  stable/9/contrib/sendmail/include/sm/sem.h
  stable/9/contrib/sendmail/include/sm/sendmail.h
  stable/9/contrib/sendmail/include/sm/setjmp.h
  stable/9/contrib/sendmail/include/sm/shm.h
  stable/9/contrib/sendmail/include/sm/signal.h
  stable/9/contrib/sendmail/include/sm/string.h
  stable/9/contrib/sendmail/include/sm/sysexits.h
  stable/9/contrib/sendmail/include/sm/test.h
  stable/9/contrib/sendmail/include/sm/time.h
  stable/9/contrib/sendmail/include/sm/types.h
  stable/9/contrib/sendmail/include/sm/varargs.h
  stable/9/contrib/sendmail/include/sm/xtrap.h
  stable/9/contrib/sendmail/libmilter/Makefile.m4
  stable/9/contrib/sendmail/libmilter/comm.c
  stable/9/contrib/sendmail/libmilter/docs/api.html
  stable/9/contrib/sendmail/libmilter/docs/design.html
  stable/9/contrib/sendmail/libmilter/docs/index.html
  stable/9/contrib/sendmail/libmilter/docs/installation.html
  stable/9/contrib/sendmail/libmilter/docs/other.html
  stable/9/contrib/sendmail/libmilter/docs/overview.html
  stable/9/contrib/sendmail/libmilter/docs/sample.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_addheader.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_addrcpt.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_addrcpt_par.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_chgfrom.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_chgheader.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_delrcpt.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_getpriv.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_getsymval.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_insheader.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_main.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_opensocket.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_progress.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_quarantine.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_register.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_replacebody.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_setbacklog.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_setconn.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_setdbg.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_setmlreply.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_setpriv.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_setreply.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_setsymlist.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_settimeout.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_stop.html
  stable/9/contrib/sendmail/libmilter/docs/smfi_version.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_abort.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_body.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_close.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_connect.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_data.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_envfrom.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_eoh.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_eom.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_header.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_helo.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_negotiate.html
  stable/9/contrib/sendmail/libmilter/docs/xxfi_unknown.html
  stable/9/contrib/sendmail/libmilter/engine.c
  stable/9/contrib/sendmail/libmilter/example.c
  stable/9/contrib/sendmail/libmilter/handler.c
  stable/9/contrib/sendmail/libmilter/libmilter.h
  stable/9/contrib/sendmail/libmilter/listener.c
  stable/9/contrib/sendmail/libmilter/main.c
  stable/9/contrib/sendmail/libmilter/monitor.c
  stable/9/contrib/sendmail/libmilter/signal.c
  stable/9/contrib/sendmail/libmilter/sm_gethost.c
  stable/9/contrib/sendmail/libmilter/smfi.c
  stable/9/contrib/sendmail/libmilter/worker.c
  stable/9/contrib/sendmail/libsm/Makefile.m4
  stable/9/contrib/sendmail/libsm/README
  stable/9/contrib/sendmail/libsm/assert.c
  stable/9/contrib/sendmail/libsm/b-strcmp.c
  stable/9/contrib/sendmail/libsm/b-strl.c
  stable/9/contrib/sendmail/libsm/cf.c
  stable/9/contrib/sendmail/libsm/clock.c
  stable/9/contrib/sendmail/libsm/clrerr.c
  stable/9/contrib/sendmail/libsm/config.c
  stable/9/contrib/sendmail/libsm/debug.c
  stable/9/contrib/sendmail/libsm/errstring.c
  stable/9/contrib/sendmail/libsm/exc.c
  stable/9/contrib/sendmail/libsm/fclose.c
  stable/9/contrib/sendmail/libsm/feof.c
  stable/9/contrib/sendmail/libsm/ferror.c
  stable/9/contrib/sendmail/libsm/fflush.c
  stable/9/contrib/sendmail/libsm/fget.c
  stable/9/contrib/sendmail/libsm/findfp.c
  stable/9/contrib/sendmail/libsm/flags.c
  stable/9/contrib/sendmail/libsm/fopen.c
  stable/9/contrib/sendmail/libsm/fpos.c
  stable/9/contrib/sendmail/libsm/fprintf.c
  stable/9/contrib/sendmail/libsm/fpurge.c
  stable/9/contrib/sendmail/libsm/fput.c
  stable/9/contrib/sendmail/libsm/fread.c
  stable/9/contrib/sendmail/libsm/fscanf.c
  stable/9/contrib/sendmail/libsm/fseek.c
  stable/9/contrib/sendmail/libsm/fvwrite.c
  stable/9/contrib/sendmail/libsm/fvwrite.h
  stable/9/contrib/sendmail/libsm/fwalk.c
  stable/9/contrib/sendmail/libsm/fwrite.c
  stable/9/contrib/sendmail/libsm/get.c
  stable/9/contrib/sendmail/libsm/glue.h
  stable/9/contrib/sendmail/libsm/heap.c
  stable/9/contrib/sendmail/libsm/ldap.c
  stable/9/contrib/sendmail/libsm/local.h
  stable/9/contrib/sendmail/libsm/makebuf.c
  stable/9/contrib/sendmail/libsm/match.c
  stable/9/contrib/sendmail/libsm/mbdb.c
  stable/9/contrib/sendmail/libsm/memstat.c
  stable/9/contrib/sendmail/libsm/mpeix.c
  stable/9/contrib/sendmail/libsm/niprop.c
  stable/9/contrib/sendmail/libsm/path.c
  stable/9/contrib/sendmail/libsm/put.c
  stable/9/contrib/sendmail/libsm/refill.c
  stable/9/contrib/sendmail/libsm/rewind.c
  stable/9/contrib/sendmail/libsm/rpool.c
  stable/9/contrib/sendmail/libsm/sem.c
  stable/9/contrib/sendmail/libsm/setvbuf.c
  stable/9/contrib/sendmail/libsm/shm.c
  stable/9/contrib/sendmail/libsm/signal.c
  stable/9/contrib/sendmail/libsm/smstdio.c
  stable/9/contrib/sendmail/libsm/snprintf.c
  stable/9/contrib/sendmail/libsm/sscanf.c
  stable/9/contrib/sendmail/libsm/stdio.c
  stable/9/contrib/sendmail/libsm/strcasecmp.c
  stable/9/contrib/sendmail/libsm/strdup.c
  stable/9/contrib/sendmail/libsm/strerror.c
  stable/9/contrib/sendmail/libsm/strexit.c
  stable/9/contrib/sendmail/libsm/string.c
  stable/9/contrib/sendmail/libsm/stringf.c
  stable/9/contrib/sendmail/libsm/strio.c
  stable/9/contrib/sendmail/libsm/strl.c
  stable/9/contrib/sendmail/libsm/strrevcmp.c
  stable/9/contrib/sendmail/libsm/strto.c
  stable/9/contrib/sendmail/libsm/syslogio.c
  stable/9/contrib/sendmail/libsm/t-cf.c
  stable/9/contrib/sendmail/libsm/t-event.c
  stable/9/contrib/sendmail/libsm/t-exc.c
  stable/9/contrib/sendmail/libsm/t-fget.c
  stable/9/contrib/sendmail/libsm/t-float.c
  stable/9/contrib/sendmail/libsm/t-fopen.c
  stable/9/contrib/sendmail/libsm/t-heap.c
  stable/9/contrib/sendmail/libsm/t-match.c
  stable/9/contrib/sendmail/libsm/t-memstat.c
  stable/9/contrib/sendmail/libsm/t-path.c
  stable/9/contrib/sendmail/libsm/t-qic.c
  stable/9/contrib/sendmail/libsm/t-rpool.c
  stable/9/contrib/sendmail/libsm/t-scanf.c
  stable/9/contrib/sendmail/libsm/t-sem.c
  stable/9/contrib/sendmail/libsm/t-shm.c
  stable/9/contrib/sendmail/libsm/t-smstdio.c
  stable/9/contrib/sendmail/libsm/t-string.c
  stable/9/contrib/sendmail/libsm/t-strio.c
  stable/9/contrib/sendmail/libsm/t-strl.c
  stable/9/contrib/sendmail/libsm/t-strrevcmp.c
  stable/9/contrib/sendmail/libsm/t-types.c
  stable/9/contrib/sendmail/libsm/test.c
  stable/9/contrib/sendmail/libsm/ungetc.c
  stable/9/contrib/sendmail/libsm/util.c
  stable/9/contrib/sendmail/libsm/vasprintf.c
  stable/9/contrib/sendmail/libsm/vfprintf.c
  stable/9/contrib/sendmail/libsm/vfscanf.c
  stable/9/contrib/sendmail/libsm/vprintf.c
  stable/9/contrib/sendmail/libsm/vsnprintf.c
  stable/9/contrib/sendmail/libsm/wbuf.c
  stable/9/contrib/sendmail/libsm/wsetup.c
  stable/9/contrib/sendmail/libsm/xtrap.c
  stable/9/contrib/sendmail/libsmdb/smdb.c
  stable/9/contrib/sendmail/libsmdb/smdb1.c
  stable/9/contrib/sendmail/libsmdb/smdb2.c
  stable/9/contrib/sendmail/libsmdb/smndbm.c
  stable/9/contrib/sendmail/libsmutil/cf.c
  stable/9/contrib/sendmail/libsmutil/debug.c
  stable/9/contrib/sendmail/libsmutil/err.c
  stable/9/contrib/sendmail/libsmutil/lockfile.c
  stable/9/contrib/sendmail/libsmutil/safefile.c
  stable/9/contrib/sendmail/libsmutil/snprintf.c
  stable/9/contrib/sendmail/mail.local/mail.local.8
  stable/9/contrib/sendmail/mail.local/mail.local.c
  stable/9/contrib/sendmail/mailstats/mailstats.8
  stable/9/contrib/sendmail/mailstats/mailstats.c
  stable/9/contrib/sendmail/makemap/makemap.8
  stable/9/contrib/sendmail/makemap/makemap.c
  stable/9/contrib/sendmail/praliases/praliases.8
  stable/9/contrib/sendmail/praliases/praliases.c
  stable/9/contrib/sendmail/rmail/rmail.8
  stable/9/contrib/sendmail/rmail/rmail.c
  stable/9/contrib/sendmail/smrsh/smrsh.8
  stable/9/contrib/sendmail/smrsh/smrsh.c
  stable/9/contrib/sendmail/src/Makefile.m4
  stable/9/contrib/sendmail/src/README
  stable/9/contrib/sendmail/src/SECURITY
  stable/9/contrib/sendmail/src/TRACEFLAGS
  stable/9/contrib/sendmail/src/TUNING
  stable/9/contrib/sendmail/src/alias.c
  stable/9/contrib/sendmail/src/aliases.5
  stable/9/contrib/sendmail/src/arpadate.c
  stable/9/contrib/sendmail/src/bf.c
  stable/9/contrib/sendmail/src/bf.h
  stable/9/contrib/sendmail/src/collect.c
  stable/9/contrib/sendmail/src/conf.c
  stable/9/contrib/sendmail/src/conf.h
  stable/9/contrib/sendmail/src/control.c
  stable/9/contrib/sendmail/src/convtime.c
  stable/9/contrib/sendmail/src/daemon.c
  stable/9/contrib/sendmail/src/daemon.h
  stable/9/contrib/sendmail/src/deliver.c
  stable/9/contrib/sendmail/src/domain.c
  stable/9/contrib/sendmail/src/envelope.c
  stable/9/contrib/sendmail/src/err.c
  stable/9/contrib/sendmail/src/headers.c
  stable/9/contrib/sendmail/src/helpfile
  stable/9/contrib/sendmail/src/macro.c
  stable/9/contrib/sendmail/src/mailq.1
  stable/9/contrib/sendmail/src/main.c
  stable/9/contrib/sendmail/src/map.c
  stable/9/contrib/sendmail/src/map.h
  stable/9/contrib/sendmail/src/mci.c
  stable/9/contrib/sendmail/src/milter.c
  stable/9/contrib/sendmail/src/mime.c
  stable/9/contrib/sendmail/src/newaliases.1
  stable/9/contrib/sendmail/src/parseaddr.c
  stable/9/contrib/sendmail/src/queue.c
  stable/9/contrib/sendmail/src/ratectrl.c
  stable/9/contrib/sendmail/src/readcf.c
  stable/9/contrib/sendmail/src/recipient.c
  stable/9/contrib/sendmail/src/sasl.c
  stable/9/contrib/sendmail/src/savemail.c
  stable/9/contrib/sendmail/src/sendmail.8
  stable/9/contrib/sendmail/src/sendmail.h
  stable/9/contrib/sendmail/src/sfsasl.c
  stable/9/contrib/sendmail/src/sfsasl.h
  stable/9/contrib/sendmail/src/shmticklib.c
  stable/9/contrib/sendmail/src/sm_resolve.c
  stable/9/contrib/sendmail/src/sm_resolve.h
  stable/9/contrib/sendmail/src/srvrsmtp.c
  stable/9/contrib/sendmail/src/stab.c
  stable/9/contrib/sendmail/src/stats.c
  stable/9/contrib/sendmail/src/statusd_shm.h
  stable/9/contrib/sendmail/src/sysexits.c
  stable/9/contrib/sendmail/src/timers.c
  stable/9/contrib/sendmail/src/timers.h
  stable/9/contrib/sendmail/src/tls.c
  stable/9/contrib/sendmail/src/trace.c
  stable/9/contrib/sendmail/src/udb.c
  stable/9/contrib/sendmail/src/usersmtp.c
  stable/9/contrib/sendmail/src/util.c
  stable/9/contrib/sendmail/src/version.c
  stable/9/contrib/sendmail/test/README
  stable/9/contrib/sendmail/test/t_dropgid.c
  stable/9/contrib/sendmail/test/t_exclopen.c
  stable/9/contrib/sendmail/test/t_pathconf.c
  stable/9/contrib/sendmail/test/t_seteuid.c
  stable/9/contrib/sendmail/test/t_setgid.c
  stable/9/contrib/sendmail/test/t_setreuid.c
  stable/9/contrib/sendmail/test/t_setuid.c
  stable/9/contrib/sendmail/test/t_snprintf.c
  stable/9/contrib/sendmail/vacation/vacation.1
  stable/9/contrib/sendmail/vacation/vacation.c
Directory Properties:
  stable/9/contrib/sendmail/   (props changed)

Modified: stable/9/contrib/sendmail/LICENSE
==============================================================================
--- stable/9/contrib/sendmail/LICENSE	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/LICENSE	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,9 +1,9 @@
 			     SENDMAIL LICENSE
 
-The following license terms and conditions apply, unless a redistribution 
-agreement or other license is obtained from Sendmail, Inc., 6475 Christie 
-Ave, Third Floor, Emeryville, CA 94608, USA, or by electronic mail at 
-license at sendmail.com.
+The following license terms and conditions apply, unless a redistribution
+agreement or other license is obtained from Proofpoint, Inc., 892
+Ross Street, Sunnyvale, CA, 94089, USA, or by electronic mail at
+sendmail-license at proofpoint.com.
 
 License Terms:
 
@@ -35,12 +35,12 @@ each of the following conditions is met:
    forth as paragraph 6 below, in the documentation and/or other materials
    provided with the distribution.  For the purposes of binary distribution
    the "Copyright Notice" refers to the following language:
-   "Copyright (c) 1998-2012 Sendmail, Inc.  All rights reserved."
+   "Copyright (c) 1998-2013 Proofpoint, Inc.  All rights reserved."
 
-4. Neither the name of Sendmail, Inc. nor the University of California nor
+4. Neither the name of Proofpoint, Inc. nor the University of California nor
    names of their contributors may be used to endorse or promote
    products derived from this software without specific prior written
-   permission.  The name "sendmail" is a trademark of Sendmail, Inc.
+   permission.  The name "sendmail" is a trademark of Proofpoint, Inc.
 
 5. All redistributions must comply with the conditions imposed by the
    University of California on certain embedded code, which copyright
@@ -78,4 +78,4 @@ each of the following conditions is met:
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-$Revision: 8.18 $, Last updated $Date: 2012/05/15 21:49:03 $, Document 139848.1	
+$Revision: 8.22 $, Last updated $Date: 2013/11/23 04:37:36 $, Document 139848.1	

Modified: stable/9/contrib/sendmail/PGPKEYS
==============================================================================
--- stable/9/contrib/sendmail/PGPKEYS	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/PGPKEYS	Sat Feb  1 23:37:03 2014	(r261370)
@@ -142,6 +142,184 @@ gpExpdV7qPrw9k01j5rod5PjZlG8zV0=
 -----END PGP PUBLIC KEY BLOCK-----
 
 Type Bits KeyID      Created    Expires    Algorithm       Use
+pub  2048 E2763A73   2014-01-02 -------    RSA             Sign & Encrypt
+fingerprint: 49F6 A8BE 8473 3949 5191  6F3B 61DE 11EC E276 3A73
+uid  Sendmail Signing Key/2014 <sendmail at Sendmail.ORG>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBFLGB58BCADFOlIYbhlAZ1URaoyfEHLgrm/bHeZufZO3jp2eeuDIkt4Z8csa
+eLkwomo/UtmUNXkn5rlUacRjyuhrDgVyuhYVeqq+tVbGccrjq4TM+5dkDTtQvLE5
+sEF3pbNYiPNJwPnqMfGTVmSouR9gGJGgttPubFDp/2jTpuFYZbcDSo+hoI9m5RAH
+aWe+MhFC0r7RZTv5pY1CG3GSODaoz2XIQ/dDJ4WKZFeEvDPQnpLY4t0cb0hVcxYO
+XVZZs1YmS2sEJirwJ+rpxivX4eyVKSO9Vjidh6cvmg2UdKfNoXXd+G9r0DR5FSo7
+hQHlOCrLFQQ5YJ3thGNl/fw7wVXVs34Nj7QfABEBAAG0MVNlbmRtYWlsIFNpZ25p
+bmcgS2V5LzIwMTQgPHNlbmRtYWlsQFNlbmRtYWlsLk9SRz6JATgEEwECACIFAlLG
+B58CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEGHeEezidjpzcRgIAJUZ
+4J6yvykcpgrIS8ZjDz1ab2sXtBx0ZjI5TxxnIwg9RQb5YkEk2/9tPo0ZwNUTDwz6
+eVENR++Bv3VXs32RnRiFNy1Mm2hhULh4ifgqT6Sy7zRk/kwiKuj6xkjAGZV71QmD
+ukFIpVaWAQwiFkDgqM3LbxZ1sisbvvA8M/zJq66uGg09Lu9CKcwjKDfy+UW1E8Ub
+SRzStTRrpvCH400q/Pwv3mOA43+H6Un4fZfCOcZeo22rSgT6D/FEY4LMdNnMLYuU
+zPkpx7cKvQa/AcMdjoGu38g364JxlDjxjE6M+XBym8Tx6j4res7o0W8TGW5g+rEv
+8X9i7uxdnEfYBlNAElGJARwEEAECAAYFAlLGCCIACgkQPWiyXVIHytM4QggAtF+W
+cXu8pJi3+OAoPmj+etgIuLhJ2GOp8qNK8yvwTEwiNwtenjennlW3ETHiCbtfQ0/T
+Z9rq5elhANsfp8LsXGoJ4ic6KJlDEhCrKa76jwEeECI74E60TpG0z64pHMmUhk7l
+eAUckCOvW7iHIBJVA7ZM8oII04ipPz6qJfJrUWkJbfZh8VV5DRp7zKAFT+URgSUc
+bdAbLjyC7AohynNVxir90UoT+wo06GPMDpeA5+fS0VZxKAwKv2P0mRZAK63yzEJz
++VK3GCHLPCWJvHoqx4KSutk2mIpZ406T/BJEphkGN0BHHiUmIr9qfX/87klA4i9K
+dHvzFr6qFBxD78XfuIkBHAQQAQIABgUCUsYIMAAKCRCOWun7zu70Ox9XB/9IP99U
+LScSFiDgoZQr3eMztpc2NLIS2bGO1iX7L+9VInPCob7Se53MpaFrDWNna53Xehwf
+NbaqsCQrG+OIMMwhRc0x3QCoXQUchA/JyAUIojfOyoFUZvlyZStRGOp2TBRrJnmb
+l3iWz3pStqqtvqag2d3YxowqGqUvlRzAXTFmgjcnfMcJrxb9f3n6Nf84QpxLHxB2
+MgOgxUCHXMtJ4WxFHAoINize+P/P99U9mpyn4ewTnSaFzcmemqoVT9yZUDYUYrap
+Bm4Xp0Y92IzoNpJgKBZLwXihisuI4alY/hBopo5L89vms2BwesQuh/4Tr6SELwFx
+zX63E++tz1TqHleWiQEcBBABAgAGBQJSxghsAAoJEDmkx32peISwXiIH/3suKuiQ
++KqQT10UdBoNg6m0XinG4IG2MghRRcdg2Q8ncCfMFJPsKQcPdjiUuuUIYtD7CE+O
+SwQ9N+6vZlsk3Zq2I8rPEwrUTmZ1gDcMK93MafNS32Xt7FmCY6wpMCkpmCLd9sjb
+7rj3uZdv/aI6Is76z6dKTfxJWBrbsUQNncASn5JyCXrYj9eeGP8gHX2KCkyPBF4u
+kHFPgdzYevCfZeP/+f/cdRwF6bAVaHiEZ2S/Vg6r3Z89vgd+wNKnNsljEiacYWuS
+zxouEn0eWQj9kC3bXJgqXH+HLrEY8NAQ5EQWjd8bzIhzCTA9MtL+N1b0Ep36gNiw
+YFB5b/b7KlbEPsSJARwEEAECAAYFAlLGCG8ACgkQYE378oVBCr4XDAf/auf1ljzq
+w2khe1L/1ANvtnugMP3sVJEPU2nDUnCK2+c0G5INnWc+c7DEFsaLHgcs2eN/w80a
+adInDn9lFw7DtcvZr3xL8q+b6j4i4jucjT5WVfYHbvc0xcKfpEjRge4oV3XR73SU
+ztdTWZZAlds4Xvh9pojjM90fBu5uDqfpRM3/vNTQ9EWvjcCGKusWRTwgdfF94cHN
+CeSe8PCo7sil6MtBBoujmLldCKZaLC08NLPX3yTGzNmuLyNZj9WgwPoK++XTxJly
+0j9EJsO28ZxmNCxsZyGA+1D1NuRurQ5FXIUHUfz6taP8FHSDt95cOiirmCMOAjT4
+UFtGAZFlbhzxroicBBABAgAGBQJSxghyAAoJEBKJbpunfyQpyFwD/1fp8qgb6zvn
+dIoTUoVWahI41Clt65cA2d1Ib1IbJJ4ms9cxNbFMTvbpPQ4AXOz1t7x2uS3YDmq5
+IxdWLr6YPSMkGmtpF2CD1HwSLcUwtKcIFrb8a0EN8Z+sRKu7yYg1vMxc7LmmOBUX
+x+j9fm/1OFGIHYnUEb9GeKFf91cK0VAIiJwEEAECAAYFAlLGCHUACgkQ2Krwyvaz
+BylxvAP+JuZQFPnk6l4SKHR/3ZWz56fOqZ6Qv8cgUCFY5AY9OdSE7aU2zVjZTjd1
+dJzVD7xc/9h8OW4HakfwcNnfAqdQ4eNdox5+uydXwU0CXJqU8QxGPaCSRkB1Thb5
+aMik5S01lzra4s6dF0iMC15I5v0PAznykJO9Sq4qhMLUCYTxFiqInAQQAQIABgUC
+UsYIeAAKCRCXQwEYcJO4QeDXBAC2hVO1j2dyQfkHr8eLAg/P+2qwZ1ZaG4jxItol
+vF91lfGNCaG3RWB9iPRIkz5B+lSoh4mSPGzJ3cFDgB53rRMpFUa0qhiUpVaNuPMY
+BSrkxYb00amJcFoXX+yE8soeu6BZ1cazg8GEkbjFbboqJMts2M39dD3c4ikbU4Op
+v9ag1YicBBABAgAGBQJSxgh7AAoJEB57s8ivlZYl1w0D/1AySnzhz5PKQo4Wh9QX
+qX+yMVBT3rgVO6EgR8ShsyMhZX8GwEEGPueDAh8MLGPqQZbjXq81QMeVk6TSUCQx
+XbhHxyGJJTVDxxJxFJZ7f8y05PjppTA6TL2aKYsZLkWUPEq5vKocE2VAmYldwvRS
+Ez4oNLWQD5dw05DPzVsJ2/49iJwEEAECAAYFAlLGCH4ACgkQcKAkTR75klFOVwP/
+fxmc8/ckreAjz7C3oarAHlWgAUHrJAAtG1MEgXN6FtzGZyzj7jsC4HI8A5nfwIWx
+A67jktU+6OpySrvIv3gRF1OAV168Q9IE8KszvnJgl6Gknf/KuiwpthWHpKztn9lF
+vealu7JKqI+3D5m33SqcWUg8SThfnGBoZOZGOnGrw4aInAQQAQIABgUCUsYIggAK
+CRDI1e0plfYXcf9oA/44QISEfFkqab+NIIgKW0SHqJDmI5QvVkcCO1Ct+/TkhGVO
+I68XKLMaNbzerl+BF26gU2IYCs0axa9hlkl8IJLokZhEPSRPDuSP2PG3GjaFsgnE
+5OK6aaVvjrEwaXe8v6rOYLmavnhZtOKg3H8pOl74KhFy1i/ZwM9oVfD4sfLhxIic
+BBABAgAGBQJSxgiFAAoJECGD4bE5bweJnYsEAJUX07KH5tI+OfmhQ+WCFuU2as+r
+I39oH1BB0W44fEhTj/yJFVqGSt4e3OBlP+SYqIM4DxPttxNtfQ9448rbzWLCdL0c
+KGOM2y9NT/LoDi1JQ/IVLYvuIyNnPViAF5JQ96NrmJH+3SaC6goK6HY6D2Oh3iyO
+1VGIhjOWyJr2+5ZjiJwEEAECAAYFAlLGCIwACgkQiWliuGeMCgNvkwQAjrrAjFyh
+pMepbLnRlxi2gcLqdmLcaub6AaRzCGDaYQxNFtBd+vLt0CtgY7sILahcMX6hLT53
+z4zCHoM93DM3jBoJehC0lH6/qd3ZAcW9vcSxk5ws97K6sbMXWIfqDgTUXaArOvKG
+GHE3vsgaLvAQ8nz0QaVkwgSIQfz+vBDjlM6InAQQAQIABgUCUsYIjwAKCRA4IttH
+zDdPLdPdBACoapJIpeNLyL9szztPzznIIxNbeuFJVfJRAE+pZ08y5YKVtGWArUcb
+GBXlZC5FrVTqV3ptIa72ALApIZ/M4Awnk3C3XyjMioKemv7I+cOj5DqRgkR/hsAF
+7YSAg718twgv8W2Ssy8i2vOlAoazxzN9bhVl5cSny5aeUnpLwK0WMYicBBABAgAG
+BQJSxgiSAAoJEJwcveLjXFY1DnoD/iFZ3zhzwIyWUl17pESa7H79tbcpmRyelH5M
+vH51sEBl27yRRKrsx4oayaumUT7W4JVoQTEYH54unN6fSBqKK9VyxzlA+v8PJjTG
+43MhtMG5lc5B1fKXFer1SpxuoR5h3Qdi4KSz3yh8K8g5KKtciPBx5kEXSTm6Nycu
+wkrCRYZLiJwEEAECAAYFAlLGCJcACgkQb1KT2KObplUY2QP/T2Zt5U2cl0usnYck
+wmMF3ZAzmcfhsxMkVgxxL9AkVJh9dHhLSYFWN6qhlkZwiW6UhhKoINfEpb8gOcBz
+rdb4u8yrWqIS726GqE/gnjYUf5CX22mOPWry8CPuWesRVpr832TzS5wxlBQzRMSS
+MVn39IPfIQnC6UQ3tPChruwwZh2InAQQAQIABgUCUsYImgAKCRDvWJZk1DLhnUOZ
+A/4qp/HD/+V1zpewexP4wL+bLA9Y6X+y2UWAh7eZCBQvXOhVAYcHxpmWgEfHuS+c
+iHYqCc7hz+1AiKV8AfVk6RX0k9Oli/IMbM3ijv3uIl+5JF765oXUAB3RWg6V+MlJ
+VhOVkBHXmBuhFnfVPeR5wNPpQ58d9LwsZtU11/Y76xzOUYicBBABAgAGBQJSxgie
+AAoJEMGcHSUS00YdL7MEAK/BtyOdoFA/8SBA+8EOG8nd5NSlGNZUBnTlpWqdphkR
+SLRrb1gLGr41ND2yvg/ElTti7m1D7+7VUnwCXM5wUO/RZuZx2uDYRCdDXj5WBhcg
+3wsHO3IPGGTbCukp9fLcthBQ46PDewlUVo6gPWhjWG/oC04XYeB3+f1f1zGAai+s
+iJwEEAECAAYFAlLGCKMACgkQwCnKQBb0zOm0CAQAhwRycBvn1kZB8cjBVw0a74Xu
+rjQrMVqmKM0LW/UzoVscB0W2KxZnvCLcw8N87CnnoSAO3MSnb/vPPhtnQxVe0IBA
+4yoe9acWJvmtIjw4JFDKioVPtEy+pcg5EDlyqNHj0He/Cmbirxbvy2XiGB/Y/lxu
+t1kad5ZYY/F5+X4hbyOIRgQQEQIABgUCUsYIsQAKCRAY9QOAJMJ4ArQbAJ414QQw
+60cTU3tVbBTT/l/sRysTXACg1ggZJszRL0P8Yy6WOryQ+r5Fg8yInAQQAQIABgUC
+UsYItwAKCRB8S2dtoA4VY3VvA/4i7bKzYElfVdTIj0IgHfd1zneeDjJoJP5tmf7F
+ElWIkENFVkKQ+tUBO2d/qMK8h+aj3brDcve5A1LUIsD5leE+igke8SjVF9/fwN4U
+8Mpqrvaw+CX7zGMnt6J075OD7mfU7hZkSpDhmOEMaEzaviei2rovBgaNv7tOlgrk
+J5nCo4icBBABAgAGBQJSxgi8AAoJENbgof5PvirdqiMEAKp3kzOjTetlDWAqK0BY
+u1kSTCLzO8jFIq620dT0BqorZ5nvxwKovog/FgrZ0LlywsjlwOGCAFo3aW7WTEyt
+7AwlQvUScAbPuZZcyZxKwQ9h2O6C2K2RPVIIHQusLRVcr+oGgqMoNjpSxOOxfJuj
+hT6fXHK5SayZSQEiZyeKme12iEYEEBECAAYFAlLGCMEACgkQIfnFvPdqm/UiSwCf
+d7Y5AR2m6vK5drJEaqbnv2tmXzcAoMhOg7eUPnYXr0Uwpo/61oHAPUTwiJwEEAEC
+AAYFAlLGCMcACgkQvdqP1j/qff1p6QP/TkEC+SJr4YUPy/0cLsSr9j0uPfvke+Qx
+U0RWynv4BMU05TKaBeZiVG25iFsGERW0drxiisPkcgMTq98wE7Q23Qtk+Fg8amDn
+6c0qEj0S4xd/DfHPhcznHjjkhiTftSmeMGHDMF8M5+ZBSlJyM6M1dtTlceU88ZYu
+Vv89Iz9nnmaJARwEEAECAAYFAlLGCMsACgkQvSdtLm/PqIVOHwgAvKy116ykGuvC
+LlxCVx+RfIjhaXa5OTtZhLc7YkXgaNr4UmcvNZtGwQLUEjDO4fVCF/7bSrryZ6Fr
+PZBNTKQRwbqH8UksQ+6hIbTBb5ZGcpKQPdIqEWjRjCoDah2EI1ln/JI8WY5NoA+V
+iuBd07msr49qevHgGEex5dX7NKOu6nuvefaasVDODNsiMp2QZmIlP7XJw7VKkiEx
+ov93DGImxD4o8r2Etzo1Lt5/soNzw26etSRFhoGHRdW2mlS5QFjebV+PNAxwvRrI
+a+5CjoA/vFfwxV+RZlvCLhzuEsBIzw6yenfNEd37bzqJq/7Jp7kQCe463o7ujG00
+k+ObGvq/YokBNwQTAQIAIQIbAwIeAQIXgAUCUsYZQgYLCQgHAwIGFQgCCQoLAxYC
+AQAKCRBh3hHs4nY6c/AjB/4rt17ezRHDxuDuS7+waPC9N6eXAQCbwdvkYd/v0bWe
+5jHgknMHR9OyGU9JKA4boJCtJNUvceAmzBtynqxy4hR6rmCwCmFW3AIK31iu3frz
+Zqq84XK791voKMMrvnux0OHqq2l2mYOSNXUeVNQeyDE6HbKXFUiWhRZl36UndVaE
+XhdDnKpxseMpYZsECW1+x1GxbUHFRx6tSiqzgLSNU/SsgwgttHwyqEdW0sr63r66
+7XSoMKvEgIhb36hJ7AIaFNWasLnnLOTOWR74IHnJ68FpordYm7lnmT5Vg/ju9y29
+JDwfOcNroCao6tTjyXcM6KmIssQPavTDLK/I6XgVr9QziQEcBBABAgAGBQJSxwGo
+AAoJEBCQryClqlvmWGgH/3CsqpTEKQW3FL/jughz3Yt8vmgqmlj7ZbTaVehIKRU4
+iL2XOlgAu3JISxCLPkdz79qcMSkZsOJtTGwA1yjvw/yx7oSznvW+jgNZ+fNOuT9w
+c6YKGSm0KbGGOFzjzoCsnIpoVEVuJwOS/zqGY349WR5dyaY4pEL42StfqLLtHO7I
+IJMKRcubedgZSogT9iwhin+sAGi60Wjq0pX240UQG0bgSB7n+/+7NT64u9yRyPwZ
+9B7Y11smlCw0jIlJD/P51rFgFciG/BdYyPfRHToe5CjOI+1sFxJYuOQI25o9/Syg
+7MMzp3ym2IEjIi3poBwfqZRlPDb5nHfu4vnSntPrwcWJAhwEEAEKAAYFAlLHCkcA
+CgkQ8Ar26sJF0gu9AA/9EXGIp5BwAYXNtlrI66nuPBwbPXHIVXocnlu2O2Kfzc9W
+Lvl3e5eSi61/TCOPNM4ParKUT9utxq9Sd01WO4GuepQFOiSfhMfKb7ORd0cKfWuM
+9shAKHsTbuAopO9R43jv1QnE+yL1xpM85JaGxI2pWf4XIpL32ZZ0s7s3x1fklNMG
+7ObB5dHr66M/V/GXZSx6rTBWhODm34W07HcXqDdwjVT8J/fo+3kkY9eXYuVfpl8t
+bVV6g8DK1zMkQiQBHpN0DCZUYB9WoJgCKFsTvVUElRyMY5sd2bkyAktA2df1EBSH
+kMXzqn3py+n3YzRY3VpsNUV3WkDRfU9SIdJd8g88muZeL9namSr/3eHTjdaMoCyL
+GyyUpy5LrD56k3QWeXDWVynU9lXuxaiJDntP6A81d6vaIBtm8AFVihtJFoufHot4
+crmPqKtH+MQ9G6xwN5Az9okXKg7HGG9ZD82s4D/X5plN0OH5pMeYLrOQI+oEhjn2
+uK67y0Zl/eqoQcnVDy9PFrynuSVBC5/BTGNbebQrTDrIsQo0m0LMYO3mUzMBA7SO
+j9iA0vmXxIGsPzf8lRu26odcahKWswRE492MZiTJlul+HWYmun1b0XJz/4YDWL5l
++kUVLnl53o2aHVlTkmPEMg/mwufkxTayJrtl3kL6oun7e6jUjaCRao9eLFZWtGWI
+mwQQAQIABgUCUscuQwAKCRBfHshviAyeVYy3A/ig6XKOyU+RC/+4HtFxvL5osE9T
+w/9JlY78umlNish7CJo0Sbka4nFipd6Iw/xcYiAQ06TuS5NDwdmcuoZoUpDAqbLP
+r/pWpBy9IAUIzAa1UnyvYTDBp2NS3nxcWnzEpXk/dDyYMKX0gUsrDjE9ZTpsKeMq
+70Kgq7lPtH6EfekmiQIcBBABAgAGBQJSx12BAAoJEG8PnXiV/JnUMB4QAJu5xu2F
+ej5QSiIXlZw8LD/uzx3UEQocQy4eGPtwTxeYogt9FtbdblRYb6Y8qc+Uyk6fLBxB
+E+gclk3I2GnKnpqjtdG5utJnAbvynqfgoE81tuC7hjxKYPaqGTJotwX4IsV8MZZN
+D6hduw1hxCWsnckS/6jnVrJxThKqlKEnnFqLE14W1WTnKIqh+dXYdnqn+MEMXZhK
+7z68TLteASvT1S9i91Kof7gmfe6hL2wbzPAtils6+gJr0ZfxxUTDzFL5hFulypzX
+GgW4VemsZLRz6hhevPiWSRIGCG6xO/boGPnlOQt6Fv2mReBiuIidSia9S1G7G8KF
+36ya41RrS6157dgAeSGGUOAzGkvamqlJozlTo1dl8eD08x5G2cHKL/H2oviaE1hr
+CgZypLuhPisW2Yd99WMndMV+jrbkNXcORVdYQO/T0aP0vA7zNrTv96shcpNoT3q7
+nWDuGvxjOic8sSX/MxR7F+4UqZO9eZGziPnKDrv1fp17CWWmBBvJHWhFXfPF9nPu
+vej6q3Eq49pq3oDuIbtV+1GaMKLre1fzMzqyz1hQ+esByOKi/cAH+QzkbXUC4KyL
+q45O/UfNR3hYZms36n05729qF+hW6tO2ZGd43k7kSVgYHj55BIr942dzWMvg7BUY
+aWQqYiahIfDxfBXz+WvW5gihr8In24L6dYXDiEYEEBECAAYFAlLHhgUACgkQCaei
+StHlggeAhgCdG3L6GRFUho2VtUOx+uaGsvj7vvUAoIahAtf5fb8mSfzceNr5neXd
+FgnpiEYEEBECAAYFAlLINaMACgkQxLEHmIV5aiNLbgCgoJYeWDcldLWYU1MH+uvo
+Ll4ThV0An0PZNMtCd6gwGGhGd9iMRqHzVpQQiQIcBBABCAAGBQJSyoYqAAoJEIvo
+ebAocx4cLO8P/jO9GWX7PSI+k21P4NIjSc6VHYv8MMa5H36NWe8wnoUSUr8FKvUh
+uLOI1bDamRZBdCWSuMf3gcWNiwVi3FKJqH/tAdjD4Mc9NaL2DJwKgHH3IlSwV+jF
+Hz9OvkEzfo8RT0zVkbt61tMhrNCK7wRw/QrjchixNyJH9YIifV2huppwbgHl5YH7
+7wYJ1thhIgyw8kSSKHFi3yJzy2q1qZ6hwcCCkUw2K9VgYV+0Y2plSkkc/OsoBUsU
+JSNdCOSAzpwAmFuSpT3YVlwWnknJu0vV5BPUL/dJTeYLbhyxfXWiWDiF1tiBWHMS
+KvUJowbW9r2CZ/FQx4V5hXKMfCupuDJpmCvIiDfRPGfuD4+4vJ+EhAp2TEyRL3HX
+7BAlQ/95TiS22AhcFqn7Zl+9tS1vUcj4xLmakPQ2REKgBqiUrVDu+GvzZY0A6V6k
+J6LNc+ncaLX+B9lYqqMQmxLyRK3JySpHWgC2ZPoyje8GR4ksf0IlvrRufFMj1Qyt
+/a8Jc1Z2mXJR3PRrsL7EBDdp7Xl8BGqnjShZgIvKPDt6+nCIqsv13OjWaUBl+CKg
+eZcDMt2nZGUfu4KJD6ktJ9nvthrocWxL4dRhFM7s/R9ad1IdmySoBH9SnUuMgM8e
+bKQ5FnVqNiy1Z+JrsigPvb671KJ1MA9n2rPaBhY1cNYaaavIbKkBzDDTuQENBFLG
+B58BCACe6UEcbxy5q6rIPXZikT4WCg6bw3AtdT/MeLUCmxWhhP9g+T3i0t7zU6bu
+Zcw1uFxjnKsMEeDBHwdI0Bg9r5EVtp77GVf1EGrveKvISURlktkBtcezTVRfukEM
+mTXBt/3vMGLg+AadFGZTU2ciKdO22AxLBZWVgz0ICoO/ljtvEFokrrzwDoF6ySHX
+3Taiq/aMqI/RjIRXXMq6u+/oVC6droj10eZRYXGPMl7og5MRSUU8waV2fYgtfLmw
+BtVEFbd0LPO5L1BNgIIMBx1X/QzMeBTldT+XcDSYh9ELfMJoynnVz0smZbeQ2PZ/
+DhGsVsLvJc+cx5cDnBKsPrejCTXBABEBAAGJAR8EGAECAAkFAlLGB58CGwwACgkQ
+Yd4R7OJ2OnMzXAf+LxzrPplcEyIDKOoGW21320AwH5NqjInqj49K0gGhOL/xNkfs
+C1wsiFFESdN7eL1+aDdk68CF1ClJagDKkH3U5o5PiPSjCsGBoGpdI6f7mRlxbUT2
+jQv0QC9Qav+9t4QcyBC/1BvwO1e7fgrpFLvBrXJpj4utHBP/R3WUo04kAp+sPbVk
+tOEByvXAHkDDe0KAG2G9A0dLqF7kfydoSaioFmoJlkAu7LCwFLFbFZ3JRFAaYEQO
+DfwkgPDDOA6k9Y1o+nbk/TgyEj7PtpzkiWh0aK5BRI8mjA/s0XNZKpuY1sghyASo
+XvRQkAGPLcqS1D4k+kW3MLWpxjbSwGi8FCdsfg==
+=d3FT
+-----END PGP PUBLIC KEY BLOCK-----
+
+Type Bits KeyID      Created    Expires    Algorithm       Use
 pub  2048 5207CAD3   2013-01-02 -------    RSA             Sign & Encrypt
 fingerprint: B87D 4569 86F1 9484 07E5  CCB4 3D68 B25D 5207 CAD3
 uid  Sendmail Signing Key/2013 <sendmail at Sendmail.ORG>
@@ -2435,4 +2613,4 @@ DnF3FZZEzV7oqPwC2jzv/1dD6GFhtgy0cnyoPGUJ
 =nES8
 -----END PGP PUBLIC KEY BLOCK-----
 
-$Revision: 8.43 $, Last updated $Date: 2013/01/18 17:40:21 $
+$Revision: 8.46 $, Last updated $Date: 2014/01/18 00:20:24 $

Modified: stable/9/contrib/sendmail/README
==============================================================================
--- stable/9/contrib/sendmail/README	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/README	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,7 +1,7 @@
 
 			SENDMAIL RELEASE 8
 
-This directory has the latest sendmail(TM) software from Sendmail, Inc.
+This directory has the latest sendmail(TM) software from Proofpoint, Inc.
 
 Report any bugs to sendmail-bugs-YYYY at support.sendmail.org
 where YYYY is the current year, e.g., 2005.
@@ -37,7 +37,7 @@ the latest updates.
 
 4. Read cf/README.
 
-Sendmail is a trademark of Sendmail, Inc.
+Sendmail is a trademark of Proofpoint, Inc.
 US Patent Numbers 6865671, 6986037.
 
 +-----------------------+
@@ -465,4 +465,4 @@ sendmail	Source for the sendmail program
 test		Some test scripts (currently only for compilation aids).
 vacation	Source for the vacation program.  NOT PART OF SENDMAIL!
 
-$Revision: 8.95 $, Last updated $Date: 2009/04/10 17:49:18 $
+$Revision: 8.96 $, Last updated $Date: 2013/11/22 20:51:01 $

Modified: stable/9/contrib/sendmail/RELEASE_NOTES
==============================================================================
--- stable/9/contrib/sendmail/RELEASE_NOTES	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/RELEASE_NOTES	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,11 +1,58 @@
 			SENDMAIL RELEASE NOTES
-      $Id: RELEASE_NOTES,v 8.2024 2013/04/19 15:01:58 ca Exp $
+      $Id: RELEASE_NOTES,v 8.2043 2014/01/23 20:27:19 ca Exp $
 
 
 This listing shows the version of the sendmail binary, the version
 of the sendmail configuration files, the date of release, and a
 summary of the changes in that release.
 
+8.14.8/8.14.8	2014/01/26
+	Properly initialize all OpenSSL algorithms for versions before
+		OpenSSL 0.9.8o. Without this SHA2 algorithms may not
+		work properly, causing for example failures for certs
+		that use sha256WithRSAEncryption as signature algorithm.
+	When looking up hostnames, ensure only to return those records
+		for the requested family (AF_INET or AF_INET6).
+		On system that have NEEDSGETIPNODE and NETINET6
+		this may have failed and cause delivery problems.
+		Problem noted by Kees Cook.
+	A new mailer flag '!' is available to suppress an MH hack
+		that drops an explicit From: header if it is the
+		same as what sendmail would generate.
+	Add an FFR (for future release) to use uncompressed IPv6 addresses,
+		i.e., they will not contain "::".  For example, instead
+		of ::1 it will be 0:0:0:0:0:0:0:1.  This means that
+		configuration data (including maps, files, classes,
+		custom ruleset, etc) have to use the same format.
+		This will be turned on in 8.15.  It can be enabled in 8.14
+		by compiling with:
+		APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_IPV6_FULL')
+		in your devtools/Site/site.config.m4 file.
+	Add an additional case for the WorkAroundBrokenAAAA check when
+		dealing with broken nameservers by ignoring SERVFAIL
+		errors returned on T_AAAA (IPv6) lookups at delivery time.
+		Problem noted by Pavel Timofeev of OCS.
+	If available, pass LOGIN_SETCPUMASK and LOGIN_SETLOGINCLASS to
+		setusercontext() on deliveries as a different user.
+		Patch from Edward Tomasz Napierala from FreeBSD.
+	Avoid compiler warnings from a change in Cyrus-SASL 2.1.25.
+		Patch from Hajimu UMEMOTO from FreeBSD.
+	Add support for DHParameters 2048-bit primes.
+	CONFIG: Accept IPv6 literals when evaluating the HELO/EHLO argument
+		in FEATURE(`block_bad_helo').  Suggested by Andrey Chernov.
+	LIBSMDB: Add a missing check for malloc() in libsmdb/smndbm.c.
+		Patch from Bill Parker.
+	LIBSMDB: Fix minor memory leaks in libsmdb/ if allocations
+		fail.  Patch from John Beck of Oracle.
+	Portability:
+		Add support for Darwin 12.x and 13.x (Mac OS X 10.8 and 10.9).
+		On Linux use socklen_t as the type for the 3rd argument
+		for getsockname/getpeername if the glibc version is at
+		least 2.1.
+	Added Files:
+		devtools/OS/Darwin.12.x
+		devtools/OS/Darwin.13.x
+
 8.14.7/8.14.7	2013/04/21
 	Drop support for IPv4-mapped IPv6 addresses to prevent the MTA
 		from using a mapped address over a legitimate IPv6 address
@@ -80,9 +127,12 @@ summary of the changes in that release.
 		the reason for the failure in a single log line.  Suggested
 		by James Carey of Boeing.
 	Portability:
-		Add support for Darwin 11.x and 12.x (Mac OS X 10.7 and 10.8).
+		Add support for Darwin 11.x (Mac OS X 10.7).
 		Add support for SunOS 5.12 (aka Solaris 12). Patch from
 		John Beck of Oracle.
+	Added Files:
+		devtools/OS/Darwin.11.x
+		devtools/OS/SunOS.5.12
 
 8.14.5/8.14.5	2011/05/17
 	Do not cache SMTP extensions across connections as the cache

Modified: stable/9/contrib/sendmail/cf/README
==============================================================================
--- stable/9/contrib/sendmail/cf/README	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/README	Sat Feb  1 23:37:03 2014	(r261370)
@@ -77,7 +77,7 @@ Let's examine a typical .mc file:
 
 	divert(-1)
 	#
-	# Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers.
+	# Copyright (c) 1998-2005 Proofpoint, Inc. and its suppliers.
 	#	All rights reserved.
 	# Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 	# Copyright (c) 1988, 1993
@@ -1402,6 +1402,9 @@ preserve_local_plus_detail
 		that address will be looked up in the alias file; user+* and
 		user will not be looked up).  Only use if the local
 		delivery agent in use supports +detail addressing.
+		Moreover, this will most likely not work if the 'w' flag
+		for the local mailer is set as the entire local address
+		including +detail is passed to the user lookup function.
 
 compat_check	Enable ruleset check_compat to look up pairs of addresses
 		with the Compat: tag --	Compat:sender<@>recipient -- in the
@@ -4701,4 +4704,4 @@ M4 DIVERSIONS
    8	DNS based blacklists
    9	special local rulesets (1 and 2)
 
-$Revision: 8.728 $, Last updated $Date: 2012/09/07 16:29:13 $
+$Revision: 8.730 $, Last updated $Date: 2014/01/16 15:55:51 $

Modified: stable/9/contrib/sendmail/cf/cf/chez.cs.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/chez.cs.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/chez.cs.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -24,7 +24,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: chez.cs.mc,v 8.14 1999/02/07 07:25:59 gshapiro Exp $')
+VERSIONID(`$Id: chez.cs.mc,v 8.15 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(bsd4.4)dnl
 DOMAIN(CS.Berkeley.EDU)dnl
 define(`LOCAL_RELAY', vangogh.CS.Berkeley.EDU)dnl

Modified: stable/9/contrib/sendmail/cf/cf/clientproto.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/clientproto.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/clientproto.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: clientproto.mc,v 8.16 2000/03/21 21:05:26 ca Exp $')
+VERSIONID(`$Id: clientproto.mc,v 8.17 2013/11/22 20:51:08 ca Exp $')
 
 OSTYPE(unknown)
 FEATURE(nullclient, mailhost.$m)

Modified: stable/9/contrib/sendmail/cf/cf/cs-hpux10.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/cs-hpux10.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/cs-hpux10.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: cs-hpux10.mc,v 8.13 1999/02/07 07:26:00 gshapiro Exp $')
+VERSIONID(`$Id: cs-hpux10.mc,v 8.14 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(hpux10)dnl
 DOMAIN(CS.Berkeley.EDU)dnl
 define(`MAIL_HUB', mailspool.CS.Berkeley.EDU)dnl

Modified: stable/9/contrib/sendmail/cf/cf/cs-hpux9.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/cs-hpux9.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/cs-hpux9.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: cs-hpux9.mc,v 8.14 1999/02/07 07:26:00 gshapiro Exp $')
+VERSIONID(`$Id: cs-hpux9.mc,v 8.15 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(hpux9)dnl
 DOMAIN(CS.Berkeley.EDU)dnl
 define(`MAIL_HUB', mailspool.CS.Berkeley.EDU)dnl

Modified: stable/9/contrib/sendmail/cf/cf/cs-osf1.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/cs-osf1.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/cs-osf1.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: cs-osf1.mc,v 8.13 1999/02/07 07:26:00 gshapiro Exp $')
+VERSIONID(`$Id: cs-osf1.mc,v 8.14 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(osf1)dnl
 DOMAIN(CS.Berkeley.EDU)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/cs-solaris2.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/cs-solaris2.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/cs-solaris2.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: cs-solaris2.mc,v 8.12 1999/02/07 07:26:00 gshapiro Exp $')
+VERSIONID(`$Id: cs-solaris2.mc,v 8.13 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(solaris2)dnl
 DOMAIN(CS.Berkeley.EDU)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/cs-sunos4.1.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/cs-sunos4.1.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/cs-sunos4.1.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: cs-sunos4.1.mc,v 8.13 1999/02/07 07:26:01 gshapiro Exp $')
+VERSIONID(`$Id: cs-sunos4.1.mc,v 8.14 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(sunos4.1)dnl
 DOMAIN(CS.Berkeley.EDU)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/cs-ultrix4.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/cs-ultrix4.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/cs-ultrix4.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: cs-ultrix4.mc,v 8.13 1999/02/07 07:26:02 gshapiro Exp $')
+VERSIONID(`$Id: cs-ultrix4.mc,v 8.14 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(ultrix4)dnl
 DOMAIN(CS.Berkeley.EDU)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/generic-bsd4.4.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/generic-bsd4.4.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/generic-bsd4.4.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -21,7 +21,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: generic-bsd4.4.mc,v 8.10 1999/02/07 07:26:02 gshapiro Exp $')
+VERSIONID(`$Id: generic-bsd4.4.mc,v 8.11 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(bsd4.4)dnl
 DOMAIN(generic)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/generic-hpux10.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/generic-hpux10.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/generic-hpux10.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: generic-hpux10.mc,v 8.13 2001/05/29 17:29:52 ca Exp $')
+VERSIONID(`$Id: generic-hpux10.mc,v 8.14 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(hpux10)dnl
 DOMAIN(generic)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/generic-hpux9.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/generic-hpux9.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/generic-hpux9.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: generic-hpux9.mc,v 8.11 1999/02/07 07:26:02 gshapiro Exp $')
+VERSIONID(`$Id: generic-hpux9.mc,v 8.12 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(hpux9)dnl
 DOMAIN(generic)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/generic-linux.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/generic-linux.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/generic-linux.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: generic-linux.mc,v 8.1 1999/09/24 22:48:05 gshapiro Exp $')
+VERSIONID(`$Id: generic-linux.mc,v 8.2 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(linux)dnl
 DOMAIN(generic)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/generic-mpeix.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/generic-mpeix.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/generic-mpeix.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -17,7 +17,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: generic-mpeix.mc,v 8.1 2001/12/13 23:56:37 gshapiro Exp $')
+VERSIONID(`$Id: generic-mpeix.mc,v 8.2 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(mpeix)dnl
 DOMAIN(generic)dnl
 define(`confFORWARD_PATH', `$z/.forward')dnl

Modified: stable/9/contrib/sendmail/cf/cf/generic-nextstep3.3.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/generic-nextstep3.3.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/generic-nextstep3.3.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: generic-nextstep3.3.mc,v 8.10 1999/02/07 07:26:02 gshapiro Exp $')
+VERSIONID(`$Id: generic-nextstep3.3.mc,v 8.11 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(nextstep)dnl
 DOMAIN(generic)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/generic-osf1.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/generic-osf1.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/generic-osf1.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: generic-osf1.mc,v 8.11 1999/02/07 07:26:02 gshapiro Exp $')
+VERSIONID(`$Id: generic-osf1.mc,v 8.12 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(osf1)dnl
 DOMAIN(generic)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/generic-solaris.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/generic-solaris.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/generic-solaris.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999, 2001 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -22,7 +22,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: generic-solaris.mc,v 8.13 2001/06/27 21:46:30 gshapiro Exp $')
+VERSIONID(`$Id: generic-solaris.mc,v 8.14 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(solaris2)dnl
 DOMAIN(generic)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/generic-sunos4.1.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/generic-sunos4.1.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/generic-sunos4.1.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: generic-sunos4.1.mc,v 8.11 1999/02/07 07:26:03 gshapiro Exp $')
+VERSIONID(`$Id: generic-sunos4.1.mc,v 8.12 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(sunos4.1)dnl
 DOMAIN(generic)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/generic-ultrix4.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/generic-ultrix4.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/generic-ultrix4.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -20,7 +20,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: generic-ultrix4.mc,v 8.11 1999/02/07 07:26:03 gshapiro Exp $')
+VERSIONID(`$Id: generic-ultrix4.mc,v 8.12 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(ultrix4)dnl
 DOMAIN(generic)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/huginn.cs.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/huginn.cs.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/huginn.cs.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -22,7 +22,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: huginn.cs.mc,v 8.15 1999/02/07 07:26:03 gshapiro Exp $')
+VERSIONID(`$Id: huginn.cs.mc,v 8.16 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(hpux9)dnl
 DOMAIN(CS.Berkeley.EDU)dnl
 MASQUERADE_AS(CS.Berkeley.EDU)dnl

Modified: stable/9/contrib/sendmail/cf/cf/knecht.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/knecht.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/knecht.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2001, 2004, 2005 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2001, 2004, 2005 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -19,7 +19,7 @@ divert(-1)
 #
 
 divert(0)
-VERSIONID(`$Id: knecht.mc,v 8.62 2006/09/27 19:48:59 eric Exp $')
+VERSIONID(`$Id: knecht.mc,v 8.63 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(bsd4.4)
 DOMAIN(generic)
 

Modified: stable/9/contrib/sendmail/cf/cf/mail.cs.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/mail.cs.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/mail.cs.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -22,7 +22,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: mail.cs.mc,v 8.18 1999/02/07 07:26:04 gshapiro Exp $')
+VERSIONID(`$Id: mail.cs.mc,v 8.19 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(ultrix4)dnl
 DOMAIN(Berkeley.EDU)dnl
 MASQUERADE_AS(CS.Berkeley.EDU)dnl

Modified: stable/9/contrib/sendmail/cf/cf/mail.eecs.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/mail.eecs.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/mail.eecs.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -22,7 +22,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: mail.eecs.mc,v 8.18 1999/02/07 07:26:04 gshapiro Exp $')
+VERSIONID(`$Id: mail.eecs.mc,v 8.19 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(ultrix4)dnl
 DOMAIN(EECS.Berkeley.EDU)dnl
 MASQUERADE_AS(EECS.Berkeley.EDU)dnl

Modified: stable/9/contrib/sendmail/cf/cf/mailspool.cs.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/mailspool.cs.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/mailspool.cs.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -24,7 +24,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: mailspool.cs.mc,v 8.12 1999/02/07 07:26:04 gshapiro Exp $')
+VERSIONID(`$Id: mailspool.cs.mc,v 8.13 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(sunos4.1)dnl
 DOMAIN(CS.Berkeley.EDU)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/python.cs.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/python.cs.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/python.cs.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -24,7 +24,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: python.cs.mc,v 8.12 1999/02/07 07:26:04 gshapiro Exp $')
+VERSIONID(`$Id: python.cs.mc,v 8.13 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(bsd4.4)dnl
 DOMAIN(CS.Berkeley.EDU)dnl
 define(`LOCAL_RELAY', vangogh.CS.Berkeley.EDU)dnl

Modified: stable/9/contrib/sendmail/cf/cf/s2k-osf1.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/s2k-osf1.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/s2k-osf1.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: s2k-osf1.mc,v 8.13 1999/02/07 07:26:04 gshapiro Exp $')
+VERSIONID(`$Id: s2k-osf1.mc,v 8.14 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(osf1)dnl
 DOMAIN(S2K.Berkeley.EDU)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/s2k-ultrix4.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/s2k-ultrix4.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/s2k-ultrix4.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -23,7 +23,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: s2k-ultrix4.mc,v 8.13 1999/02/07 07:26:04 gshapiro Exp $')
+VERSIONID(`$Id: s2k-ultrix4.mc,v 8.14 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(ultrix4)dnl
 DOMAIN(S2K.Berkeley.EDU)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/submit.cf
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/submit.cf	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/submit.cf	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998-2004, 2009, 2010 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2004, 2009, 2010 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983, 1995 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -16,8 +16,8 @@
 #####
 #####		SENDMAIL CONFIGURATION FILE
 #####
-##### built by ca at wiz.smi.sendmail.com on Fri Apr 19 08:04:44 PDT 2013
-##### in /extra/home/ca/sm-8.14.7/OpenSource/sendmail-8.14.7/cf/cf
+##### built by ca at lab.smi.sendmail.com on Thu Jan 23 12:29:13 PST 2014
+##### in /home/ca/sm8-rel/sm-8.14.8/OpenSource/sendmail-8.14.8/cf/cf
 ##### using ../ as configuration include directory
 #####
 ######################################################################
@@ -27,15 +27,15 @@
 ######################################################################
 ######################################################################
 
-#####  $Id: cfhead.m4,v 8.121 2010/01/07 18:20:19 ca Exp $  #####
-#####  $Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $  #####
-#####  $Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca Exp $  #####
-#####  $Id: msp.m4,v 1.33 2004/02/09 22:32:38 ca Exp $  #####
+#####  $Id: cfhead.m4,v 8.122 2013/11/22 20:51:13 ca Exp $  #####
+#####  $Id: cf.m4,v 8.33 2013/11/22 20:51:13 ca Exp $  #####
+#####  $Id: submit.mc,v 8.15 2013/11/22 20:51:08 ca Exp $  #####
+#####  $Id: msp.m4,v 1.34 2013/11/22 20:51:11 ca Exp $  #####
 
-#####  $Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $  #####
+#####  $Id: no_default_msa.m4,v 8.3 2013/11/22 20:51:11 ca Exp $  #####
 
 
-#####  $Id: proto.m4,v 8.760 2012/09/07 16:30:15 ca Exp $  #####
+#####  $Id: proto.m4,v 8.762 2013/11/22 20:51:13 ca Exp $  #####
 
 # level 10 config file format
 V10/Berkeley
@@ -114,7 +114,7 @@ D{MTAHost}[127.0.0.1]
 
 
 # Configuration version number
-DZ8.14.7/Submit
+DZ8.14.8/Submit
 
 
 ###############
@@ -1299,7 +1299,7 @@ R$*			$#relay $@ ${MTAHost} $: $1 < @ $j
 ###   Local and Program Mailer specification   ###
 ##################################################
 
-#####  $Id: local.m4,v 8.59 2004/11/23 00:37:25 ca Exp $  #####
+#####  $Id: local.m4,v 8.60 2013/11/22 20:51:14 ca Exp $  #####
 
 #
 #  Envelope sender rewriting
@@ -1351,7 +1351,7 @@ Mprog,		P=[IPC], F=lmDFMuXk5, S=EnvFromL
 ###   SMTP Mailer specification   ###
 #####################################
 
-#####  $Id: smtp.m4,v 8.65 2006/07/12 21:08:10 ca Exp $  #####
+#####  $Id: smtp.m4,v 8.66 2013/11/22 20:51:14 ca Exp $  #####
 
 #
 #  common sender and masquerading recipient rewriting
@@ -1442,7 +1442,7 @@ Mrelay,		P=[IPC], F=mDFMuXa8k, S=EnvFrom
 ### submit.mc ###
 # divert(-1)
 # #
-# # Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers.
+# # Copyright (c) 2001-2003 Proofpoint, Inc. and its suppliers.
 # #	All rights reserved.
 # #
 # # By using this file, you agree to the terms and conditions set
@@ -1457,7 +1457,7 @@ Mrelay,		P=[IPC], F=mDFMuXa8k, S=EnvFrom
 # #
 # 
 # divert(0)dnl
-# VERSIONID(`$Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca Exp $')
+# VERSIONID(`$Id: submit.mc,v 8.15 2013/11/22 20:51:08 ca Exp $')
 # define(`confCF_VERSION', `Submit')dnl
 # define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
 # define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet

Modified: stable/9/contrib/sendmail/cf/cf/submit.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/submit.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/submit.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001-2003 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -15,7 +15,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca Exp $')
+VERSIONID(`$Id: submit.mc,v 8.15 2013/11/22 20:51:08 ca Exp $')
 define(`confCF_VERSION', `Submit')dnl
 define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
 define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet

Modified: stable/9/contrib/sendmail/cf/cf/tcpproto.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/tcpproto.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/tcpproto.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2000 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -26,7 +26,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: tcpproto.mc,v 8.14 2000/08/03 15:26:50 ca Exp $')
+VERSIONID(`$Id: tcpproto.mc,v 8.15 2013/11/22 20:51:08 ca Exp $')
 OSTYPE(`unknown')
 FEATURE(`nouucp', `reject')
 MAILER(`local')

Modified: stable/9/contrib/sendmail/cf/cf/ucbarpa.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/ucbarpa.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/ucbarpa.mc	Sat Feb  1 23:37:03 2014	(r261370)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998, 1999 Proofpoint, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -21,7 +21,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: ucbarpa.mc,v 8.12 1999/02/07 07:26:05 gshapiro Exp $')
+VERSIONID(`$Id: ucbarpa.mc,v 8.13 2013/11/22 20:51:08 ca Exp $')
 DOMAIN(CS.Berkeley.EDU)dnl
 OSTYPE(bsd4.4)dnl
 MAILER(local)dnl

Modified: stable/9/contrib/sendmail/cf/cf/ucbvax.mc
==============================================================================
--- stable/9/contrib/sendmail/cf/cf/ucbvax.mc	Sat Feb  1 22:38:34 2014	(r261369)
+++ stable/9/contrib/sendmail/cf/cf/ucbvax.mc	Sat Feb  1 23:37:03 2014	(r261370)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-stable-9 mailing list