Module Name:	src
Committed By:	atatat
Date:		Tue Mar 15 02:14:20 UTC 2005

Modified Files:
	src/gnu/dist/sendmail: KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES
	src/gnu/dist/sendmail/cf: README
	src/gnu/dist/sendmail/cf/cf: Makefile generic-bsd4.4.cf
	    generic-hpux10.cf generic-hpux9.cf generic-linux.cf
	    generic-nextstep3.3.cf generic-osf1.cf generic-sunos4.1.cf
	    generic-ultrix4.cf knecht.mc
	src/gnu/dist/sendmail/cf/feature: access_db.m4 bitdomain.m4 dnsbl.m4
	    domaintable.m4 genericstable.m4 ldap_routing.m4 local_lmtp.m4
	    local_procmail.m4 mailertable.m4 uucpdomain.m4 virtusertable.m4
	src/gnu/dist/sendmail/cf/m4: cfhead.m4 proto.m4 version.m4
	src/gnu/dist/sendmail/cf/mailer: local.m4 usenet.m4
	src/gnu/dist/sendmail/contrib: buildvirtuser cidrexpand qtool.8
	    qtool.pl
	src/gnu/dist/sendmail/devtools: README
	src/gnu/dist/sendmail/devtools/M4: header.m4
	src/gnu/dist/sendmail/devtools/OS: AIX.4.3 Darwin FreeBSD HP-UX.10.x
	    HP-UX.11.x NetBSD UNICOS UnixWare.5.i386
	src/gnu/dist/sendmail/devtools/bin: Build configure.sh
	src/gnu/dist/sendmail/doc/op: Makefile op.me
	src/gnu/dist/sendmail/include/libmilter: mfapi.h milter.h
	src/gnu/dist/sendmail/include/libsmdb: smdb.h
	src/gnu/dist/sendmail/include/sendmail: mailstats.h sendmail.h
	src/gnu/dist/sendmail/include/sm: cdefs.h conf.h
	src/gnu/dist/sendmail/libmilter: README comm.c engine.c handler.c
	    libmilter.h listener.c main.c signal.c sm_gethost.c smfi.c
	src/gnu/dist/sendmail/libsmdb: smdb.c smdb1.c smdb2.c
	src/gnu/dist/sendmail/libsmutil: lockfile.c safefile.c
	src/gnu/dist/sendmail/mail.local: README mail.local.0 mail.local.8
	    mail.local.c
	src/gnu/dist/sendmail/mailstats: mailstats.8 mailstats.c
	src/gnu/dist/sendmail/makemap: makemap.8 makemap.c
	src/gnu/dist/sendmail/sendmail: README TRACEFLAGS alias.c aliases.0
	    aliases.5 collect.c conf.c conf.h control.c daemon.c deliver.c
	    domain.c envelope.c err.c headers.c helpfile macro.c mailq.0
	    mailq.1 main.c map.c mci.c milter.c mime.c parseaddr.c queue.c
	    readcf.c recipient.c savemail.c sendmail.0 sendmail.8 sendmail.h
	    sfsasl.c srvrsmtp.c stab.c stats.c sysexits.c trace.c udb.c
	    usersmtp.c util.c version.c
	src/gnu/dist/sendmail/smrsh: README smrsh.8 smrsh.c
	src/gnu/dist/sendmail/vacation: vacation.0 vacation.1 vacation.c
	src/gnu/usr.sbin/sendmail/cf/feature: Makefile.inc
	src/gnu/usr.sbin/sendmail/cf/ostype: Makefile.inc
	src/gnu/usr.sbin/sendmail/libsm: Makefile
	src/gnu/usr.sbin/sendmail/sendmail: Makefile
Removed Files:
	src/gnu/dist/sendmail/cf/feature: nodns.m4
	src/gnu/dist/sendmail/contrib: oldbind.compat.c
	src/gnu/dist/sendmail/devtools/OS: CRAYT3E.2.0.x CRAYTS.10.0.x
	    Darwin.7.0
	src/gnu/dist/sendmail/libsm: vsprintf.c vsscanf.c

Log Message:
resolve conflicts, pull 8.13.3 to head, make it build


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/KNOWNBUGS \
    src/gnu/dist/sendmail/LICENSE src/gnu/dist/sendmail/README
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/PGPKEYS
cvs rdiff -r1.13 -r1.14 src/gnu/dist/sendmail/RELEASE_NOTES
cvs rdiff -r1.12 -r1.13 src/gnu/dist/sendmail/cf/README
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/cf/cf/Makefile \
    src/gnu/dist/sendmail/cf/cf/generic-nextstep3.3.cf
cvs rdiff -r1.13 -r1.14 src/gnu/dist/sendmail/cf/cf/generic-bsd4.4.cf \
    src/gnu/dist/sendmail/cf/cf/generic-hpux10.cf \
    src/gnu/dist/sendmail/cf/cf/generic-hpux9.cf \
    src/gnu/dist/sendmail/cf/cf/generic-linux.cf \
    src/gnu/dist/sendmail/cf/cf/generic-osf1.cf \
    src/gnu/dist/sendmail/cf/cf/generic-sunos4.1.cf \
    src/gnu/dist/sendmail/cf/cf/generic-ultrix4.cf
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/cf/cf/knecht.mc
cvs rdiff -r1.4 -r1.5 src/gnu/dist/sendmail/cf/feature/access_db.m4 \
    src/gnu/dist/sendmail/cf/feature/bitdomain.m4 \
    src/gnu/dist/sendmail/cf/feature/domaintable.m4 \
    src/gnu/dist/sendmail/cf/feature/genericstable.m4 \
    src/gnu/dist/sendmail/cf/feature/local_lmtp.m4 \
    src/gnu/dist/sendmail/cf/feature/local_procmail.m4 \
    src/gnu/dist/sendmail/cf/feature/mailertable.m4 \
    src/gnu/dist/sendmail/cf/feature/uucpdomain.m4 \
    src/gnu/dist/sendmail/cf/feature/virtusertable.m4
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/cf/feature/dnsbl.m4 \
    src/gnu/dist/sendmail/cf/feature/ldap_routing.m4
cvs rdiff -r1.3 -r0 src/gnu/dist/sendmail/cf/feature/nodns.m4
cvs rdiff -r1.9 -r1.10 src/gnu/dist/sendmail/cf/m4/cfhead.m4
cvs rdiff -r1.10 -r1.11 src/gnu/dist/sendmail/cf/m4/proto.m4
cvs rdiff -r1.13 -r1.14 src/gnu/dist/sendmail/cf/m4/version.m4
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/cf/mailer/local.m4
cvs rdiff -r1.4 -r1.5 src/gnu/dist/sendmail/cf/mailer/usenet.m4
cvs rdiff -r1.4 -r1.5 src/gnu/dist/sendmail/contrib/buildvirtuser
cvs rdiff -r1.2 -r1.3 src/gnu/dist/sendmail/contrib/cidrexpand
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/sendmail/contrib/oldbind.compat.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/contrib/qtool.8
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/contrib/qtool.pl
cvs rdiff -r1.8 -r1.9 src/gnu/dist/sendmail/devtools/README
cvs rdiff -r1.4 -r1.5 src/gnu/dist/sendmail/devtools/M4/header.m4
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/devtools/OS/AIX.4.3 \
    src/gnu/dist/sendmail/devtools/OS/Darwin \
    src/gnu/dist/sendmail/devtools/OS/HP-UX.10.x \
    src/gnu/dist/sendmail/devtools/OS/NetBSD
cvs rdiff -r1.4 -r0 src/gnu/dist/sendmail/devtools/OS/CRAYT3E.2.0.x \
    src/gnu/dist/sendmail/devtools/OS/CRAYTS.10.0.x
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/sendmail/devtools/OS/Darwin.7.0
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/devtools/OS/FreeBSD \
    src/gnu/dist/sendmail/devtools/OS/HP-UX.11.x
cvs rdiff -r1.4 -r1.5 src/gnu/dist/sendmail/devtools/OS/UNICOS \
    src/gnu/dist/sendmail/devtools/OS/UnixWare.5.i386
cvs rdiff -r1.10 -r1.11 src/gnu/dist/sendmail/devtools/bin/Build
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/devtools/bin/configure.sh
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/doc/op/Makefile
cvs rdiff -r1.12 -r1.13 src/gnu/dist/sendmail/doc/op/op.me
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/include/libmilter/mfapi.h
cvs rdiff -r1.9 -r1.10 src/gnu/dist/sendmail/include/libmilter/milter.h
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/include/libsmdb/smdb.h
cvs rdiff -r1.4 -r1.5 src/gnu/dist/sendmail/include/sendmail/mailstats.h
cvs rdiff -r1.8 -r1.9 src/gnu/dist/sendmail/include/sendmail/sendmail.h
cvs rdiff -r1.4 -r1.5 src/gnu/dist/sendmail/include/sm/cdefs.h
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/include/sm/conf.h
cvs rdiff -r1.10 -r1.11 src/gnu/dist/sendmail/libmilter/README \
    src/gnu/dist/sendmail/libmilter/engine.c \
    src/gnu/dist/sendmail/libmilter/libmilter.h
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/libmilter/comm.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/libmilter/handler.c
cvs rdiff -r1.11 -r1.12 src/gnu/dist/sendmail/libmilter/listener.c
cvs rdiff -r1.8 -r1.9 src/gnu/dist/sendmail/libmilter/main.c \
    src/gnu/dist/sendmail/libmilter/signal.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/sendmail/libmilter/sm_gethost.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/libmilter/smfi.c
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/sendmail/libsm/vsprintf.c \
    src/gnu/dist/sendmail/libsm/vsscanf.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/libsmdb/smdb.c \
    src/gnu/dist/sendmail/libsmdb/smdb1.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/sendmail/libsmdb/smdb2.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/libsmutil/lockfile.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/libsmutil/safefile.c
cvs rdiff -r1.3 -r1.4 src/gnu/dist/sendmail/mail.local/README
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/mail.local/mail.local.0
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/mail.local/mail.local.8
cvs rdiff -r1.10 -r1.11 src/gnu/dist/sendmail/mail.local/mail.local.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/mailstats/mailstats.8
cvs rdiff -r1.8 -r1.9 src/gnu/dist/sendmail/mailstats/mailstats.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/makemap/makemap.8 \
    src/gnu/dist/sendmail/makemap/makemap.c
cvs rdiff -r1.12 -r1.13 src/gnu/dist/sendmail/sendmail/README \
    src/gnu/dist/sendmail/sendmail/deliver.c \
    src/gnu/dist/sendmail/sendmail/headers.c \
    src/gnu/dist/sendmail/sendmail/map.c \
    src/gnu/dist/sendmail/sendmail/milter.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/sendmail/TRACEFLAGS \
    src/gnu/dist/sendmail/sendmail/mime.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/sendmail/sendmail/alias.c \
    src/gnu/dist/sendmail/sendmail/helpfile \
    src/gnu/dist/sendmail/sendmail/macro.c \
    src/gnu/dist/sendmail/sendmail/savemail.c \
    src/gnu/dist/sendmail/sendmail/stab.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/sendmail/aliases.0 \
    src/gnu/dist/sendmail/sendmail/aliases.5 \
    src/gnu/dist/sendmail/sendmail/mailq.1 \
    src/gnu/dist/sendmail/sendmail/sendmail.0 \
    src/gnu/dist/sendmail/sendmail/stats.c \
    src/gnu/dist/sendmail/sendmail/trace.c \
    src/gnu/dist/sendmail/sendmail/udb.c
cvs rdiff -r1.11 -r1.12 src/gnu/dist/sendmail/sendmail/collect.c \
    src/gnu/dist/sendmail/sendmail/conf.h \
    src/gnu/dist/sendmail/sendmail/queue.c \
    src/gnu/dist/sendmail/sendmail/sfsasl.c \
    src/gnu/dist/sendmail/sendmail/srvrsmtp.c \
    src/gnu/dist/sendmail/sendmail/usersmtp.c \
    src/gnu/dist/sendmail/sendmail/util.c
cvs rdiff -r1.18 -r1.19 src/gnu/dist/sendmail/sendmail/conf.c
cvs rdiff -r1.10 -r1.11 src/gnu/dist/sendmail/sendmail/control.c \
    src/gnu/dist/sendmail/sendmail/domain.c \
    src/gnu/dist/sendmail/sendmail/recipient.c
cvs rdiff -r1.13 -r1.14 src/gnu/dist/sendmail/sendmail/daemon.c \
    src/gnu/dist/sendmail/sendmail/main.c
cvs rdiff -r1.8 -r1.9 src/gnu/dist/sendmail/sendmail/envelope.c \
    src/gnu/dist/sendmail/sendmail/err.c \
    src/gnu/dist/sendmail/sendmail/mailq.0 \
    src/gnu/dist/sendmail/sendmail/mci.c \
    src/gnu/dist/sendmail/sendmail/sendmail.8
cvs rdiff -r1.14 -r1.15 src/gnu/dist/sendmail/sendmail/parseaddr.c \
    src/gnu/dist/sendmail/sendmail/readcf.c \
    src/gnu/dist/sendmail/sendmail/sendmail.h
cvs rdiff -r1.4 -r1.5 src/gnu/dist/sendmail/sendmail/sysexits.c
cvs rdiff -r1.15 -r1.16 src/gnu/dist/sendmail/sendmail/version.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/smrsh/README
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/smrsh/smrsh.8
cvs rdiff -r1.12 -r1.13 src/gnu/dist/sendmail/smrsh/smrsh.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/vacation/vacation.0 \
    src/gnu/dist/sendmail/vacation/vacation.1
cvs rdiff -r1.9 -r1.10 src/gnu/dist/sendmail/vacation/vacation.c
cvs rdiff -r1.1 -r1.2 src/gnu/usr.sbin/sendmail/cf/feature/Makefile.inc
cvs rdiff -r1.1 -r1.2 src/gnu/usr.sbin/sendmail/cf/ostype/Makefile.inc
cvs rdiff -r1.4 -r1.5 src/gnu/usr.sbin/sendmail/libsm/Makefile
cvs rdiff -r1.11 -r1.12 src/gnu/usr.sbin/sendmail/sendmail/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.