The xinit upgrade to 1.4.3 introduced a large upstream changeset that ends up
breaking startx in a couple cases. This commit patches the upstream build to
1) let startx use mcookie, and 2) protect the injected mcookie path.