aboutsummaryrefslogtreecommitdiffstats
path: root/usr.bin/bsdcat
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2017-03-16 23:08:18 +0000
committerMartin Matuska <mm@FreeBSD.org>2017-03-16 23:08:18 +0000
commited2017017c295c5742d17d8eb6b43ef26aae190f (patch)
tree87a6d288519799b4a0946d55b736f27b0635ceae /usr.bin/bsdcat
parent1fbaa7bafcdec4611c84e154440b2525c04d2fd6 (diff)
downloadsrc-ed2017017c295c5742d17d8eb6b43ef26aae190f.tar.gz
src-ed2017017c295c5742d17d8eb6b43ef26aae190f.zip
MFC r314571:
Update libarchive to version 3.3.1 (and sync with latest vendor dist) Notable vendor changes: PR #501: improvements in ACL path handling PR #724: fix hang when reading malformed cpio files PR #864: fix out of bounds read with malformed GNU tar archives Documentation, style, test suite improvements and typo fixes. New options to bsdtar that enable or disable reading and/or writing of: Access Control Lists (--acls, --no-acls) Extended file flags (--fflags, --no-fflags) Extended attributes (--xattrs, --no-xattrs) Mac OS X metadata (Mac OS X only) (--mac-metadata, --no-mac-metadata)
Notes
Notes: svn path=/stable/10/; revision=315433
Diffstat (limited to 'usr.bin/bsdcat')
-rw-r--r--usr.bin/bsdcat/Makefile2
-rw-r--r--usr.bin/bsdcat/tests/Makefile10
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/bsdcat/Makefile b/usr.bin/bsdcat/Makefile
index f3dd81221b60..c5e8c024a233 100644
--- a/usr.bin/bsdcat/Makefile
+++ b/usr.bin/bsdcat/Makefile
@@ -6,7 +6,7 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
_LIBARCHIVECONFDIR= ${SRCTOP}/lib/libarchive
PROG= bsdcat
-BSDCAT_VERSION_STRING= 3.2.2
+BSDCAT_VERSION_STRING= 3.3.1
.PATH: ${_LIBARCHIVEDIR}/cat
SRCS= bsdcat.c cmdline.c
diff --git a/usr.bin/bsdcat/tests/Makefile b/usr.bin/bsdcat/tests/Makefile
index d8e8ac80b7c8..a23650572f3a 100644
--- a/usr.bin/bsdcat/tests/Makefile
+++ b/usr.bin/bsdcat/tests/Makefile
@@ -14,8 +14,8 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\"
CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR}
CFLAGS+= -I${.OBJDIR}
-CFLAGS+= -I${_LIBARCHIVEDIR}/cat -I${_LIBARCHIVEDIR}/libarchive_fe
-CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils
+CFLAGS+= -I${_LIBARCHIVEDIR}/cat -I${_LIBARCHIVEDIR}/cat/test
+CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive_fe -I${_LIBARCHIVEDIR}/test_utils
# Uncomment to link against dmalloc
#LDADD+= -L/usr/local/lib -ldmalloc
@@ -40,11 +40,11 @@ TESTS_SRCS= \
test_version.c
SRCS.bsdcat_test= list.h \
- ${TESTS_SRCS} \
- main.c
+ ${TESTS_SRCS}
.PATH: ${_LIBARCHIVEDIR}/test_utils
-SRCS.bsdcat_test+= test_utils.c
+SRCS.bsdcat_test+= test_main.c \
+ test_utils.c
LIBADD.bsdcat_test= archive