Only enable the tar and gzip modules when initialising libarchive.

This means you will only be able to run pkgadd/pkginfo on gzipped tarballs
but not on tarballs that were compressed with eg bzip2 or xz.

diff --git a/Makefile b/Makefile
index 172b7e9b3f629455914ed3e5798b3f5da936ebb8..a194ad238a7be65cf2f4e4e62492bc0dd45eb121 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ CXXFLAGS += -DNDEBUG
 CXXFLAGS += -O2 -Wall -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" \
            -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
-LDFLAGS += -static -larchive -lz -lbz2
+LDFLAGS += -static -larchive -lz
 
 OBJECTS = main.o pkgutil.o pkgadd.o pkgrm.o pkginfo.o
 

diff --git a/pkgutil.cc b/pkgutil.cc
index 709e7488493143cee0d9e9fde22184d7b4d39dc2..69fefc1e4bde7474df824508cdcc7cd77b0c79ff 100644 (file)
--- a/pkgutil.cc
+++ b/pkgutil.cc
@@ -44,8 +44,8 @@
 #include <archive_entry.h>
 
 #define INIT_ARCHIVE(ar) \
-       archive_read_support_compression_all((ar)); \
-       archive_read_support_format_all((ar))
+       archive_read_support_compression_gzip((ar)); \
+       archive_read_support_format_tar((ar))
 
 using __gnu_cxx::stdio_filebuf;