error: patch failed: NEWS:21
error: NEWS: patch does not apply