head	1.61;
access;
symbols
	RELENG_8_4:1.61.0.2
	RELENG_9_1_0_RELEASE:1.55.2.3.2.2
	RELENG_9_1:1.55.2.3.0.2
	RELENG_9_1_BP:1.55.2.3
	RELENG_8_3_0_RELEASE:1.44.2.11.2.1
	RELENG_8_3:1.44.2.11.0.2
	RELENG_8_3_BP:1.44.2.11
	RELENG_9_0_0_RELEASE:1.55.2.1.2.1
	RELENG_9_0:1.55.2.1.0.2
	RELENG_9_0_BP:1.55.2.1
	RELENG_9:1.55.0.2
	RELENG_9_BP:1.55
	RELENG_7_4_0_RELEASE:1.32.2.4.8.1
	RELENG_8_2_0_RELEASE:1.44.2.7.2.1
	RELENG_7_4:1.32.2.4.0.8
	RELENG_7_4_BP:1.32.2.4
	RELENG_8_2:1.44.2.7.0.2
	RELENG_8_2_BP:1.44.2.7
	RELENG_8_1_0_RELEASE:1.44.2.1.4.1
	RELENG_8_1:1.44.2.1.0.4
	RELENG_8_1_BP:1.44.2.1
	RELENG_7_3_0_RELEASE:1.32.2.4.6.1
	RELENG_7_3:1.32.2.4.0.6
	RELENG_7_3_BP:1.32.2.4
	RELENG_8_0_0_RELEASE:1.44.2.1.2.1
	RELENG_8_0:1.44.2.1.0.2
	RELENG_8_0_BP:1.44.2.1
	RELENG_8:1.44.0.2
	RELENG_8_BP:1.44
	RELENG_7_2_0_RELEASE:1.32.2.4.4.1
	RELENG_7_2:1.32.2.4.0.4
	RELENG_7_2_BP:1.32.2.4
	RELENG_7_1_0_RELEASE:1.32.2.4.2.1
	RELENG_6_4_0_RELEASE:1.24.2.12.2.1
	RELENG_7_1:1.32.2.4.0.2
	RELENG_7_1_BP:1.32.2.4
	RELENG_6_4:1.24.2.12.0.2
	RELENG_6_4_BP:1.24.2.12
	RELENG_7_0_0_RELEASE:1.32
	RELENG_6_3_0_RELEASE:1.24.2.4
	RELENG_7_0:1.32.0.4
	RELENG_7_0_BP:1.32
	RELENG_6_3:1.24.2.4.0.2
	RELENG_6_3_BP:1.24.2.4
	RELENG_7:1.32.0.2
	RELENG_7_BP:1.32
	RELENG_6_2_0_RELEASE:1.24.2.1
	RELENG_6_2:1.24.2.1.0.2
	RELENG_6_2_BP:1.24.2.1
	RELENG_5_5_0_RELEASE:1.11.2.2
	RELENG_5_5:1.11.2.2.0.4
	RELENG_5_5_BP:1.11.2.2
	RELENG_6_1_0_RELEASE:1.24
	RELENG_6_1:1.24.0.6
	RELENG_6_1_BP:1.24
	RELENG_6_0_0_RELEASE:1.24
	RELENG_6_0:1.24.0.4
	RELENG_6_0_BP:1.24
	RELENG_6:1.24.0.2
	RELENG_6_BP:1.24
	RELENG_5_4_0_RELEASE:1.11.2.2
	RELENG_5_4:1.11.2.2.0.2
	RELENG_5_4_BP:1.11.2.2
	RELENG_5_3_0_RELEASE:1.11
	RELENG_5_3:1.11.0.4
	RELENG_5_3_BP:1.11
	RELENG_5:1.11.0.2
	RELENG_5_BP:1.11;
locks; strict;
comment	@# @;


1.61
date	2013.03.23.02.25.00;	author svnexp;	state Exp;
branches
	1.61.2.1;
next	1.60;

1.60
date	2012.11.17.01.54.31;	author svnexp;	state Exp;
branches;
next	1.59;

1.59
date	2012.07.28.06.38.44;	author mm;	state Exp;
branches;
next	1.58;

1.58
date	2012.02.25.10.58.02;	author mm;	state Exp;
branches;
next	1.57;

1.57
date	2011.12.22.08.42.07;	author mm;	state Exp;
branches;
next	1.56;

1.56
date	2011.12.20.20.06.33;	author mm;	state Exp;
branches;
next	1.55;

1.55
date	2011.08.01.08.22.40;	author mm;	state Exp;
branches
	1.55.2.1;
next	1.54;

1.54
date	2011.07.17.21.33.15;	author mm;	state Exp;
branches;
next	1.53;

1.53
date	2010.05.10.15.28.44;	author mm;	state Exp;
branches;
next	1.52;

1.52
date	2010.05.08.16.29.02;	author kientzle;	state Exp;
branches;
next	1.51;

1.51
date	2010.02.25.20.24.19;	author ru;	state Exp;
branches;
next	1.50;

1.50
date	2010.02.07.02.00.26;	author kientzle;	state Exp;
branches;
next	1.49;

1.49
date	2010.02.06.20.27.36;	author kientzle;	state Exp;
branches;
next	1.48;

1.48
date	2010.02.06.19.53.48;	author kientzle;	state Exp;
branches;
next	1.47;

1.47
date	2010.02.06.19.44.37;	author kientzle;	state Exp;
branches;
next	1.46;

1.46
date	2010.01.02.10.27.05;	author ed;	state Exp;
branches;
next	1.45;

1.45
date	2009.09.07.06.37.44;	author pjd;	state Exp;
branches;
next	1.44;

1.44
date	2009.04.18.06.03.09;	author kientzle;	state Exp;
branches
	1.44.2.1;
next	1.43;

1.43
date	2009.04.17.03.45.15;	author kientzle;	state Exp;
branches;
next	1.42;

1.42
date	2009.03.08.06.20.35;	author kientzle;	state Exp;
branches;
next	1.41;

1.41
date	2009.03.08.06.03.15;	author kientzle;	state Exp;
branches;
next	1.40;

1.40
date	2008.12.06.07.38.14;	author kientzle;	state Exp;
branches;
next	1.39;

1.39
date	2008.11.08.04.43.24;	author kientzle;	state Exp;
branches;
next	1.38;

1.38
date	2008.08.22.01.31.13;	author kientzle;	state Exp;
branches;
next	1.37;

1.37
date	2008.07.05.02.09.54;	author kientzle;	state Exp;
branches;
next	1.36;

1.36
date	2008.05.26.17.10.10;	author kientzle;	state Exp;
branches;
next	1.35;

1.35
date	2008.05.18.06.24.47;	author cperciva;	state Exp;
branches;
next	1.34;

1.34
date	2008.03.18.06.18.49;	author kientzle;	state Exp;
branches;
next	1.33;

1.33
date	2008.01.02.00.27.14;	author kientzle;	state Exp;
branches;
next	1.32;

1.32
date	2007.07.20.01.24.49;	author kientzle;	state Exp;
branches
	1.32.2.1;
next	1.31;

1.31
date	2007.05.29.05.39.09;	author kientzle;	state Exp;
branches;
next	1.30;

1.30
date	2007.04.12.04.45.32;	author kientzle;	state Exp;
branches;
next	1.29;

1.29
date	2007.03.24.03.25.49;	author kientzle;	state Exp;
branches;
next	1.28;

1.28
date	2007.03.11.10.36.42;	author kientzle;	state Exp;
branches;
next	1.27;

1.27
date	2006.04.02.07.13.11;	author kientzle;	state Exp;
branches;
next	1.26;

1.26
date	2006.03.21.17.03.51;	author kientzle;	state Exp;
branches;
next	1.25;

1.25
date	2006.03.08.02.49.12;	author kientzle;	state Exp;
branches;
next	1.24;

1.24
date	2005.05.08.06.25.15;	author kientzle;	state Exp;
branches
	1.24.2.1;
next	1.23;

1.23
date	2005.04.24.05.53.37;	author kientzle;	state Exp;
branches;
next	1.22;

1.22
date	2005.04.23.18.44.25;	author kientzle;	state Exp;
branches;
next	1.21;

1.21
date	2005.04.17.17.51.05;	author kientzle;	state Exp;
branches;
next	1.20;

1.20
date	2005.04.17.17.20.54;	author kientzle;	state Exp;
branches;
next	1.19;

1.19
date	2005.03.20.20.38.46;	author kientzle;	state Exp;
branches;
next	1.18;

1.18
date	2005.03.13.23.49.53;	author kientzle;	state Exp;
branches;
next	1.17;

1.17
date	2005.03.13.19.55.53;	author kientzle;	state Exp;
branches;
next	1.16;

1.16
date	2005.03.13.18.36.24;	author kientzle;	state Exp;
branches;
next	1.15;

1.15
date	2005.03.13.04.12.30;	author kientzle;	state Exp;
branches;
next	1.14;

1.14
date	2004.12.22.00.21.28;	author kientzle;	state Exp;
branches;
next	1.13;

1.13
date	2004.11.12.13.28.42;	author ru;	state Exp;
branches;
next	1.12;

1.12
date	2004.11.05.05.39.37;	author kientzle;	state Exp;
branches;
next	1.11;

1.11
date	2004.08.08.17.20.23;	author kientzle;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	2004.08.07.19.25.34;	author kientzle;	state Exp;
branches;
next	1.9;

1.9
date	2004.08.07.03.24.48;	author kientzle;	state Exp;
branches;
next	1.8;

1.8
date	2004.07.26.03.21.41;	author kientzle;	state Exp;
branches;
next	1.7;

1.7
date	2004.07.17.06.03.47;	author kientzle;	state Exp;
branches;
next	1.6;

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

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

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

1.3
date	2004.04.12.18.06.07;	author kientzle;	state Exp;
branches;
next	1.2;

1.2
date	2004.04.12.00.13.23;	author kientzle;	state Exp;
branches;
next	1.1;

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

1.61.2.1
date	2013.03.23.02.25.00;	author svnexp;	state dead;
branches;
next	1.61.2.2;

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

1.55.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.55.2.1.2.1;
next	1.55.2.2;

1.55.2.2
date	2012.01.05.11.44.55;	author mm;	state Exp;
branches;
next	1.55.2.3;

1.55.2.3
date	2012.01.05.12.52.05;	author mm;	state Exp;
branches
	1.55.2.3.2.1;
next	1.55.2.4;

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

1.55.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.55.2.1.2.2;

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

1.55.2.3.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.55.2.3.2.2;

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

1.44.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.44.2.1.2.1
	1.44.2.1.4.1;
next	1.44.2.2;

1.44.2.2
date	2010.10.10.08.41.08;	author mm;	state Exp;
branches;
next	1.44.2.3;

1.44.2.3
date	2010.10.10.12.18.53;	author mm;	state Exp;
branches;
next	1.44.2.4;

1.44.2.4
date	2010.11.13.05.43.58;	author kientzle;	state Exp;
branches;
next	1.44.2.5;

1.44.2.5
date	2010.11.13.05.50.49;	author kientzle;	state Exp;
branches;
next	1.44.2.6;

1.44.2.6
date	2010.11.13.05.53.55;	author kientzle;	state Exp;
branches;
next	1.44.2.7;

1.44.2.7
date	2010.11.13.06.00.27;	author kientzle;	state Exp;
branches
	1.44.2.7.2.1;
next	1.44.2.8;

1.44.2.8
date	2011.08.01.08.00.46;	author mm;	state Exp;
branches;
next	1.44.2.9;

1.44.2.9
date	2011.08.04.07.29.08;	author mm;	state Exp;
branches;
next	1.44.2.10;

1.44.2.10
date	2012.01.05.11.45.22;	author mm;	state Exp;
branches;
next	1.44.2.11;

1.44.2.11
date	2012.01.05.12.57.14;	author mm;	state Exp;
branches
	1.44.2.11.2.1;
next	1.44.2.12;

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

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

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

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

1.44.2.11.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.44.2.11.2.2;

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

1.32.2.1
date	2008.02.10.23.24.16;	author kientzle;	state Exp;
branches;
next	1.32.2.2;

1.32.2.2
date	2008.08.10.07.07.00;	author kientzle;	state Exp;
branches;
next	1.32.2.3;

1.32.2.3
date	2008.08.10.07.35.55;	author kientzle;	state Exp;
branches;
next	1.32.2.4;

1.32.2.4
date	2008.08.25.02.18.12;	author kientzle;	state Exp;
branches
	1.32.2.4.2.1
	1.32.2.4.4.1
	1.32.2.4.6.1
	1.32.2.4.8.1;
next	1.32.2.5;

1.32.2.5
date	2012.11.17.08.08.43;	author svnexp;	state Exp;
branches;
next	;

1.32.2.4.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

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

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

1.32.2.4.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.32.2.4.8.2;

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

1.24.2.1
date	2006.07.30.06.32.14;	author kientzle;	state Exp;
branches;
next	1.24.2.2;

1.24.2.2
date	2007.08.25.03.58.25;	author kientzle;	state Exp;
branches;
next	1.24.2.3;

1.24.2.3
date	2007.08.25.04.35.21;	author kientzle;	state Exp;
branches;
next	1.24.2.4;

1.24.2.4
date	2007.08.25.04.38.44;	author kientzle;	state Exp;
branches;
next	1.24.2.5;

1.24.2.5
date	2008.06.12.06.20.49;	author kientzle;	state Exp;
branches;
next	1.24.2.6;

1.24.2.6
date	2008.06.27.04.46.06;	author jhb;	state Exp;
branches;
next	1.24.2.7;

1.24.2.7
date	2008.08.10.18.21.50;	author kientzle;	state Exp;
branches;
next	1.24.2.8;

1.24.2.8
date	2008.08.13.14.50.42;	author kientzle;	state Exp;
branches;
next	1.24.2.9;

1.24.2.9
date	2008.08.28.05.12.03;	author kientzle;	state Exp;
branches;
next	1.24.2.10;

1.24.2.10
date	2008.08.28.05.33.28;	author kientzle;	state Exp;
branches;
next	1.24.2.11;

1.24.2.11
date	2008.08.28.05.41.10;	author kientzle;	state Exp;
branches;
next	1.24.2.12;

1.24.2.12
date	2008.08.28.06.18.58;	author kientzle;	state Exp;
branches
	1.24.2.12.2.1;
next	1.24.2.13;

1.24.2.13
date	2012.11.17.07.45.56;	author svnexp;	state Exp;
branches;
next	;

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

1.11.2.1
date	2004.12.22.00.07.17;	author kientzle;	state Exp;
branches;
next	1.11.2.2;

1.11.2.2
date	2005.02.25.05.14.42;	author kientzle;	state Exp;
branches;
next	;


desc
@@


1.61
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/Makefile 248616 2013-03-22 13:36:03Z mm $
.include <bsd.own.mk>

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

PROG=	bsdtar
BSDTAR_VERSION_STRING=	3.1.2

.PATH: ${LIBARCHIVEDIR}/tar
SRCS=	bsdtar.c	\
	cmdline.c	\
	creation_set.c	\
	read.c		\
	subst.c		\
	util.c		\
	write.c

.PATH: ${LIBARCHIVEDIR}/libarchive_fe
SRCS+=	err.c		\
	line_reader.c

DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBBSDXML}
LDADD=	-larchive -lbz2 -lz -llzma -lbsdxml
.if ${MK_OPENSSL} != "no"
DPADD+=	${LIBCRYPTO}
LDADD+= -lcrypto
.else
DPADD+= ${LIBMD}
LDADD+= -lmd
.endif

.if ${MK_ICONV} != "no"
CFLAGS+=	-DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
.endif

CFLAGS+=	-DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../../lib/libarchive/config_freebsd.h\"
CFLAGS+=	-I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive
CFLAGS+=	-I${LIBARCHIVEDIR}/libarchive_fe
SYMLINKS=	bsdtar ${BINDIR}/tar
MLINKS=	bsdtar.1 tar.1
DEBUG_FLAGS=-g

.PHONY: check test clean-test
check test: $(PROG) bsdtar.1.gz
	cd ${.CURDIR}/test && make obj && make test

clean-test:
	cd ${.CURDIR}/test && make clean

.include <bsd.prog.mk>
@


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


1.61.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 51
# $FreeBSD: releng/8.4/usr.bin/tar/Makefile 229596 2012-01-05 12:57:14Z mm $
.include <bsd.own.mk>

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

PROG=	bsdtar
BSDTAR_VERSION_STRING=2.8.5

.PATH: ${LIBARCHIVEDIR}/tar
SRCS=	bsdtar.c	\
	cmdline.c	\
	getdate.c	\
	read.c		\
	subst.c		\
	tree.c		\
	util.c		\
	write.c

.PATH: ${LIBARCHIVEDIR}/libarchive_fe
SRCS+=	err.c		\
	line_reader.c	\
	matching.c	\
	pathmatch.c

WARNS?=	6
DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBBSDXML}
LDADD=	-larchive -lbz2 -lz -llzma -lbsdxml
.if ${MK_OPENSSL} != "no"
DPADD+=	${LIBCRYPTO}
LDADD+= -lcrypto
.else
DPADD+= ${LIBMD}
LDADD+= -lmd
.endif

CFLAGS+=	-DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
CFLAGS+=	-I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive
CFLAGS+=	-I${LIBARCHIVEDIR}/libarchive_fe
SYMLINKS=	bsdtar ${BINDIR}/tar
MLINKS=	bsdtar.1 tar.1
DEBUG_FLAGS=-g

.PHONY: check test clean-test
check test: $(PROG) bsdtar.1.gz
	cd ${.CURDIR}/test && make obj && make test

clean-test:
	cd ${.CURDIR}/test && make clean

.include <bsd.prog.mk>
@


1.60
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/usr.bin/tar/Makefile 238856 2012-07-28 06:38:44Z mm $
d7 1
a7 1
BSDTAR_VERSION_STRING=	3.0.4
d12 1
@


1.59
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.58
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
@d7 1
a7 1
BSDTAR_VERSION_STRING=	3.0.3
a11 1
	getdate.c	\
a13 1
	tree.c		\
d19 1
a19 3
	line_reader.c	\
	matching.c	\
	pathmatch.c
@


1.57
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
@d7 1
a7 1
BSDTAR_VERSION_STRING=2.8.5
d35 4
d40 1
a40 1
CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
@


1.56
log
@SVN rev 228745 on 2011-12-20 20:06:33Z by mm

Update libarchive, tar and cpio to version 2.8.5

The following additional vendor revisions are applied:

Revision 3740:
Use archive_clear_error() to clear the error markers.

Obtained from:	http://code.google.com/p/libarchive
MFC after:	2 weeks
@
text
@d4 2
d8 2
d19 1
a19 1
.PATH: ${.CURDIR}/../../lib/libarchive/libarchive_fe
d36 3
a38 3
CFLAGS+=	-DPLATFORM_CONFIG_H=\"config_freebsd.h\"
CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../../lib/libarchive
CFLAGS+=	-I${.CURDIR}/../../lib/libarchive/libarchive_fe
d43 1
a43 1
.PHONY: check test
d45 4
a48 1
	cd ${.CURDIR}/test && make test
@


1.55
log
@SVN rev 224566 on 2011-08-01 08:22:40Z by mm

Correctly link bsdcpio and bsdtar against libmd and libcrpyto
by applying the change from r221472 (libarchive).

Reviewed by:	kientzle
Approved by:	re (kib)
MFC after:	3 days
@
text
@d5 1
a5 1
BSDTAR_VERSION_STRING=2.8.4
@


1.55.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.55.2.2
log
@SVN rev 229588 on 2012-01-05 11:44:55Z by mm

MFC r228744, r228745, r228748:

MFC r228744 [1]:
Merge vendor revision 3723:
Fixes extraction of Zip entries that use length-at-end without specifying
either the compressed or uncompressed length.  In particular, fixes bsdtar
extraction of such files.

Reported by:	Patrick Lamaiziere <patfbsd@@davenulle.org> (freebsd-stable@@)

MFC r228745:
Update libarchive, tar and cpio to version 2.8.5

The following additional vendor revisions are applied:

Revision 3740:
Use archive_clear_error() to clear the error markers.

Obtained from:	http://code.google.com/p/libarchive

MFC r228748:
Sync libarchive with vendor branch release/2.8:

3730:
Fix issue 174 (Windows path names, not relevant for FreeBSD)

3734:
Merge r1989: archive_clear_error should set errno to 0.

3735:
Merge r3247 from trunk: Clear errors before returning
from archive_read_support_format_all()

3799:
Check the position before dereferencing the pointer.
This avoids dereferencing one byte past the end of a string

3824:
Merge r3823 from trunk for issue 199 (hang in iso9660 reading)

Obtained from:	http://code.google.com/p/libarchive
@
text
@d5 1
a5 1
BSDTAR_VERSION_STRING=2.8.5
@


1.55.2.3
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
@a3 2
LIBARCHIVEDIR=	${.CURDIR}/../../contrib/libarchive

a5 2

.PATH: ${LIBARCHIVEDIR}/tar
d15 1
a15 1
.PATH: ${LIBARCHIVEDIR}/libarchive_fe
d32 3
a34 3
CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
CFLAGS+=	-I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive
CFLAGS+=	-I${LIBARCHIVEDIR}/libarchive_fe
d39 1
a39 1
.PHONY: check test clean-test
d41 1
a41 4
	cd ${.CURDIR}/test && make obj && make test

clean-test:
	cd ${.CURDIR}/test && make clean
@


1.55.2.4
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/Makefile 229595 2012-01-05 12:52:05Z mm $
@


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


1.55.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.55.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.bin/tar/Makefile 224566 2011-08-01 08:22:40Z mm $
@


1.54
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
@d21 2
a22 2
DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBLZMA} ${LIBBSDXML}
LDADD=	-larchive -lbz2 -lz -lmd -llzma -lbsdxml
d26 3
d30 1
@


1.53
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
@d5 1
a5 1
BSDTAR_VERSION_STRING=2.8.3
a7 1
	err.c		\
a8 3
	line_reader.c	\
	matching.c	\
	pathmatch.c	\
d14 9
a22 2
DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBLZMA}
LDADD=	-larchive -lbz2 -lz -lmd -llzma
d30 1
@


1.52
log
@SVN rev 207791 on 2010-05-08 16:29:02Z by kientzle

FreeBSD is now using bsdtar 2.8.3.
@
text
@d18 2
a19 2
DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBMD}
LDADD=	-larchive -lbz2 -lz -lmd
@


1.51
log
@SVN rev 204329 on 2010-02-25 20:24:19Z by ru

Fixed dependencies (make checkdpadd).
@
text
@d5 1
a5 1
BSDTAR_VERSION_STRING=2.7.0
@


1.50
log
@SVN rev 203593 on 2010-02-07 02:00:26Z by 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.
@
text
@d18 1
a18 1
DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
d21 1
@


1.49
log
@SVN rev 203568 on 2010-02-06 20:27:36Z by kientzle

Refactor the siginfo/sigusr1 handling.  The read/write reporting
is sufficiently different that it was simpler to just put separate
reporting functions into read.c and write.c rather than try to have
a single all-purpose reporting function.
Switch to a custom function for converting int64_t to a string; in
the portable version, this saves a lot of configuration headaches
trying to decipher the platform printf().
@
text
@d10 1
d12 1
@


1.48
log
@SVN rev 203559 on 2010-02-06 19:53:48Z by kientzle

Reformat the Makefile slightly.
@
text
@a11 1
	siginfo.c	\
@


1.47
log
@SVN rev 203557 on 2010-02-06 19:44:37Z by kientzle

Diff reduction compared to portable bsdtar 2.8:  Move the
program name into a global, which eliminates an extra
argument from a lot of places.
@
text
@d6 11
a16 1
SRCS=	bsdtar.c cmdline.c err.c getdate.c matching.c read.c siginfo.c subst.c tree.c util.c write.c
@


1.46
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
@d6 1
a6 1
SRCS=	bsdtar.c cmdline.c getdate.c matching.c read.c siginfo.c subst.c tree.c util.c write.c
@


1.45
log
@SVN rev 196911 on 2009-09-07 06:37:44Z by pjd

Make sure to use up-to-date libarchive header files from source tree when
compiling tar and not the ones from /usr/include/.

Reviewed by:	kientzle
Approved by:	kientzle
@
text
@a6 1
WARNS?=	5
@


1.44
log
@SVN rev 191240 on 2009-04-18 06:03:09Z by kientzle

Make -lcrypto usage dependent on whether or not we're building with OpenSSL.
@
text
@d15 1
a15 1
CFLAGS+=	-I${.CURDIR}
@


1.44.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.44.2.2
log
@SVN rev 213667 on 2010-10-10 08:41:08Z by mm

- Add liblzma support to libarchive and usr.bin/tar
- Do not link usr.bin/ar to liblzma if building bootstrap-tools and
the local system doesn't include liblzma (fixes world build on FreeBSD 7.x)

This is a direct commit.

Approved by:	delphij (mentor)
@
text
@d8 2
a9 2
DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA}
LDADD=	-larchive -lbz2 -lz -lmd -llzma
a14 1
CFLAGS+=	-DHAVE_LIBLZMA
@


1.44.2.3
log
@SVN rev 213669 on 2010-10-10 12:18:53Z by mm

Move HAVE_LIBLZMA from Makefile to config_freebsd.h

Approved by:	delphij (mentor)
@
text
@d15 1
@


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

MFC some Makefile tweaks.
@
text
@d7 1
d15 1
a15 1
CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../../lib/libarchive
@


1.44.2.5
log
@SVN rev 215228 on 2010-11-13 05:50:49Z by kientzle

MFC r203557:  Move program name into a global, eliminate
an extra argument from the error-reporting routines.
@
text
@d6 1
a6 1
SRCS=	bsdtar.c cmdline.c err.c getdate.c matching.c read.c siginfo.c subst.c tree.c util.c write.c
@


1.44.2.6
log
@SVN rev 215230 on 2010-11-13 05:53:55Z by kientzle

MFC minor Makefile reformat.
@
text
@d6 1
a6 11
SRCS=	bsdtar.c	\
	cmdline.c	\
	err.c		\
	getdate.c	\
	matching.c	\
	read.c		\
	siginfo.c	\
	subst.c		\
	tree.c		\
	util.c		\
	write.c
@


1.44.2.7
log
@SVN rev 215232 on 2010-11-13 06:00:27Z by kientzle

MFC r203568:  Refactor and simplify the SIGINFO/SIGUSR1
handling.  Switch to a custom function to format 64-bit
ints to avoid the headache of trying to guess printf
modifiers on different platforms.
@
text
@d12 1
@


1.44.2.8
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
@d5 1
a5 1
BSDTAR_VERSION_STRING=2.8.4
d8 1
d10 1
d16 2
a17 10

.PATH: ${.CURDIR}/../../lib/libarchive/libarchive_fe
SRCS+=	err.c		\
	line_reader.c	\
	matching.c	\
	pathmatch.c

WARNS?=	6
DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBLZMA} ${LIBBSDXML}
LDADD=	-larchive -lbz2 -lz -lmd -llzma -lbsdxml
a18 1
DPADD+=	${LIBCRYPTO}
a23 1
CFLAGS+=	-I${.CURDIR}/../../lib/libarchive/libarchive_fe
@


1.44.2.9
log
@SVN rev 224646 on 2011-08-04 07:29:08Z by mm

MFC r224566:

Correctly link bsdcpio and bsdtar against libmd and libcrpyto
by applying the change from r221472 (libarchive).

Reviewed by:	kientzle
@
text
@d22 2
a23 2
DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBBSDXML}
LDADD=	-larchive -lbz2 -lz -llzma -lbsdxml
a26 3
.else
DPADD+= ${LIBMD}
LDADD+= -lmd
a27 1

@


1.44.2.10
log
@SVN rev 229589 on 2012-01-05 11:45:22Z by mm

MFC r228744, r228745, r228748:

MFC r228744 [1]:
Merge vendor revision 3723:
Fixes extraction of Zip entries that use length-at-end without specifying
either the compressed or uncompressed length.  In particular, fixes bsdtar
extraction of such files.

Reported by:	Patrick Lamaiziere <patfbsd@@davenulle.org> (freebsd-stable@@)

MFC r228745:
Update libarchive, tar and cpio to version 2.8.5

The following additional vendor revisions are applied:

Revision 3740:
Use archive_clear_error() to clear the error markers.

Obtained from:	http://code.google.com/p/libarchive

MFC r228748:
Sync libarchive with vendor branch release/2.8:

3730:
Fix issue 174 (Windows path names, not relevant for FreeBSD)

3734:
Merge r1989: archive_clear_error should set errno to 0.

3735:
Merge r3247 from trunk: Clear errors before returning
from archive_read_support_format_all()

3799:
Check the position before dereferencing the pointer.
This avoids dereferencing one byte past the end of a string

3824:
Merge r3823 from trunk for issue 199 (hang in iso9660 reading)

Obtained from:	http://code.google.com/p/libarchive
@
text
@d5 1
a5 1
BSDTAR_VERSION_STRING=2.8.5
@


1.44.2.11
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
@a3 2
LIBARCHIVEDIR=	${.CURDIR}/../../contrib/libarchive

a5 2

.PATH: ${LIBARCHIVEDIR}/tar
d15 1
a15 1
.PATH: ${LIBARCHIVEDIR}/libarchive_fe
d33 3
a35 3
CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
CFLAGS+=	-I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive
CFLAGS+=	-I${LIBARCHIVEDIR}/libarchive_fe
d40 1
a40 1
.PHONY: check test clean-test
d42 1
a42 4
	cd ${.CURDIR}/test && make obj && make test

clean-test:
	cd ${.CURDIR}/test && make clean
@


1.44.2.12
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/Makefile 229596 2012-01-05 12:57:14Z mm $
@


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


1.44.2.7.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.44.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.44.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.43
log
@SVN rev 191190 on 2009-04-17 03:45:15Z by kientzle

Merge remaining changes from libarchive.googlecode.com:
 * Add xz and lzma compression options
 * Rename --format-options to simply --options
 * Add --same-owner for GNU tar compat
 * Add -lmd and -lcrypto to fix link
 * Documentation
@
text
@d2 1
d9 4
a12 1
LDADD=	-larchive -lbz2 -lz -lmd -lcrypto
@


1.42
log
@SVN rev 189527 on 2009-03-08 06:20:35Z by kientzle

Update version to 2.6.901a to indicate this is synced up with r745 of
libarchive.googlecode.com (except for the lzma/xz support).
@
text
@d4 1
a4 1
BSDTAR_VERSION_STRING=2.6.901a
d8 1
a8 1
LDADD=	-larchive -lbz2 -lz
@


1.41
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
@d4 1
a4 1
BSDTAR_VERSION_STRING=2.5.903a
@


1.40
log
@SVN rev 185688 on 2008-12-06 07:38:14Z by kientzle

bsdtar is synced up with 2.5.903a
@
text
@d5 1
a5 1
SRCS=	bsdtar.c cmdline.c getdate.y matching.c read.c siginfo.c subst.c tree.c util.c write.c
@


1.39
log
@SVN rev 184761 on 2008-11-08 04:43:24Z by kientzle

New command-line parser for bsdtar.

This replaces the getopt()/getopt_long() wrapper, the old-style
argument rewriter and the associated configuration glue with a more
straightforward custom command parser.  In particular, this ensures
that bsdtar will have consistent option parsing on every platform,
regardless of whether the platform supports getopt_long().

MFC after:	30 days
@
text
@d4 1
a4 1
BSDTAR_VERSION_STRING=2.5.5
@


1.38
log
@SVN rev 181984 on 2008-08-22 01:31:13Z by kientzle

Don't clean before running tests.
@
text
@d5 1
a5 1
SRCS=	bsdtar.c getdate.y matching.c read.c siginfo.c subst.c tree.c util.c write.c
d14 1
@


1.37
log
@SVN rev 180276 on 2008-07-05 02:09:54Z by kientzle

FreeBSD-CURRENT bsdtar is synched up with libarchive-portable 2.5.5.
@
text
@d17 1
a17 1
	cd ${.CURDIR}/test && make clean test
@


1.36
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
@d4 1
a4 1
BSDTAR_VERSION_STRING=2.5.4b
@


1.35
log
@Add SIGINFO (and for portability to SIGINFO-lacking systems, SIGUSR1)
handling to bsdtar.  When writing archives (including copying via the
@@archive directive) a line is output to stderr indicating what is being
done (adding or copying), the path, and how far through the file we are;
extracting currently does not report progress within each file, but
this is likely to happen eventually.

Discussed with:	kientzle
Obtained from:	tarsnap
@
text
@d4 2
a5 2
BSDTAR_VERSION_STRING=2.5.0b
SRCS=	bsdtar.c getdate.y matching.c read.c siginfo.c tree.c util.c write.c
d15 2
a16 1
check: $(PROG)
@


1.34
log
@Fix --fast-read by decrementing the remaining patterns to be matched,
instead of incrementing.

Pointy hat: me
Thanks to: Tomasz Przygoda
MFC after: 3 days
@
text
@d5 1
a5 1
SRCS=	bsdtar.c getdate.y matching.c read.c tree.c util.c write.c
@


1.33
log
@A couple of miscellaneous fixes:
  * prototypes for optarg/optind on platforms that don't already have them
  * Disambiguate version number macros
  * Remove unnecessary PACKAGE_NAME macro
  * Hook for forthcoming bsdtar test suite
  * Sync version number up with the portable distribution
@
text
@d4 1
a4 1
BSDTAR_VERSION_STRING= 2.4.11
@


1.32
log
@Don't exit immediately on libarchive warnings, just
set the delayed return value and keep going.

Approved by: re (hrs)
MFC after: 7 days
@
text
@d4 1
a4 1
VERSION=	2.2.5
d9 1
a9 1
CFLAGS+=	-DPACKAGE_VERSION=\"${VERSION}\"
d15 3
@


1.32.2.1
log
@MFC: Various, including:
 * -l now always has the POSIX behavior (GNU tar recently adjusted their
   -l to comply with POSIX, so bsdtar no longer has to guess what the
   user really meant).
 * More complete COPYING information.
 * Various portability fixes and minor configuration changes.
This brings bsdtar into line with -CURRENT, except for one change that
relies on a new libarchive feature that hasn't been MFCed yet.
@
text
@d4 1
a4 1
BSDTAR_VERSION_STRING= 2.4.11
d9 1
a9 1
CFLAGS+=	-DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
a14 3
check: $(PROG)
	cd ${.CURDIR}/test && make clean test

@


1.32.2.2
log
@SVN rev 181511 on 2008-08-10 07:07:00Z by kientzle

MFC r179083, r179213: When we receive SIGINFO (or SIGUSR1), print out some
basic progress information.
@
text
@d5 1
a5 1
SRCS=	bsdtar.c getdate.y matching.c read.c siginfo.c tree.c util.c write.c
@


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

Big MFC of bsdtar 2.5.5.
@
text
@d4 2
a5 2
BSDTAR_VERSION_STRING=2.5.5
SRCS=	bsdtar.c getdate.y matching.c read.c siginfo.c subst.c tree.c util.c write.c
d15 1
a15 2
.PHONY: check test
check test: $(PROG) bsdtar.1.gz
@


1.32.2.4
log
@SVN rev 182137 on 2008-08-25 02:18:12Z by kientzle

MFC r181984: Don't clean before testing, since clean also removes
results from previous tests.
@
text
@d17 1
a17 1
	cd ${.CURDIR}/test && make test
@


1.32.2.5
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.bin/tar/Makefile 182137 2008-08-25 02:18:12Z kientzle $
@


1.32.2.4.8.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.32.2.4.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.bin/tar/Makefile 182137 2008-08-25 02:18:12Z kientzle $
@


1.32.2.4.6.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.32.2.4.4.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.32.2.4.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.31
log
@bsdtar 2.2.3:
  * Implement --use-compress-program using new libarchive feature.
  * Minor portability improvement by adjusting casts used to
    print out uids, gids, and device numbers.

Thanks to: Joerg Sonnenberger for the --use-compress-program implementation.
MFC after: 15 days
@
text
@d4 1
a4 1
VERSION=	2.2.3
@


1.30
log
@Make it easier to support more platforms.
Thanks to: Joerg Sonnenberger for pointing out the need and the technique.
@
text
@d4 1
a4 1
VERSION=	2.0.28
@


1.29
log
@Issue a warning if there's a non-zero exit value.
@
text
@d4 1
a4 1
VERSION=	2.0.25
d10 1
@


1.28
log
@bsdtar 2.0.23:
   * New test scripts exercise some basic functionality
   * Most header inclusions are now protected (portability)
   * read.c now relies on security checks in libarchive instead
     of trying to do its own (optimization)
   * -p now enabled by default for root, add --no-same-permissions
     to disable it
   * Comments, minor style fixes.
@
text
@d4 1
a4 1
VERSION=	2.0.23
@


1.27
log
@If you see a broken symlink, don't try to follow it,
just archive it as a symlink, even if -h was specified.

Thanks to: Jin Guojun
PR: bin/95175
MFC After: 1 week
@
text
@d4 1
a4 1
VERSION=	1.2.53
@


1.26
log
@Extended attribute support on write for Linux; FreeBSD hooks are
forthcoming.  This commit also has a number of style(9) fixes and
minor corrections so the code works better with the build system being
used for non-FreeBSD builds.

Many thanks to: Jaakko Heinonen, who proposed a mechanism for extended
attribute support and implemented both the machine-independent portion
and the Linux-specific portion.
@
text
@d4 1
a4 1
VERSION=	1.2.51
@


1.25
log
@Remove configure.ac.in and the 'distfile' target from
the FreeBSD makefile.  This is a step towards cleaning
out the non-FreeBSD bits from the FreeBSD source tree.
@
text
@d4 1
a4 1
VERSION=	1.2.41
@


1.24
log
@Clarify some error messages.
@
text
@a2 5
#
# Use "make distfile" to build a tar.gz file suitable for distribution,
# including an autoconf/automake-generated build system.
#

d4 2
a5 3
VERSION=	1.02.023
DIST_SRCS=	bsdtar.c getdate.y matching.c read.c tree.c util.c write.c
SRCS=	${DIST_SRCS}
a13 28
DIST_BUILD_DIR=	${.OBJDIR}/${PROG}-${VERSION}
CLEANDIRS+=	${DIST_BUILD_DIR}
DISTFILE=	${PROG}-${VERSION}.tar.gz
# Files that just get copied to the distfile build directory
DIST_FILES=	${DIST_SRCS}
DIST_FILES+=	${MAN}
DIST_FILES+=	bsdtar.h bsdtar_platform.h
DIST_FILES+=	Makefile.am
DIST_FILES+=	tree.h

distfile:
	rm -rf ${DIST_BUILD_DIR}
	mkdir ${DIST_BUILD_DIR}
	for f in ${DIST_FILES};					\
	do							\
		cat ${.CURDIR}/$$f >${DIST_BUILD_DIR}/$$f;	\
	done
	cat ${.CURDIR}/configure.ac.in |			\
		sed 's/@@VERSION@@/${VERSION}/' |			\
		cat > ${DIST_BUILD_DIR}/configure.ac
	(cd ${DIST_BUILD_DIR} && aclocal && autoheader && autoconf )
	(cd ${DIST_BUILD_DIR} && automake -a --foreign)
	(cd ${DIST_BUILD_DIR} && ./configure && make distcheck && make dist)
	mv ${DIST_BUILD_DIR}/${DISTFILE} ${.OBJDIR}
	@@echo ==================================================
	@@echo Created ${.OBJDIR}/${DISTFILE}
	@@echo ==================================================

@


1.24.2.1
log
@MFC bsdtar 1.2.53 to FreeBSD 6:

  * Fixes bin/87911 (internal error attempting -u with empty file)
  * Fixes bin/84993 (warnings with GCC 4.1)
  * Fixes bin/95175 (core dump on nonexistent symlink)
  * Documentation fixes
  * Corrections to pathname matching
  * Portability fixes
  * Initial extended attribute support
@
text
@d3 5
d9 3
a11 2
VERSION=	1.2.53
SRCS=	bsdtar.c getdate.y matching.c read.c tree.c util.c write.c
d20 28
@


1.24.2.2
log
@MFC refactored platform configuration.
Separate platform-specific config into config_freebsd.h.
Changes to Makefile and bsdtar_platform.h to use this instead
of coding the FreeBSD configuration into bsdtar_platform.h
@
text
@a9 1
CFLAGS+=	-DPLATFORM_CONFIG_H=\"config_freebsd.h\"
@


1.24.2.3
log
@Update bsdtar version to 1.9 to match libarchive.
At this point, bsdtar is identical to that in 7-CURRENT
except for one small behavioral change that I'm debating.
@
text
@d4 1
a4 1
VERSION=	1.9.2
@


1.24.2.4
log
@MFC:  Enable -p by default for root, which seems to be what
most people expect.
@
text
@d4 1
a4 1
VERSION=	1.9.3
@


1.24.2.5
log
@SVN rev 179754 on 2008-06-12 06:20:49Z by kientzle

MFC 177341: Decrement matched patterns so that --extract-fast works.
@
text
@d4 1
a4 1
VERSION=	1.9.4
@


1.24.2.6
log
@SVN rev 180058 on 2008-06-27 04:46:06Z by jhb

MFC: Add the mpt_user personality to mpt(4).
@
text
@@


1.24.2.7
log
@SVN rev 181532 on 2008-08-10 18:21:50Z by kientzle

MFC r175051 | kientzle | 2008-01-01 16:27:14 -0800 (Tue, 01 Jan 2008)

 * prototypes for optarg/optind on platforms that don't already have them
 * Disambiguate version number macros
 * Remove unnecessary PACKAGE_NAME macro
 * Hook for forthcoming bsdtar test suite
@
text
@d9 1
a9 1
CFLAGS+=	-DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
a14 3
check: $(PROG)
	cd ${.CURDIR}/test && make clean test

@


1.24.2.8
log
@SVN rev 181689 on 2008-08-13 14:50:42Z by kientzle

Fix the merge of r175051, which inadvertently broke the output of tar --version.
@
text
@d4 1
a4 1
BSDTAR_VERSION_STRING=	1.9.4
@


1.24.2.9
log
@SVN rev 182334 on 2008-08-28 05:12:03Z by kientzle

MFC r179083: SIGINFO/SIGUSR1 now reports detailed progress information.
@
text
@d5 1
a5 1
SRCS=	bsdtar.c getdate.y matching.c read.c siginfo.c tree.c util.c write.c
@


1.24.2.10
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
@d4 2
a5 2
BSDTAR_VERSION_STRING=	1.9.25
SRCS=	bsdtar.c getdate.y matching.c read.c siginfo.c subst.c tree.c util.c write.c
d15 1
a15 2
.PHONY: check test
check test: $(PROG) bsdtar.1.gz
@


1.24.2.11
log
@SVN rev 182345 on 2008-08-28 05:41:10Z by kientzle

Apart from using the old libarchive API, this is now identical to bsdtar 2.5.5.
@
text
@d4 1
a4 1
BSDTAR_VERSION_STRING=	1.9.255
@


1.24.2.12
log
@SVN rev 182355 on 2008-08-28 06:18:58Z by kientzle

Don't clean tests before testing, lest you lose the results of previous tests.
@
text
@d17 1
a17 1
	cd ${.CURDIR}/test && make test
@


1.24.2.13
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.bin/tar/Makefile 182355 2008-08-28 06:18:58Z kientzle $
@


1.24.2.12.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.23
log
@bsdtar now uses the "tree" package instead of "fts" for walking
directory heirarchies.
@
text
@d9 1
a9 1
VERSION=	1.02.022
@


1.22
log
@Correct autoconf/automake invocation to work with devel/gnu-auto* from
ports.

Thanks to: Dag-Erling Sm?rgrav (des@@)
@
text
@d9 2
a10 2
VERSION=	1.01.023
DIST_SRCS=	bsdtar.c getdate.y matching.c read.c util.c write.c
d28 1
a28 1
DIST_FILES+=	fts.c fts.h
@


1.21
log
@Update "make distfile" to use newest automake/autoconf from ports.

Thanks to: Juergen Lock
@
text
@d40 2
a41 2
	(cd ${DIST_BUILD_DIR} && aclocal19 && autoheader259 && autoconf259 )
	(cd ${DIST_BUILD_DIR} && automake19 -a --foreign)
@


1.20
log
@Support path-rewriting options (including --strip-components) for both
extraction and creation.  While I'm here, fix a bug reported by Garrett
Wollman: when stripping the leading '/' from the path "/", don't produce
an entry with an empty name; produce "." instead.
@
text
@d40 2
a41 2
	(cd ${DIST_BUILD_DIR} && aclocal && autoheader && autoconf )
	(cd ${DIST_BUILD_DIR} && automake -a --foreign)
@


1.19
log
@Deorbit gtar, step 1:  Remove WITH_GTAR knob.
  "tar" is now always a synonym for "bsdtar".
  People who need gtar can access it as "gtar."

Approved by:	No objections on arch@@
@
text
@d9 1
a9 1
VERSION=	1.01.022
@


1.18
log
@Re-unbreak the distfile target.

Also, reduce the WARNS level to 5 since different build environments
end up using different Yacc skeletons.  The BSD one does not
predeclare yyparse, the FSF one does, so it's not really possible to
consistently enforce both -Wmissing-prototypes and -Wredundant-decls.
@
text
@a16 2

.if !defined(WITH_GTAR)
a18 1
.endif
@


1.17
log
@"make depend" with .y files is trickier than it looks.  <sigh>
@
text
@d10 3
a12 2
SRCS=	bsdtar.c getdate.y matching.c read.c util.c write.c
WARNS?=	6
d27 1
a27 1
DIST_FILES=	${SRCS_ORIGINAL}
@


1.16
log
@Add --newer-ctime, --newer-mtime, --newer-ctime-than, and --newer-mtime-than
switches to support selecting files by time of modification.

Special thanks to: Steven M. Bellovin, Rich $alz, and Jim Berets,
	authors of the public-domain getdate.y date-parsing code.
@
text
@d10 1
a10 3
# bsd.prog.mk rewrites SRCS, but I need the unedited list below
SRCS_ORIGINAL=	bsdtar.c getdate.y matching.c read.c util.c write.c
SRCS= ${SRCS_ORIGINAL}
d15 1
@


1.15
log
@Add --strip-components option, per bin/77666.

Thanks to: Sangwoo Shim
@
text
@d9 4
a12 2
VERSION=	1.01.021
SRCS=	bsdtar.c matching.c read.c util.c write.c
d27 1
a27 1
DIST_FILES=	${SRCS}
@


1.14
log
@Portability: the included fts.c should now
compile on many non-FreeBSD systems, including
Linux, Solaris, Darwin, etc.

Thanks to: many people who pointed out the same portability problem
@
text
@d9 1
a9 1
VERSION=	1.01.020
@


1.13
log
@Use a relative symlinking so that "tar" also works in /stand.
@
text
@d9 1
a9 1
VERSION=	1.01.015
@


1.12
log
@Correct error handling on failed writes
to the archive.
@
text
@d17 1
a17 1
SYMLINKS=	${BINDIR}/bsdtar ${BINDIR}/tar
@


1.11
log
@gtar uses -F for another purpose, so bsdtar no longer treats it as a
synonym for --format.  Update the man page to reflect this.  While
I'm here, change the man page to document "tar" rather than "bsdtar,"
update some comments about -l compatibility and fix a few grammar nits.
@
text
@d9 1
a9 1
VERSION=	1.01.011
@


1.11.2.1
log
@MFC: Synchronize with -current

Fixes:
  * Failed writes are recognized
  * Correct spacing of dates in -tv format
  * Display large file sizes correctly
  * Eliminate a redundant "Unrecognized option"
    warning.
@
text
@d9 1
a9 1
VERSION=	1.01.015
d17 1
a17 1
SYMLINKS=	bsdtar ${BINDIR}/tar
@


1.11.2.2
log
@MFC: Sync bsdtar with -CURRENT.

This brings a number of portability enhancements and documentation
improvements to 5-STABLE.
@
text
@d9 1
a9 1
VERSION=	1.01.020
@


1.10
log
@Add --totals option.  Unlike gtar, this reports the bytes actually
written to the archive, not the ones written to the compressor.
For uncompressed archives, these numbers are the same, of course.
@
text
@d9 1
a9 1
VERSION=	1.01
@


1.9
log
@Add "make distfile" capabilities to bsdtar, including informational
COPYING file and some conditional compilation cleanups.
@
text
@d9 1
a9 1
VERSION=	1.00
@


1.8
log
@Add a --version option to bsdtar that prints the versions of
both bsdtar and libarchive.  Of course, this requires that bsdtar
have a version number.  Let's call this 1.00, shall we? ;-)
@
text
@d3 5
d21 28
a49 1

@


1.7
log
@Make bsdtar the default system tar.  This makes /usr/bin/tar a symlink
pointing to /usr/bin/bsdtar by default.  To make it point to /usr/bin/gtar,
you can define WITH_GTAR.
@
text
@d4 1
d9 1
@


1.6
log
@Oops.  Forced commit to document that the previous commit
also included a Makefile change:  use a symlink
/usr/bin/tar -> /usr/bin/bsdtar rather than a hardlink so that
people can more easily tell which tar they're currently using.
@
text
@d9 1
a9 1
.if defined(WITH_BSDTAR)
@


1.5
log
@Pointy hat: sticky bit 't' or 'T' is shown over IXOTH bit, not IXGRP. <sigh>
@
text
@@


1.4
log
@Allow brave souls to install bsdtar as the
default "tar" command by defining WITH_BSDTAR.

Note: "gtar" and "bsdtar" commands both exist regardless.
@
text
@d10 1
a10 1
LINKS=	${BINDIR}/bsdtar ${BINDIR}/tar
@


1.3
log
@Style fixes

Pointed out by: bde
@
text
@d9 5
@


1.2
log
@Add DPADD to Makefile (thanks to Andrey for pointing this out).

Generally clean up Makefile, remove dmalloc references from source
(there are better ways to do this than pollute the FreeBSD src tree).
@
text
@a4 1

d6 2
a7 2
LDADD+=	-larchive -lbz2 -lz
DPADD+=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
@


1.1
log
@Initial commit for bsdtar.
@
text
@a0 2
# Makefile for bsdtar
#
a1 2
#
DEBUG_FLAGS= -g
a4 1
MAN =   bsdtar.1
a5 1
BINDIR?=	/usr/bin
d7 2
a8 6
LDADD += -larchive -lz -lbz2

.if defined(DMALLOC)
CFLAGS += -DDMALLOC -I/usr/local/include
LDADD += -L/usr/local/lib -ldmalloc
.endif
@

