head	1.4;
access;
symbols
	RELENG_8_4:1.4.0.2
	RELENG_9_1_0_RELEASE:1.2.2.2.2.2
	RELENG_9_1:1.2.2.2.0.2
	RELENG_9_1_BP:1.2.2.2
	RELENG_8_3_0_RELEASE:1.2.4.2.2.1
	RELENG_8_3:1.2.4.2.0.2
	RELENG_8_3_BP:1.2.4.2
	RELENG_8:1.2.0.4
	RELENG_9:1.2.0.2;
locks; strict;
comment	@# @;


1.4
date	2012.11.17.01.48.47;	author svnexp;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2012.07.27.08.28.44;	author mm;	state Exp;
branches;
next	1.2;

1.2
date	2011.12.23.08.50.26;	author mm;	state Exp;
branches
	1.2.2.1
	1.2.4.1;
next	1.1;

1.1
date	2011.12.21.11.11.51;	author mm;	state Exp;
branches;
next	;

1.4.2.1
date	2012.11.17.01.48.47;	author svnexp;	state dead;
branches;
next	1.4.2.2;

1.4.2.2
date	2013.03.28.13.01.23;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2012.01.05.12.06.54;	author mm;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2012.01.05.12.06.54;	author mm;	state Exp;
branches
	1.2.2.2.2.1;
next	1.2.2.3;

1.2.2.3
date	2012.11.17.11.36.06;	author svnexp;	state Exp;
branches;
next	;

1.2.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.2.2.2.2.2;

1.2.2.2.2.2
date	2012.11.17.08.46.56;	author svnexp;	state Exp;
branches;
next	;

1.2.4.1
date	2012.01.05.12.07.42;	author mm;	state dead;
branches;
next	1.2.4.2;

1.2.4.2
date	2012.01.05.12.07.42;	author mm;	state Exp;
branches
	1.2.4.2.2.1;
next	1.2.4.3;

1.2.4.3
date	2012.11.17.10.35.52;	author svnexp;	state Exp;
branches;
next	;

1.2.4.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.4.2.2.2;

1.2.4.2.2.2
date	2012.11.17.08.24.34;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Switching exporter and resync
@
text
@$FreeBSD: head/contrib/libarchive/FREEBSD-upgrade 238827 2012-07-27 08:28:44Z mm $

libarchive

The source code is pulled with git:

	git clone -b release git://github.com/libarchive/libarchive.git

For the contrib directory files and directories were pruned by:
	
sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do rm -rf ./$F ; done'

You may check if there are any new files that we don't need.

The instructions for importing new release and merging to HEAD can be found
at FreeBSD wiki:

	http://wiki.freebsd.org/SubversionPrimer/VendorImports

To make local changes to libarchive, simply patch and commit to the trunk
branch (aka HEAD).  Never make local changes on the vendor branch.

mm@@FreeBSD.org
27-July-2012
@


1.4.2.1
log
@file FREEBSD-upgrade was added on branch RELENG_8_4 on 2013-03-28 13:01:23 +0000
@
text
@d1 24
@


1.4.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 24
$FreeBSD: releng/8.4/contrib/libarchive/FREEBSD-upgrade 229593 2012-01-05 12:07:42Z mm $

libarchive

The source code is pulled with svn:

	svn checkout http://libarchive.googlecode.com/svn/release/2.8

For the contrib directory files and directories were pruned by:
	
sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do rm -rf ./$F ; done'

You may check if there are any new files that we don't need.

The instructions for importing new release and merging to HEAD can be found
at FreeBSD wiki:

	http://wiki.freebsd.org/SubversionPrimer/VendorImports

To make local changes to libarchive, simply patch and commit to the trunk
branch (aka HEAD).  Never make local changes on the vendor branch.

mm@@FreeBSD.org
21-December-2011
@


1.3
log
@SVN rev 238827 on 2012-07-27 08:28:44Z by mm

Update information on obtaining libarchive sources and FreeBSD-Xlist
@
text
@d1 1
a1 1
$FreeBSD$
@


1.2
log
@SVN rev 228835 on 2011-12-23 08:50:26Z by mm

Fix typo s/xz/libarchive/

Reported by:	Emil Mikulic (private e-mail)
MFC after:	12 days
@
text
@d5 1
a5 1
The source code is pulled with svn:
d7 1
a7 1
	svn checkout http://libarchive.googlecode.com/svn/release/2.8
d24 1
a24 1
21-December-2011
@


1.2.4.1
log
@file FREEBSD-upgrade was added on branch RELENG_8 on 2012-01-05 12:08:08 +0000
@
text
@d1 24
@


1.2.4.2
log
@SVN rev 229593 on 2012-01-05 12:07:42Z by mm

MFC contrib/libarchive:
r228761-r228764, r228770-r228777, r228835, r228911:

MFC r228761:
Copy libarchive from vendor branch to contrib

MFC r228762:
Add FREEBSD-Xlist and FREEBSD-upgrade to contrib/libarchive

MFC r228763:
Set svn:keywords to FreeBSD=%H for contrib/libarchive

MFC r228764:
Strip unnecessary files and directories from contrib/libarchive
according to FREEBSD-Xlist

MFC r228770:
Remove libarchive/archive_entry_copy_bhfi.c and libarchive/mtree.5
Add these files to FREEBSD-Xlist

MFC r228771:
Partial merge of r224691 from lib/libarchive:

Add compatibility for ISO images created with unfixed makefs that
violated ECMA-119 (ISO9660): allow reserved4 to be 0x20 in PVD.
This allows tar to read FreeBSD distribution ISO images created
with makefs prior to NetBSD bin/45217 bugfix (up to 9.0-BETA1).

MFC r228772:
Add missing integer casts to comparsions in libarchive read.

MFC r228773:
Merge FreeBSD changes from lib/libarchive to contrib/libarchive:

r204111 (uqs):
Fix common misspelling of hierarchy

r208027 (uqs):
mdoc: move CAVEATS, BUGS and SECURITY CONSIDERATIONS sections to the
bottom of the manpages and order them consistently.

GNU groff doesn't care about the ordering, and doesn't even mention
CAVEATS and SECURITY CONSIDERATIONS as common sections and where to put
them.

r208291 (uqs):
mdoc: consistently spell our email addresses <foo@@FreeBSD.org>

r209031 (uqs):
mdoc nitpicking: the title argument shall be uppercase

r214822 (kientzle):
Clarify the naming:  Methods that free an object should
be called "free".  Retain the old "finish" names to preserve
source compatibility for now.

r214905 (kientzle):
If the Zip reader doesn't see a PK signature block
because there's inter-entry garbage, just scan forward
to find the next one.  This allows us to handle a lot
of Zip archives that have been modified in-place.

Thanks to: Gleb Kurtsou for sending me a sample archive

r216258 (kientzle):
Don't write data into an empty "file."

In particular, this check avoids a warning when
extracting directory entries from certain GNU tar
archives that store directory contents.

r225525 (kientzle):
Fix cpio on ARM.

MFC r228774:
Add $FreeBSD$ to libarchive_fe headers where missing.

MFC r228775:
Merge FreeBSD changes from usr.bin/tar to contrib/libarchive/libarchive_fe:

r213469:
Recognize both ! and ^ as markers for negated character classes.

MFC r228776:
Merge FreeBSD changes from usr.bin/tar to contrib/libarchive/tar:

r204111 (uqs):
Fix common misspelling of hierarchy

r207786 (kientzle):
Various manpage updates, including many long-option synonyms that were
previously undocumented.

r208028 (uqs):
mdoc: move remaining sections into consistent order

This pertains mostly to FILES, HISTORY, EXIT STATUS and AUTHORS sections.

r209152 (kientzle):
If the compressed data is larger than the uncompressed,
report the compression ratio as 0% instead of displaying
nonsense triggered by numeric overflow.  This is common
when dealing with uncompressed files when the I/O blocking
causes there to be small transient differences in the
accounting.

r210720 (joel):
Fix typos.

r223541 (kientzle):
If there is a read error reading Y/N confirmation from the keyboard,
exit immediately with an error.

If there is an error opening or reading a file to put into the archive,
set the return value for a deferred error exit.

r223573 (kientzle):
The --newer-than test should descend into old
directories to look for new files.

r226636 (kientzle):
Typo from previous commit. Urgh.

r224153 (mm, partial):
Update bsdtar.1 manpage

MFC r228777:
Merge FreeBSD changes from usr.bin/cpio to contrib/libarchive/cpio:

r204111 (uqs):
Fix common misspelling of hierarchy

r211054 (kientzle);
Fix -R when used with -p.  Previously, the
uname and gname weren't overwritten, so the
disk restore would use those to lookup the
original uid/gid again.  Clearing the uname
and gname prevents this.

r212263 (gjb):
Fix typo in bsdcpio manual:
s/libarchive_formats/libarchive-formats

MFC r228835:
Fix typo s/xz/libarchive/

Reported by:	Emil Mikulic (private e-mail)

MFC r228911:
Update to vendor revision 4016.

Vendor has integrated most of our local changes in revisions 3976-3979 so
future updates are going to be easier.
Thanks to Tim Kientzle <kientzle@@FreeBSD.org>.
@
text
@a0 24
$FreeBSD$

libarchive

The source code is pulled with svn:

	svn checkout http://libarchive.googlecode.com/svn/release/2.8

For the contrib directory files and directories were pruned by:
	
sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do rm -rf ./$F ; done'

You may check if there are any new files that we don't need.

The instructions for importing new release and merging to HEAD can be found
at FreeBSD wiki:

	http://wiki.freebsd.org/SubversionPrimer/VendorImports

To make local changes to libarchive, simply patch and commit to the trunk
branch (aka HEAD).  Never make local changes on the vendor branch.

mm@@FreeBSD.org
21-December-2011
@


1.2.4.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
$FreeBSD: stable/8/contrib/libarchive/FREEBSD-upgrade 229593 2012-01-05 12:07:42Z mm $
@


1.2.4.2.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.4.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/8.3/contrib/libarchive/FREEBSD-upgrade 229593 2012-01-05 12:07:42Z mm $
@


1.2.2.1
log
@file FREEBSD-upgrade was added on branch RELENG_9 on 2012-01-05 12:07:18 +0000
@
text
@d1 24
@


1.2.2.2
log
@SVN rev 229592 on 2012-01-05 12:06:54Z by mm

MFC contrib/libarchive:
r228761-r228764, r228770-r228777, r228835, r228911:

MFC r228761:
Copy libarchive from vendor branch to contrib

MFC r228762:
Add FREEBSD-Xlist and FREEBSD-upgrade to contrib/libarchive

MFC r228763:
Set svn:keywords to FreeBSD=%H for contrib/libarchive

MFC r228764:
Strip unnecessary files and directories from contrib/libarchive
according to FREEBSD-Xlist

MFC r228770:
Remove libarchive/archive_entry_copy_bhfi.c and libarchive/mtree.5
Add these files to FREEBSD-Xlist

MFC r228771:
Partial merge of r224691 from lib/libarchive:

Add compatibility for ISO images created with unfixed makefs that
violated ECMA-119 (ISO9660): allow reserved4 to be 0x20 in PVD.
This allows tar to read FreeBSD distribution ISO images created
with makefs prior to NetBSD bin/45217 bugfix (up to 9.0-BETA1).

MFC r228772:
Add missing integer casts to comparsions in libarchive read.

MFC r228773:
Merge FreeBSD changes from lib/libarchive to contrib/libarchive:

r204111 (uqs):
Fix common misspelling of hierarchy

r208027 (uqs):
mdoc: move CAVEATS, BUGS and SECURITY CONSIDERATIONS sections to the
bottom of the manpages and order them consistently.

GNU groff doesn't care about the ordering, and doesn't even mention
CAVEATS and SECURITY CONSIDERATIONS as common sections and where to put
them.

r208291 (uqs):
mdoc: consistently spell our email addresses <foo@@FreeBSD.org>

r209031 (uqs):
mdoc nitpicking: the title argument shall be uppercase

r214822 (kientzle):
Clarify the naming:  Methods that free an object should
be called "free".  Retain the old "finish" names to preserve
source compatibility for now.

r214905 (kientzle):
If the Zip reader doesn't see a PK signature block
because there's inter-entry garbage, just scan forward
to find the next one.  This allows us to handle a lot
of Zip archives that have been modified in-place.

Thanks to: Gleb Kurtsou for sending me a sample archive

r216258 (kientzle):
Don't write data into an empty "file."

In particular, this check avoids a warning when
extracting directory entries from certain GNU tar
archives that store directory contents.

r225525 (kientzle):
Fix cpio on ARM.

MFC r228774:
Add $FreeBSD$ to libarchive_fe headers where missing.

MFC r228775:
Merge FreeBSD changes from usr.bin/tar to contrib/libarchive/libarchive_fe:

r213469:
Recognize both ! and ^ as markers for negated character classes.

MFC r228776:
Merge FreeBSD changes from usr.bin/tar to contrib/libarchive/tar:

r204111 (uqs):
Fix common misspelling of hierarchy

r207786 (kientzle):
Various manpage updates, including many long-option synonyms that were
previously undocumented.

r208028 (uqs):
mdoc: move remaining sections into consistent order

This pertains mostly to FILES, HISTORY, EXIT STATUS and AUTHORS sections.

r209152 (kientzle):
If the compressed data is larger than the uncompressed,
report the compression ratio as 0% instead of displaying
nonsense triggered by numeric overflow.  This is common
when dealing with uncompressed files when the I/O blocking
causes there to be small transient differences in the
accounting.

r210720 (joel):
Fix typos.

r223541 (kientzle):
If there is a read error reading Y/N confirmation from the keyboard,
exit immediately with an error.

If there is an error opening or reading a file to put into the archive,
set the return value for a deferred error exit.

r223573 (kientzle):
The --newer-than test should descend into old
directories to look for new files.

r226636 (kientzle):
Typo from previous commit. Urgh.

r224153 (mm, partial):
Update bsdtar.1 manpage

MFC r228777:
Merge FreeBSD changes from usr.bin/cpio to contrib/libarchive/cpio:

r204111 (uqs):
Fix common misspelling of hierarchy

r211054 (kientzle);
Fix -R when used with -p.  Previously, the
uname and gname weren't overwritten, so the
disk restore would use those to lookup the
original uid/gid again.  Clearing the uname
and gname prevents this.

r212263 (gjb):
Fix typo in bsdcpio manual:
s/libarchive_formats/libarchive-formats

MFC r228835:
Fix typo s/xz/libarchive/

Reported by:	Emil Mikulic (private e-mail)

MFC r228911:
Update to vendor revision 4016.

Vendor has integrated most of our local changes in revisions 3976-3979 so
future updates are going to be easier.
Thanks to Tim Kientzle <kientzle@@FreeBSD.org>.
@
text
@a0 24
$FreeBSD$

libarchive

The source code is pulled with svn:

	svn checkout http://libarchive.googlecode.com/svn/release/2.8

For the contrib directory files and directories were pruned by:
	
sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do rm -rf ./$F ; done'

You may check if there are any new files that we don't need.

The instructions for importing new release and merging to HEAD can be found
at FreeBSD wiki:

	http://wiki.freebsd.org/SubversionPrimer/VendorImports

To make local changes to libarchive, simply patch and commit to the trunk
branch (aka HEAD).  Never make local changes on the vendor branch.

mm@@FreeBSD.org
21-December-2011
@


1.2.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
$FreeBSD: stable/9/contrib/libarchive/FREEBSD-upgrade 229592 2012-01-05 12:06:54Z mm $
@


1.2.2.2.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.2.2.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/9.1/contrib/libarchive/FREEBSD-upgrade 229592 2012-01-05 12:06:54Z mm $
@


1.1
log
@SVN rev 228762 on 2011-12-21 11:11:51Z by mm

Add FREEBSD-Xlist and FREEBSD-upgrade to contrib/libarchive

MFC after:	2 weeks
@
text
@d20 1
a20 1
To make local changes to xz, simply patch and commit to the trunk
@

