Merge pull request #7904 from ja-pa/libarchive-patch-cve