This change updates the first patch so that it can be applied again. It adds another patch to make it work with compiler flag "-Werror=format-security".