1278736 package extension: switch for .bsd to .pkg — HardenedBSD-pkg

modified libpkg/packing.c

@@ -94,7 +94,7 @@ packing_init(struct packing **pack, const char *path, pkg_formats format, int cl

 		*pack = NULL;
 		return (EPKG_FATAL); /* error set by _set_format() */
 	}
 	snprintf(archive_path, sizeof(archive_path), "%s.bsd", path);
 	snprintf(archive_path, sizeof(archive_path), "%s.pkg", path);
 	archive_name = strrchr(archive_path, '/');
 	if (archive_name == NULL)
 		archive_name = archive_path;

@@ -472,7 +472,7 @@ packing_is_valid_format(const char *str)

 {
 	if (str == NULL)
 		return (false);
 	if ((strcmp(str, "bsd") == 0) ||
 	if ((strcmp(str, "pkg") == 0) ||
 	    (strcmp(str, "tzst") == 0) ||
 	    (strcmp(str, "txz") == 0) ||
 	    (strcmp(str, "tbz") == 0) ||

modified libpkg/pkg_create.c

@@ -316,11 +316,11 @@ hash_file(struct pkg_create *pc, struct pkg *pkg)

 	char filename[MAXPATHLEN];
 	/* Find the hash and rename the file and create a symlink */
 	pkg_snprintf(filename, sizeof(filename), "%n-%v.bsd",
 	pkg_snprintf(filename, sizeof(filename), "%n-%v.pkg",
 			pkg, pkg);
 	pkg->sum = pkg_checksum_file(filename,
 			PKG_HASH_TYPE_SHA256_HEX);
 	pkg_snprintf(hash_dest, sizeof(hash_dest), "%n-%v-%z.bsd",
 	pkg_snprintf(hash_dest, sizeof(hash_dest), "%n-%v-%z.pkg",
 			pkg, pkg, pkg);
 	pkg_debug(1, "Rename the pkg file from: %s to: %s",

modified libpkg/pkg_jobs.c

@@ -201,7 +201,7 @@ pkg_jobs_maybe_match_file(struct job_pattern *jp, const char *pattern)

 		 * Compare suffix with .txz or .tbz
 		 */
 		dot_pos ++;
 		if (strcmp(dot_pos, "bsd") == 0 ||
 		if (strcmp(dot_pos, "pkg") == 0 ||
 		    strcmp(dot_pos, "tzst") == 0 ||
 		    strcmp(dot_pos, "txz") == 0 ||
 		    strcmp(dot_pos, "tbz") == 0 ||

modified libpkg/pkg_repo.c

@@ -665,7 +665,7 @@ pkg_repo_fetch_remote_extract_fd(struct pkg_repo *repo, const char *filename,

 	char tmp[MAXPATHLEN];
 	struct stat st;
 	fd = pkg_repo_fetch_remote_tmp(repo, filename, "bsd", t, rc, false);
 	fd = pkg_repo_fetch_remote_tmp(repo, filename, "pkg", t, rc, false);
 	if (fd == -1) {
 		fd = pkg_repo_fetch_remote_tmp(repo, filename,
 		    packing_format_to_string(repo->meta->packing_format), t, rc, false);

modified tests/frontend/abi.sh

@@ -5,12 +5,12 @@ tests_init \

 	basic
 basic_body() {
 	if [ `uname -s` != "FreeBSD" ]; then
 		atf_skip "Not yet supported on non FreeBSD"
 	if [ `uname -s` != "Fre.pkg" ]; then
 		atf_skip "Not yet supported on non Fre.pkg"
 	fi
 	atf_check \
 		-o inline:"FreeBSD:13:amd64\n" \
 		pkg -o IGNORE_OSMAJOR=1 -o ABI_FILE=$(atf_get_srcdir)/fbsd.bin config abi
 		-o inline:"Fre.pkg:13:amd64\n" \
 		pkg -o IGNORE_OSMAJOR=1 -o ABI_FILE=$(atf_get_srcdir)/.pkg.bin config abi
 #	atf_check \
 #		-o inline:"dragonfly:5.10:x86:64\n" \

modified tests/frontend/add.sh

@@ -48,7 +48,7 @@ post-install

 	atf_check \
 		-o inline:"${OUTPUT}" \
 		-e empty \
 		pkg add test-1.bsd
 		pkg add test-1.pkg
 # test automatic is not set
 	atf_check \

@@ -68,7 +68,7 @@ post-install

 	atf_check \
 		-o inline:"${OUTPUT}" \
 		-e empty \
 		pkg add -A test-1.bsd
 		pkg add -A test-1.pkg
 	atf_check \
 		-o inline:"1\n" \

@@ -83,10 +83,10 @@ add_noscript_body() {

 OUTPUT="${JAILED}Installing test-1...
 ${JAILED}Extracting test-1:  done
 "
 	cat test-1.bsd | atf_check \
 	cat test-1.pkg | atf_check \
 		-o inline:"${OUTPUT}" \
 		-e empty \
 		pkg add -I test-1.bsd
 		pkg add -I test-1.pkg
 }
 add_force_body() {

@@ -124,10 +124,10 @@ EOF

 		pkg create -M test.ucl
 	atf_check \
 		-o inline:"${JAILED}Installing test-1...\n\nFailed to install the following 1 package(s): test-1.bsd\n" \
 		-o inline:"${JAILED}Installing test-1...\n\nFailed to install the following 1 package(s): test-1.pkg\n" \
 		-e inline:"${PROGNAME}: Missing dependency 'b'\n" \
 		-s exit:1 \
 		pkg add test-1.bsd
 		pkg add test-1.pkg
 OUTPUT="${JAILED}Installing test-1...
 pre-install

@@ -138,7 +138,7 @@ post-install

 		-o inline:"${OUTPUT}" \
 		-e inline:"${PROGNAME}: Missing dependency 'b'\n" \
 		-s exit:0 \
 		pkg add -M test-1.bsd
 		pkg add -M test-1.pkg
 }
 add_quiet_body() {

@@ -147,7 +147,7 @@ add_quiet_body() {

 	atf_check \
 		-o inline:"pre-install\npost-install\n" \
 		-e empty \
 		pkg add -q ./test-1.bsd
 		pkg add -q ./test-1.pkg
 }
 add_stdin_body() {

@@ -158,7 +158,7 @@ pre-install

 ${JAILED}Extracting test-1:  done
 post-install
 "
 	cat test-1.bsd | atf_check \
 	cat test-1.pkg | atf_check \
 		-o inline:"${OUTPUT}" \
 		-e empty \
 		pkg add -

@@ -193,7 +193,7 @@ EOF

 		-s exit:0 \
 		pkg create -M test.ucl
 	cat test-1.bsd | atf_check \
 	cat test-1.pkg | atf_check \
 		-o inline:"${JAILED}Installing test-1...\n\nFailed to install the following 1 package(s): -\n" \
 		-e inline:"${PROGNAME}: Missing dependency 'b'\n" \
 		-s exit:1 \

@@ -204,7 +204,7 @@ pre-install

 ${JAILED}Extracting test-1:  done
 post-install
 "
 	cat test-1.bsd | atf_check \
 	cat test-1.pkg | atf_check \
 		-o inline:"${OUTPUT}" \
 		-e inline:"${PROGNAME}: Missing dependency 'b'\n" \
 		-s exit:0 \

@@ -228,5 +228,5 @@ EOF

 			pkg create -M ${p}.ucl
 	done
 	atf_check -o ignore -s exit:0 \
 		pkg add final-1.bsd
 		pkg add final-1.pkg
 }

modified tests/frontend/backup_lib.sh

@@ -41,13 +41,13 @@ EOF

 		-e empty \
 		-o empty \
 		-s exit:0 \
 		pkg -o BACKUP_LIBRARIES=true -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o BACKUP_LIBRARIES=true -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check \
 		-e empty \
 		-o empty \
 		-s exit:0 \
 		pkg -o BACKUP_LIBRARIES=true -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/foo-1.bsd
 		pkg -o BACKUP_LIBRARIES=true -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/foo-1.pkg
 	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"

@@ -55,7 +55,7 @@ EOF

 		-s exit:0 \
 		pkg create -M test.ucl
 	rm test-1.bsd
 	rm test-1.pkg
 	atf_check \
 		-o ignore \
 		-s exit:0 pkg repo .

@@ -81,7 +81,7 @@ EOF

 	atf_check \
 		-o inline:"/back/libempty.so.1\n" \
 		pkg -r ${TMPDIR}/target query "%Fp" compat-libraries
 	rm foo-1.bsd
 	rm foo-1.pkg
 	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "foo" "foo" "2"
 	atf_check \
 		-s exit:0 \

modified tests/frontend/clean.sh

@@ -18,7 +18,7 @@ basic_body() {

 		-e empty \
 		-o ignore \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"

@@ -49,7 +49,7 @@ EOF

 	mv test-* cache
 	atf_check \
 		-e empty \
 		-o match:"test-.\.bsd" \
 		-o match:"test-.\.pkg" \
 		-s exit:0 \
 		pkg -C /dev/null -o PKG_CACHEDIR=${TMPDIR}/cache -o REPOS_DIR="${TMPDIR}/reposconf" clean -n
 }

modified tests/frontend/configmerge.sh

@@ -21,12 +21,12 @@ config_body()

 	atf_check \
 		-o match:"^config" \
 		pkg info -R --raw-format ucl -F ${TMPDIR}/test-1.bsd
 		pkg info -R --raw-format ucl -F ${TMPDIR}/test-1.pkg
 	mkdir ${TMPDIR}/target
 	unset PKG_DBDIR
 	atf_check \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.pkg
 	test -f ${TMPDIR}/target/${TMPDIR}/a || atf_fail "file absent"
 	echo "addition" >> ${TMPDIR}/target/${TMPDIR}/a
 	atf_check \

@@ -63,7 +63,7 @@ config_fileexist_body()

 	mkdir ${TMPDIR}/target
 	unset PKG_DBDIR
 	atf_check \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.pkg
 	test -f ${TMPDIR}/target/${TMPDIR}/a || atf_fail "file absent"
 	echo "addition" >> ${TMPDIR}/target/${TMPDIR}/a
 	atf_check \

@@ -99,7 +99,7 @@ config_filenotexist_body()

 	mkdir ${TMPDIR}/target
 	unset PKG_DBDIR
 	atf_check \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.pkg
 	test -f ${TMPDIR}/target/${TMPDIR}/a || atf_fail "file absent"
 	echo "addition" >> ${TMPDIR}/target/${TMPDIR}/a
 	atf_check \

@@ -145,7 +145,7 @@ config_hardlink_body()

 	# Install the pkg
 	atf_check \
 		pkg -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target install -qy test
 	rm *.bsd
 	rm *.pkg
 	# Modify the local config
 	echo "line 1a" > target/a

@@ -209,12 +209,12 @@ config_morecomplicated_body()

 	atf_check \
 		-o match:"^config" \
 		pkg info -R --raw-format ucl -F ${TMPDIR}/test-1.bsd
 		pkg info -R --raw-format ucl -F ${TMPDIR}/test-1.pkg
 	mkdir ${TMPDIR}/target
 	unset PKG_DBDIR
 	atf_check \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy ${TMPDIR}/test-1.pkg
 	test -f ${TMPDIR}/target/${TMPDIR}/test.config || atf_fail "file absent"
 	atf_check \

modified tests/frontend/conflicts-multirepo.sh

@@ -146,12 +146,12 @@ EOF

 OUTPUT="Updating local1 repository catalogue...
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.bsd:  done
 ${JAILED}Fetching packagesite.pkg:  done
 Processing entries:  done
 local1 repository update completed. 2 packages processed.
 Updating local2 repository catalogue...
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.bsd:  done
 ${JAILED}Fetching packagesite.pkg:  done
 Processing entries:  done
 local2 repository update completed. 2 packages processed.
 All repositories are up to date.

modified tests/frontend/conflicts.sh

@@ -426,7 +426,7 @@ EOF

 OUTPUT="Updating local repository catalogue...
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.bsd:  done
 ${JAILED}Fetching packagesite.pkg:  done
 Processing entries:  done
 local repository update completed. 1 packages processed.
 All repositories are up to date.

modified tests/frontend/create.sh

@@ -59,7 +59,7 @@ preparetestcredentials() {

 }
 basic_validation() {
 	test -f test-1.bsd || atf_fail "Package not created"
 	test -f test-1.pkg || atf_fail "Package not created"
 }
 create_with_hardlink_body() {

@@ -91,7 +91,7 @@ create_from_plist_body() {

 		-o match:"-rw-r--r-- .*root[ /]+wheel.* /file1$" \
 		-e ignore \
 		-s exit:0 \
 		tar tvf test-1.bsd
 		tar tvf test-1.pkg
 }
 create_from_plist_set_owner_body() {

@@ -109,7 +109,7 @@ create_from_plist_set_owner_body() {

 		-o match:"-rw-r--r-- .*plop[ /]+wheel.* /file1$" \
 		-e ignore \
 		-s exit:0 \
 		tar tvf test-1.bsd
 		tar tvf test-1.pkg
 }
 create_from_plist_set_group_body() {

@@ -127,7 +127,7 @@ create_from_plist_set_group_body() {

 		-o match:"-rw-r--r-- .*root[ /]+bla.* /file1$" \
 		-e ignore \
 		-s exit:0 \
 		tar tvf test-1.bsd
 		tar tvf test-1.pkg
 }

@@ -146,7 +146,7 @@ create_from_plist_set_group_space_body() {

 		-o match:"-rw-r--r-- .*root[ /]+bla.* /file1$" \
 		-e ignore \
 		-s exit:0 \
 		tar tvf test-1.bsd
 		tar tvf test-1.pkg
 }
 create_from_plist_gather_mode_body() {

@@ -166,7 +166,7 @@ create_from_plist_gather_mode_body() {

 		-o match:"-rwxrwxrwx .*plop[ /]+bla.* /file1$" \
 		-e ignore \
 		-s exit:0 \
 		tar tvf test-1.bsd
 		tar tvf test-1.pkg
 }
 create_from_plist_set_mode_body() {

@@ -184,7 +184,7 @@ create_from_plist_set_mode_body() {

 		-o match:"-rwxr-sr-x .*root[ /]+wheel.* /file1$" \
 		-e ignore \
 		-s exit:0 \
 		tar tvf test-1.bsd
 		tar tvf test-1.pkg
 }
 create_from_plist_mini_body() {

@@ -202,7 +202,7 @@ create_from_plist_mini_body() {

 		-o match:"-rw-r--r-- .*plop[ /]+wheel.* /file1$" \
 		-e ignore \
 		-s exit:0 \
 		tar tvf test-1.bsd
 		tar tvf test-1.pkg
 }
 create_from_plist_dirrm_body() {

@@ -238,7 +238,7 @@ aline"

 		-o inline:"+COMPACT_MANIFEST\n+MANIFEST\n" \
 		-e empty \
 		-s exit:0 \
 		tar tf test-1.bsd
 		tar tf test-1.pkg
 	atf_check \
 		-o empty \

@@ -293,7 +293,7 @@ mkdir target

 	atf_check \
 		-o inline:"yes\nfile1\nyes\nA\nB\nC\nD\n" \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 }
 create_from_plist_keyword_validation_body() {

@@ -477,7 +477,7 @@ EOF

 		-o file:output.ucl \
 		-e empty \
 		-s exit:0 \
 		pkg info -R --raw-format=ucl -F test-1.bsd
 		pkg info -R --raw-format=ucl -F test-1.pkg
 }
 create_from_manifest_and_plist_body() {

@@ -515,7 +515,7 @@ EOF

 		-o file:output.ucl \
 		-e empty \
 		-s exit:0 \
 		pkg info -R --raw-format=ucl -F test-1.bsd
 		pkg info -R --raw-format=ucl -F test-1.pkg
 }
 create_from_manifest_body() {

@@ -557,7 +557,7 @@ EOF

 		-o file:output.ucl \
 		-e empty \
 		-s exit:0 \
 		pkg info -R --raw-format=ucl -F test-1.bsd
 		pkg info -R --raw-format=ucl -F test-1.pkg
 }
 create_from_manifest_dir_body() {

@@ -590,7 +590,7 @@ Message

 "
 	atf_check pkg create -m . -r ${TMPDIR}
 	atf_check -o inline:"${OUTPUT}" pkg info -D -F ./test-1.bsd
 	atf_check -o inline:"${OUTPUT}" pkg info -D -F ./test-1.pkg
 cat << EOF > ./+DISPLAY
 [

@@ -609,7 +609,7 @@ message upgrade

 '
 	atf_check pkg create -m . -r ${TMPDIR}
 	atf_check -o inline:"${OUTPUT}" pkg info -D -F ./test-1.bsd
 	atf_check -o inline:"${OUTPUT}" pkg info -D -F ./test-1.pkg
 }

@@ -628,7 +628,7 @@ create_from_plist_hash_body() {

 		-o ignore \
 		-e empty \
 		-s exit:0 \
 		ls test-1-*.bsd
 		ls test-1-*.pkg
 }
 create_from_plist_with_keyword_and_message_body() {

@@ -661,7 +661,7 @@ on install

 '
 	atf_check pkg -o PLIST_KEYWORDS_DIR=. create -m . -r ${TMPDIR} -p test.plist
 	atf_check -o inline:"${OUTPUT}" pkg info -D -F ./test-1.bsd
 	atf_check -o inline:"${OUTPUT}" pkg info -D -F ./test-1.pkg
 }

@@ -678,24 +678,24 @@ EOF

 	atf_check env SOURCE_DATE_EPOCH=86400 pkg create -M test.ucl
 	atf_check \
 		-o match:"0 Jan +2 +1970.*/a" \
 		tar tvf test-1.bsd
 		tar tvf test-1.pkg
 	atf_check -e match:"Invalid" -s exit:1 pkg create -t meh -M test.ucl
 	atf_check pkg create -t 172800 -M test.ucl
 	atf_check \
 		-o match:"0 Jan +3 +1970.*/a" \
 		tar tvf test-1.bsd
 		tar tvf test-1.pkg
 	atf_check env SOURCE_DATE_EPOCH=86400 pkg create -t 172800 -M test.ucl
 	atf_check \
 		-o match:"0 Jan +3 +1970.*/a" \
 		tar tvf test-1.bsd
 		tar tvf test-1.pkg
 	atf_check pkg create -M test.ucl
 	atf_check \
 		-o match:"${pattern}" \
 		tar tvf test-1.bsd
 		tar tvf test-1.pkg
 	mkdir target
 	atf_check -o empty \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check \
 		-o match:"${pattern}" \
 		ls -l ${TMPDIR}/target/${TMPDIR}/a

@@ -705,10 +705,10 @@ create_no_clobber_body()

 {
 	atf_check sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "1"
 	touch test-1.bsd
 	before=$(ls -l test-1.bsd)
 	touch test-1.pkg
 	before=$(ls -l test-1.pkg)
 	atf_check pkg create -nM test.ucl
 	after=$(ls -l test-1.bsd)
 	after=$(ls -l test-1.pkg)
 	[ "$before" = "$after" ] || atf_fail "Package was recreated \"$before\" vs \"$after\""
 }

@@ -732,7 +732,7 @@ EOF

 		-s exit:0 \
 		pkg create -o ${TMPDIR} -m . -p test.plist -r .
 	atf_check -o inline:"/file1\n/file3\n/file2\n" pkg info -ql -F test*.bsd
 	atf_check -o inline:"/file1\n/file3\n/file2\n" pkg info -ql -F test*.pkg
 	cat << EOF >> other-plist
 @include test.plist
 EOF

@@ -783,7 +783,7 @@ touch A B

 	atf_check \
 		-o match:"-rw-r--r-- .*plop[ /]+wheel.* /A$" \
 		tar tvf test-1.bsd
 		tar tvf test-1.pkg
 }
 create_from_plist_keyword_deprecated_body()

modified tests/frontend/extract.sh

@@ -33,7 +33,7 @@ EOF

 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qy \
 			${TMPDIR}/test-1.bsd
 			${TMPDIR}/test-1.pkg
 OUTPUT="${TMPDIR}/target/local.sqlite
 ${TMPDIR}/target${TMPDIR}/a

@@ -57,7 +57,7 @@ ${TMPDIR}/target${TMPDIR}/a

 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
 			${TMPDIR}/test-1.bsd
 			${TMPDIR}/test-1.pkg
 	atf_check \
 		-o inline:"${OUTPUT}" \

@@ -89,7 +89,7 @@ EOF

 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
 			${TMPDIR}/test-1.bsd
 			${TMPDIR}/test-1.pkg
 	test -d ${TMPDIR}/target${TMPDIR}/plop || atf_fail "directory not extracted"
 }

@@ -113,7 +113,7 @@ EOF

 	atf_check \
 		-o match:"^-r-sr-xr-- " \
 		-e ignore \
 		tar tvf ${TMPDIR}/test-1.bsd
 		tar tvf ${TMPDIR}/test-1.pkg
 	mkdir ${TMPDIR}/target
 	atf_check \

@@ -121,7 +121,7 @@ EOF

 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
 			${TMPDIR}/test-1.bsd
 			${TMPDIR}/test-1.pkg
 	atf_check \
 		-o match:"^-r-sr-xr-- " \

@@ -153,7 +153,7 @@ EOF

 		-o match:"^-r-sr-xr--.*a$" \
 		-o match:"^hr-sr-xr--.*a$" \
 		-e ignore \
 		tar tvf ${TMPDIR}/test-1.bsd
 		tar tvf ${TMPDIR}/test-1.pkg
 	mkdir ${TMPDIR}/target
 	atf_check \

@@ -161,7 +161,7 @@ EOF

 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null  -r ${TMPDIR}/target install -qfy \
 			${TMPDIR}/test-1.bsd
 			${TMPDIR}/test-1.pkg
 	atf_check \
 		-o match:"^-r-sr-xr-- " \

@@ -199,7 +199,7 @@ chflags_body()

 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
 		    ${TMPDIR}/test-1.bsd
 		    ${TMPDIR}/test-1.pkg
 	atf_check \
 		-o match:"nodump" \

@@ -230,7 +230,7 @@ chflags_schg_body()

 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
 			${TMPDIR}/test-1.bsd
 			${TMPDIR}/test-1.pkg
 	atf_check \
 		-o match:"schg" \

@@ -244,7 +244,7 @@ chflags_schg_body()

 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
 			${TMPDIR}/test-1.bsd
 			${TMPDIR}/test-1.pkg
 }
 chflags_schg_cleanup()

@@ -276,5 +276,5 @@ EOF

 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
 			${TMPDIR}/test-1.bsd
 			${TMPDIR}/test-1.pkg
 }

modified tests/frontend/formula.sh

@@ -57,7 +57,7 @@ EOF

 	OUTPUT="Updating local1 repository catalogue...
 ${JAILED}meta.conf                                 :  done
 ${JAILED}packagesite.bsd                           :  done
 ${JAILED}packagesite.pkg                           :  done
 Processing entries:  done
 local1 repository update completed. 2 packages processed.
 All repositories are up to date.

modified tests/frontend/http.sh

@@ -19,7 +19,7 @@ simple_repo_body()

 	atf_check sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1
 	atf_check pkg create -M test.ucl
 	mkdir repo
 	mv test-1.txz test-1.bsd repo/
 	mv test-1.txz test-1.pkg repo/
 	atf_check -o ignore pkg repo repo
 	trap cleanup EXIT

modified tests/frontend/install.sh

@@ -124,7 +124,7 @@ EOF

 	atf_check -o ignore \
 		-e inline:"${PROGNAME}: PRE-INSTALL script failed\n" \
 		-s exit:3 \
 		pkg -o REPOS_DIR="/dev/null" install -y ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR="/dev/null" install -y ${TMPDIR}/test-1.pkg
 }
 post_script_ignored_body()

@@ -145,5 +145,5 @@ EOF

 	atf_check -o ignore \
 		-e inline:"${PROGNAME}: POST-INSTALL script failed\n" \
 		-s exit:0 \
 		pkg -o REPOS_DIR="/dev/null" install -y ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR="/dev/null" install -y ${TMPDIR}/test-1.pkg
 }

modified tests/frontend/issue1374.sh

@@ -2,7 +2,7 @@

 . $(atf_get_srcdir)/test_environment.sh
 # https://github.com/freebsd/pkg/issues/1374
 # https://github.com/fre.pkg/pkg/issues/1374
 tests_init \
         issue1374

modified tests/frontend/issue1425.sh

@@ -2,7 +2,7 @@

 . $(atf_get_srcdir)/test_environment.sh
 # https://github.com/freebsd/pkg/issues/1425
 # https://github.com/fre.pkg/pkg/issues/1425
 #pkgA
 # - pkgB
 #    - pkgC

@@ -153,12 +153,12 @@ EOF

 OUTPUT_CASE1="Updating repoA repository catalogue...
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.bsd:  done
 ${JAILED}Fetching packagesite.pkg:  done
 Processing entries:  done
 repoA repository update completed. 4 packages processed.
 Updating repoB repository catalogue...
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.bsd:  done
 ${JAILED}Fetching packagesite.pkg:  done
 Processing entries:  done
 repoB repository update completed. 4 packages processed.
 All repositories are up to date.

modified tests/frontend/issue1440.sh

@@ -3,7 +3,7 @@

 . $(atf_get_srcdir)/test_environment.sh
 # https://github.com/freebsd/pkg/issues/1440
 # https://github.com/fre.pkg/pkg/issues/1440
 #pkgA
 # - pkgB
 #    - pkgC

@@ -188,12 +188,12 @@ EOF

 OUTPUT_CASE1="Updating repoA repository catalogue...
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.bsd:  done
 ${JAILED}Fetching packagesite.pkg:  done
 Processing entries:  done
 repoA repository update completed. 4 packages processed.
 Updating repoB repository catalogue...
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.bsd:  done
 ${JAILED}Fetching packagesite.pkg:  done
 Processing entries:  done
 repoB repository update completed. 4 packages processed.
 All repositories are up to date.

modified tests/frontend/issue1445.sh

@@ -22,7 +22,7 @@ EOF

 	ln -sf ${TMPDIR}/plop2 ${TMPDIR}/plop
 	atf_check \
 		-o ignore \
 		pkg -o REPOS_DIR=/dev/null install -y ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null install -y ${TMPDIR}/test-1.pkg
 	test -d ${TMPDIR}/plop || atf_fail "directory not created"
 }

@@ -42,6 +42,6 @@ EOF

 	ln -sf ${TMPDIR}/plop2 ${TMPDIR}/plop
 	atf_check \
 		-o ignore \
 		pkg -o REPOS_DIR=/dev/null install -y ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null install -y ${TMPDIR}/test-1.pkg
 	test -h ${TMPDIR}/plop || atf_fail "Symlink deleted"
 }

modified tests/frontend/lua.sh

@@ -41,7 +41,7 @@ EOF

 		-o inline:"plop\n" \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 }

@@ -67,7 +67,7 @@ EOF

 		-o inline:"this is post install1\nthis is post install2\n" \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 }

@@ -94,7 +94,7 @@ EOF

 		-o inline:"this is post install1\nthis is post install2\nthis is a message\n" \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 }

@@ -123,7 +123,7 @@ EOF

 	atf_check \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	[ -f ${TMPDIR}/target/file.txt ] || atf_fail "File not created in the rootdir"
 	# test the mode
 	atf_check -o match:"^-rw-r--r--" ls -l ${TMPDIR}/target/file.txt

@@ -157,14 +157,14 @@ EOF

 	atf_check \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	test -d ${TMPDIR}/target/file && atf_fail "directory not removed"
 	touch ${TMPDIR}/target/file
 	atf_check \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	test -f ${TMPDIR}/target/file && atf_fail "file not removed"
 	return 0
 }

@@ -191,7 +191,7 @@ EOF

 	atf_check \
 		-e inline:"${ERR}" \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	test -f ${TMPDIR}/target/file && atf_fail "File not renamed"
 	test -f ${TMPDIR}/target/plop || atf_fail "File not renamed"
 	return 0

@@ -222,7 +222,7 @@ pkg: lua script failed\n"

 	atf_check \
 		-e inline:"${ERR}" \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 }
 script_upgrade_body() {

@@ -250,7 +250,7 @@ EOF

 		-e empty \
 		-o empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2" "/"
 	cat << EOF >> test.ucl

@@ -265,7 +265,7 @@ EOS

 }
 EOF
 	rm ${TMPDIR}/test-1.bsd
 	rm ${TMPDIR}/test-1.pkg
 	atf_check \
 		-o empty \
 		-e empty \

@@ -323,7 +323,7 @@ EOF

 		-o inline:"same\n" \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	# Cleanup
 	atf_check \

@@ -364,7 +364,7 @@ EOF

 		-o inline:"different\n" \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 }
 script_filecmp_symlink_body() {

@@ -403,7 +403,7 @@ EOF

 		-o inline:"same\n" \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	# Cleanup
 	atf_check \

@@ -449,7 +449,7 @@ EOF

 		-o inline:"different\n" \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 }
 script_copy_body() {

@@ -478,7 +478,7 @@ EOF

 		-o empty \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a.sample
 	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a

@@ -517,7 +517,7 @@ EOF

 		-o empty \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a.sample
 	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/b

@@ -569,7 +569,7 @@ EOF

 		-o empty \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a.sample
 	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a

@@ -617,7 +617,7 @@ EOF

 		-o empty \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a
 	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/b.sample

@@ -664,7 +664,7 @@ EOF

 		-o empty \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/a
 	atf_check -o inline:"sample text\n" cat ${TMPDIR}/target${TMPDIR}/b

@@ -711,7 +711,7 @@ EOF

 		-o empty \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check \
 		-o empty \

@@ -748,5 +748,5 @@ EOF

 		-o inline:"zero\nreg\n" \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 }

modified tests/frontend/php-pr.sh

@@ -113,7 +113,7 @@ EOF

 	rm reposconf/repo1.conf
 	rm -f *.ucl
 	rm *.txz
 	rm *.bsd
 	rm *.pkg
 	cat << EOF > php53.new.ucl
 name: php53

@@ -241,7 +241,7 @@ php53-gd-5.3.27

 OUTPUT="Updating local repository catalogue...
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.bsd:  done
 ${JAILED}Fetching packagesite.pkg:  done
 Processing entries:  done
 local repository update completed. 4 packages processed.
 All repositories are up to date.

modified tests/frontend/query.sh

@@ -126,8 +126,8 @@ EOF

 		-s exit:0 \
 		pkg create -M test2.ucl
 	sum1=$(pkg query -F ./test-1.bsd '%X')
 	sum2=$(pkg query -F ./test-2.bsd '%X')
 	sum1=$(pkg query -F ./test-1.pkg '%X')
 	sum2=$(pkg query -F ./test-2.pkg '%X')
 	atf_check \
 		-o empty \

@@ -146,35 +146,35 @@ EOF

 		-o inline:"${TMPDIR}/plop\n${TMPDIR}/bla\n" \
 		-e empty \
 		-s exit:0 \
 		pkg query -F ./test-1.bsd '%Fp'
 		pkg query -F ./test-1.pkg '%Fp'
 	atf_check \
 		-o inline:"1\n" \
 		-e empty \
 		-s exit:0 \
 		pkg query -F ./test-1.bsd '%?F'
 		pkg query -F ./test-1.pkg '%?F'
 	atf_check \
 		-o inline:"2\n" \
 		-e empty \
 		-s exit:0 \
 		pkg query -F ./test-1.bsd '%#F'
 		pkg query -F ./test-1.pkg '%#F'
 	atf_check \
 		-o inline:"test 1\n" \
 		-e empty \
 		-s exit:0 \
 		pkg query -F ./test-1.bsd '%n %v'
 		pkg query -F ./test-1.pkg '%n %v'
 	atf_check \
 		-o inline:"a test\n" \
 		-e empty \
 		-s exit:0 \
 		pkg query -F ./test-1.bsd '%c'
 		pkg query -F ./test-1.pkg '%c'
 	atf_check \
 		-o inline:"Nothing to see here\n" \
 		-e empty \
 		-s exit:0 \
 		pkg query -F ./plop-1.bsd '%c'
 		pkg query -F ./plop-1.pkg '%c'
 }

modified tests/frontend/repo.sh

@@ -36,7 +36,7 @@ EOF

 		-s exit:0 \
 		pkg repo --meta-file meta.ucl .
 	cp test-1.bsd test.bsd
 	cp test-1.pkg test.pkg
 	atf_check \
 		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

@@ -48,11 +48,11 @@ EOF

 		atf_pass
 	fi
 	nb=$(tar -xf digests.bsd -O digests | wc -l)
 	nb=$(tar -xf digests.pkg -O digests | wc -l)
 	atf_check_equal $nb 2
 	mkdir Latest
 	ln -s test-1.bsd Latest/test.bsd
 	ln -s test-1.pkg Latest/test.pkg
 	atf_check \
 		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

@@ -86,7 +86,7 @@ EOF

 		-s exit:0 \
 		pkg repo --meta-file meta.ucl .
 	ln -s test-1.bsd test.bsd
 	ln -s test-1.pkg test.pkg
 	atf_check \
 		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

@@ -98,10 +98,10 @@ EOF

 		atf_pass
 	fi
 	atf_check -s exit:127 -o ignore -e ignore "ls digest.bsd"
 	atf_check -s exit:127 -o ignore -e ignore "ls digest.pkg"
 	mkdir Latest
 	ln -s test-1.bsd Latest/test.bsd
 	ln -s test-1.pkg Latest/test.pkg
 	atf_check \
 		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \

@@ -188,7 +188,7 @@ repo_symlinks_body() {

 	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1.0 "${TMPDIR}"
 	atf_check pkg create --format txz -M test.ucl
 	mkdir repo
 	ln -sf ../test-1.0.bsd ./repo/meh-1.0.bsd
 	ln -sf ../test-1.0.pkg ./repo/meh-1.0.pkg
 	atf_check -o ignore pkg repo repo
 	cat > pkg.conf << EOF
 PKG_DBDIR=${TMPDIR}

@@ -205,8 +205,8 @@ EOF

 	rm -rf repo
 	mkdir repo
 	cp test-1.0.bsd repo/
 	ln -fs test-1.0.bsd ./repo/meh-1.0.bsd
 	cp test-1.0.pkg repo/
 	ln -fs test-1.0.pkg ./repo/meh-1.0.pkg
 	atf_check -o ignore pkg repo repo
 	atf_check -o ignore \

@@ -219,6 +219,6 @@ repo_content_body() {

 	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg test test 1.0 "${TMPDIR}"
 	atf_check pkg create --format txz -M test.ucl
 	atf_check -o ignore pkg repo .
 	nb=$(tar -xf packagesite.bsd -O - packagesite.yaml | wc -l)
 	nb=$(tar -xf packagesite.pkg -O - packagesite.yaml | wc -l)
 	[ $nb -eq 1 ] || atf_fail "packagesite has $nb entries instead of 1"
 }

modified tests/frontend/requires.sh

@@ -40,7 +40,7 @@ EOF

 	OUTPUT="Updating local1 repository catalogue...
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.bsd:  done
 ${JAILED}Fetching packagesite.pkg:  done
 Processing entries:  done
 local1 repository update completed. 2 packages processed.
 All repositories are up to date.

modified tests/frontend/rubypuppet.sh

@@ -124,7 +124,7 @@ EOF

 	rm reposconf/repo1.conf
 	rm -f *.ucl
 	rm *.txz
 	rm *.bsd
 	rm *.pkg
 	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg rubygemrubyaugeas.new rubygem-ruby-augeas 1.0
 	cat << EOF >> rubygemrubyaugeas.new.ucl

@@ -228,7 +228,7 @@ EOF

 	OUTPUT="Updating local repository catalogue...
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.bsd:  done
 ${JAILED}Fetching packagesite.pkg:  done
 Processing entries:  done
 local repository update completed. 5 packages processed.
 All repositories are up to date.

modified tests/frontend/shellscript.sh

@@ -30,7 +30,7 @@ EOF

 		-o inline:"this is post install1\nthis is post install2\n" \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 }

@@ -58,7 +58,7 @@ EOF

 		-o inline:"this is post install1\nthis is post install2\nthis is a message\n" \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 }

@@ -87,7 +87,7 @@ EOF

 		-o inline:"this is post install1\nthis is post install2\nthis is a message\n" \
 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 }

@@ -114,7 +114,7 @@ EOF

 		-e empty \
 		-o ignore \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check -s exit:0 sh ${RESOURCEDIR}/test_subr.sh new_pkg "test" "test" "2"
 	cat << EOF >> test.ucl

@@ -127,7 +127,7 @@ EOS

 }
 EOF
 	rm ${TMPDIR}/test-1.bsd
 	rm ${TMPDIR}/test-1.pkg
 	atf_check \
 		-o empty \
 		-e empty \

@@ -138,7 +138,7 @@ EOF

 		-o ignore \
 		-e empty \
 		-s exit:0 \
 		pkg info -R -F ./test-2.bsd
 		pkg info -R -F ./test-2.pkg
 	atf_check \
 		-o ignore \
 		-e empty \

modified tests/frontend/triggers.sh

@@ -27,8 +27,8 @@ EOF

 	echo trigger_dir/trigger.ucl > plist
 	atf_check pkg create -M test.ucl -p plist -r .
 	mkdir target
 	atf_check pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 	atf_check pkg -o REPOS_DIR=/dev/null -o PKG_TRIGGERS_DIR="/trigger_dir" -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 	atf_check pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check pkg -o REPOS_DIR=/dev/null -o PKG_TRIGGERS_DIR="/trigger_dir" -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check -o inline:"Cleaning up\n" pkg -o REPOS_DIR=/dev/null -o PKG_TRIGGERS_DIR="/trigger_dir" -r ${TMPDIR}/target delete -qy test
 }

@@ -53,7 +53,7 @@ EOF

 	echo trigger_dir/trigger.ucl > plist
 	atf_check pkg create -M test.ucl -p plist -r .
 	mkdir target
 	atf_check pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 	atf_check pkg -o REPOS_DIR=/dev/null -o PKG_TRIGGERS_DIR="/trigger_dir" -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.bsd
 	atf_check pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check pkg -o REPOS_DIR=/dev/null -o PKG_TRIGGERS_DIR="/trigger_dir" -r ${TMPDIR}/target install -qfy ${TMPDIR}/test-1.pkg
 	atf_check -o inline:"Cleaning up\n" pkg -o REPOS_DIR=/dev/null -o PKG_TRIGGERS_DIR="/trigger_dir" -r ${TMPDIR}/target delete -qy test
 }

modified tests/frontend/update.sh

@@ -17,7 +17,7 @@ EOF

 	atf_check \
 		-o match:"Unable to update repository test" \
 		-e match:"pkg: file://empty//packagesite.bsd: No such file or directory" \
 		-e match:"pkg: file://empty//packagesite.pkg: No such file or directory" \
 		-s exit:1 \
 		pkg -R repos update
 }

modified tests/frontend/vital.sh

@@ -22,7 +22,7 @@ EOF

 		-o match:"^vital" \
 		-e empty \
 		-s exit:0 \
 		pkg info -R --raw-format ucl -F ${TMPDIR}/test-1.bsd
 		pkg info -R --raw-format ucl -F ${TMPDIR}/test-1.pkg
 	mkdir ${TMPDIR}/target
 	atf_check \

@@ -30,7 +30,7 @@ EOF

 		-e empty \
 		-s exit:0 \
 		pkg -o REPOS_DIR=/dev/null -r ${TMPDIR}/target install -qfy \
 			${TMPDIR}/test-1.bsd
 			${TMPDIR}/test-1.pkg
 	atf_check \
 		-o inline:"1\n" \