head	1.22;
access;
symbols
	RELENG_8_4:1.22.0.2
	RELENG_9_1_0_RELEASE:1.16.2.3.2.2
	RELENG_9_1:1.16.2.3.0.2
	RELENG_9_1_BP:1.16.2.3
	RELENG_8_3_0_RELEASE:1.9.2.6.2.1
	RELENG_8_3:1.9.2.6.0.2
	RELENG_8_3_BP:1.9.2.6
	RELENG_9_0_0_RELEASE:1.16.2.1.2.1
	RELENG_9_0:1.16.2.1.0.2
	RELENG_9_0_BP:1.16.2.1
	RELENG_9:1.16.0.2
	RELENG_9_BP:1.16
	RELENG_8_2_0_RELEASE:1.9.2.2.4.1
	RELENG_8_2:1.9.2.2.0.4
	RELENG_8_2_BP:1.9.2.2
	RELENG_8_1_0_RELEASE:1.9.2.2.2.1
	RELENG_8_1:1.9.2.2.0.2
	RELENG_8_1_BP:1.9.2.2
	RELENG_8_0_0_RELEASE:1.9.2.1.2.1
	RELENG_8_0:1.9.2.1.0.2
	RELENG_8_0_BP:1.9.2.1
	RELENG_8:1.9.0.2
	RELENG_8_BP:1.9;
locks; strict;
comment	@# @;


1.22
date	2013.03.23.02.25.00;	author svnexp;	state Exp;
branches
	1.22.2.1;
next	1.21;

1.21
date	2012.11.17.01.54.17;	author svnexp;	state Exp;
branches;
next	1.20;

1.20
date	2012.07.28.06.38.44;	author mm;	state Exp;
branches;
next	1.19;

1.19
date	2012.02.25.10.58.02;	author mm;	state Exp;
branches;
next	1.18;

1.18
date	2011.12.22.08.42.07;	author mm;	state Exp;
branches;
next	1.17;

1.17
date	2011.12.20.20.06.33;	author mm;	state Exp;
branches;
next	1.16;

1.16
date	2011.08.01.08.22.40;	author mm;	state Exp;
branches
	1.16.2.1;
next	1.15;

1.15
date	2011.07.17.21.42.22;	author mm;	state Exp;
branches;
next	1.14;

1.14
date	2010.05.10.15.28.44;	author mm;	state Exp;
branches;
next	1.13;

1.13
date	2010.05.08.16.47.33;	author kientzle;	state Exp;
branches;
next	1.12;

1.12
date	2010.03.26.17.02.32;	author delphij;	state Exp;
branches;
next	1.11;

1.11
date	2010.02.25.20.24.19;	author ru;	state Exp;
branches;
next	1.10;

1.10
date	2010.01.02.10.27.05;	author ed;	state Exp;
branches;
next	1.9;

1.9
date	2009.04.19.06.59.12;	author kientzle;	state Exp;
branches
	1.9.2.1;
next	1.8;

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

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

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

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

1.4
date	2008.06.16.07.24.05;	author dougb;	state Exp;
branches;
next	1.3;

1.3
date	2008.06.16.05.48.15;	author dougb;	state Exp;
branches;
next	1.2;

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

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

1.22.2.1
date	2013.03.23.02.25.00;	author svnexp;	state dead;
branches;
next	1.22.2.2;

1.22.2.2
date	2013.03.28.13.06.01;	author svnexp;	state Exp;
branches;
next	;

1.16.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.16.2.1.2.1;
next	1.16.2.2;

1.16.2.2
date	2012.01.05.11.44.55;	author mm;	state Exp;
branches;
next	1.16.2.3;

1.16.2.3
date	2012.01.05.12.52.05;	author mm;	state Exp;
branches
	1.16.2.3.2.1;
next	1.16.2.4;

1.16.2.4
date	2012.11.17.11.37.38;	author svnexp;	state Exp;
branches;
next	;

1.16.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.16.2.1.2.2;

1.16.2.1.2.2
date	2012.11.17.08.37.34;	author svnexp;	state Exp;
branches;
next	;

1.16.2.3.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.16.2.3.2.2;

1.16.2.3.2.2
date	2012.11.17.08.48.25;	author svnexp;	state Exp;
branches;
next	;

1.9.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.9.2.1.2.1;
next	1.9.2.2;

1.9.2.2
date	2010.03.29.18.24.08;	author delphij;	state Exp;
branches
	1.9.2.2.2.1
	1.9.2.2.4.1;
next	1.9.2.3;

1.9.2.3
date	2011.08.01.07.59.54;	author mm;	state Exp;
branches;
next	1.9.2.4;

1.9.2.4
date	2011.08.04.07.29.08;	author mm;	state Exp;
branches;
next	1.9.2.5;

1.9.2.5
date	2012.01.05.11.45.22;	author mm;	state Exp;
branches;
next	1.9.2.6;

1.9.2.6
date	2012.01.05.12.57.14;	author mm;	state Exp;
branches
	1.9.2.6.2.1;
next	1.9.2.7;

1.9.2.7
date	2012.11.17.10.37.16;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.9.2.6.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.9.2.6.2.2;

1.9.2.6.2.2
date	2012.11.17.08.25.49;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.22
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/cpio/Makefile 248616 2013-03-22 13:36:03Z mm $

.include <bsd.own.mk>

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

PROG=	bsdcpio
BSDCPIO_VERSION_STRING=	3.1.2

.PATH:	${LIBARCHIVEDIR}/cpio
SRCS=	cpio.c cmdline.c

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

CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
CFLAGS+= -DPLATFORM_CONFIG_H=\"${LIBARCHIVECONFDIR}/config_freebsd.h\"
CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe

.ifdef RELEASE_CRUNCH
# FreeBSD's installer uses cpio in crunched binaries that are
# statically linked, cannot use -lcrypto, and are size sensitive.
CFLAGS+= -DSMALLER
.endif
DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBBSDXML}
LDADD=	-larchive -lz -lbz2 -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

SYMLINKS=bsdcpio ${BINDIR}/cpio
MLINKS= bsdcpio.1 cpio.1

.PHONY: check test clean-test

check test: $(PROG) bsdcpio.1.gz
	cd ${.CURDIR}/test && make obj && make test

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

.include <bsd.prog.mk>
@


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


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

.include <bsd.own.mk>

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

PROG=	bsdcpio
BSDCPIO_VERSION_STRING=2.8.5

.PATH:	${LIBARCHIVEDIR}/cpio
SRCS=	cpio.c cmdline.c

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

WARNS?=	6
DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe

.ifdef RELEASE_CRUNCH
# FreeBSD's installer uses cpio in crunched binaries that are
# statically linked, cannot use -lcrypto, and are size sensitive.
CFLAGS+= -DSMALLER
.endif
DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBBSDXML}
LDADD=	-larchive -lz -lbz2 -llzma -lbsdxml
.if ${MK_OPENSSL} != "no"
DPADD+=	${LIBCRYPTO}
LDADD+= -lcrypto
.else
DPADD+= ${LIBMD}
LDADD+= -lmd
.endif

SYMLINKS=bsdcpio ${BINDIR}/cpio
MLINKS= bsdcpio.1 cpio.1

.PHONY: check test clean-test

check test: $(PROG) bsdcpio.1.gz
	cd ${.CURDIR}/test && make obj && make test

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

.include <bsd.prog.mk>
@


1.21
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/usr.bin/cpio/Makefile 238856 2012-07-28 06:38:44Z mm $
d9 1
a9 1
BSDCPIO_VERSION_STRING=	3.0.4
@


1.20
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.19
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
@d9 1
a9 1
BSDCPIO_VERSION_STRING=	3.0.3
d15 1
a15 1
SRCS+=	err.c line_reader.c matching.c pathmatch.c
@


1.18
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
@d6 1
d9 1
a9 1
BSDCPIO_VERSION_STRING=2.8.5
d18 1
a18 1
CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
d36 4
@


1.17
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
@d5 2
d10 1
d13 1
a13 1
.PATH:	${.CURDIR}/../../lib/libarchive/libarchive_fe
d17 2
a18 2
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libarchive/libarchive_fe
d38 1
a38 1
.PHONY: check test
d41 4
a44 1
	cd ${.CURDIR}/test && make clean test
@


1.16
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
@d6 1
a6 1
BSDCPIO_VERSION_STRING=2.8.4
@


1.16.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.16.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
@d6 1
a6 1
BSDCPIO_VERSION_STRING=2.8.5
@


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

a7 1
.PATH:	${LIBARCHIVEDIR}/cpio
d10 1
a10 1
.PATH:	${LIBARCHIVEDIR}/libarchive_fe
d14 2
a15 2
CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe
d35 1
a35 1
.PHONY: check test clean-test
d38 1
a38 4
	cd ${.CURDIR}/test && make obj && make test

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


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


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


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


1.15
log
@SVN rev 224154 on 2011-07-17 21:42:22Z by mm

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

Approved by:	kientzle
MFC after:	2 weeks
@
text
@d22 2
a23 2
DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBMD} ${LIBLZMA} ${LIBBSDXML}
LDADD=	-larchive -lz -lbz2 -lmd -llzma -lbsdxml
d27 3
@


1.14
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
@d6 7
a12 2
BSDCPIO_VERSION_STRING=2.8.3
SRCS=	cpio.c cmdline.c err.c line_reader.c matching.c pathmatch.c
d15 2
d22 2
a23 2
DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBMD} ${LIBLZMA}
LDADD=	-larchive -lz -lbz2 -lmd -llzma
@


1.13
log
@SVN rev 207792 on 2010-05-08 16:47:33Z by kientzle

bsdcpio 2.8.3
@
text
@d15 2
a16 2
DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBMD}
LDADD=	-larchive -lz -lbz2 -lmd
@


1.12
log
@SVN rev 205702 on 2010-03-26 17:02:32Z by delphij

Remove GNU cpio after fix of CVE-2010-0624.

Note that this is actually a no-op for most users, as this GNU
cpio was broken on -HEAD and 8-STABLE since last March until
the recent fix.

FreeBSD 8.0+ uses BSD cpio by default and the code is being
actively maintained.

Blessed by:	kientzle
With hat:	secteam
MFC after:	3 days
@
text
@d6 2
a7 2
BSDCPIO_VERSION_STRING=2.7.0
SRCS=	cpio.c cmdline.c err.c matching.c pathmatch.c
@


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

Fixed dependencies (make checkdpadd).
@
text
@a21 1
.if ${MK_GNU_CPIO} != "yes"
a23 1
.endif
@


1.10
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
@a7 1
DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
d15 2
a16 1
LDADD+=	-larchive -lz -lbz2 -lmd
d18 1
@


1.9
log
@SVN rev 191262 on 2009-04-19 06:59:12Z by kientzle

When compiled for the release crunches, be a bit
more selective about what libarchive features we pull in:
 * No compression support
 * Only cpio and ustar writing
 * Only cpio and tar/pax readers
This reduces a statically linked, stripped binary from 900k to 680k
and completely eliminates the dependency on libcrypto.
@
text
@a7 1
WARNS?=	6
@


1.9.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.9.2.2
log
@SVN rev 205848 on 2010-03-29 18:24:08Z by delphij

MFC r205702:

Remove GNU cpio after fix of CVE-2010-0624.

Note that this is actually a no-op for most users, as this GNU
cpio was broken on -HEAD and 8-STABLE since last March until
the recent fix.

FreeBSD 8.0+ uses BSD cpio by default and the code is being
actively maintained.
@
text
@d22 1
d25 1
@


1.9.2.3
log
@SVN rev 224562 on 2011-08-01 07:59:54Z by mm

Sync bsdcpio with 9-CURRENT:

MFC on usr.bin/cpio:
203183,204329,207792,211054,211397,212263,224154-224155

MFC 203183 (kientzle):
Support -V option to print a dot for each file processed.
Also, change the existing -vi behavior to send the filenames to
stderr rather than stdout, as GNU cpio does.

PR:				bin/141175
Submitted by:	Philip Kizer

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

MFC 207792 (kientzle):
bsdcpio 2.8.3

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

Reported by:	swell.k

MFC 211397 (joel):
Fix typos, spelling, formatting and mdoc mistakes found by Nobuyuki while
translating these manual pages.  Minor corrections by me.

Submitted by:	Nobuyuki Koganemaru <n-kogane@@syd.odn.ne.jp>

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

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

MFC 224155 (mm):
Append to CPIO_SRCS instead of using TAR_SRCS,
the variable name is misleading
@
text
@d6 2
a7 7
BSDCPIO_VERSION_STRING=2.8.4

SRCS=	cpio.c cmdline.c

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

a11 2
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libarchive/libarchive_fe

d17 1
a17 2
DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBMD} ${LIBLZMA} ${LIBBSDXML}
LDADD=	-larchive -lz -lbz2 -lmd -llzma -lbsdxml
a18 1
DPADD+=	${LIBCRYPTO}
@


1.9.2.4
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
@d24 2
a25 2
DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBBSDXML}
LDADD=	-larchive -lz -lbz2 -llzma -lbsdxml
a28 3
.else
DPADD+= ${LIBMD}
LDADD+= -lmd
@


1.9.2.5
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
@d6 1
a6 1
BSDCPIO_VERSION_STRING=2.8.5
@


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

a7 1
.PATH:	${LIBARCHIVEDIR}/cpio
d10 1
a10 1
.PATH:	${LIBARCHIVEDIR}/libarchive_fe
d16 2
a17 2
CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe
d37 1
a37 1
.PHONY: check test clean-test
d40 1
a40 4
	cd ${.CURDIR}/test && make obj && make test

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


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


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


1.9.2.2.4.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.9.2.2.2.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.9.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.8
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
@d12 5
@


1.7
log
@SVN rev 191192 on 2009-04-17 04:04:57Z by kientzle

Merge from libarchive.googlecode.com:
 * Lots of new tests.
 * New -n / --numeric-uid-gid option
 * More sanity-checking of arguments
 * Various Windows portability improvements
 * Sync up version number to 2.7.0
@
text
@d12 4
a15 1
LDADD+=	-larchive -lz -lbz2 -lmd -lcrypto
@


1.6
log
@SVN rev 185685 on 2008-12-06 07:30:40Z by kientzle

Custom command line parser for cpio; this is a little more
code but should be a lot fewer cross-platform compatibility
headaches.
@
text
@d6 1
a6 1
BSDCPIO_VERSION_STRING=1.1.0
d12 1
a12 1
LDADD+=	-larchive -lz -lbz2
@


1.5
log
@SVN rev 180280 on 2008-07-05 05:17:33Z by kientzle

bsdcpio is now at version 1.0.0.
@
text
@d6 1
a6 1
BSDCPIO_VERSION_STRING=1.0.0
@


1.4
log
@SVN rev 179816 on 2008-06-16 07:24:05Z by dougb

Include bsd.own.mk to pick up the definition of MK_GNU_CPIO
@
text
@d6 1
a6 1
BSDCPIO_VERSION_STRING=0.9.11b
@


1.3
log
@SVN rev 179813 on 2008-06-16 05:48:15Z by dougb

1. Make the BSD version of cpio the default [1]
a. The BSD version will be built and installed unless
WITHOUT_BSD_CPIO is defined.
b. The GNU version will not be built or installed unless
WITH_GNU_CPIO is defined. If this is defined, the symlink
in /usr/bin will be to the GNU version whether the BSD
version is present or not.

When these changes are MFCed the defaults should be flipped.

2. Add a knob to disable the building of GNU grep. This will
make it easier for those that want to test the BSD version in
the ports.

Approved by:	kientzle [1]
@
text
@d3 2
@


1.2
log
@bsdcpio is always installed as 'bsdcpio', symlink it to 'cpio'
only if WITH_BSDCPIO is defined.
@
text
@d12 1
a12 1
.if defined(WITH_BSDCPIO)
@


1.1
log
@Initial commit of bsdcpio 0.9.11b.

A new implementation of cpio that uses libarchive as it's back-end
archiving/dearchiving infrastructure.  Includes test harness;
"make check" in the bsdcpio directory to build and run the test
harness.
@
text
@d9 1
a9 1
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" -O0 -g
d11 2
d15 1
@

