From fd8d47684aa9fbffbada8f2bc0a2ecbc1d70108c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 18 Apr 2009 23:55:38 +0200 Subject: [PATCH] Revert "Only add support for bzip2/lzma compression and tar format in" This reverts commit d8153785d25241d8e22ef664d484cf37a50c8ef2. --HG-- extra : convert_revision : 62e08401d6a94e78d149ff5ce4ba455d087b39df --- bin/xbps-repo/index.c | 7 +++---- lib/unpack.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/bin/xbps-repo/index.c b/bin/xbps-repo/index.c index 6426a57b66..8fd0626c7d 100644 --- a/bin/xbps-repo/index.c +++ b/bin/xbps-repo/index.c @@ -94,10 +94,9 @@ repoidx_addpkg(const char *file, const char *filename, const char *pkgdir) if (ar == NULL) return errno; - /* 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); + /* Enable support for all format and compression methods */ + archive_read_support_compression_all(ar); + archive_read_support_format_all(ar); if ((rv = archive_read_open_filename(ar, file, ARCHIVE_READ_BLOCKSIZE)) == -1) { diff --git a/lib/unpack.c b/lib/unpack.c index 8dc3176ca1..36126468ed 100644 --- a/lib/unpack.c +++ b/lib/unpack.c @@ -87,10 +87,9 @@ unpack_archive_init(prop_dictionary_t pkg, const char *binfile) return ENOMEM; } - /* 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); + /* Enable support for all format and compression methods */ + archive_read_support_compression_all(ar); + archive_read_support_format_all(ar); /* 2048 is arbitrary... dunno what value is better. */ if ((rv = archive_read_open_fd(ar, pkg_fd,