reorder patches to fix tcp_wrappers build