head	1.15;
access;
symbols
	RELENG_8_4:1.15.0.2
	RELENG_9_1_0_RELEASE:1.10.2.2.2.2
	RELENG_9_1:1.10.2.2.0.2
	RELENG_9_1_BP:1.10.2.2
	RELENG_8_3_0_RELEASE:1.7.2.4.2.1
	RELENG_8_3:1.7.2.4.0.2
	RELENG_8_3_BP:1.7.2.4
	RELENG_9_0_0_RELEASE:1.10.2.1.2.1
	RELENG_9_0:1.10.2.1.0.2
	RELENG_9_0_BP:1.10.2.1
	RELENG_9:1.10.0.2
	RELENG_9_BP:1.10
	RELENG_7_4_0_RELEASE:1.2.2.4.6.1
	RELENG_8_2_0_RELEASE:1.7.2.2.2.1
	RELENG_7_4:1.2.2.4.0.6
	RELENG_7_4_BP:1.2.2.4
	RELENG_8_2:1.7.2.2.0.2
	RELENG_8_2_BP:1.7.2.2
	RELENG_8_1_0_RELEASE:1.7.2.1.4.1
	RELENG_8_1:1.7.2.1.0.4
	RELENG_8_1_BP:1.7.2.1
	RELENG_7_3_0_RELEASE:1.2.2.4.4.1
	RELENG_7_3:1.2.2.4.0.4
	RELENG_7_3_BP:1.2.2.4
	RELENG_8_0_0_RELEASE:1.7.2.1.2.1
	RELENG_8_0:1.7.2.1.0.2
	RELENG_8_0_BP:1.7.2.1
	RELENG_8:1.7.0.2
	RELENG_8_BP:1.7
	RELENG_7_2_0_RELEASE:1.2.2.4.2.1
	RELENG_7_2:1.2.2.4.0.2
	RELENG_7_2_BP:1.2.2.4
	RELENG_7_1_0_RELEASE:1.2.2.3.2.2
	RELENG_6_4_0_RELEASE:1.3.2.3.2.1
	RELENG_7_1:1.2.2.3.0.2
	RELENG_7_1_BP:1.2.2.3
	RELENG_6_4:1.3.2.3.0.2
	RELENG_6_4_BP:1.3.2.3
	RELENG_6:1.3.0.2
	RELENG_7:1.2.0.2;
locks; strict;
comment	@# @;


1.15
date	2013.03.23.02.25.00;	author svnexp;	state Exp;
branches
	1.15.2.1;
next	1.14;

1.14
date	2012.11.17.01.54.31;	author svnexp;	state Exp;
branches;
next	1.13;

1.13
date	2012.07.28.06.38.44;	author mm;	state Exp;
branches;
next	1.12;

1.12
date	2012.02.25.10.58.02;	author mm;	state Exp;
branches;
next	1.11;

1.11
date	2011.12.22.08.42.07;	author mm;	state Exp;
branches;
next	1.10;

1.10
date	2011.07.17.21.33.15;	author mm;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2010.05.10.15.28.44;	author mm;	state Exp;
branches;
next	1.8;

1.8
date	2010.01.02.10.27.05;	author ed;	state Exp;
branches;
next	1.7;

1.7
date	2009.03.08.06.03.15;	author kientzle;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2009.03.08.05.17.58;	author kientzle;	state Exp;
branches;
next	1.5;

1.5
date	2008.11.10.05.04.55;	author kientzle;	state Exp;
branches;
next	1.4;

1.4
date	2008.09.14.02.16.04;	author kientzle;	state Exp;
branches;
next	1.3;

1.3
date	2008.08.22.01.22.55;	author kientzle;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2008.05.26.17.10.10;	author kientzle;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2008.05.02.05.17.16;	author kientzle;	state Exp;
branches;
next	;

1.15.2.1
date	2013.03.23.02.25.00;	author svnexp;	state dead;
branches;
next	1.15.2.2;

1.15.2.2
date	2013.03.28.13.06.09;	author svnexp;	state Exp;
branches;
next	;

1.10.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.10.2.1.2.1;
next	1.10.2.2;

1.10.2.2
date	2012.01.05.12.52.05;	author mm;	state Exp;
branches
	1.10.2.2.2.1;
next	1.10.2.3;

1.10.2.3
date	2012.11.17.11.37.41;	author svnexp;	state Exp;
branches;
next	;

1.10.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.10.2.1.2.2;

1.10.2.1.2.2
date	2012.11.17.08.37.37;	author svnexp;	state Exp;
branches;
next	;

1.10.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.10.2.2.2.2;

1.10.2.2.2.2
date	2012.11.17.08.48.29;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.7.2.1.2.1
	1.7.2.1.4.1;
next	1.7.2.2;

1.7.2.2
date	2010.11.13.05.43.58;	author kientzle;	state Exp;
branches
	1.7.2.2.2.1;
next	1.7.2.3;

1.7.2.3
date	2011.08.01.08.00.46;	author mm;	state Exp;
branches;
next	1.7.2.4;

1.7.2.4
date	2012.01.05.12.57.14;	author mm;	state Exp;
branches
	1.7.2.4.2.1;
next	1.7.2.5;

1.7.2.5
date	2012.11.17.10.37.19;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.7.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.7.2.2.2.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.7.2.4.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.7.2.4.2.2;

1.7.2.4.2.2
date	2012.11.17.08.25.52;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2008.08.28.05.03.21;	author kientzle;	state Exp;
branches;
next	1.3.2.2;

1.3.2.2
date	2008.08.28.05.33.28;	author kientzle;	state Exp;
branches;
next	1.3.2.3;

1.3.2.3
date	2008.08.28.06.17.41;	author kientzle;	state Exp;
branches
	1.3.2.3.2.1;
next	1.3.2.4;

1.3.2.4
date	2012.11.17.07.45.57;	author svnexp;	state Exp;
branches;
next	;

1.3.2.3.2.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.2.2.1
date	2008.08.10.06.53.28;	author kientzle;	state Exp;
branches;
next	1.2.2.2;

1.2.2.2
date	2008.08.10.07.35.55;	author kientzle;	state Exp;
branches;
next	1.2.2.3;

1.2.2.3
date	2008.08.25.02.14.52;	author kientzle;	state Exp;
branches
	1.2.2.3.2.1;
next	1.2.2.4;

1.2.2.4
date	2008.12.11.05.56.47;	author kientzle;	state Exp;
branches
	1.2.2.4.2.1
	1.2.2.4.4.1
	1.2.2.4.6.1;
next	1.2.2.5;

1.2.2.5
date	2012.11.17.08.08.44;	author svnexp;	state Exp;
branches;
next	;

1.2.2.3.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	1.2.2.3.2.2;

1.2.2.3.2.2
date	2008.12.11.05.56.25;	author kientzle;	state Exp;
branches;
next	;

1.2.2.4.2.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.2.2.4.4.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.2.2.4.6.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.2.2.4.6.2;

1.2.2.4.6.2
date	2012.11.17.08.17.44;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.15
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248616
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/usr.bin/tar/test/Makefile 248616 2013-03-22 13:36:03Z mm $

LIBARCHIVEDIR=	${.CURDIR}/../../../contrib/libarchive

.PATH: ${LIBARCHIVEDIR}/tar/test
TESTS=	\
	test_0.c				\
	test_basic.c				\
	test_copy.c				\
	test_empty_mtree.c			\
	test_extract_tar_bz2.c			\
	test_extract_tar_grz.c			\
	test_extract_tar_gz.c			\
	test_extract_tar_lrz.c			\
	test_extract_tar_lz.c			\
	test_extract_tar_lzma.c			\
	test_extract_tar_lzo.c			\
	test_extract_tar_xz.c			\
	test_format_newc.c			\
	test_help.c				\
	test_option_C_upper.c			\
	test_option_H_upper.c			\
	test_option_L_upper.c			\
	test_option_O_upper.c			\
	test_option_T_upper.c			\
	test_option_U_upper.c			\
	test_option_X_upper.c			\
	test_option_a.c				\
	test_option_b.c				\
	test_option_b64encode.c			\
	test_option_exclude.c			\
	test_option_gid_gname.c			\
	test_option_grzip.c			\
	test_option_j.c				\
	test_option_k.c				\
	test_option_keep_newer_files.c		\
	test_option_lrzip.c			\
	test_option_lzma.c			\
	test_option_lzop.c			\
	test_option_n.c				\
	test_option_newer_than.c		\
	test_option_nodump.c			\
	test_option_older_than.c		\
	test_option_q.c				\
	test_option_r.c				\
	test_option_s.c				\
	test_option_uid_uname.c			\
	test_option_uuencode.c			\
	test_option_xz.c			\
	test_option_z.c				\
	test_patterns.c				\
	test_print_longpath.c			\
	test_stdio.c				\
	test_strip_components.c			\
	test_symlink_dir.c			\
	test_version.c

# Build the test program
SRCS=	${TAR_SRCS}				\
	${TESTS}				\
	list.h					\
	main.c

.PATH: ${LIBARCHIVEDIR}/test_utils
SRCS+=	test_utils.c

CLEANFILES+= list.h

NO_MAN=yes

PROG=bsdtar_test
DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA}
CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../../../lib/libarchive/config_freebsd.h\"
LDADD= -larchive -lz -lbz2 -llzma
CFLAGS+= -static -g -O2 -Wall
CFLAGS+= -I${.CURDIR}/../../../lib/libarchive -I${.OBJDIR}
CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/test_utils

# Uncomment to link against dmalloc
#LDADD+= -L/usr/local/lib -ldmalloc
#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC

check test:	bsdtar_test
	./bsdtar_test -p ${.OBJDIR}/../bsdtar -r ${LIBARCHIVEDIR}/tar/test

list.h: ${TESTS} Makefile
	(cd ${LIBARCHIVEDIR}/tar/test; cat ${TESTS}) | \
	grep DEFINE_TEST > ${.OBJDIR}/list.h

clean:
	rm -f ${CLEANFILES}
	rm -f *.out
	rm -f *.o
	rm -f *.core
	rm -f *~
	rm -f list.h
	rm -f archive.h ../archive.h
	-chmod -R +w /tmp/bsdtar_test.*
	rm -rf /tmp/bsdtar_test.*

.include <bsd.prog.mk>
@


1.15.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:09 +0000
@
text
@d1 101
@


1.15.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 68
# $FreeBSD: releng/8.4/usr.bin/tar/test/Makefile 229596 2012-01-05 12:57:14Z mm $

LIBARCHIVEDIR=	${.CURDIR}/../../../contrib/libarchive

.PATH: ${LIBARCHIVEDIR}/tar
# Some tar sources are pulled in for white-box tests
TAR_SRCS=						\
	getdate.c

.PATH: ${LIBARCHIVEDIR}/tar/test
TESTS=	\
	test_0.c				\
	test_basic.c				\
	test_copy.c				\
	test_empty_mtree.c			\
	test_getdate.c				\
	test_help.c				\
	test_option_T_upper.c			\
	test_option_q.c				\
	test_option_r.c				\
	test_option_s.c				\
	test_patterns.c				\
	test_stdio.c				\
	test_strip_components.c			\
	test_symlink_dir.c			\
	test_version.c

# Build the test program
SRCS=	${TAR_SRCS}				\
	${TESTS}				\
	list.h					\
	main.c

CLEANFILES+= list.h

NO_MAN=yes

PROG=bsdtar_test
DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../config_freebsd.h\"
LDADD= -larchive -lz -lbz2
CFLAGS+= -static -g -O2 -Wall
CFLAGS+= -I${.CURDIR}/.. -I${.OBJDIR}
CFLAGS+= -I${LIBARCHIVEDIR}/tar

# Uncomment to link against dmalloc
#LDADD+= -L/usr/local/lib -ldmalloc
#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC

check test:	bsdtar_test
	./bsdtar_test -p ${.OBJDIR}/../bsdtar -r ${LIBARCHIVEDIR}/tar/test

list.h: ${TESTS} Makefile
	(cd ${LIBARCHIVEDIR}/tar/test; cat ${TESTS}) | \
	grep DEFINE_TEST > ${.OBJDIR}/list.h

clean:
	rm -f ${CLEANFILES}
	rm -f *.out
	rm -f *.o
	rm -f *.core
	rm -f *~
	rm -f list.h
	rm -f archive.h ../archive.h
	-chmod -R +w /tmp/bsdtar_test.*
	rm -rf /tmp/bsdtar_test.*

.include <bsd.prog.mk>
@


1.14
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/usr.bin/tar/test/Makefile 238856 2012-07-28 06:38:44Z mm $
d11 8
d28 1
d30 1
d33 2
d37 3
d41 1
d43 1
a43 1
	test_option_newer_than.c		\
d48 3
d64 3
d77 1
a77 1
CFLAGS+= -I${LIBARCHIVEDIR}/tar
@


1.13
log
@SVN rev 238856 on 2012-07-28 06:38:44Z by mm

Update libarchive to 3.0.4
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.12
log
@SVN rev 232153 on 2012-02-25 10:58:02Z by mm

Update libarchive to 3.0.3

Some of new features:
  - New readers: RAR, LHA/LZH, CAB reader, 7-Zip
  - New writers: ISO9660, XAR
  - Improvements to many formats, especially including ISO9660 and Zip
  - Stackable write filters to write, e.g., tar.gz.uu in a single pass
  - Exploit seekable input; new "seekable" Zip reader can exploit the Zip
    Central Directory when it's available; the old "streamable" Zip reader
    is still fully supported for cases where seeking is not possible.

Full release notes available at:
	https://github.com/libarchive/libarchive/wiki/ReleaseNotes
@
text
@a4 5
.PATH: ${LIBARCHIVEDIR}/tar
# Some tar sources are pulled in for white-box tests
TAR_SRCS=						\
	getdate.c

d11 1
a11 1
	test_getdate.c				\
d26 1
@


1.11
log
@SVN rev 228797 on 2011-12-22 08:42:07Z by mm

Use contrib sources for building libarchive, tar and cpio.
Make "make test" fully operational.

MFC after:	2 weeks
@
text
@d18 4
d23 9
d35 1
d37 1
d55 1
a55 1
CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../config_freebsd.h\"
d58 1
a58 1
CFLAGS+= -I${.CURDIR}/.. -I${.OBJDIR}
@


1.10
log
@SVN rev 224153 on 2011-07-17 21:33:15Z by mm

Update bsdtar to 2.8.4
Use common code from lib/libarchive/libarchive_fe

Approved by:	kientzle
MFC after:	2 weeks
@
text
@d3 1
a3 3
# Where to find the tar sources (for the internal unit tests)
TAR_SRCDIR=${.CURDIR}/..
.PATH: ${TAR_SRCDIR}
d5 1
d7 1
a7 1
TAR_SRCS=					\
d10 1
d29 1
a29 1
SRCS= ${TAR_SRCS}				\
d40 1
a40 2
CFLAGS+=	-DPLATFORM_CONFIG_H=\"config_freebsd.h\"
CFLAGS+=	-I..
d43 2
a44 2
CFLAGS+= -I${.OBJDIR}
CFLAGS+= -I${TAR_SRCDIR}
d51 1
a51 1
	./bsdtar_test -p ${.OBJDIR}/../bsdtar -r ${.CURDIR}
d54 2
a55 1
	(cd ${.CURDIR}; cat ${TESTS}) | grep DEFINE_TEST > list.h
d58 1
@


1.10.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.10.2.2
log
@SVN rev 229595 on 2012-01-05 12:52:05Z by mm

MFC r228797:
Use contrib sources for building libarchive, tar and cpio.
Make "make test" fully operational.
@
text
@d3 3
a5 1
LIBARCHIVEDIR=	${.CURDIR}/../../../contrib/libarchive
a6 1
.PATH: ${LIBARCHIVEDIR}/tar
d8 1
a8 1
TAR_SRCS=						\
a10 1
.PATH: ${LIBARCHIVEDIR}/tar/test
d29 1
a29 1
SRCS=	${TAR_SRCS}				\
d40 2
a41 1
CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../config_freebsd.h\"
d44 2
a45 2
CFLAGS+= -I${.CURDIR}/.. -I${.OBJDIR}
CFLAGS+= -I${LIBARCHIVEDIR}/tar
d52 1
a52 1
	./bsdtar_test -p ${.OBJDIR}/../bsdtar -r ${LIBARCHIVEDIR}/tar/test
d55 1
a55 2
	(cd ${LIBARCHIVEDIR}/tar/test; cat ${TESTS}) | \
	grep DEFINE_TEST > ${.OBJDIR}/list.h
a57 1
	rm -f ${CLEANFILES}
@


1.10.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/usr.bin/tar/test/Makefile 229595 2012-01-05 12:52:05Z mm $
@


1.10.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.10.2.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.bin/tar/test/Makefile 229595 2012-01-05 12:52:05Z mm $
@


1.10.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.10.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.bin/tar/test/Makefile 224153 2011-07-17 21:33:15Z mm $
@


1.9
log
@SVN rev 207849 on 2010-05-10 15:28:44Z by mm

Enable liblzma support in libarchive
Adjust dependencies for programs using libarchive
Add xz and linkage against liblzma to rescue system

Approved by:	kientzle, delphij (mentor)
MFC after:	2 weeks
@
text
@d9 1
a9 1
	../getdate.c
d15 1
d18 1
a18 1
	test_option_T.c				\
d20 1
@


1.8
log
@SVN rev 201386 on 2010-01-02 10:27:05Z by ed

Build usr.bin/ with WARNS=6 by default.

Also add some missing $FreeBSD$ to keep svn happy.
@
text
@d37 1
a37 1
DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
d40 1
a40 1
LDADD= -larchive -lz -lbz2
@


1.7
log
@SVN rev 189521 on 2009-03-08 06:03:15Z by kientzle

Merge r687-689,691,693-701,720 from libarchive.googlecode.com:
Translate getdate.y into C for portability.  Make the get_date()
function easier to test as well:
 * Have it accept a time_t "now" to use as a reference so that test
   code can verify relative time specifications against known starting
   points.
 * Set up default date after parsing the string so that we
   can use the specified timezone (if any) instead of the local
   default.  Otherwise, local DST makes it almost impossible to
   reliably test time specifications such as "sunday UTC"
@
text
@a47 1
WARNS=6
@


1.7.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.7.2.2
log
@SVN rev 215227 on 2010-11-13 05:43:58Z by kientzle

MFC some Makefile tweaks.
@
text
@d48 1
@


1.7.2.3
log
@SVN rev 224563 on 2011-08-01 08:00:46Z by mm

Sync bsdtar with 9-CURRENT:

MFC on usr.bin/bsdtar:
203569,203571,203586-203590,203593-203594,204329,205076,206463-206466,
206484-206485,206487,207786,207790-207791,208028,209152,210720,213469,
223541,223573,224153,224158

MFC 203569 (kientzle):
bsdtar doesn't actually know what compression is supported by libarchive
and it should not pretend that it does.  It should just pass along the
user's request and handle an error if it's not supported.

MFC 203571 (kientzle):
Fill in some missing error handling, be a little more careful about
error reporting, prefer int64_t to off_t.

MFC 203586 (kientzle):
Trim out some unused configuration variables, remove
some unused headers, etc.

MFC 203587 (kientzle):
Minor code rework.

MFC 203588 (kientzle):
Restructure the logic that determines when we're crossing a mount
point.  In particular, this carves out a place for detecting and
excluding synthetic or network filesystems.

MFC 203589 (kientzle):
Various portability workarounds for non-FreeBSD platforms.

MFC 203590 (kientzle):
Style & Portability:  Use archive_entry methods to examine
file information, change some functions to static, remove
some unused headers.

MFC 203593 (kientzle):
Merge a bunch of refactoring from Joerg Sonnenberger to
isolate common code used by tar and cpio (and useful to other
libarchive clients).  The functions here are prefixed with
"lafe" (libarchive front-end) to indicate their use.

MFC 203594 (kientzle):
Simplify, remove unnecessary code.

MFC 204329 (ru)
Fixed dependencies (make checkdpadd).

MFC 205076 (uqs):
Fix several typos in macros or macro misusage.

Found by:	make manlint

MFC 206463 (kientzle):
Correct the markup for the -s option,
document the iso9660:rockridge and mtree:indent options

MFC 206464 (kientzle):
Remove an unnecessary include and conditionalize some code.

MFC 206465 (kientzle):
Consistently specify O_BINARY when opening files.

MFC 206466 (kientzle):
Fix -X.

MFC 206484 (kientzle):
Diff reduction against bsdtar 2.8.3

MFC 206485 (kientzle):
Diff reduction against bsdtar 2.8.3

MFC 206487 (kientzle):
If a file is specifically both included and excluded, then:
 * It is not extracted (because it is excluded)
 * If it's not present in the archive, then an error is
   reported (because the file was requested and not found)
 * If it is present in the archive, no error is reported.
Previously, this would always report an error because the
exclusion prevented the entry from matching the inclusion.

Also, tar is now more reluctant to report unmatched inclusions.
Previously, "tar x file1 'file*'" against an archive that contained a
single entry "file1" would match file1 and then report an error for
the second pattern because it wasn't matched.  It now considers both
inclusions to be matched and reports no error.

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

MFC 207790 (kientzle):
Config updates.

MFC 207791 (kientzle)
FreeBSD is now using bsdtar 2.8.3.

MFC 208028 (uqs):
mdoc: move remaining sections into consistent order

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

Found by:	mdocml lint run

MFC 209152 (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.

Thanks to:	Boris Samorodov

MFC 210720 (joel):
Fix typos.

MFC 213469 (kientzle):
Recognize both ! and ^ as markers for negated character classes.

Submitted by:	Mykola Dzham

MFC 223541 (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.

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

MFC 224153 (mm):
Update bsdtar to 2.8.4
Use common code from lib/libarchive/libarchive_fe

MFC 224158 (mm):
Fix accidential commit part:
Include "bsdtar_platform.h" instead of "lafe_platform.h"
@
text
@d9 1
a9 1
	getdate.c
a14 1
	test_empty_mtree.c			\
d17 1
a17 1
	test_option_T_upper.c			\
a18 1
	test_option_r.c				\
@


1.7.2.4
log
@SVN rev 229596 on 2012-01-05 12:57:14Z by mm

MFC r228797:
Use contrib sources for building libarchive, tar and cpio.
Make "make test" fully operational.
@
text
@d3 3
a5 1
LIBARCHIVEDIR=	${.CURDIR}/../../../contrib/libarchive
a6 1
.PATH: ${LIBARCHIVEDIR}/tar
d8 1
a8 1
TAR_SRCS=						\
a10 1
.PATH: ${LIBARCHIVEDIR}/tar/test
d29 1
a29 1
SRCS=	${TAR_SRCS}				\
d40 2
a41 1
CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../config_freebsd.h\"
d44 2
a45 2
CFLAGS+= -I${.CURDIR}/.. -I${.OBJDIR}
CFLAGS+= -I${LIBARCHIVEDIR}/tar
d52 1
a52 1
	./bsdtar_test -p ${.OBJDIR}/../bsdtar -r ${LIBARCHIVEDIR}/tar/test
d55 1
a55 2
	(cd ${LIBARCHIVEDIR}/tar/test; cat ${TESTS}) | \
	grep DEFINE_TEST > ${.OBJDIR}/list.h
a57 1
	rm -f ${CLEANFILES}
@


1.7.2.5
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/usr.bin/tar/test/Makefile 229596 2012-01-05 12:57:14Z mm $
@


1.7.2.4.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.7.2.4.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.bin/tar/test/Makefile 229596 2012-01-05 12:57:14Z mm $
@


1.7.2.2.2.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.6
log
@SVN rev 189512 on 2009-03-08 05:17:58Z by kientzle

Merge r369 from libarchive.googlecode.com: Test -s option.
@
text
@d9 1
a9 1
	../getdate.y
@


1.5
log
@SVN rev 184807 on 2008-11-10 05:04:55Z by kientzle

Test --strip-components and fix it to actually work.  Jaakko did a
good job writing this test; it exercises a lot of subtle cases.  The
trickiest one is that a hardlink to something that didn't get
extracted should not itself be extracted.  In some sense, this is not
the desired behavior (we'd rather restore the file), but it's the best
you can do in a single-pass restore of a tar archive.

The test here should be extended to exercise cpio and newc formats as
well, since their hardlink models are different, which will lead to
different handling of some of these edge cases.

Submitted by:	Jaakko Heinonen
MFC after:	30 days
@
text
@d19 1
@


1.4
log
@SVN rev 183009 on 2008-09-14 02:16:04Z by kientzle

Test handling of restores relative to symlinks.
In particular:
  * tar -x -P follows symlinks to existing dirs, but not without -P
  * symlinks to files are always replaced
  * broken symlinks are always replaced
@
text
@d21 1
@


1.3
log
@SVN rev 181979 on 2008-08-22 01:22:55Z by kientzle

Test for -q (aka --fast-read).
Fix the error uncovered by this test.
@
text
@d21 1
@


1.3.2.1
log
@SVN rev 182331 on 2008-08-28 05:03:21Z by kientzle

MFC r178715: New bsdtar test harness, modeled after bsdcpio and libarchive
test harnesses.
@
text
@d18 2
@


1.3.2.2
log
@SVN rev 182337 on 2008-08-28 05:33:28Z by kientzle

MFC r179322: Many features from bsdtar 2.5.4b
	--numeric-owner
	-S  (sparsify files on extraction)
	-s  (regex filename substitutions)
	Uses libarchive 'linkify' support to get correct hardlink handling
		for cpio formats
	Number of test enhancements.
@
text
@a17 1
	test_patterns.c				\
@


1.3.2.3
log
@SVN rev 182354 on 2008-08-28 06:17:41Z by kientzle

MFC r181979,181981,181985: Test -q option (aka --fast-read).
This test uncovered that 'q' had been overlooked in the opts list. <sigh>
@
text
@a17 1
	test_option_q.c				\
@


1.3.2.4
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.bin/tar/test/Makefile 182354 2008-08-28 06:17:41Z kientzle $
@


1.3.2.3.2.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.2
log
@MFp4: bsdtar 2.5.4b

In addition to a number of bug fixes and minor changes:
 * --numeric-owner (ignore user/group names on create and extract)
 * -S (sparsify files on extraction)
 * -s (regex filename substitutions)
 * Use new libarchive 'linkify' to get correct hardlink handling for
   both old and new cpio formats
 * Rework 'copy' test to be insensitive to readdir() filename ordering

Most of the credit for this work goes to Joerg Sonnenberger, who
has been duplicating features from NetBSD's 'pax' program.
@
text
@d18 1
@


1.2.2.1
log
@SVN rev 181507 on 2008-08-10 06:53:28Z by kientzle

MFC r178715, r175052: New bsdtar test harness, modeled after
libarchive test harness.
@
text
@d18 1
@


1.2.2.2
log
@SVN rev 181514 on 2008-08-10 07:35:55Z by kientzle

Big MFC of bsdtar 2.5.5.
@
text
@a17 1
	test_patterns.c				\
@


1.2.2.3
log
@SVN rev 182136 on 2008-08-25 02:14:52Z by kientzle

MFC r181979, r181981, r181985: Test -q option and make it actually work.
@
text
@a17 1
	test_option_q.c				\
@


1.2.2.4
log
@SVN rev 185909 on 2008-12-11 05:56:47Z by kientzle

MFC r183009, r184807, r184808:  Fix --strip-components, plus
a handful of test suite improvements.

PR:		bin/128562
Submitted by:	Jaakko Heinonen
Approved by:	re
@
text
@a20 2
	test_strip_components.c			\
	test_symlink_dir.c			\
@


1.2.2.5
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.bin/tar/test/Makefile 185909 2008-12-11 05:56:47Z kientzle $
@


1.2.2.4.6.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.2.2.4.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.bin/tar/test/Makefile 185909 2008-12-11 05:56:47Z kientzle $
@


1.2.2.4.4.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.2.2.4.2.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.2.2.3.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.2.2.3.2.2
log
@SVN rev 185908 on 2008-12-11 05:56:25Z by kientzle

MFC r183009, r184807, r184808:  Fix --strip-components, plus
a handful of test suite improvements.

PR:		bin/128562
Submitted by:	Jaakko Heinonen
Approved by:	re
@
text
@a20 2
	test_strip_components.c			\
	test_symlink_dir.c			\
@


1.1
log
@New bsdtar test harness.  Still rather skimpy, but a lot easier
to run and maintain than the old scripts that used to be here.
@
text
@d18 1
@

