Fixed upstream in a different way (our patch was buggy, see CVE-2017-16997).
All of the useful glibc maintainer scripts are located at: https://pagure.io/glibc-maintainer-scripts