Bring patches from 2.7, remove unneeded ones, change plist to not conflict with upcoming 3.3.1 version and update changes specific to OpenBSD.
Bring patches from 2.7, remove unneeded ones, change plist to not conflict with upcoming 3.3.1 version and update changes specific to OpenBSD.