Sync with NetBSD. In addition to some bug fixes, this brings in -s srcaddr
tree308a23165b9919f06265ca1d593bca7af9db349c
drwxr-xr-x - contrib