patch provided in PR 22412 by neil at daikokuya dot co dot uk Long list of changes/fixes. See the HISTORY file for details.
+ move the patch digest/checksum values from files/patch-sum to distinfo