[crux-commits] ports/compat-32 (3.2): re-add files that got wrongly removed from a merge from 3.3