Use a newer version of e2fsprogs, redo the patchset. Gets things building again but with ugly hacks in the sources. Some cleanup will be needed before we can consider upstreaming changes.