Patch committed by James Cook <james.cook@utoronto.ca>.
A test build pulled too many packages (including perl) for my VM so while it's a simple bump, it's also untested.
Additionally, move all gnupg expressions into the gnupg folder.