cherry-pick_08e5cabe_portability_fixes.patch
cherry-pick_b079eaf8d_fix_compatibility_issue_with_GNU_Hurd.patch
