Here is a possible debdiff for review. I've asked for a CVE to be assigned to this bug and the other one.
Here is a possible debdiff for review. I've asked for a CVE to be assigned to this bug and the other one.