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