Drop two local patches which were replaced by upstream commits. Signed-off-by: Daniel Golle <daniel@makrotopia.org>