Merge pull request #9550 from ja-pa/libarchive-3.4.0