Merge branch 'master' into portable

Conflicts:
	smtpd/makemap/Makefile
	smtpd/smtpctl/Makefile
	smtpd/smtpd/Makefile
	smtpd/table.c
	smtpd/table_ldap.c
	smtpd/table_sqlite.c
cosmesthic
Merge branch 'portable' of ssh.poolp.org:/git/opensmtpd into portable
Merge branch 'master' into portable
lowercase comparison of IPv6 prefix ...
Merge branch 'portable' of /git/opensmtpd into portable
Merge branch 'master' into portable