Backport pkg.conf move to 9.2, and add revoked placeholder