sync

18 files changed, 108 insertions, 0 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 3a9583d0f41..6a25098bbd4 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1535,6 +1535,10 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/libmilter
+./usr/libdata/perl5/site_perl/alpha-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 157d1a50cf8..b0991652de3 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1561,6 +1561,10 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/libmilter
+./usr/libdata/perl5/site_perl/amd64-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index f0a368502ec..7edd24bff87 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -1595,6 +1595,10 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/libmilter
+./usr/libdata/perl5/site_perl/arm-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index cc42d817730..27c4d8a4b98 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1510,6 +1510,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/libmilter
+./usr/libdata/perl5/site_perl/m68k-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index ae0dc1d170b..f2998fed52b 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1537,6 +1537,10 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/libmilter
+./usr/libdata/perl5/site_perl/hppa-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 730cb171379..f0336375ce9 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1552,6 +1552,10 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/libmilter
+./usr/libdata/perl5/site_perl/i386-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 5de3f12de1d..cf9144bb0e5 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1404,6 +1404,10 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/libmilter
+./usr/libdata/perl5/site_perl/m88k-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 33765f754ae..af4ee5654fa 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1474,6 +1474,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/libmilter
+./usr/libdata/perl5/site_perl/m68k-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index cc4f49c6ef5..713d1398803 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1481,6 +1481,10 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/libmilter
+./usr/libdata/perl5/site_perl/powerpc-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index bd649550f1f..ecb6ec4b5e8 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1473,6 +1473,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/libmilter
+./usr/libdata/perl5/site_perl/m68k-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 4eb0e5f284c..40560d84e3e 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1403,6 +1403,10 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/libmilter
+./usr/libdata/perl5/site_perl/m88k-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 8aba85a97fe..7c62a76e5ab 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1474,6 +1474,10 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/libmilter
+./usr/libdata/perl5/site_perl/powerpc-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 4a0537fc0a9..0486d3b66fb 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -969,6 +969,10 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/libmilter
+./usr/libdata/perl5/site_perl/sparc-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 769cd5c735b..e915ef9e74e 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -980,6 +980,10 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/libmilter
+./usr/libdata/perl5/site_perl/sparc64-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 9cb9686d3a7..d23c0b2055a 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -907,6 +907,10 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/langinfo.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/libgen.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/libmilter
+./usr/libdata/perl5/site_perl/vax-openbsd/libmilter/mfapi.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/libmilter/mfdef.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/libmilter/milter.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/limits.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/link.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/link_aout.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 8c6c02dfc96..50840770c5f 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -514,6 +514,8 @@
 ./usr/lib/apache/include/xml
 ./usr/lib/apache/modules
 ./usr/lib/gcc-lib
+./usr/lib/libmilter.a
+./usr/lib/libmilter_p.a
 ./usr/libdata
 ./usr/libdata/cvs
 ./usr/libdata/cvs/contrib
@@ -2198,6 +2200,7 @@
 ./usr/share/pf/spamd
 ./usr/share/sendmail
 ./usr/share/sendmail/README
+./usr/share/sendmail/README.milter
 ./usr/share/sendmail/TUNING
 ./usr/share/sendmail/cf
 ./usr/share/sendmail/cf/Makefile
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 43ae20f2a68..fae31044285 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -869,6 +869,10 @@
 ./usr/include/kvm.h
 ./usr/include/langinfo.h
 ./usr/include/libgen.h
+./usr/include/libmilter
+./usr/include/libmilter/mfapi.h
+./usr/include/libmilter/mfdef.h
+./usr/include/libmilter/milter.h
 ./usr/include/limits.h
 ./usr/include/link.h
 ./usr/include/link_aout.h
diff --git a/distrib/sets/lists/misc/mi b/distrib/sets/lists/misc/mi
index 93f24ebf0fc..38d25d125a8 100644
--- a/distrib/sets/lists/misc/mi
+++ b/distrib/sets/lists/misc/mi
@@ -45,6 +45,47 @@
 ./usr/share/doc/html/lynx_help/lynx-dev.html
 ./usr/share/doc/html/lynx_help/lynx_help_main.html
 ./usr/share/doc/html/lynx_help/lynx_url_support.html
+./usr/share/doc/html/milter
+./usr/share/doc/html/milter/api.html
+./usr/share/doc/html/milter/design.html
+./usr/share/doc/html/milter/figure1.jpg
+./usr/share/doc/html/milter/figure2.jpg
+./usr/share/doc/html/milter/index.html
+./usr/share/doc/html/milter/installation.html
+./usr/share/doc/html/milter/other.html
+./usr/share/doc/html/milter/overview.html
+./usr/share/doc/html/milter/sample.html
+./usr/share/doc/html/milter/smfi_addheader.html
+./usr/share/doc/html/milter/smfi_addrcpt.html
+./usr/share/doc/html/milter/smfi_chgheader.html
+./usr/share/doc/html/milter/smfi_delrcpt.html
+./usr/share/doc/html/milter/smfi_getpriv.html
+./usr/share/doc/html/milter/smfi_getsymval.html
+./usr/share/doc/html/milter/smfi_insheader.html
+./usr/share/doc/html/milter/smfi_main.html
+./usr/share/doc/html/milter/smfi_opensocket.html
+./usr/share/doc/html/milter/smfi_progress.html
+./usr/share/doc/html/milter/smfi_quarantine.html
+./usr/share/doc/html/milter/smfi_register.html
+./usr/share/doc/html/milter/smfi_replacebody.html
+./usr/share/doc/html/milter/smfi_setbacklog.html
+./usr/share/doc/html/milter/smfi_setconn.html
+./usr/share/doc/html/milter/smfi_setdbg.html
+./usr/share/doc/html/milter/smfi_setmlreply.html
+./usr/share/doc/html/milter/smfi_setpriv.html
+./usr/share/doc/html/milter/smfi_setreply.html
+./usr/share/doc/html/milter/smfi_settimeout.html
+./usr/share/doc/html/milter/smfi_stop.html
+./usr/share/doc/html/milter/xxfi_abort.html
+./usr/share/doc/html/milter/xxfi_body.html
+./usr/share/doc/html/milter/xxfi_close.html
+./usr/share/doc/html/milter/xxfi_connect.html
+./usr/share/doc/html/milter/xxfi_envfrom.html
+./usr/share/doc/html/milter/xxfi_envrcpt.html
+./usr/share/doc/html/milter/xxfi_eoh.html
+./usr/share/doc/html/milter/xxfi_eom.html
+./usr/share/doc/html/milter/xxfi_header.html
+./usr/share/doc/html/milter/xxfi_helo.html
 ./usr/share/doc/psd
 ./usr/share/doc/psd/00.contents
 ./usr/share/doc/psd/01.cacm