Update the format descriptions to include ISO9660 and ZIP support.

Also remove some unnecessary blank lines from archive_read.3.

3 files changed, 19 insertions, 4 deletions

diff --git a/lib/libarchive/README b/lib/libarchive/README
index 105cef5..1380b4a 100644
--- a/lib/libarchive/README
+++ b/lib/libarchive/README
@@ -15,8 +15,7 @@ Documentation:
 
 You should also read the copious comments in "archive.h" and the source
 code for the sample "bsdtar" program for more details.  Please let me know
-about any errors or omissions you find.  (In particular, I no doubt missed
-a few things when researching the tar.5 page.)
+about any errors or omissions you find.
 
 Currently, the library automatically detects and reads the following:
   * gzip compression
@@ -31,6 +30,8 @@ Currently, the library automatically detects and reads the following:
   * POSIX octet-oriented cpio
   * SVR4 ASCII cpio
   * Binary cpio (big-endian or little-endian)
+  * ISO9660 CD-ROM images (with optional Rockridge extensions)
+  * ZIP archives (with uncompressed or "deflate" compressed entries)
 
 The library can write:
   * gzip compression
diff --git a/lib/libarchive/archive_read.3 b/lib/libarchive/archive_read.3
index 5d5948e3..9618f99 100644
--- a/lib/libarchive/archive_read.3
+++ b/lib/libarchive/archive_read.3
@@ -491,5 +491,3 @@ or before calling
 you may confuse the permission-setting logic with
 the result that directory permissions are restored
 incorrectly.
-
-
diff --git a/lib/libarchive/libarchive-formats.5 b/lib/libarchive/libarchive-formats.5
index c4ee23b..c6fcd2a 100644
--- a/lib/libarchive/libarchive-formats.5
+++ b/lib/libarchive/libarchive-formats.5
@@ -219,9 +219,25 @@ It also includes additional shell commands that attempt to reproduce as
 many file attributes as possible, including owner, mode, and flags.
 The additional commands used to restore file attributes make
 shardump archives less portable than plain shar archives.
+.Ss ISO9660 format
+Libarchive can read and extract from files containing ISO9660-compliant
+CDROM images.  It also has partial support for Rockridge extensions.
+In many cases, this can remove the need to burn a physical CDROM.
+It also avoids security and complexity issues that come with
+virtual mounts and loopback devices.
+.Ss Zip format
+Libarchive can extract from most zip format archives.
+It currently only supports uncompressed entries and entries
+compressed with the
+.Dq deflate
+algorithm.
+Older zip compression algorithms are not supported.
 .El
 .Sh SEE ALSO
 .Xr cpio 1 ,
+.Xr mkisofs 1 ,
 .Xr shar 1 ,
 .Xr tar 1 ,
+.Xr zip 1 ,
+.Xr zlib 3 ,
 .Xr tar 5