731c58d3ae07a65e30723355d234f807  0005-util-Consolidate-common-macros.patch