From e4c31936b262262b0bd268056e3d2f7f01a6aa9e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 18 Apr 2009 17:25:04 +0200 Subject: [PATCH] Only add support for bzip2/lzma compression and tar format in libarchive. --HG-- extra : convert_revision : d8153785d25241d8e22ef664d484cf37a50c8ef2 --- bin/xbps-repo/index.c | 7 ++++--- lib/unpack.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/xbps-repo/index.c b/bin/xbps-repo/index.c index 8fd0626c7df..6426a57b662 100644 --- a/bin/xbps-repo/index.c +++ b/bin/xbps-repo/index.c @@ -94,9 +94,10 @@ repoidx_addpkg(const char *file, const char *filename, const char *pkgdir) if (ar == NULL) return errno; - /* Enable support for all format and compression methods */ - archive_read_support_compression_all(ar); - archive_read_support_format_all(ar); + /* Enable support for tar format archives with bzip2/lzma compression */ + archive_read_support_compression_bzip2(ar); + archive_read_support_compression_lzma(ar); + archive_read_support_format_tar(ar); if ((rv = archive_read_open_filename(ar, file, ARCHIVE_READ_BLOCKSIZE)) == -1) { diff --git a/lib/unpack.c b/lib/unpack.c index 36126468ed4..8dc3176ca16 100644 --- a/lib/unpack.c +++ b/lib/unpack.c @@ -87,9 +87,10 @@ unpack_archive_init(prop_dictionary_t pkg, const char *binfile) return ENOMEM; } - /* Enable support for all format and compression methods */ - archive_read_support_compression_all(ar); - archive_read_support_format_all(ar); + /* Enable support for tar archives with bzip2/lzma compression */ + archive_read_support_compression_bzip2(ar); + archive_read_support_compression_lzma(ar); + archive_read_support_format_tar(ar); /* 2048 is arbitrary... dunno what value is better. */ if ((rv = archive_read_open_fd(ar, pkg_fd,