From fbb1b16ad8bc7a6f9a32424ddbd61e59ad5a4d4d Mon Sep 17 00:00:00 2001
From: Martin Matuska <mm@FreeBSD.org>
Date: Tue, 12 Feb 2019 22:29:41 +0000
Subject: Update vendor/libarchive/dist to git
 31c0a517c91f44eeee717a04db8b075cadda83d8

Relevant vendor changes:
  PR #1085: Fix a null pointer dereference bug in zip writer
  PR #1110: ZIP reader added support for XZ, LZMA, PPMD8 and BZIP2
            decopmpression
  PR #1116: Add support for 64-bit ar format
  PR #1120: Fix a 7zip crash [1] and a ISO9660 infinite loop [2]
  PR #1125: RAR5 reader - fix an invalid read and a memory leak
  PR #1131: POSIX reader - do not fail when tree_current_lstat() fails
            due to ENOENT [3]
  PR #1134: Delete unnecessary null pointer checks before calls of free()
  OSS-Fuzz 10843: Force intermediate to uint64_t to make UBSAN happy.
  OSS-Fuzz 11011: Avoid buffer overflow in rar5 reader

PR:		233006 [3]
Security:	CVE-2019-1000019 [1], CVE-2019-1000020 [2]
---
 build/ci/cirrus_ci.sh | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100755 build/ci/cirrus_ci.sh

(limited to 'build/ci/cirrus_ci.sh')

diff --git a/build/ci/cirrus_ci.sh b/build/ci/cirrus_ci.sh
new file mode 100755
index 000000000000..9db762f97cca
--- /dev/null
+++ b/build/ci/cirrus_ci.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+UNAME=`uname`
+if [ "$1" = "install" ]
+then
+	if [ "${UNAME}" = "FreeBSD" ]
+	then
+		set -x -e
+		sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf
+		mount -u -o acls /
+		mkdir /tmp_acl_nfsv4
+		MD=`mdconfig -a -t swap -s 128M`
+		newfs /dev/$MD
+		tunefs -N enable /dev/$MD
+		mount /dev/$MD /tmp_acl_nfsv4
+		chmod 1777 /tmp_acl_nfsv4
+		pkg install -y autoconf automake cmake libiconv libtool pkgconf expat libxml2 liblz4 zstd
+	elif [ "${UNAME}" = "Darwin" ]
+	then
+		set -x -e
+		brew update
+		brew install autoconf automake libtool pkg-config cmake xz lz4 zstd
+	elif [ "${UNAME}" = "Linux" ]
+	then
+		if [ -f "/etc/debian_version" ]
+		then
+			apt-get -y update
+			apt-get -y install build-essential locales automake libtool bison sharutils pkgconf libacl1-dev libbz2-dev libzip-dev zlib1g-dev liblzma-dev liblz4-dev libzstd-dev libssl-dev lrzip cmake
+		elif [ -f "/etc/fedora-release" ]
+		then
+			dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel librichacl-devel bzip2-devel libzip-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel
+		fi
+	fi
+elif [ "$1" = "test" ]
+then
+	if [ "${UNAME}" = "FreeBSD" ]
+	then
+		set -e
+		echo "Additional NFSv4 ACL tests"
+		CURDIR=`pwd`
+		if [ "${BS}" = "cmake" ]
+		then
+			BIN_SUBDIR="bin"
+		else
+			BIN_SUBDIR=.
+		fi
+		BUILDDIR="${CURDIR}/build_ci/${BS}"
+		cd "$BUILDDIR"
+		TMPDIR=/tmp_acl_nfsv4 ${BIN_SUBDIR}/libarchive_test -r "${CURDIR}/libarchive/test" -v test_acl_platform_nfs4
+	fi
+else
+	echo "Usage $0 install | test_nfsv4_acls"
+	exit 1
+fi
-- 
cgit v1.2.3