Fixups for several of my packages

This should fix the build failures for `criu` and `duo-unix` on Hydra. I also adopted `scrypt` as well.