diff -Naur libarchive-3.4.0.orig/cpio/bsdcpio.1 libarchive-3.4.0/cpio/bsdcpio.1 --- libarchive-3.4.0.orig/cpio/bsdcpio.1 2019-11-10 19:33:26.000000000 +0000 +++ libarchive-3.4.0/cpio/bsdcpio.1 2019-11-10 19:34:33.000000000 +0000 @@ -123,18 +123,42 @@ Produce the output archive in the specified format. Supported formats include: .Pp -.Bl -tag -width "iso9660" -compact +.Bl -tag -width "shardump" -compact +.It Ar 7zip +7z archive compatible with the 7-Zip +.It Ar arbsd +Static library compatible with BSD ar(1) +.It Ar arsvr4 +Static library compatible with SVR4 and GNU ar(1) +.It Ar bsdtar +(DEFAULT) Restricted pax; mostly compatible with the standard tar .It Ar cpio Synonym for .Ar odc . +.It Ar gnutar +Tar archive with GNU extensions +.It Ar iso9660 +ISO9660 CD-ROM image +.It Ar mtree +Not a true archive but a textual description of filesystem hierarchy .It Ar newc -The SVR4 portable cpio format. +SVR4 ASCII cpio archive .It Ar odc -The old POSIX.1 portable octet-oriented cpio format. +POSIX.1-1988 standard cpio archive .It Ar pax -The POSIX.1 pax format, an extension of the ustar format. +Extended tar format introduced by POSIX.1-2001 standard +.It Ar shar +Shell archive composed of text files only +.It Ar shardump +Shell archive supporting binary files, but depends on uuencode and uudecode .It Ar ustar -The POSIX.1 tar format. +Standard tar archive compatible with the most of tar(1) implementations +.It Ar v7tar +Traditional tar archive compatible with the UNIX V7 +.It Ar xar +XAR archives +.It Ar zip +Zip archive commonly used in Windows .El .Pp The default format is diff -Naur libarchive-3.4.0.orig/libarchive/libarchive.3 libarchive-3.4.0/libarchive/libarchive.3 --- libarchive-3.4.0.orig/libarchive/libarchive.3 2019-11-10 19:33:27.000000000 +0000 +++ libarchive-3.4.0/libarchive/libarchive.3 2019-11-10 19:34:33.000000000 +0000 @@ -64,6 +64,8 @@ .It ISO9660 CD images (including RockRidge and Joliet extensions), .It +7-Zip archives, +.It Zip archives, .It ar archives (including GNU/SysV and BSD extensions), diff -Naur libarchive-3.4.0.orig/tar/bsdtar.1 libarchive-3.4.0/tar/bsdtar.1 --- libarchive-3.4.0.orig/tar/bsdtar.1 2019-11-10 19:33:27.000000000 +0000 +++ libarchive-3.4.0/tar/bsdtar.1 2019-11-10 19:34:33.000000000 +0000 @@ -228,12 +228,48 @@ (c, r, u mode only) Use the specified format for the created archive. Supported formats include -.Dq cpio , -.Dq pax , -.Dq shar , -and -.Dq ustar . -Other formats may also be supported; see +.Pp +.Bl -tag -width "shardump" -compact +.It Ar 7zip +7z archive compatible with the 7-Zip +.It Ar arbsd +Static library compatible with BSD ar(1) +.It Ar arsvr4 +Static library compatible with SVR4 and GNU ar(1) +.It Ar bsdtar +(DEFAULT) Restricted pax; mostly compatible with the standard tar +.It Ar cpio +Synonym for +.Ar odc . +.It Ar gnutar +Tar archive with GNU extensions +.It Ar iso9660 +ISO9660 CD-ROM image +.It Ar mtree +Not a true archive but a textual description of filesystem hierarchy +.It Ar newc +SVR4 ASCII cpio archive +.It Ar odc +POSIX.1-1988 standard cpio archive +.It Ar pax +Extended tar format introduced by POSIX.1-2001 standard +.It Ar shar +Shell archive composed of text files only +.It Ar shardump +Shell archive supporting binary files, but depends on uuencode and uudecode +.It Ar ustar +Standard tar archive compatible with the most of tar(1) implementations +.It Ar v7tar +Traditional tar archive compatible with the UNIX V7 +.It Ar xar +XAR archives +.It Ar zip +Zip archive commonly used in Windows +.El +.Pp +The default is +.Ar bsdtar . +See .Xr libarchive-formats 5 for more information about currently-supported formats. In r and u modes, when extending an existing archive, the format specified @@ -244,12 +280,7 @@ .Pa - for standard input or standard output. The default varies by system; -on -.Fx , -the default is -.Pa /dev/sa0 ; -on Linux, the default is -.Pa /dev/st0 . +on Fink/MacOS X, the default is standard input or output. .It Fl Fl gid Ar id Use the provided group id number. On extract, this overrides the group id in the archive; @@ -1172,10 +1203,7 @@ public-domain implementation (circa November, 1987) was quite influential, and formed the basis of GNU tar. GNU tar was included as the standard system tar -in -.Fx -beginning with -.Fx 1.0 . +in FreeBSD beginning with FreeBSD 1.0 . .Pp This is a complete re-implementation based on the .Xr libarchive 3 diff -Naur libarchive-3.4.0.orig/tar/bsdtar.c libarchive-3.4.0/tar/bsdtar.c --- libarchive-3.4.0.orig/tar/bsdtar.c 2019-11-10 19:33:27.000000000 +0000 +++ libarchive-3.4.0/tar/bsdtar.c 2019-11-10 19:34:33.000000000 +0000 @@ -217,8 +217,10 @@ /* Default: open tape drive. */ bsdtar->filename = getenv("TAPE"); +#if !(defined(__APPLE__) && defined(__MACH__)) /* default to stdio on Fink/MacOS X */ if (bsdtar->filename == NULL) bsdtar->filename = _PATH_DEFTAPE; +#endif /* Default block size settings. */ bsdtar->bytes_per_block = DEFAULT_BYTES_PER_BLOCK;