[Midnightbsd-cvs] src [11318] trunk/usr.bin/cpio: update config

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Jul 4 16:48:50 EDT 2018


Revision: 11318
          http://svnweb.midnightbsd.org/src/?rev=11318
Author:   laffer1
Date:     2018-07-04 16:48:49 -0400 (Wed, 04 Jul 2018)
Log Message:
-----------
update config

Modified Paths:
--------------
    trunk/usr.bin/cpio/Makefile
    trunk/usr.bin/cpio/config_midnightbsd.h

Added Paths:
-----------
    trunk/usr.bin/cpio/tests/
    trunk/usr.bin/cpio/tests/Makefile
    trunk/usr.bin/cpio/tests/functional_test.sh

Modified: trunk/usr.bin/cpio/Makefile
===================================================================
--- trunk/usr.bin/cpio/Makefile	2018-07-04 14:48:54 UTC (rev 11317)
+++ trunk/usr.bin/cpio/Makefile	2018-07-04 20:48:49 UTC (rev 11318)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/cpio/Makefile 321304 2017-07-20 20:16:18Z mm $
 
 .include <bsd.own.mk>
 
@@ -6,7 +7,7 @@
 LIBARCHIVECONFDIR=	${.CURDIR}/../../lib/libarchive
 
 PROG=	bsdcpio
-BSDCPIO_VERSION_STRING=	3.2.1
+BSDCPIO_VERSION_STRING=	3.3.2
 
 .PATH:	${LIBARCHIVEDIR}/cpio
 SRCS=	cpio.c cmdline.c
@@ -15,14 +16,16 @@
 SRCS+=	err.c line_reader.c passphrase.c
 
 CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
-CFLAGS+= -DPLATFORM_CONFIG_H=\"${LIBARCHIVECONFDIR}/config.h\"
+CFLAGS+= -DPLATFORM_CONFIG_H=\"${LIBARCHIVECONFDIR}/config_midnightbsd.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
+DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBPTHREAD} ${LIBBSDXML}
+LDADD=	-larchive -lz -lbz2 -llzma -lpthread -lbsdxml
 .if ${MK_OPENSSL} != "no"
 DPADD+=	${LIBCRYPTO}
 LDADD+= -lcrypto
@@ -38,4 +41,8 @@
 SYMLINKS=bsdcpio ${BINDIR}/cpio
 MLINKS= bsdcpio.1 cpio.1
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Modified: trunk/usr.bin/cpio/config_midnightbsd.h
===================================================================
--- trunk/usr.bin/cpio/config_midnightbsd.h	2018-07-04 14:48:54 UTC (rev 11317)
+++ trunk/usr.bin/cpio/config_midnightbsd.h	2018-07-04 20:48:49 UTC (rev 11318)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2003-2007 Tim Kientzle
  * All rights reserved.

Added: trunk/usr.bin/cpio/tests/Makefile
===================================================================
--- trunk/usr.bin/cpio/tests/Makefile	                        (rev 0)
+++ trunk/usr.bin/cpio/tests/Makefile	2018-07-04 20:48:49 UTC (rev 11318)
@@ -0,0 +1,128 @@
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/cpio/tests/Makefile 324418 2017-10-08 20:55:45Z mm $
+
+SRCTOP=		${.CURDIR:H:H:H}
+TESTSDIR=	${TESTSBASE}/usr.bin/cpio
+
+LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
+
+ATF_TESTS_SH+=	functional_test
+
+BINDIR=		${TESTSDIR}
+
+PROGS+=		bsdcpio_test
+
+CFLAGS+=	-DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\"
+CFLAGS+=	-I${SRCTOP}/lib/libarchive -I${.OBJDIR}
+
+CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/cpio/test
+CFLAGS+=	-I${LIBARCHIVEDIR}/libarchive
+CFLAGS+=	-I${LIBARCHIVEDIR}/libarchive_fe -I${LIBARCHIVEDIR}/test_utils
+
+# Uncomment to link against dmalloc
+#LDADD+= -L/usr/local/lib -ldmalloc
+#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
+
+.PATH:	${LIBARCHIVEDIR}/cpio
+CPIO_SRCS= cmdline.c
+
+.PATH:	${LIBARCHIVEDIR}/libarchive_fe
+CPIO_SRCS+= err.c
+
+.PATH:	${LIBARCHIVEDIR}/cpio/test
+TESTS_SRCS=	\
+	test_0.c				\
+	test_basic.c				\
+	test_cmdline.c				\
+	test_extract_cpio_Z.c			\
+	test_extract_cpio_bz2.c			\
+	test_extract_cpio_grz.c			\
+	test_extract_cpio_gz.c			\
+	test_extract_cpio_lrz.c			\
+	test_extract_cpio_lz.c			\
+	test_extract_cpio_lz4.c			\
+	test_extract_cpio_lzma.c		\
+	test_extract_cpio_lzo.c			\
+	test_extract_cpio_xz.c			\
+	test_extract_cpio_zstd.c		\
+	test_format_newc.c			\
+	test_gcpio_compat.c			\
+	test_missing_file.c			\
+	test_option_0.c				\
+	test_option_B_upper.c			\
+	test_option_C_upper.c			\
+	test_option_J_upper.c			\
+	test_option_L_upper.c			\
+	test_option_Z_upper.c			\
+	test_option_a.c				\
+	test_option_b64encode.c			\
+	test_option_c.c				\
+	test_option_d.c				\
+	test_option_f.c				\
+	test_option_grzip.c			\
+	test_option_help.c			\
+	test_option_l.c				\
+	test_option_lrzip.c			\
+	test_option_lz4.c			\
+	test_option_lzma.c			\
+	test_option_lzop.c			\
+	test_option_m.c				\
+	test_option_passphrase.c		\
+	test_option_t.c				\
+	test_option_u.c				\
+	test_option_uuencode.c			\
+	test_option_version.c			\
+	test_option_xz.c			\
+	test_option_y.c				\
+	test_option_z.c				\
+	test_option_zstd.c			\
+	test_owner_parse.c			\
+	test_passthrough_dotdot.c		\
+	test_passthrough_reverse.c
+
+SRCS.bsdcpio_test= list.h			\
+	${CPIO_SRCS}				\
+	${TESTS_SRCS}
+
+.PATH:	${LIBARCHIVEDIR}/test_utils
+SRCS.bsdcpio_test+=	test_main.c		\
+			test_utils.c
+
+DPADD.bsdcpio_test=	${LIBARCHIVE}
+LDADD.bsdcpio_test=	-larchive
+
+list.h: ${TESTS_SRCS} Makefile
+	@(cd ${LIBARCHIVEDIR}/tar/test && \
+	grep -h DEFINE_TEST ${.ALLSRC:N*Makefile}) > ${.TARGET}.tmp
+	@mv ${.TARGET}.tmp ${.TARGET}
+
+CLEANFILES+=	list.h list.h.tmp
+
+FILES+= test_extract.cpio.Z.uu
+FILES+= test_extract.cpio.bz2.uu
+FILES+= test_extract.cpio.grz.uu
+FILES+= test_extract.cpio.gz.uu
+FILES+= test_extract.cpio.lrz.uu
+FILES+= test_extract.cpio.lz.uu
+FILES+=	test_extract.cpio.lz4.uu
+FILES+= test_extract.cpio.lzma.uu
+FILES+= test_extract.cpio.lzo.uu
+FILES+= test_extract.cpio.xz.uu
+FILES+= test_extract.cpio.zst.uu
+FILES+= test_gcpio_compat_ref.bin.uu
+FILES+= test_gcpio_compat_ref.crc.uu
+FILES+= test_gcpio_compat_ref.newc.uu
+FILES+= test_gcpio_compat_ref.ustar.uu
+FILES+= test_gcpio_compat_ref_nosym.bin.uu
+FILES+= test_gcpio_compat_ref_nosym.crc.uu
+FILES+= test_gcpio_compat_ref_nosym.newc.uu
+FILES+= test_gcpio_compat_ref_nosym.ustar.uu
+FILES+= test_option_f.cpio.uu
+FILES+= test_option_m.cpio.uu
+FILES+=	test_option_passphrase.zip.uu
+FILES+= test_option_t.cpio.uu
+FILES+= test_option_t.stdout.uu
+FILES+= test_option_tv.stdout.uu
+
+.include <bsd.test.mk>


Property changes on: trunk/usr.bin/cpio/tests/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/usr.bin/cpio/tests/functional_test.sh
===================================================================
--- trunk/usr.bin/cpio/tests/functional_test.sh	                        (rev 0)
+++ trunk/usr.bin/cpio/tests/functional_test.sh	2018-07-04 20:48:49 UTC (rev 11318)
@@ -0,0 +1,57 @@
+#
+# Copyright 2015 EMC Corp.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/cpio/tests/functional_test.sh 288977 2015-10-07 06:08:55Z ngie $
+
+SRCDIR=$(atf_get_srcdir)
+TESTER="${SRCDIR}/bsdcpio_test"
+export BSDCPIO=$(which cpio)
+
+check()
+{
+	local testcase=${1}; shift
+
+	# For some odd reason /bin/sh spuriously writes
+	# "write error on stdout" with some of the testcases
+	#
+	# Probably an issue with how they're written as it calls system(3) to
+	# clean up directories..
+	atf_check -e ignore -o ignore -s exit:0 ${TESTER} -d -r "${SRCDIR}" -v "${testcase}"
+}
+
+atf_init_test_cases()
+{
+	# Redirect stderr to stdout for the usage message because if you don't
+	# kyua list/kyua test will break:
+	# https://github.com/jmmv/kyua/issues/149
+	testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }')
+	for testcase in ${testcases}; do
+		atf_test_case ${testcase}
+		eval "${testcase}_body() { check ${testcase}; }"
+		atf_add_test_case ${testcase}
+	done
+}


Property changes on: trunk/usr.bin/cpio/tests/functional_test.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list