Apply the same patches as glibc 2.5: they apply without any problem (except for ridiculously small offsets).