From owner-dev-commits-ports-all@freebsd.org Mon Aug 30 17:21:47 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 43CE765A8B5; Mon, 30 Aug 2021 17:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GyxvH19QKz3rQk; Mon, 30 Aug 2021 17:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1091721BF5; Mon, 30 Aug 2021 17:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17UHLkDv008123; Mon, 30 Aug 2021 17:21:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17UHLkrZ008122; Mon, 30 Aug 2021 17:21:46 GMT (envelope-from git) Date: Mon, 30 Aug 2021 17:21:46 GMT Message-Id: <202108301721.17UHLkrZ008122@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: c555f0f92a65 - main - ports-mgmt/poudriere: Bring in fix for distclean make.conf error MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c555f0f92a6524a104b42d915465e3fb5fe7e08c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Aug 2021 17:21:47 -0000 The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=c555f0f92a6524a104b42d915465e3fb5fe7e08c commit c555f0f92a6524a104b42d915465e3fb5fe7e08c Author: Bryan Drewery AuthorDate: 2021-08-30 17:20:21 +0000 Commit: Bryan Drewery CommitDate: 2021-08-30 17:21:44 +0000 ports-mgmt/poudriere: Bring in fix for distclean make.conf error Fixes https://github.com/freebsd/poudriere/issues/910 --- ports-mgmt/poudriere/Makefile | 2 +- .../patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile index 062bc57b7b35..215a512ad71c 100644 --- a/ports-mgmt/poudriere/Makefile +++ b/ports-mgmt/poudriere/Makefile @@ -1,6 +1,6 @@ PORTNAME= poudriere DISTVERSION= 3.3.7 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 b/ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 new file mode 100644 index 000000000000..892ab3d338ae --- /dev/null +++ b/ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 @@ -0,0 +1,24 @@ +commit 8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 +Author: Bryan Drewery +Date: Sat Aug 28 11:57:56 2021 -0700 + + distclean: Fix reading make.conf + + Fixes #910 + Fixes fa0308152e6 ("Move make.conf ports_env handling to its own not-spammy file") + + (cherry picked from commit 95971acb6ffd51b2432a38efd1111dd189f68edd) + +diff --git src/share/poudriere/distclean.sh src/share/poudriere/distclean.sh +index 08889f1dd..f77163fc4 100755 +--- src/share/poudriere/distclean.sh ++++ src/share/poudriere/distclean.sh +@@ -144,7 +144,7 @@ for PTNAME in ${PTNAMES}; do + + __MAKE_CONF=$(mktemp -t poudriere-make.conf) + export __MAKE_CONF +- setup_ports_env "/" "${__MAKE_CONF}" ++ setup_ports_env "" "${__MAKE_CONF}" + if [ -z "${NO_PACKAGE_BUILDING}" ]; then + echo "BATCH=yes" + echo "PACKAGE_BUILDING=yes"