d/patches: refresh 'sort' fix with upstream version

Our previous patch was flawed in that it didn't allow for multiple -k arguments. Upstream came up with a better solution so we should switch to that one.