From 94451fa8a022b9dc3ae3929949ffa9ca840ed9a5 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sat, 7 Apr 2007 05:54:23 +0000 Subject: Enable 'ar' support; hook it up to the build and enable it with _read_support_format_all(). --- lib/libarchive/Makefile | 4 +++- lib/libarchive/archive_read_support_format_all.c | 1 + lib/libarchive/test/Makefile | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index c6468befab1d..0fd956d7ed62 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -9,7 +9,7 @@ LDADD= -lbz2 -lz # Major: Bumped ONLY when API/ABI breakage happens (see SHLIB_MAJOR) # Minor: Bumped when significant new features are added # Revision: Bumped on any notable change -VERSION= 2.0.25 +VERSION= 2.0.27 ARCHIVE_API_MAJOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/\..*//' ARCHIVE_API_MINOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/[0-9]*\.//' -e 's/\..*//' @@ -58,6 +58,7 @@ SRCS= archive.h \ archive_read_support_compression_gzip.c \ archive_read_support_compression_none.c \ archive_read_support_format_all.c \ + archive_read_support_format_ar.c \ archive_read_support_format_cpio.c \ archive_read_support_format_empty.c \ archive_read_support_format_iso9660.c \ @@ -78,6 +79,7 @@ SRCS= archive.h \ archive_write_set_compression_gzip.c \ archive_write_set_compression_none.c \ archive_write_set_format.c \ + archive_write_set_format_ar.c \ archive_write_set_format_by_name.c \ archive_write_set_format_cpio.c \ archive_write_set_format_pax.c \ diff --git a/lib/libarchive/archive_read_support_format_all.c b/lib/libarchive/archive_read_support_format_all.c index df3a03f70be9..d03f362b26b7 100644 --- a/lib/libarchive/archive_read_support_format_all.c +++ b/lib/libarchive/archive_read_support_format_all.c @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); int archive_read_support_format_all(struct archive *a) { + archive_read_support_format_ar(a); archive_read_support_format_cpio(a); archive_read_support_format_empty(a); archive_read_support_format_iso9660(a); diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile index 552dec1eaede..b5da3abf9898 100644 --- a/lib/libarchive/test/Makefile +++ b/lib/libarchive/test/Makefile @@ -7,6 +7,7 @@ TESTS= \ test_bad_fd.c \ test_read_data_large.c \ test_read_extract.c \ + test_read_format_ar.c \ test_read_format_cpio_bin.c \ test_read_format_cpio_bin_Z.c \ test_read_format_cpio_bin_bz2.c \ @@ -30,6 +31,7 @@ TESTS= \ test_write_disk.c \ test_write_disk_perms.c \ test_write_disk_secure.c \ + test_write_format_ar.c \ test_write_format_cpio_empty.c \ test_write_format_shar_empty.c \ test_write_format_tar.c \ @@ -66,4 +68,4 @@ clean: -chmod -R +w /tmp/libarchive_test.* rm -rf /tmp/libarchive_test.* -.include \ No newline at end of file +.include -- cgit v1.3