bdrewery

[00:01:02] Building 417 packages using up to 14 builders
[00:01:02] Hit CTRL+t at any time to see build progress and stats
[00:01:03] [01] [00:00:00] Builder starting
[00:01:03] [02] [00:00:00] Builder starting
[00:01:04] [01] [00:00:01] Builder started
[00:01:04] [02] [00:00:01] Builder started
[00:01:05] [01] [00:00:01] Inspecting graphics/jbig2dec | jbig2dec-0.19 for needed shlibs
[00:01:05] [02] [00:00:01] Inspecting audio/libvorbis | libvorbis-1.3.7_2,3 for needed shlibs
[00:01:05] [03] [00:00:00] Builder starting
[00:01:06] [03] [00:00:01] Builder started

bdrewery

1

bdrewery

diff --git src/poudriere-sh/helpers.h src/poudriere-sh/helpers.h
index 9a9f151a9..930c0de89 100644
--- src/poudriere-sh/helpers.h
+++ src/poudriere-sh/helpers.h
@@ -107,7 +107,10 @@ void verrorwithstatus(int, const char *, va_list) __printf0like(2, 0) __dead2;
 #define exit_(...)		exit_X(__VA_ARGS__, _1, _0)(__VA_ARGS__)
 #define exit_X(_0, _1, X, ...)	exit ## X
 #define exit_0(_)		return (0)
-#define exit_1(_, status)	verrorwithstatus(status, NULL, NULL)
+#define exit_1(_, status)	do {			\

bdrewery

--- external/sh/miscbltin.c.orig	2021-09-04 19:18:23 UTC
+++ external/sh/miscbltin.c
@@ -231,6 +231,8 @@ readcmd(int argc __unused, char **argv __unused)
 		 * If there's nothing ready, return an error.
 		 */
 		if (status <= 0) {
+			while (*ap != NULL)
+				setvar(*ap++, "", 0);
 			sig = pendingsig;
 			return (128 + (sig != 0 ? sig : SIGALRM));

bdrewery

diff --git src/share/poudriere/testport.sh src/share/poudriere/testport.sh
index d8f0124da..d04f8c48b 100755
--- src/share/poudriere/testport.sh
+++ src/share/poudriere/testport.sh
@@ -217,11 +217,11 @@ if [ $CONFIGSTR -eq 1 ]; then
 	command -v dialog4ports >/dev/null 2>&1 || err 1 "You must have ports-mgmt/dialog4ports installed on the host to use -c."
 	__MAKE_CONF=$(mktemp -t poudriere-make.conf)
 	setup_makeconf "${__MAKE_CONF}" "${JAILNAME}" "${PTNAME}" "${SETNAME}"
-	PORTSDIR=${portsdir} \
+	PORTSDIR="${MASTERMNT}${portsdir}" \

bdrewery

diff --git src/share/poudriere/common.sh src/share/poudriere/common.sh
index c4d5673dd..96c431ee5 100644
--- src/share/poudriere/common.sh
+++ src/share/poudriere/common.sh
@@ -6783,8 +6783,11 @@ _listed_ports() {
 	{
 		# -f specified
 		if [ -z "${LISTPORTS}" ]; then
+			local _ignore_comments
+

bdrewery

diff --git src/share/poudriere/common.sh src/share/poudriere/common.sh
index c4d5673dd..1fe68ce95 100644
--- src/share/poudriere/common.sh
+++ src/share/poudriere/common.sh
@@ -2268,6 +2268,7 @@ setup_ccache() {
 		WITH_CCACHE_BUILD=yes
 		CCACHE_DIR=${HOME}/.ccache
 		EOF
+		chmod o+rx "${tomnt}${HOME}/.ccache"
 	fi

bdrewery

diff --git src/bin/poudriere.in src/bin/poudriere.in
index df58f5093..386807af7 100644
--- src/bin/poudriere.in
+++ src/bin/poudriere.in
@@ -163,7 +163,7 @@ esac
 # Special-case environment passthroughs.
 while read envvar; do
 	case "${envvar}" in
-	FETCH_BIND_ADDRESS|FTP_*|ftp_*|HTTP_*|http_*|SSL_|NO_PROXY|no_proxy)
+	FETCH_BIND_ADDRESS|FTP_*|ftp_*|HTTP_*|http_*|SSL_|NO_PROXY|no_proxy|HOME)

bdrewery

#! /bin/sh
# :vim setf sh:
# 
# Copyright (c) 2013 Bryan Drewery <[email protected]>
# All rights reserved.
# 
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright

bdrewery

DEFAULT_VERSIONS+=	znc=1.6

# XXX: All the symlinks on the main files should be done via a script and the
# port should supply ALT_FILES via PKG_NOTES.

# Port configuration

ALT_VER_EPOCH=	14
ALT_FILES+=	\
	bin/znc				bin/znc${ALT_VER} \