More libarchive patches