move

293 files changed, 0 insertions, 205 deletions

diff --git a/contrib/CVS/Entries b/contrib/CVS/Entries
deleted file mode 100644
index 82a9d101..00000000
--- a/contrib/CVS/Entries
+++ /dev/null
@@ -1,4 +0,0 @@
-D/lib////
-D/libexec////
-/Makefile/-1.50/Mon Mar  5 11:15:41 2012//
-/Makefile.inc/-1.2/Sun Jan 28 19:34:26 2001//
diff --git a/contrib/CVS/Repository b/contrib/CVS/Repository
deleted file mode 100644
index 31ac4266..00000000
--- a/contrib/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-src/libexec
diff --git a/contrib/CVS/Root b/contrib/CVS/Root
deleted file mode 100644
index 7040dfb5..00000000
--- a/contrib/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-anoncvs@anoncvs.spacehopper.org:/cvs
diff --git a/contrib/libexec/CVS/Entries b/contrib/libexec/CVS/Entries
deleted file mode 100644
index cc09ac02..00000000
--- a/contrib/libexec/CVS/Entries
+++ /dev/null
@@ -1,3 +0,0 @@
-D/mail.local////
-/Makefile/1.50/Mon Jul  9 11:41:26 2012//
-/Makefile.inc/1.2/Mon Jul  9 11:41:26 2012//
diff --git a/contrib/libexec/CVS/Repository b/contrib/libexec/CVS/Repository
deleted file mode 100644
index 31ac4266..00000000
--- a/contrib/libexec/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-src/libexec
diff --git a/contrib/libexec/CVS/Root b/contrib/libexec/CVS/Root
deleted file mode 100644
index 7040dfb5..00000000
--- a/contrib/libexec/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-anoncvs@anoncvs.spacehopper.org:/cvs
diff --git a/contrib/libexec/mail.local/CVS/Entries b/contrib/libexec/mail.local/CVS/Entries
deleted file mode 100644
index d4e29f84..00000000
--- a/contrib/libexec/mail.local/CVS/Entries
+++ /dev/null
@@ -1,7 +0,0 @@
-/Makefile/1.3/Mon Jul  9 11:41:26 2012//
-/pathnames.h/1.5/Mon Jul  9 11:36:35 2012//
-/locking.c/1.12/Result of merge+Fri Jan 31 21:09:44 2020//
-/mail.local.8/1.31/Fri Jan 31 21:09:45 2020//
-/mail.local.c/1.36/Result of merge+Fri Jan 31 21:09:45 2020//
-/mail.local.h/1.5/Thu Jan  9 23:34:12 2020//
-D
diff --git a/contrib/libexec/mail.local/CVS/Repository b/contrib/libexec/mail.local/CVS/Repository
deleted file mode 100644
index ca372a1e..00000000
--- a/contrib/libexec/mail.local/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-src/libexec/mail.local
diff --git a/contrib/libexec/mail.local/CVS/Root b/contrib/libexec/mail.local/CVS/Root
deleted file mode 100644
index 7040dfb5..00000000
--- a/contrib/libexec/mail.local/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-anoncvs@anoncvs.spacehopper.org:/cvs
diff --git a/.builds/freebsd.yml b/foobar/.builds/freebsd.yml
index 51993106..51993106 100644
--- a/.builds/freebsd.yml
+++ b/foobar/.builds/freebsd.yml
diff --git a/.builds/openbsd.yml b/foobar/.builds/openbsd.yml
index a0557a99..a0557a99 100644
--- a/.builds/openbsd.yml
+++ b/foobar/.builds/openbsd.yml
diff --git a/.gitattributes b/foobar/.gitattributes
index eaca2e77..eaca2e77 100644
--- a/.gitattributes
+++ b/foobar/.gitattributes
diff --git a/.github/FUNDING.yml b/foobar/.github/FUNDING.yml
index 36cb5950..36cb5950 100644
--- a/.github/FUNDING.yml
+++ b/foobar/.github/FUNDING.yml
diff --git a/.github/workflows/alpine.yml b/foobar/.github/workflows/alpine.yml
index 6f2d29f6..6f2d29f6 100644
--- a/.github/workflows/alpine.yml
+++ b/foobar/.github/workflows/alpine.yml
diff --git a/.github/workflows/arch.yml b/foobar/.github/workflows/arch.yml
index a3528152..a3528152 100644
--- a/.github/workflows/arch.yml
+++ b/foobar/.github/workflows/arch.yml
diff --git a/.github/workflows/clang.yml b/foobar/.github/workflows/clang.yml
index 15ccd31d..15ccd31d 100644
--- a/.github/workflows/clang.yml
+++ b/foobar/.github/workflows/clang.yml
diff --git a/.github/workflows/coverity.yml b/foobar/.github/workflows/coverity.yml
index d25bb4f7..d25bb4f7 100644
--- a/.github/workflows/coverity.yml
+++ b/foobar/.github/workflows/coverity.yml
diff --git a/.github/workflows/ubuntu-gcc10.yml b/foobar/.github/workflows/ubuntu-gcc10.yml
index 9f70d7f0..9f70d7f0 100644
--- a/.github/workflows/ubuntu-gcc10.yml
+++ b/foobar/.github/workflows/ubuntu-gcc10.yml
diff --git a/.github/workflows/ubuntu.yml b/foobar/.github/workflows/ubuntu.yml
index c068c6d5..c068c6d5 100644
--- a/.github/workflows/ubuntu.yml
+++ b/foobar/.github/workflows/ubuntu.yml
diff --git a/.gitignore b/foobar/.gitignore
index f9f88aa5..f9f88aa5 100644
--- a/.gitignore
+++ b/foobar/.gitignore
diff --git a/CHANGES.md b/foobar/portable/CHANGES.md
index db25a4db..db25a4db 100644
--- a/CHANGES.md
+++ b/foobar/portable/CHANGES.md
diff --git a/INSTALL b/foobar/portable/INSTALL
index d3c5b40a..d3c5b40a 100644
--- a/INSTALL
+++ b/foobar/portable/INSTALL
diff --git a/LICENSE b/foobar/portable/LICENSE
index f1cea087..f1cea087 100644
--- a/LICENSE
+++ b/foobar/portable/LICENSE
diff --git a/Makefile.am b/foobar/portable/Makefile.am
index 7d95a5b8..7d95a5b8 100644
--- a/Makefile.am
+++ b/foobar/portable/Makefile.am
diff --git a/README.md b/foobar/portable/README.md
index c00663cd..c00663cd 100644
--- a/README.md
+++ b/foobar/portable/README.md
diff --git a/bootstrap b/foobar/portable/bootstrap
index 24e29440..24e29440 100755
--- a/bootstrap
+++ b/foobar/portable/bootstrap
diff --git a/ci/COVERITY.MD5SUM b/foobar/portable/ci/COVERITY.MD5SUM
index 67b8a2de..67b8a2de 100644
--- a/ci/COVERITY.MD5SUM
+++ b/foobar/portable/ci/COVERITY.MD5SUM
diff --git a/ci/README.md b/foobar/portable/ci/README.md
index 2eee08f1..2eee08f1 100644
--- a/ci/README.md
+++ b/foobar/portable/ci/README.md
diff --git a/ci/docker/Dockerfile.alpine b/foobar/portable/ci/docker/Dockerfile.alpine
index 2c7c66fc..2c7c66fc 100644
--- a/ci/docker/Dockerfile.alpine
+++ b/foobar/portable/ci/docker/Dockerfile.alpine
diff --git a/ci/docker/Dockerfile.archlinux b/foobar/portable/ci/docker/Dockerfile.archlinux
index dcd46684..dcd46684 100644
--- a/ci/docker/Dockerfile.archlinux
+++ b/foobar/portable/ci/docker/Dockerfile.archlinux
diff --git a/ci/docker/Dockerfile.ubuntu b/foobar/portable/ci/docker/Dockerfile.ubuntu
index 6626033d..6626033d 100644
--- a/ci/docker/Dockerfile.ubuntu
+++ b/foobar/portable/ci/docker/Dockerfile.ubuntu
diff --git a/ci/docker/Dockerfile.ubuntu-gcc10 b/foobar/portable/ci/docker/Dockerfile.ubuntu-gcc10
index 2ebbdf58..2ebbdf58 100644
--- a/ci/docker/Dockerfile.ubuntu-gcc10
+++ b/foobar/portable/ci/docker/Dockerfile.ubuntu-gcc10
diff --git a/ci/scripts/clang_scan.sh b/foobar/portable/ci/scripts/clang_scan.sh
index 714d55a7..714d55a7 100755
--- a/ci/scripts/clang_scan.sh
+++ b/foobar/portable/ci/scripts/clang_scan.sh
diff --git a/ci/scripts/coverity_scan.sh b/foobar/portable/ci/scripts/coverity_scan.sh
index ab302767..ab302767 100755
--- a/ci/scripts/coverity_scan.sh
+++ b/foobar/portable/ci/scripts/coverity_scan.sh
diff --git a/ci/scripts/generate_certs.sh b/foobar/portable/ci/scripts/generate_certs.sh
index a9249c1e..a9249c1e 100755
--- a/ci/scripts/generate_certs.sh
+++ b/foobar/portable/ci/scripts/generate_certs.sh
diff --git a/ci/scripts/imports/badge.sh b/foobar/portable/ci/scripts/imports/badge.sh
index d6cf0b3a..d6cf0b3a 100644
--- a/ci/scripts/imports/badge.sh
+++ b/foobar/portable/ci/scripts/imports/badge.sh
diff --git a/ci/scripts/ssl.conf b/foobar/portable/ci/scripts/ssl.conf
index eddfb7f8..eddfb7f8 100644
--- a/ci/scripts/ssl.conf
+++ b/foobar/portable/ci/scripts/ssl.conf
diff --git a/configure.ac b/foobar/portable/configure.ac
index 33b929c1..33b929c1 100644
--- a/configure.ac
+++ b/foobar/portable/configure.ac
diff --git a/contrib/Makefile.am b/foobar/portable/contrib/Makefile.am
index 37a8e73a..37a8e73a 100644
--- a/contrib/Makefile.am
+++ b/foobar/portable/contrib/Makefile.am
diff --git a/contrib/libexec/Makefile.am b/foobar/portable/contrib/libexec/Makefile.am
index 0e3a271f..0e3a271f 100644
--- a/contrib/libexec/Makefile.am
+++ b/foobar/portable/contrib/libexec/Makefile.am
diff --git a/contrib/libexec/encrypt/Makefile.am b/foobar/portable/contrib/libexec/encrypt/Makefile.am
index 6ad7b82d..6ad7b82d 100644
--- a/contrib/libexec/encrypt/Makefile.am
+++ b/foobar/portable/contrib/libexec/encrypt/Makefile.am
diff --git a/contrib/libexec/encrypt/encrypt.c b/foobar/portable/contrib/libexec/encrypt/encrypt.c
index 80275921..80275921 100644
--- a/contrib/libexec/encrypt/encrypt.c
+++ b/foobar/portable/contrib/libexec/encrypt/encrypt.c
diff --git a/contrib/libexec/lockspool/Makefile.am b/foobar/portable/contrib/libexec/lockspool/Makefile.am
index dacf5386..dacf5386 100644
--- a/contrib/libexec/lockspool/Makefile.am
+++ b/foobar/portable/contrib/libexec/lockspool/Makefile.am
diff --git a/contrib/libexec/lockspool/locking.c b/foobar/portable/contrib/libexec/lockspool/locking.c
index e4922dd6..e4922dd6 100644
--- a/contrib/libexec/lockspool/locking.c
+++ b/foobar/portable/contrib/libexec/lockspool/locking.c
diff --git a/contrib/libexec/lockspool/lockspool.1 b/foobar/portable/contrib/libexec/lockspool/lockspool.1
index ea5524bf..ea5524bf 100644
--- a/contrib/libexec/lockspool/lockspool.1
+++ b/foobar/portable/contrib/libexec/lockspool/lockspool.1
diff --git a/contrib/libexec/lockspool/lockspool.c b/foobar/portable/contrib/libexec/lockspool/lockspool.c
index 9277241b..9277241b 100644
--- a/contrib/libexec/lockspool/lockspool.c
+++ b/foobar/portable/contrib/libexec/lockspool/lockspool.c
diff --git a/contrib/libexec/lockspool/mail.local.h b/foobar/portable/contrib/libexec/lockspool/mail.local.h
index bc3137cb..bc3137cb 100644
--- a/contrib/libexec/lockspool/mail.local.h
+++ b/foobar/portable/contrib/libexec/lockspool/mail.local.h
diff --git a/contrib/libexec/lockspool/pathnames.h b/foobar/portable/contrib/libexec/lockspool/pathnames.h
index 0a2c2731..0a2c2731 100644
--- a/contrib/libexec/lockspool/pathnames.h
+++ b/foobar/portable/contrib/libexec/lockspool/pathnames.h
diff --git a/contrib/libexec/mail.local/Makefile.am b/foobar/portable/contrib/libexec/mail.local/Makefile.am
index bd5211a2..bd5211a2 100644
--- a/contrib/libexec/mail.local/Makefile.am
+++ b/foobar/portable/contrib/libexec/mail.local/Makefile.am
diff --git a/contrib/libexec/mail.local/locking.c b/foobar/portable/contrib/libexec/mail.local/locking.c
index 85a48d5e..85a48d5e 100644
--- a/contrib/libexec/mail.local/locking.c
+++ b/foobar/portable/contrib/libexec/mail.local/locking.c
diff --git a/contrib/libexec/mail.local/mail.local.8 b/foobar/portable/contrib/libexec/mail.local/mail.local.8
index 330a4473..330a4473 100644
--- a/contrib/libexec/mail.local/mail.local.8
+++ b/foobar/portable/contrib/libexec/mail.local/mail.local.8
diff --git a/contrib/libexec/mail.local/mail.local.c b/foobar/portable/contrib/libexec/mail.local/mail.local.c
index a574b3fe..a574b3fe 100644
--- a/contrib/libexec/mail.local/mail.local.c
+++ b/foobar/portable/contrib/libexec/mail.local/mail.local.c
diff --git a/contrib/libexec/mail.local/mail.local.h b/foobar/portable/contrib/libexec/mail.local/mail.local.h
index bc3137cb..bc3137cb 100644
--- a/contrib/libexec/mail.local/mail.local.h
+++ b/foobar/portable/contrib/libexec/mail.local/mail.local.h
diff --git a/contrib/libexec/mail.local/pathnames.h b/foobar/portable/contrib/libexec/mail.local/pathnames.h
index 0a2c2731..0a2c2731 100644
--- a/contrib/libexec/mail.local/pathnames.h
+++ b/foobar/portable/contrib/libexec/mail.local/pathnames.h
diff --git a/etc/README.md b/foobar/portable/etc/README.md
index 0c53cc6b..0c53cc6b 100644
--- a/etc/README.md
+++ b/foobar/portable/etc/README.md
diff --git a/etc/aliases b/foobar/portable/etc/aliases
index 09fb6cf5..09fb6cf5 100644
--- a/etc/aliases
+++ b/foobar/portable/etc/aliases
diff --git a/mk/Makefile.am b/foobar/portable/mk/Makefile.am
index f49c5289..f49c5289 100644
--- a/mk/Makefile.am
+++ b/foobar/portable/mk/Makefile.am
diff --git a/mk/mail/Makefile.am b/foobar/portable/mk/mail/Makefile.am
index cc6d96cb..cc6d96cb 100644
--- a/mk/mail/Makefile.am
+++ b/foobar/portable/mk/mail/Makefile.am
diff --git a/mk/mail/mail.lmtp/Makefile.am b/foobar/portable/mk/mail/mail.lmtp/Makefile.am
index 9847dfdf..9847dfdf 100644
--- a/mk/mail/mail.lmtp/Makefile.am
+++ b/foobar/portable/mk/mail/mail.lmtp/Makefile.am
diff --git a/mk/mail/mail.maildir/Makefile.am b/foobar/portable/mk/mail/mail.maildir/Makefile.am
index d8f696ee..d8f696ee 100644
--- a/mk/mail/mail.maildir/Makefile.am
+++ b/foobar/portable/mk/mail/mail.maildir/Makefile.am
diff --git a/mk/mail/mail.mboxfile/Makefile.am b/foobar/portable/mk/mail/mail.mboxfile/Makefile.am
index d57362c0..d57362c0 100644
--- a/mk/mail/mail.mboxfile/Makefile.am
+++ b/foobar/portable/mk/mail/mail.mboxfile/Makefile.am
diff --git a/mk/mail/mail.mda/Makefile.am b/foobar/portable/mk/mail/mail.mda/Makefile.am
index b04aefda..b04aefda 100644
--- a/mk/mail/mail.mda/Makefile.am
+++ b/foobar/portable/mk/mail/mail.mda/Makefile.am
diff --git a/mk/mdoc2man.awk b/foobar/portable/mk/mdoc2man.awk
index 726f628c..726f628c 100644
--- a/mk/mdoc2man.awk
+++ b/foobar/portable/mk/mdoc2man.awk
diff --git a/mk/pathnames b/foobar/portable/mk/pathnames
index b233ec33..b233ec33 100644
--- a/mk/pathnames
+++ b/foobar/portable/mk/pathnames
diff --git a/mk/smtp/Makefile.am b/foobar/portable/mk/smtp/Makefile.am
index e955a271..e955a271 100644
--- a/mk/smtp/Makefile.am
+++ b/foobar/portable/mk/smtp/Makefile.am
diff --git a/mk/smtpctl/Makefile.am b/foobar/portable/mk/smtpctl/Makefile.am
index 3aac9bd7..3aac9bd7 100644
--- a/mk/smtpctl/Makefile.am
+++ b/foobar/portable/mk/smtpctl/Makefile.am
diff --git a/mk/smtpd/Makefile.am b/foobar/portable/mk/smtpd/Makefile.am
index bf7a483b..bf7a483b 100644
--- a/mk/smtpd/Makefile.am
+++ b/foobar/portable/mk/smtpd/Makefile.am
diff --git a/openbsd-compat/Makefile.am b/foobar/portable/openbsd-compat/Makefile.am
index db1e93fa..db1e93fa 100644
--- a/openbsd-compat/Makefile.am
+++ b/foobar/portable/openbsd-compat/Makefile.am
diff --git a/openbsd-compat/NOTES b/foobar/portable/openbsd-compat/NOTES
index 42aefc7d..42aefc7d 100644
--- a/openbsd-compat/NOTES
+++ b/foobar/portable/openbsd-compat/NOTES
diff --git a/openbsd-compat/SSL_CTX_use_certificate_chain_mem.c b/foobar/portable/openbsd-compat/SSL_CTX_use_certificate_chain_mem.c
index 3a47ff0e..3a47ff0e 100644
--- a/openbsd-compat/SSL_CTX_use_certificate_chain_mem.c
+++ b/foobar/portable/openbsd-compat/SSL_CTX_use_certificate_chain_mem.c
diff --git a/openbsd-compat/arc4random.c b/foobar/portable/openbsd-compat/arc4random.c
index f5cda877..f5cda877 100644
--- a/openbsd-compat/arc4random.c
+++ b/foobar/portable/openbsd-compat/arc4random.c
diff --git a/openbsd-compat/base64.c b/foobar/portable/openbsd-compat/base64.c
index a3c5782b..a3c5782b 100644
--- a/openbsd-compat/base64.c
+++ b/foobar/portable/openbsd-compat/base64.c
diff --git a/openbsd-compat/base64.h b/foobar/portable/openbsd-compat/base64.h
index 732c6b3f..732c6b3f 100644
--- a/openbsd-compat/base64.h
+++ b/foobar/portable/openbsd-compat/base64.h
diff --git a/openbsd-compat/basename.c b/foobar/portable/openbsd-compat/basename.c
index ffa5c898..ffa5c898 100644
--- a/openbsd-compat/basename.c
+++ b/foobar/portable/openbsd-compat/basename.c
diff --git a/openbsd-compat/bsd-err.c b/foobar/portable/openbsd-compat/bsd-err.c
index a7823fad..a7823fad 100644
--- a/openbsd-compat/bsd-err.c
+++ b/foobar/portable/openbsd-compat/bsd-err.c
diff --git a/openbsd-compat/bsd-err.h b/foobar/portable/openbsd-compat/bsd-err.h
index f75d0eb4..f75d0eb4 100644
--- a/openbsd-compat/bsd-err.h
+++ b/foobar/portable/openbsd-compat/bsd-err.h
diff --git a/openbsd-compat/bsd-misc.h b/foobar/portable/openbsd-compat/bsd-misc.h
index c638462d..c638462d 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/foobar/portable/openbsd-compat/bsd-misc.h
diff --git a/openbsd-compat/bsd-vis.h b/foobar/portable/openbsd-compat/bsd-vis.h
index d1286c99..d1286c99 100644
--- a/openbsd-compat/bsd-vis.h
+++ b/foobar/portable/openbsd-compat/bsd-vis.h
diff --git a/openbsd-compat/bsd-waitpid.c b/foobar/portable/openbsd-compat/bsd-waitpid.c
index 3ef68a53..3ef68a53 100644
--- a/openbsd-compat/bsd-waitpid.c
+++ b/foobar/portable/openbsd-compat/bsd-waitpid.c
diff --git a/openbsd-compat/bsd-waitpid.h b/foobar/portable/openbsd-compat/bsd-waitpid.h
index 2d853db6..2d853db6 100644
--- a/openbsd-compat/bsd-waitpid.h
+++ b/foobar/portable/openbsd-compat/bsd-waitpid.h
diff --git a/openbsd-compat/chacha_private.h b/foobar/portable/openbsd-compat/chacha_private.h
index 46613646..46613646 100644
--- a/openbsd-compat/chacha_private.h
+++ b/foobar/portable/openbsd-compat/chacha_private.h
diff --git a/openbsd-compat/clock_gettime.c b/foobar/portable/openbsd-compat/clock_gettime.c
index 6c1ef0d4..6c1ef0d4 100644
--- a/openbsd-compat/clock_gettime.c
+++ b/foobar/portable/openbsd-compat/clock_gettime.c
diff --git a/openbsd-compat/closefrom.c b/foobar/portable/openbsd-compat/closefrom.c
index 528949a6..528949a6 100644
--- a/openbsd-compat/closefrom.c
+++ b/foobar/portable/openbsd-compat/closefrom.c
diff --git a/openbsd-compat/crypt_checkpass.c b/foobar/portable/openbsd-compat/crypt_checkpass.c
index d10b3a57..d10b3a57 100644
--- a/openbsd-compat/crypt_checkpass.c
+++ b/foobar/portable/openbsd-compat/crypt_checkpass.c
diff --git a/openbsd-compat/daemon.c b/foobar/portable/openbsd-compat/daemon.c
index 3efe14c6..3efe14c6 100644
--- a/openbsd-compat/daemon.c
+++ b/foobar/portable/openbsd-compat/daemon.c
diff --git a/openbsd-compat/defines.h b/foobar/portable/openbsd-compat/defines.h
index a6e528eb..a6e528eb 100644
--- a/openbsd-compat/defines.h
+++ b/foobar/portable/openbsd-compat/defines.h
diff --git a/openbsd-compat/dirname.c b/foobar/portable/openbsd-compat/dirname.c
index 30fcb496..30fcb496 100644
--- a/openbsd-compat/dirname.c
+++ b/foobar/portable/openbsd-compat/dirname.c
diff --git a/openbsd-compat/empty.c b/foobar/portable/openbsd-compat/empty.c
index e69de29b..e69de29b 100644
--- a/openbsd-compat/empty.c
+++ b/foobar/portable/openbsd-compat/empty.c
diff --git a/openbsd-compat/entropy.c b/foobar/portable/openbsd-compat/entropy.c
index 367d7135..367d7135 100644
--- a/openbsd-compat/entropy.c
+++ b/foobar/portable/openbsd-compat/entropy.c
diff --git a/openbsd-compat/entropy.h b/foobar/portable/openbsd-compat/entropy.h
index 496bed66..496bed66 100644
--- a/openbsd-compat/entropy.h
+++ b/foobar/portable/openbsd-compat/entropy.h
diff --git a/openbsd-compat/err_h/err.h b/foobar/portable/openbsd-compat/err_h/err.h
index a56b6188..a56b6188 100644
--- a/openbsd-compat/err_h/err.h
+++ b/foobar/portable/openbsd-compat/err_h/err.h
diff --git a/openbsd-compat/errc.c b/foobar/portable/openbsd-compat/errc.c
index 658a55b4..658a55b4 100644
--- a/openbsd-compat/errc.c
+++ b/foobar/portable/openbsd-compat/errc.c
diff --git a/openbsd-compat/event_asr_run.c b/foobar/portable/openbsd-compat/event_asr_run.c
index aef86154..aef86154 100644
--- a/openbsd-compat/event_asr_run.c
+++ b/foobar/portable/openbsd-compat/event_asr_run.c
diff --git a/openbsd-compat/explicit_bzero.c b/foobar/portable/openbsd-compat/explicit_bzero.c
index d9f4abf5..d9f4abf5 100644
--- a/openbsd-compat/explicit_bzero.c
+++ b/foobar/portable/openbsd-compat/explicit_bzero.c
diff --git a/openbsd-compat/fgetln.c b/foobar/portable/openbsd-compat/fgetln.c
index 1c51ff78..1c51ff78 100644
--- a/openbsd-compat/fgetln.c
+++ b/foobar/portable/openbsd-compat/fgetln.c
diff --git a/openbsd-compat/fmt_scaled.c b/foobar/portable/openbsd-compat/fmt_scaled.c
index edd682a4..edd682a4 100644
--- a/openbsd-compat/fmt_scaled.c
+++ b/foobar/portable/openbsd-compat/fmt_scaled.c
diff --git a/openbsd-compat/fparseln.c b/foobar/portable/openbsd-compat/fparseln.c
index dfa9093c..dfa9093c 100644
--- a/openbsd-compat/fparseln.c
+++ b/foobar/portable/openbsd-compat/fparseln.c
diff --git a/openbsd-compat/freezero.c b/foobar/portable/openbsd-compat/freezero.c
index da20d132..da20d132 100644
--- a/openbsd-compat/freezero.c
+++ b/foobar/portable/openbsd-compat/freezero.c
diff --git a/openbsd-compat/getopt.c b/foobar/portable/openbsd-compat/getopt.c
index 5450e43d..5450e43d 100644
--- a/openbsd-compat/getopt.c
+++ b/foobar/portable/openbsd-compat/getopt.c
diff --git a/openbsd-compat/getpeereid.c b/foobar/portable/openbsd-compat/getpeereid.c
index c8ce808f..c8ce808f 100644
--- a/openbsd-compat/getpeereid.c
+++ b/foobar/portable/openbsd-compat/getpeereid.c
diff --git a/openbsd-compat/imsg-buffer.c b/foobar/portable/openbsd-compat/imsg-buffer.c
index e3762092..e3762092 100644
--- a/openbsd-compat/imsg-buffer.c
+++ b/foobar/portable/openbsd-compat/imsg-buffer.c
diff --git a/openbsd-compat/imsg.c b/foobar/portable/openbsd-compat/imsg.c
index a5900a05..a5900a05 100644
--- a/openbsd-compat/imsg.c
+++ b/foobar/portable/openbsd-compat/imsg.c
diff --git a/openbsd-compat/imsg.h b/foobar/portable/openbsd-compat/imsg.h
index 3757c8b9..3757c8b9 100644
--- a/openbsd-compat/imsg.h
+++ b/foobar/portable/openbsd-compat/imsg.h
diff --git a/openbsd-compat/includes.h b/foobar/portable/openbsd-compat/includes.h
index cd044a20..cd044a20 100644
--- a/openbsd-compat/includes.h
+++ b/foobar/portable/openbsd-compat/includes.h
diff --git a/openbsd-compat/inet_net_pton.c b/foobar/portable/openbsd-compat/inet_net_pton.c
index b65cb76f..b65cb76f 100644
--- a/openbsd-compat/inet_net_pton.c
+++ b/foobar/portable/openbsd-compat/inet_net_pton.c
diff --git a/openbsd-compat/libasr/asr.c b/foobar/portable/openbsd-compat/libasr/asr.c
index 90bc59b4..90bc59b4 100644
--- a/openbsd-compat/libasr/asr.c
+++ b/foobar/portable/openbsd-compat/libasr/asr.c
diff --git a/openbsd-compat/libasr/asr.h b/foobar/portable/openbsd-compat/libasr/asr.h
index e9725e6b..e9725e6b 100644
--- a/openbsd-compat/libasr/asr.h
+++ b/foobar/portable/openbsd-compat/libasr/asr.h
diff --git a/openbsd-compat/libasr/asr_compat.c b/foobar/portable/openbsd-compat/libasr/asr_compat.c
index ee958357..ee958357 100644
--- a/openbsd-compat/libasr/asr_compat.c
+++ b/foobar/portable/openbsd-compat/libasr/asr_compat.c
diff --git a/openbsd-compat/libasr/asr_compat.h b/foobar/portable/openbsd-compat/libasr/asr_compat.h
index 2c7686a4..2c7686a4 100644
--- a/openbsd-compat/libasr/asr_compat.h
+++ b/foobar/portable/openbsd-compat/libasr/asr_compat.h
diff --git a/openbsd-compat/libasr/asr_debug.c b/foobar/portable/openbsd-compat/libasr/asr_debug.c
index be80436a..be80436a 100644
--- a/openbsd-compat/libasr/asr_debug.c
+++ b/foobar/portable/openbsd-compat/libasr/asr_debug.c
diff --git a/openbsd-compat/libasr/asr_private.h b/foobar/portable/openbsd-compat/libasr/asr_private.h
index acf0e874..acf0e874 100644
--- a/openbsd-compat/libasr/asr_private.h
+++ b/foobar/portable/openbsd-compat/libasr/asr_private.h
diff --git a/openbsd-compat/libasr/asr_run.3 b/foobar/portable/openbsd-compat/libasr/asr_run.3
index 61c1b02c..61c1b02c 100644
--- a/openbsd-compat/libasr/asr_run.3
+++ b/foobar/portable/openbsd-compat/libasr/asr_run.3
diff --git a/openbsd-compat/libasr/asr_utils.c b/foobar/portable/openbsd-compat/libasr/asr_utils.c
index e3d24c93..e3d24c93 100644
--- a/openbsd-compat/libasr/asr_utils.c
+++ b/foobar/portable/openbsd-compat/libasr/asr_utils.c
diff --git a/openbsd-compat/libasr/getaddrinfo.c b/foobar/portable/openbsd-compat/libasr/getaddrinfo.c
index 37fe2d4d..37fe2d4d 100644
--- a/openbsd-compat/libasr/getaddrinfo.c
+++ b/foobar/portable/openbsd-compat/libasr/getaddrinfo.c
diff --git a/openbsd-compat/libasr/getaddrinfo_async.c b/foobar/portable/openbsd-compat/libasr/getaddrinfo_async.c
index 1fd44ff7..1fd44ff7 100644
--- a/openbsd-compat/libasr/getaddrinfo_async.c
+++ b/foobar/portable/openbsd-compat/libasr/getaddrinfo_async.c
diff --git a/openbsd-compat/libasr/gethostnamadr.c b/foobar/portable/openbsd-compat/libasr/gethostnamadr.c
index 2fce46b3..2fce46b3 100644
--- a/openbsd-compat/libasr/gethostnamadr.c
+++ b/foobar/portable/openbsd-compat/libasr/gethostnamadr.c
diff --git a/openbsd-compat/libasr/gethostnamadr_async.c b/foobar/portable/openbsd-compat/libasr/gethostnamadr_async.c
index 2636e848..2636e848 100644
--- a/openbsd-compat/libasr/gethostnamadr_async.c
+++ b/foobar/portable/openbsd-compat/libasr/gethostnamadr_async.c
diff --git a/openbsd-compat/libasr/getnameinfo.c b/foobar/portable/openbsd-compat/libasr/getnameinfo.c
index 7bee468d..7bee468d 100644
--- a/openbsd-compat/libasr/getnameinfo.c
+++ b/foobar/portable/openbsd-compat/libasr/getnameinfo.c
diff --git a/openbsd-compat/libasr/getnameinfo_async.c b/foobar/portable/openbsd-compat/libasr/getnameinfo_async.c
index faba8860..faba8860 100644
--- a/openbsd-compat/libasr/getnameinfo_async.c
+++ b/foobar/portable/openbsd-compat/libasr/getnameinfo_async.c
diff --git a/openbsd-compat/libasr/getnetnamadr.c b/foobar/portable/openbsd-compat/libasr/getnetnamadr.c
index 141b4a9a..141b4a9a 100644
--- a/openbsd-compat/libasr/getnetnamadr.c
+++ b/foobar/portable/openbsd-compat/libasr/getnetnamadr.c
diff --git a/openbsd-compat/libasr/getnetnamadr_async.c b/foobar/portable/openbsd-compat/libasr/getnetnamadr_async.c
index 1e02d008..1e02d008 100644
--- a/openbsd-compat/libasr/getnetnamadr_async.c
+++ b/foobar/portable/openbsd-compat/libasr/getnetnamadr_async.c
diff --git a/openbsd-compat/libasr/getrrsetbyname.c b/foobar/portable/openbsd-compat/libasr/getrrsetbyname.c
index 24df2c8b..24df2c8b 100644
--- a/openbsd-compat/libasr/getrrsetbyname.c
+++ b/foobar/portable/openbsd-compat/libasr/getrrsetbyname.c
diff --git a/openbsd-compat/libasr/getrrsetbyname_async.c b/foobar/portable/openbsd-compat/libasr/getrrsetbyname_async.c
index 9ff7f6c7..9ff7f6c7 100644
--- a/openbsd-compat/libasr/getrrsetbyname_async.c
+++ b/foobar/portable/openbsd-compat/libasr/getrrsetbyname_async.c
diff --git a/openbsd-compat/libasr/libasr.la b/foobar/portable/openbsd-compat/libasr/libasr.la
index 71346e8a..71346e8a 100644
--- a/openbsd-compat/libasr/libasr.la
+++ b/foobar/portable/openbsd-compat/libasr/libasr.la
diff --git a/openbsd-compat/libasr/res_debug.c b/foobar/portable/openbsd-compat/libasr/res_debug.c
index ca9c5ee0..ca9c5ee0 100644
--- a/openbsd-compat/libasr/res_debug.c
+++ b/foobar/portable/openbsd-compat/libasr/res_debug.c
diff --git a/openbsd-compat/libasr/res_init.c b/foobar/portable/openbsd-compat/libasr/res_init.c
index 04243c47..04243c47 100644
--- a/openbsd-compat/libasr/res_init.c
+++ b/foobar/portable/openbsd-compat/libasr/res_init.c
diff --git a/openbsd-compat/libasr/res_mkquery.c b/foobar/portable/openbsd-compat/libasr/res_mkquery.c
index 959ecc47..959ecc47 100644
--- a/openbsd-compat/libasr/res_mkquery.c
+++ b/foobar/portable/openbsd-compat/libasr/res_mkquery.c
diff --git a/openbsd-compat/libasr/res_query.c b/foobar/portable/openbsd-compat/libasr/res_query.c
index 3f891416..3f891416 100644
--- a/openbsd-compat/libasr/res_query.c
+++ b/foobar/portable/openbsd-compat/libasr/res_query.c
diff --git a/openbsd-compat/libasr/res_search_async.c b/foobar/portable/openbsd-compat/libasr/res_search_async.c
index 6436ab85..6436ab85 100644
--- a/openbsd-compat/libasr/res_search_async.c
+++ b/foobar/portable/openbsd-compat/libasr/res_search_async.c
diff --git a/openbsd-compat/libasr/res_send.c b/foobar/portable/openbsd-compat/libasr/res_send.c
index 32c94081..32c94081 100644
--- a/openbsd-compat/libasr/res_send.c
+++ b/foobar/portable/openbsd-compat/libasr/res_send.c
diff --git a/openbsd-compat/libasr/res_send_async.c b/foobar/portable/openbsd-compat/libasr/res_send_async.c
index 7eeeef48..7eeeef48 100644
--- a/openbsd-compat/libasr/res_send_async.c
+++ b/foobar/portable/openbsd-compat/libasr/res_send_async.c
diff --git a/openbsd-compat/libasr/sethostent.c b/foobar/portable/openbsd-compat/libasr/sethostent.c
index 61fa3e2f..61fa3e2f 100644
--- a/openbsd-compat/libasr/sethostent.c
+++ b/foobar/portable/openbsd-compat/libasr/sethostent.c
diff --git a/openbsd-compat/libasr/thread_private.h b/foobar/portable/openbsd-compat/libasr/thread_private.h
index 23951975..23951975 100644
--- a/openbsd-compat/libasr/thread_private.h
+++ b/foobar/portable/openbsd-compat/libasr/thread_private.h
diff --git a/openbsd-compat/libressl.c b/foobar/portable/openbsd-compat/libressl.c
index f4f2b52e..f4f2b52e 100644
--- a/openbsd-compat/libressl.c
+++ b/foobar/portable/openbsd-compat/libressl.c
diff --git a/openbsd-compat/nanosleep.c b/foobar/portable/openbsd-compat/nanosleep.c
index 1256c0b5..1256c0b5 100644
--- a/openbsd-compat/nanosleep.c
+++ b/foobar/portable/openbsd-compat/nanosleep.c
diff --git a/openbsd-compat/openbsd-compat.h b/foobar/portable/openbsd-compat/openbsd-compat.h
index 57748621..57748621 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/foobar/portable/openbsd-compat/openbsd-compat.h
diff --git a/openbsd-compat/paths_h/paths.h b/foobar/portable/openbsd-compat/paths_h/paths.h
index 6b66a9c1..6b66a9c1 100644
--- a/openbsd-compat/paths_h/paths.h
+++ b/foobar/portable/openbsd-compat/paths_h/paths.h
diff --git a/openbsd-compat/pidfile.c b/foobar/portable/openbsd-compat/pidfile.c
index d6f83880..d6f83880 100644
--- a/openbsd-compat/pidfile.c
+++ b/foobar/portable/openbsd-compat/pidfile.c
diff --git a/openbsd-compat/progname.c b/foobar/portable/openbsd-compat/progname.c
index b8b9ae30..b8b9ae30 100644
--- a/openbsd-compat/progname.c
+++ b/foobar/portable/openbsd-compat/progname.c
diff --git a/openbsd-compat/reallocarray.c b/foobar/portable/openbsd-compat/reallocarray.c
index 9beec719..9beec719 100644
--- a/openbsd-compat/reallocarray.c
+++ b/foobar/portable/openbsd-compat/reallocarray.c
diff --git a/openbsd-compat/recallocarray.c b/foobar/portable/openbsd-compat/recallocarray.c
index fc0b5a8a..fc0b5a8a 100644
--- a/openbsd-compat/recallocarray.c
+++ b/foobar/portable/openbsd-compat/recallocarray.c
diff --git a/openbsd-compat/res_hnok.c b/foobar/portable/openbsd-compat/res_hnok.c
index a4b54baf..a4b54baf 100644
--- a/openbsd-compat/res_hnok.c
+++ b/foobar/portable/openbsd-compat/res_hnok.c
diff --git a/openbsd-compat/res_randomid.c b/foobar/portable/openbsd-compat/res_randomid.c
index c848c41d..c848c41d 100644
--- a/openbsd-compat/res_randomid.c
+++ b/foobar/portable/openbsd-compat/res_randomid.c
diff --git a/openbsd-compat/setegid.c b/foobar/portable/openbsd-compat/setegid.c
index 9e056351..9e056351 100644
--- a/openbsd-compat/setegid.c
+++ b/foobar/portable/openbsd-compat/setegid.c
diff --git a/openbsd-compat/seteuid.c b/foobar/portable/openbsd-compat/seteuid.c
index 6f581125..6f581125 100644
--- a/openbsd-compat/seteuid.c
+++ b/foobar/portable/openbsd-compat/seteuid.c
diff --git a/openbsd-compat/setproctitle.c b/foobar/portable/openbsd-compat/setproctitle.c
index eef70c14..eef70c14 100644
--- a/openbsd-compat/setproctitle.c
+++ b/foobar/portable/openbsd-compat/setproctitle.c
diff --git a/openbsd-compat/setresgid.c b/foobar/portable/openbsd-compat/setresgid.c
index e798cdad..e798cdad 100644
--- a/openbsd-compat/setresgid.c
+++ b/foobar/portable/openbsd-compat/setresgid.c
diff --git a/openbsd-compat/setresuid.c b/foobar/portable/openbsd-compat/setresuid.c
index 36df39e9..36df39e9 100644
--- a/openbsd-compat/setresuid.c
+++ b/foobar/portable/openbsd-compat/setresuid.c
diff --git a/openbsd-compat/signal.c b/foobar/portable/openbsd-compat/signal.c
index cdae0cd2..cdae0cd2 100644
--- a/openbsd-compat/signal.c
+++ b/foobar/portable/openbsd-compat/signal.c
diff --git a/openbsd-compat/strerror.c b/foobar/portable/openbsd-compat/strerror.c
index 0ddad2d4..0ddad2d4 100644
--- a/openbsd-compat/strerror.c
+++ b/foobar/portable/openbsd-compat/strerror.c
diff --git a/openbsd-compat/strlcat.c b/foobar/portable/openbsd-compat/strlcat.c
index 979eb876..979eb876 100644
--- a/openbsd-compat/strlcat.c
+++ b/foobar/portable/openbsd-compat/strlcat.c
diff --git a/openbsd-compat/strlcpy.c b/foobar/portable/openbsd-compat/strlcpy.c
index 2562ebbf..2562ebbf 100644
--- a/openbsd-compat/strlcpy.c
+++ b/foobar/portable/openbsd-compat/strlcpy.c
diff --git a/openbsd-compat/strmode.c b/foobar/portable/openbsd-compat/strmode.c
index 2fc2bb0e..2fc2bb0e 100644
--- a/openbsd-compat/strmode.c
+++ b/foobar/portable/openbsd-compat/strmode.c
diff --git a/openbsd-compat/strndup.c b/foobar/portable/openbsd-compat/strndup.c
index f43ba659..f43ba659 100644
--- a/openbsd-compat/strndup.c
+++ b/foobar/portable/openbsd-compat/strndup.c
diff --git a/openbsd-compat/strnlen.c b/foobar/portable/openbsd-compat/strnlen.c
index a2017e19..a2017e19 100644
--- a/openbsd-compat/strnlen.c
+++ b/foobar/portable/openbsd-compat/strnlen.c
diff --git a/openbsd-compat/strsep.c b/foobar/portable/openbsd-compat/strsep.c
index b36eb8fd..b36eb8fd 100644
--- a/openbsd-compat/strsep.c
+++ b/foobar/portable/openbsd-compat/strsep.c
diff --git a/openbsd-compat/strtonum.c b/foobar/portable/openbsd-compat/strtonum.c
index 87f2f24b..87f2f24b 100644
--- a/openbsd-compat/strtonum.c
+++ b/foobar/portable/openbsd-compat/strtonum.c
diff --git a/openbsd-compat/sys/queue.h b/foobar/portable/openbsd-compat/sys/queue.h
index 28aaaa37..28aaaa37 100644
--- a/openbsd-compat/sys/queue.h
+++ b/foobar/portable/openbsd-compat/sys/queue.h
diff --git a/openbsd-compat/sys/tree.h b/foobar/portable/openbsd-compat/sys/tree.h
index 7f7546ec..7f7546ec 100644
--- a/openbsd-compat/sys/tree.h
+++ b/foobar/portable/openbsd-compat/sys/tree.h
diff --git a/openbsd-compat/usleep.c b/foobar/portable/openbsd-compat/usleep.c
index 946befc9..946befc9 100644
--- a/openbsd-compat/usleep.c
+++ b/foobar/portable/openbsd-compat/usleep.c
diff --git a/openbsd-compat/vis.c b/foobar/portable/openbsd-compat/vis.c
index a49b4dc3..a49b4dc3 100644
--- a/openbsd-compat/vis.c
+++ b/foobar/portable/openbsd-compat/vis.c
diff --git a/smtpd/Makefile b/foobar/portable/smtpd/Makefile
index a3dbc9d1..a3dbc9d1 100644
--- a/smtpd/Makefile
+++ b/foobar/portable/smtpd/Makefile
diff --git a/smtpd/aliases.5 b/foobar/portable/smtpd/aliases.5
index 7c250c81..7c250c81 100644
--- a/smtpd/aliases.5
+++ b/foobar/portable/smtpd/aliases.5
diff --git a/smtpd/aliases.c b/foobar/portable/smtpd/aliases.c
index 0f8a5c1e..0f8a5c1e 100644
--- a/smtpd/aliases.c
+++ b/foobar/portable/smtpd/aliases.c
diff --git a/smtpd/bounce.c b/foobar/portable/smtpd/bounce.c
index 4a4a0992..4a4a0992 100644
--- a/smtpd/bounce.c
+++ b/foobar/portable/smtpd/bounce.c
diff --git a/smtpd/ca.c b/foobar/portable/smtpd/ca.c
index a27db87a..a27db87a 100644
--- a/smtpd/ca.c
+++ b/foobar/portable/smtpd/ca.c
diff --git a/smtpd/cert.c b/foobar/portable/smtpd/cert.c
index 79b1df91..79b1df91 100644
--- a/smtpd/cert.c
+++ b/foobar/portable/smtpd/cert.c
diff --git a/smtpd/compress_backend.c b/foobar/portable/smtpd/compress_backend.c
index 1b974662..1b974662 100644
--- a/smtpd/compress_backend.c
+++ b/foobar/portable/smtpd/compress_backend.c
diff --git a/smtpd/compress_gzip.c b/foobar/portable/smtpd/compress_gzip.c
index dd60aeec..dd60aeec 100644
--- a/smtpd/compress_gzip.c
+++ b/foobar/portable/smtpd/compress_gzip.c
diff --git a/smtpd/config.c b/foobar/portable/smtpd/config.c
index 8fe983d6..8fe983d6 100644
--- a/smtpd/config.c
+++ b/foobar/portable/smtpd/config.c
diff --git a/smtpd/control.c b/foobar/portable/smtpd/control.c
index 0e35bbd1..0e35bbd1 100644
--- a/smtpd/control.c
+++ b/foobar/portable/smtpd/control.c
diff --git a/smtpd/crypto.c b/foobar/portable/smtpd/crypto.c
index 20a422cd..20a422cd 100644
--- a/smtpd/crypto.c
+++ b/foobar/portable/smtpd/crypto.c
diff --git a/smtpd/dict.c b/foobar/portable/smtpd/dict.c
index e660f0a5..e660f0a5 100644
--- a/smtpd/dict.c
+++ b/foobar/portable/smtpd/dict.c
diff --git a/smtpd/dict.h b/foobar/portable/smtpd/dict.h
index c5d47e1a..c5d47e1a 100644
--- a/smtpd/dict.h
+++ b/foobar/portable/smtpd/dict.h
diff --git a/smtpd/dns.c b/foobar/portable/smtpd/dns.c
index a3107e89..a3107e89 100644
--- a/smtpd/dns.c
+++ b/foobar/portable/smtpd/dns.c
diff --git a/smtpd/enqueue.c b/foobar/portable/smtpd/enqueue.c
index 0ef694b5..0ef694b5 100644
--- a/smtpd/enqueue.c
+++ b/foobar/portable/smtpd/enqueue.c
diff --git a/smtpd/envelope.c b/foobar/portable/smtpd/envelope.c
index 35d98b79..35d98b79 100644
--- a/smtpd/envelope.c
+++ b/foobar/portable/smtpd/envelope.c
diff --git a/smtpd/esc.c b/foobar/portable/smtpd/esc.c
index 64a44c79..64a44c79 100644
--- a/smtpd/esc.c
+++ b/foobar/portable/smtpd/esc.c
diff --git a/smtpd/expand.c b/foobar/portable/smtpd/expand.c
index a4306fc0..a4306fc0 100644
--- a/smtpd/expand.c
+++ b/foobar/portable/smtpd/expand.c
diff --git a/smtpd/filter.c b/foobar/portable/smtpd/filter.c
index 614486b7..614486b7 100644
--- a/smtpd/filter.c
+++ b/foobar/portable/smtpd/filter.c
diff --git a/smtpd/forward.5 b/foobar/portable/smtpd/forward.5
index 5a68f229..5a68f229 100644
--- a/smtpd/forward.5
+++ b/foobar/portable/smtpd/forward.5
diff --git a/smtpd/forward.c b/foobar/portable/smtpd/forward.c
index 7494c6ce..7494c6ce 100644
--- a/smtpd/forward.c
+++ b/foobar/portable/smtpd/forward.c
diff --git a/smtpd/iobuf.c b/foobar/portable/smtpd/iobuf.c
index dec10660..dec10660 100644
--- a/smtpd/iobuf.c
+++ b/foobar/portable/smtpd/iobuf.c
diff --git a/smtpd/iobuf.h b/foobar/portable/smtpd/iobuf.h
index c454d0a1..c454d0a1 100644
--- a/smtpd/iobuf.h
+++ b/foobar/portable/smtpd/iobuf.h
diff --git a/smtpd/ioev.c b/foobar/portable/smtpd/ioev.c
index e0a8a096..e0a8a096 100644
--- a/smtpd/ioev.c
+++ b/foobar/portable/smtpd/ioev.c
diff --git a/smtpd/ioev.h b/foobar/portable/smtpd/ioev.h
index f155a7fc..f155a7fc 100644
--- a/smtpd/ioev.h
+++ b/foobar/portable/smtpd/ioev.h
diff --git a/smtpd/libressl.c b/foobar/portable/smtpd/libressl.c
index 57d74389..57d74389 100644
--- a/smtpd/libressl.c
+++ b/foobar/portable/smtpd/libressl.c
diff --git a/smtpd/limit.c b/foobar/portable/smtpd/limit.c
index 25e7a026..25e7a026 100644
--- a/smtpd/limit.c
+++ b/foobar/portable/smtpd/limit.c
diff --git a/smtpd/lka.c b/foobar/portable/smtpd/lka.c
index 6ac21245..6ac21245 100644
--- a/smtpd/lka.c
+++ b/foobar/portable/smtpd/lka.c
diff --git a/smtpd/lka_filter.c b/foobar/portable/smtpd/lka_filter.c
index 2dc66057..2dc66057 100644
--- a/smtpd/lka_filter.c
+++ b/foobar/portable/smtpd/lka_filter.c
diff --git a/smtpd/lka_session.c b/foobar/portable/smtpd/lka_session.c
index 999e01d6..999e01d6 100644
--- a/smtpd/lka_session.c
+++ b/foobar/portable/smtpd/lka_session.c
diff --git a/smtpd/log.c b/foobar/portable/smtpd/log.c
index 14f681e3..14f681e3 100644
--- a/smtpd/log.c
+++ b/foobar/portable/smtpd/log.c
diff --git a/smtpd/log.h b/foobar/portable/smtpd/log.h
index 81d0973c..81d0973c 100644
--- a/smtpd/log.h
+++ b/foobar/portable/smtpd/log.h
diff --git a/smtpd/mail.lmtp.8 b/foobar/portable/smtpd/mail.lmtp.8
index 98dee00d..98dee00d 100644
--- a/smtpd/mail.lmtp.8
+++ b/foobar/portable/smtpd/mail.lmtp.8
diff --git a/smtpd/mail.lmtp.c b/foobar/portable/smtpd/mail.lmtp.c
index 90b89990..90b89990 100644
--- a/smtpd/mail.lmtp.c
+++ b/foobar/portable/smtpd/mail.lmtp.c
diff --git a/smtpd/mail.maildir.8 b/foobar/portable/smtpd/mail.maildir.8
index ce822698..ce822698 100644
--- a/smtpd/mail.maildir.8
+++ b/foobar/portable/smtpd/mail.maildir.8
diff --git a/smtpd/mail.maildir.c b/foobar/portable/smtpd/mail.maildir.c
index fe6adba6..fe6adba6 100644
--- a/smtpd/mail.maildir.c
+++ b/foobar/portable/smtpd/mail.maildir.c
diff --git a/smtpd/mail.mboxfile.8 b/foobar/portable/smtpd/mail.mboxfile.8
index 015adcb5..015adcb5 100644
--- a/smtpd/mail.mboxfile.8
+++ b/foobar/portable/smtpd/mail.mboxfile.8
diff --git a/smtpd/mail.mboxfile.c b/foobar/portable/smtpd/mail.mboxfile.c
index 097a8d96..097a8d96 100644
--- a/smtpd/mail.mboxfile.c
+++ b/foobar/portable/smtpd/mail.mboxfile.c
diff --git a/smtpd/mail.mda.8 b/foobar/portable/smtpd/mail.mda.8
index 61fed733..61fed733 100644
--- a/smtpd/mail.mda.8
+++ b/foobar/portable/smtpd/mail.mda.8
diff --git a/smtpd/mail.mda.c b/foobar/portable/smtpd/mail.mda.c
index 23958071..23958071 100644
--- a/smtpd/mail.mda.c
+++ b/foobar/portable/smtpd/mail.mda.c
diff --git a/smtpd/mail/Makefile b/foobar/portable/smtpd/mail/Makefile
index b2bc2a26..b2bc2a26 100644
--- a/smtpd/mail/Makefile
+++ b/foobar/portable/smtpd/mail/Makefile
diff --git a/smtpd/mailaddr.c b/foobar/portable/smtpd/mailaddr.c
index 4346e3dc..4346e3dc 100644
--- a/smtpd/mailaddr.c
+++ b/foobar/portable/smtpd/mailaddr.c
diff --git a/smtpd/makemap.8 b/foobar/portable/smtpd/makemap.8
index 674bef6f..674bef6f 100644
--- a/smtpd/makemap.8
+++ b/foobar/portable/smtpd/makemap.8
diff --git a/smtpd/makemap.c b/foobar/portable/smtpd/makemap.c
index be6122f1..be6122f1 100644
--- a/smtpd/makemap.c
+++ b/foobar/portable/smtpd/makemap.c
diff --git a/smtpd/mda.c b/foobar/portable/smtpd/mda.c
index 5e8fec19..5e8fec19 100644
--- a/smtpd/mda.c
+++ b/foobar/portable/smtpd/mda.c
diff --git a/smtpd/mda_mbox.c b/foobar/portable/smtpd/mda_mbox.c
index 8918e3ee..8918e3ee 100644
--- a/smtpd/mda_mbox.c
+++ b/foobar/portable/smtpd/mda_mbox.c
diff --git a/smtpd/mda_unpriv.c b/foobar/portable/smtpd/mda_unpriv.c
index 2143b9a0..2143b9a0 100644
--- a/smtpd/mda_unpriv.c
+++ b/foobar/portable/smtpd/mda_unpriv.c
diff --git a/smtpd/mda_variables.c b/foobar/portable/smtpd/mda_variables.c
index b672e492..b672e492 100644
--- a/smtpd/mda_variables.c
+++ b/foobar/portable/smtpd/mda_variables.c
diff --git a/smtpd/mproc.c b/foobar/portable/smtpd/mproc.c
index bde229e1..bde229e1 100644
--- a/smtpd/mproc.c
+++ b/foobar/portable/smtpd/mproc.c
diff --git a/smtpd/mta.c b/foobar/portable/smtpd/mta.c
index 922170ae..922170ae 100644
--- a/smtpd/mta.c
+++ b/foobar/portable/smtpd/mta.c
diff --git a/smtpd/mta_session.c b/foobar/portable/smtpd/mta_session.c
index 632f5be7..632f5be7 100644
--- a/smtpd/mta_session.c
+++ b/foobar/portable/smtpd/mta_session.c
diff --git a/smtpd/newaliases.8 b/foobar/portable/smtpd/newaliases.8
index b82e4515..b82e4515 100644
--- a/smtpd/newaliases.8
+++ b/foobar/portable/smtpd/newaliases.8
diff --git a/smtpd/parse.y b/foobar/portable/smtpd/parse.y
index db5be747..db5be747 100644
--- a/smtpd/parse.y
+++ b/foobar/portable/smtpd/parse.y
diff --git a/smtpd/parser.c b/foobar/portable/smtpd/parser.c
index 4c2321ec..4c2321ec 100644
--- a/smtpd/parser.c
+++ b/foobar/portable/smtpd/parser.c
diff --git a/smtpd/parser.h b/foobar/portable/smtpd/parser.h
index f0114e9e..f0114e9e 100644
--- a/smtpd/parser.h
+++ b/foobar/portable/smtpd/parser.h
diff --git a/smtpd/pony.c b/foobar/portable/smtpd/pony.c
index 1865b339..1865b339 100644
--- a/smtpd/pony.c
+++ b/foobar/portable/smtpd/pony.c
diff --git a/smtpd/proxy.c b/foobar/portable/smtpd/proxy.c
index fdaf4f27..fdaf4f27 100644
--- a/smtpd/proxy.c
+++ b/foobar/portable/smtpd/proxy.c
diff --git a/smtpd/queue.c b/foobar/portable/smtpd/queue.c
index 434e3647..434e3647 100644
--- a/smtpd/queue.c
+++ b/foobar/portable/smtpd/queue.c
diff --git a/smtpd/queue_backend.c b/foobar/portable/smtpd/queue_backend.c
index fa945f47..fa945f47 100644
--- a/smtpd/queue_backend.c
+++ b/foobar/portable/smtpd/queue_backend.c
diff --git a/smtpd/queue_fs.c b/foobar/portable/smtpd/queue_fs.c
index 097ba1e2..097ba1e2 100644
--- a/smtpd/queue_fs.c
+++ b/foobar/portable/smtpd/queue_fs.c
diff --git a/smtpd/queue_null.c b/foobar/portable/smtpd/queue_null.c
index 1e608be8..1e608be8 100644
--- a/smtpd/queue_null.c
+++ b/foobar/portable/smtpd/queue_null.c
diff --git a/smtpd/queue_proc.c b/foobar/portable/smtpd/queue_proc.c
index d6e0f409..d6e0f409 100644
--- a/smtpd/queue_proc.c
+++ b/foobar/portable/smtpd/queue_proc.c
diff --git a/smtpd/queue_ram.c b/foobar/portable/smtpd/queue_ram.c
index 50ce17e1..50ce17e1 100644
--- a/smtpd/queue_ram.c
+++ b/foobar/portable/smtpd/queue_ram.c
diff --git a/smtpd/report_smtp.c b/foobar/portable/smtpd/report_smtp.c
index 7802eaae..7802eaae 100644
--- a/smtpd/report_smtp.c
+++ b/foobar/portable/smtpd/report_smtp.c
diff --git a/smtpd/resolver.c b/foobar/portable/smtpd/resolver.c
index f0f0f8ea..f0f0f8ea 100644
--- a/smtpd/resolver.c
+++ b/foobar/portable/smtpd/resolver.c
diff --git a/smtpd/rfc5322.c b/foobar/portable/smtpd/rfc5322.c
index 0af66772..0af66772 100644
--- a/smtpd/rfc5322.c
+++ b/foobar/portable/smtpd/rfc5322.c
diff --git a/smtpd/rfc5322.h b/foobar/portable/smtpd/rfc5322.h
index 0979bd4c..0979bd4c 100644
--- a/smtpd/rfc5322.h
+++ b/foobar/portable/smtpd/rfc5322.h
diff --git a/smtpd/ruleset.c b/foobar/portable/smtpd/ruleset.c
index 719a2913..719a2913 100644
--- a/smtpd/ruleset.c
+++ b/foobar/portable/smtpd/ruleset.c
diff --git a/smtpd/runq.c b/foobar/portable/smtpd/runq.c
index 786d36fb..786d36fb 100644
--- a/smtpd/runq.c
+++ b/foobar/portable/smtpd/runq.c
diff --git a/smtpd/scheduler.c b/foobar/portable/smtpd/scheduler.c
index ea70a83d..ea70a83d 100644
--- a/smtpd/scheduler.c
+++ b/foobar/portable/smtpd/scheduler.c
diff --git a/smtpd/scheduler_backend.c b/foobar/portable/smtpd/scheduler_backend.c
index ad2b4cab..ad2b4cab 100644
--- a/smtpd/scheduler_backend.c
+++ b/foobar/portable/smtpd/scheduler_backend.c
diff --git a/smtpd/scheduler_null.c b/foobar/portable/smtpd/scheduler_null.c
index 40db6205..40db6205 100644
--- a/smtpd/scheduler_null.c
+++ b/foobar/portable/smtpd/scheduler_null.c
diff --git a/smtpd/scheduler_proc.c b/foobar/portable/smtpd/scheduler_proc.c
index 5f4e8b70..5f4e8b70 100644
--- a/smtpd/scheduler_proc.c
+++ b/foobar/portable/smtpd/scheduler_proc.c
diff --git a/smtpd/scheduler_ramqueue.c b/foobar/portable/smtpd/scheduler_ramqueue.c
index 0c04fc0b..0c04fc0b 100644
--- a/smtpd/scheduler_ramqueue.c
+++ b/foobar/portable/smtpd/scheduler_ramqueue.c
diff --git a/smtpd/sendmail.8 b/foobar/portable/smtpd/sendmail.8
index 1696a861..1696a861 100644
--- a/smtpd/sendmail.8
+++ b/foobar/portable/smtpd/sendmail.8
diff --git a/smtpd/smtp.1 b/foobar/portable/smtpd/smtp.1
index 3cc03844..3cc03844 100644
--- a/smtpd/smtp.1
+++ b/foobar/portable/smtpd/smtp.1
diff --git a/smtpd/smtp.c b/foobar/portable/smtpd/smtp.c
index 602fd0d6..602fd0d6 100644
--- a/smtpd/smtp.c
+++ b/foobar/portable/smtpd/smtp.c
diff --git a/smtpd/smtp.h b/foobar/portable/smtpd/smtp.h
index dc91d878..dc91d878 100644
--- a/smtpd/smtp.h
+++ b/foobar/portable/smtpd/smtp.h
diff --git a/smtpd/smtp/Makefile b/foobar/portable/smtpd/smtp/Makefile
index 380e3ad6..380e3ad6 100644
--- a/smtpd/smtp/Makefile
+++ b/foobar/portable/smtpd/smtp/Makefile
diff --git a/smtpd/smtp_client.c b/foobar/portable/smtpd/smtp_client.c
index 8e146e1b..8e146e1b 100644
--- a/smtpd/smtp_client.c
+++ b/foobar/portable/smtpd/smtp_client.c
diff --git a/smtpd/smtp_session.c b/foobar/portable/smtpd/smtp_session.c
index aefce155..aefce155 100644
--- a/smtpd/smtp_session.c
+++ b/foobar/portable/smtpd/smtp_session.c
diff --git a/smtpd/smtpc.c b/foobar/portable/smtpd/smtpc.c
index 59479703..59479703 100644
--- a/smtpd/smtpc.c
+++ b/foobar/portable/smtpd/smtpc.c
diff --git a/smtpd/smtpctl.8 b/foobar/portable/smtpd/smtpctl.8
index 1efcff63..1efcff63 100644
--- a/smtpd/smtpctl.8
+++ b/foobar/portable/smtpd/smtpctl.8
diff --git a/smtpd/smtpctl.c b/foobar/portable/smtpd/smtpctl.c
index 7dba4224..7dba4224 100644
--- a/smtpd/smtpctl.c
+++ b/foobar/portable/smtpd/smtpctl.c
diff --git a/smtpd/smtpctl/Makefile b/foobar/portable/smtpd/smtpctl/Makefile
index ef8148be..ef8148be 100644
--- a/smtpd/smtpctl/Makefile
+++ b/foobar/portable/smtpd/smtpctl/Makefile
diff --git a/smtpd/smtpd-api.h b/foobar/portable/smtpd/smtpd-api.h
index f83edd05..f83edd05 100644
--- a/smtpd/smtpd-api.h
+++ b/foobar/portable/smtpd/smtpd-api.h
diff --git a/smtpd/smtpd-defines.h b/foobar/portable/smtpd/smtpd-defines.h
index f22a546f..f22a546f 100644
--- a/smtpd/smtpd-defines.h
+++ b/foobar/portable/smtpd/smtpd-defines.h
diff --git a/smtpd/smtpd-filters.7 b/foobar/portable/smtpd/smtpd-filters.7
index 5af7008e..5af7008e 100644
--- a/smtpd/smtpd-filters.7
+++ b/foobar/portable/smtpd/smtpd-filters.7
diff --git a/smtpd/smtpd.8 b/foobar/portable/smtpd/smtpd.8
index e3429f07..e3429f07 100644
--- a/smtpd/smtpd.8
+++ b/foobar/portable/smtpd/smtpd.8
diff --git a/smtpd/smtpd.c b/foobar/portable/smtpd/smtpd.c
index e8b361fd..e8b361fd 100644
--- a/smtpd/smtpd.c
+++ b/foobar/portable/smtpd/smtpd.c
diff --git a/smtpd/smtpd.conf b/foobar/portable/smtpd/smtpd.conf
index a7ba6c64..a7ba6c64 100644
--- a/smtpd/smtpd.conf
+++ b/foobar/portable/smtpd/smtpd.conf
diff --git a/smtpd/smtpd.conf.5 b/foobar/portable/smtpd/smtpd.conf.5
index c543c662..c543c662 100644
--- a/smtpd/smtpd.conf.5
+++ b/foobar/portable/smtpd/smtpd.conf.5
diff --git a/smtpd/smtpd.h b/foobar/portable/smtpd/smtpd.h
index 4385f747..4385f747 100644
--- a/smtpd/smtpd.h
+++ b/foobar/portable/smtpd/smtpd.h
diff --git a/smtpd/smtpd/Makefile b/foobar/portable/smtpd/smtpd/Makefile
index 34a4dc74..34a4dc74 100644
--- a/smtpd/smtpd/Makefile
+++ b/foobar/portable/smtpd/smtpd/Makefile
diff --git a/smtpd/spfwalk.c b/foobar/portable/smtpd/spfwalk.c
index 0832d1bc..0832d1bc 100644
--- a/smtpd/spfwalk.c
+++ b/foobar/portable/smtpd/spfwalk.c
diff --git a/smtpd/srs.c b/foobar/portable/smtpd/srs.c
index bb4f4d9e..bb4f4d9e 100644
--- a/smtpd/srs.c
+++ b/foobar/portable/smtpd/srs.c
diff --git a/smtpd/ssl.c b/foobar/portable/smtpd/ssl.c
index a37d6fea..a37d6fea 100644
--- a/smtpd/ssl.c
+++ b/foobar/portable/smtpd/ssl.c
diff --git a/smtpd/ssl.h b/foobar/portable/smtpd/ssl.h
index 11c80c68..11c80c68 100644
--- a/smtpd/ssl.h
+++ b/foobar/portable/smtpd/ssl.h
diff --git a/smtpd/ssl_smtpd.c b/foobar/portable/smtpd/ssl_smtpd.c
index 4e5b7e75..4e5b7e75 100644
--- a/smtpd/ssl_smtpd.c
+++ b/foobar/portable/smtpd/ssl_smtpd.c
diff --git a/smtpd/ssl_verify.c b/foobar/portable/smtpd/ssl_verify.c
index 2e784b97..2e784b97 100644
--- a/smtpd/ssl_verify.c
+++ b/foobar/portable/smtpd/ssl_verify.c
diff --git a/smtpd/stat_backend.c b/foobar/portable/smtpd/stat_backend.c
index 30cb299b..30cb299b 100644
--- a/smtpd/stat_backend.c
+++ b/foobar/portable/smtpd/stat_backend.c
diff --git a/smtpd/stat_ramstat.c b/foobar/portable/smtpd/stat_ramstat.c
index bbf1541a..bbf1541a 100644
--- a/smtpd/stat_ramstat.c
+++ b/foobar/portable/smtpd/stat_ramstat.c
diff --git a/smtpd/table.5 b/foobar/portable/smtpd/table.5
index e9d4fa4b..e9d4fa4b 100644
--- a/smtpd/table.5
+++ b/foobar/portable/smtpd/table.5
diff --git a/smtpd/table.c b/foobar/portable/smtpd/table.c
index 469eeee1..469eeee1 100644
--- a/smtpd/table.c
+++ b/foobar/portable/smtpd/table.c
diff --git a/smtpd/table_db.c b/foobar/portable/smtpd/table_db.c
index f7d766dd..f7d766dd 100644
--- a/smtpd/table_db.c
+++ b/foobar/portable/smtpd/table_db.c
diff --git a/smtpd/table_getpwnam.c b/foobar/portable/smtpd/table_getpwnam.c
index ccf889be..ccf889be 100644
--- a/smtpd/table_getpwnam.c
+++ b/foobar/portable/smtpd/table_getpwnam.c
diff --git a/smtpd/table_proc.c b/foobar/portable/smtpd/table_proc.c
index 44589bd7..44589bd7 100644
--- a/smtpd/table_proc.c
+++ b/foobar/portable/smtpd/table_proc.c
diff --git a/smtpd/table_static.c b/foobar/portable/smtpd/table_static.c
index 8f78ae11..8f78ae11 100644
--- a/smtpd/table_static.c
+++ b/foobar/portable/smtpd/table_static.c
diff --git a/smtpd/to.c b/foobar/portable/smtpd/to.c
index 81a1bb54..81a1bb54 100644
--- a/smtpd/to.c
+++ b/foobar/portable/smtpd/to.c
diff --git a/smtpd/tree.c b/foobar/portable/smtpd/tree.c
index 1d720a59..1d720a59 100644
--- a/smtpd/tree.c
+++ b/foobar/portable/smtpd/tree.c
diff --git a/smtpd/tree.h b/foobar/portable/smtpd/tree.h
index 3d719f09..3d719f09 100644
--- a/smtpd/tree.h
+++ b/foobar/portable/smtpd/tree.h
diff --git a/smtpd/unpack_dns.c b/foobar/portable/smtpd/unpack_dns.c
index 974d5727..974d5727 100644
--- a/smtpd/unpack_dns.c
+++ b/foobar/portable/smtpd/unpack_dns.c
diff --git a/smtpd/unpack_dns.h b/foobar/portable/smtpd/unpack_dns.h
index 2318a0c5..2318a0c5 100644
--- a/smtpd/unpack_dns.h
+++ b/foobar/portable/smtpd/unpack_dns.h
diff --git a/smtpd/util.c b/foobar/portable/smtpd/util.c
index b2b1458c..b2b1458c 100644
--- a/smtpd/util.c
+++ b/foobar/portable/smtpd/util.c
diff --git a/smtpd/waitq.c b/foobar/portable/smtpd/waitq.c
index 082a1e51..082a1e51 100644
--- a/smtpd/waitq.c
+++ b/foobar/portable/smtpd/waitq.c
diff --git a/smtpscript/LICENSE b/foobar/portable/smtpscript/LICENSE
index 92859014..92859014 100644
--- a/smtpscript/LICENSE
+++ b/foobar/portable/smtpscript/LICENSE
diff --git a/smtpscript/Makefile b/foobar/portable/smtpscript/Makefile
index 6a628f2a..6a628f2a 100644
--- a/smtpscript/Makefile
+++ b/foobar/portable/smtpscript/Makefile
diff --git a/smtpscript/Makefile.inc b/foobar/portable/smtpscript/Makefile.inc
index be93057b..be93057b 100644
--- a/smtpscript/Makefile.inc
+++ b/foobar/portable/smtpscript/Makefile.inc
diff --git a/smtpscript/README.md b/foobar/portable/smtpscript/README.md
index 18f5fe9e..18f5fe9e 100644
--- a/smtpscript/README.md
+++ b/foobar/portable/smtpscript/README.md
diff --git a/smtpscript/iobuf.c b/foobar/portable/smtpscript/iobuf.c
index 05a9cd59..05a9cd59 100644
--- a/smtpscript/iobuf.c
+++ b/foobar/portable/smtpscript/iobuf.c
diff --git a/smtpscript/iobuf.h b/foobar/portable/smtpscript/iobuf.h
index ee4690c8..ee4690c8 100644
--- a/smtpscript/iobuf.h
+++ b/foobar/portable/smtpscript/iobuf.h
diff --git a/smtpscript/parse.y b/foobar/portable/smtpscript/parse.y
index 47a0f35c..47a0f35c 100644
--- a/smtpscript/parse.y
+++ b/foobar/portable/smtpscript/parse.y
diff --git a/smtpscript/smtpscript.c b/foobar/portable/smtpscript/smtpscript.c
index a75c4249..a75c4249 100644
--- a/smtpscript/smtpscript.c
+++ b/foobar/portable/smtpscript/smtpscript.c
diff --git a/smtpscript/smtpscript.h b/foobar/portable/smtpscript/smtpscript.h
index ba90b240..ba90b240 100644
--- a/smtpscript/smtpscript.h
+++ b/foobar/portable/smtpscript/smtpscript.h
diff --git a/smtpscript/smtpscript/Makefile b/foobar/portable/smtpscript/smtpscript/Makefile
index 0520606f..0520606f 100644
--- a/smtpscript/smtpscript/Makefile
+++ b/foobar/portable/smtpscript/smtpscript/Makefile
diff --git a/smtpscript/ssl.c b/foobar/portable/smtpscript/ssl.c
index 54f0993d..54f0993d 100644
--- a/smtpscript/ssl.c
+++ b/foobar/portable/smtpscript/ssl.c
diff --git a/m4/aclocal-openssh.m4 b/m4/aclocal-openssh.m4
deleted file mode 100644
index 2944bb99..00000000
--- a/m4/aclocal-openssh.m4
+++ /dev/null
@@ -1,179 +0,0 @@
-dnl $Id: aclocal.m4,v 1.13 2014/01/22 10:30:12 djm Exp $
-dnl
-dnl OpenSSH-specific autoconf macros
-dnl
-
-dnl OSSH_CHECK_CFLAG_COMPILE(check_flag[, define_flag])
-dnl Check that $CC accepts a flag 'check_flag'. If it is supported append
-dnl 'define_flag' to $CFLAGS. If 'define_flag' is not specified, then append
-dnl 'check_flag'.
-AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{
-	AC_MSG_CHECKING([if $CC supports compile flag $1])
-	saved_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $WERROR $1"
-	_define_flag="$2"
-	test "x$_define_flag" = "x" && _define_flag="$1"
-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-#include <stdlib.h>
-#include <stdio.h>
-int main(int argc, char **argv) {
-	/* Some math to catch -ftrapv problems in the toolchain */
-	int i = 123 * argc, j = 456 + argc, k = 789 - argc;
-	float l = i * 2.1;
-	double m = l / 0.5;
-	long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
-	printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
-	exit(0);
-}
-	]])],
-		[
-if `grep -i "unrecognized option" conftest.err >/dev/null`
-then
-		AC_MSG_RESULT([no])
-		CFLAGS="$saved_CFLAGS"
-else
-		AC_MSG_RESULT([yes])
-		 CFLAGS="$saved_CFLAGS $_define_flag"
-fi],
-		[ AC_MSG_RESULT([no])
-		  CFLAGS="$saved_CFLAGS" ]
-	)
-}])
-
-dnl OSSH_CHECK_CFLAG_LINK(check_flag[, define_flag])
-dnl Check that $CC accepts a flag 'check_flag'. If it is supported append
-dnl 'define_flag' to $CFLAGS. If 'define_flag' is not specified, then append
-dnl 'check_flag'.
-AC_DEFUN([OSSH_CHECK_CFLAG_LINK], [{
-	AC_MSG_CHECKING([if $CC supports compile flag $1 and linking succeeds])
-	saved_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $WERROR $1"
-	_define_flag="$2"
-	test "x$_define_flag" = "x" && _define_flag="$1"
-	AC_LINK_IFELSE([AC_LANG_SOURCE([[
-#include <stdlib.h>
-#include <stdio.h>
-int main(int argc, char **argv) {
-	/* Some math to catch -ftrapv problems in the toolchain */
-	int i = 123 * argc, j = 456 + argc, k = 789 - argc;
-	float l = i * 2.1;
-	double m = l / 0.5;
-	long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
-	printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
-	exit(0);
-}
-	]])],
-		[
-if `grep -i "unrecognized option" conftest.err >/dev/null`
-then
-		AC_MSG_RESULT([no])
-		CFLAGS="$saved_CFLAGS"
-else
-		AC_MSG_RESULT([yes])
-		 CFLAGS="$saved_CFLAGS $_define_flag"
-fi],
-		[ AC_MSG_RESULT([no])
-		  CFLAGS="$saved_CFLAGS" ]
-	)
-}])
-
-dnl OSSH_CHECK_LDFLAG_LINK(check_flag[, define_flag])
-dnl Check that $LD accepts a flag 'check_flag'. If it is supported append
-dnl 'define_flag' to $LDFLAGS. If 'define_flag' is not specified, then append
-dnl 'check_flag'.
-AC_DEFUN([OSSH_CHECK_LDFLAG_LINK], [{
-	AC_MSG_CHECKING([if $LD supports link flag $1])
-	saved_LDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS $WERROR $1"
-	_define_flag="$2"
-	test "x$_define_flag" = "x" && _define_flag="$1"
-	AC_LINK_IFELSE([AC_LANG_SOURCE([[
-#include <stdlib.h>
-#include <stdio.h>
-int main(int argc, char **argv) {
-	/* Some math to catch -ftrapv problems in the toolchain */
-	int i = 123 * argc, j = 456 + argc, k = 789 - argc;
-	float l = i * 2.1;
-	double m = l / 0.5;
-	long long int n = argc * 12345LL, o = 12345LL * (long long int)argc;
-	printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o);
-	exit(0);
-}
-		]])],
-		[ AC_MSG_RESULT([yes])
-		  LDFLAGS="$saved_LDFLAGS $_define_flag"],
-		[ AC_MSG_RESULT([no])
-		  LDFLAGS="$saved_LDFLAGS" ]
-	)
-}])
-
-dnl OSSH_CHECK_HEADER_FOR_FIELD(field, header, symbol)
-dnl Does AC_EGREP_HEADER on 'header' for the string 'field'
-dnl If found, set 'symbol' to be defined. Cache the result.
-dnl TODO: This is not foolproof, better to compile and read from there
-AC_DEFUN([OSSH_CHECK_HEADER_FOR_FIELD], [
-# look for field '$1' in header '$2'
-	dnl This strips characters illegal to m4 from the header filename
-	ossh_safe=`echo "$2" | sed 'y%./+-%__p_%'`
-	dnl
-	ossh_varname="ossh_cv_$ossh_safe""_has_"$1
-	AC_MSG_CHECKING(for $1 field in $2)
-	AC_CACHE_VAL($ossh_varname, [
-		AC_EGREP_HEADER($1, $2, [ dnl
-			eval "$ossh_varname=yes" dnl
-		], [ dnl
-			eval "$ossh_varname=no" dnl
-		]) dnl
-	])
-	ossh_result=`eval 'echo $'"$ossh_varname"`
-	if test -n "`echo $ossh_varname`"; then
-		AC_MSG_RESULT($ossh_result)
-		if test "x$ossh_result" = "xyes"; then
-			AC_DEFINE($3, 1, [Define if you have $1 in $2])
-		fi
-	else
-		AC_MSG_RESULT(no)
-	fi
-])
-
-dnl Check for socklen_t: historically on BSD it is an int, and in
-dnl POSIX 1g it is a type of its own, but some platforms use different
-dnl types for the argument to getsockopt, getpeername, etc.  So we
-dnl have to test to find something that will work.
-AC_DEFUN([TYPE_SOCKLEN_T],
-[
-   AC_CHECK_TYPE([socklen_t], ,[
-      AC_MSG_CHECKING([for socklen_t equivalent])
-      AC_CACHE_VAL([curl_cv_socklen_t_equiv],
-      [
-	 # Systems have either "struct sockaddr *" or
-	 # "void *" as the second argument to getpeername
-	 curl_cv_socklen_t_equiv=
-	 for arg2 in "struct sockaddr" void; do
-	    for t in int size_t unsigned long "unsigned long"; do
-	       AC_TRY_COMPILE([
-		  #include <sys/types.h>
-		  #include <sys/socket.h>
-
-		  int getpeername (int, $arg2 *, $t *);
-	       ],[
-		  $t len;
-		  getpeername(0,0,&len);
-	       ],[
-		  curl_cv_socklen_t_equiv="$t"
-		  break
-	       ])
-	    done
-	 done
-
-	 if test "x$curl_cv_socklen_t_equiv" = x; then
-	    AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
-	 fi
-      ])
-      AC_MSG_RESULT($curl_cv_socklen_t_equiv)
-      AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
-			[type to use in place of socklen_t if not defined])],
-      [#include <sys/types.h>
-#include <sys/socket.h>])
-])
-
diff --git a/smtpd/smtpctl/CVS/Entries b/smtpd/smtpctl/CVS/Entries
deleted file mode 100644
index 4c1dedd7..00000000
--- a/smtpd/smtpctl/CVS/Entries
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile/1.46/Wed Apr 25 07:51:42 2018//
-D
diff --git a/smtpd/smtpctl/CVS/Repository b/smtpd/smtpctl/CVS/Repository
deleted file mode 100644
index edc50474..00000000
--- a/smtpd/smtpctl/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-src/usr.sbin/smtpd/smtpctl
diff --git a/smtpd/smtpctl/CVS/Root b/smtpd/smtpctl/CVS/Root
deleted file mode 100644
index 8a89d1a7..00000000
--- a/smtpd/smtpctl/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-gilles@cvs.openbsd.org:/cvs
diff --git a/smtpd/smtpd/CVS/Repository b/smtpd/smtpd/CVS/Repository
deleted file mode 100644
index 11be251c..00000000
--- a/smtpd/smtpd/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-src/usr.sbin/smtpd/smtpd
diff --git a/smtpd/smtpd/CVS/Root b/smtpd/smtpd/CVS/Root
deleted file mode 100644
index 8a89d1a7..00000000
--- a/smtpd/smtpd/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-gilles@cvs.openbsd.org:/cvs