From nobody Tue Oct 31 12:56:41 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SKVWs3sVlz4yLdT; Tue, 31 Oct 2023 12:56:41 +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 4SKVWs3KqSz4fVS; Tue, 31 Oct 2023 12:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698757001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sRsJrwiQ3a9maB46JM2fwMHvgVFeK1qHbbcPl/VM8dQ=; b=PG2jQFNTY7t3h6/mrfu9oHZ8OpuwxXeGejHSjKTVe9uWwwUhSjErNPpFckZsJQt4g575b8 SHdAdNJGzHFg1F3MzCClZ5Nj/WqkOCcoEh9H0dcQjL4A+9pUuj2iddLtPkuRRdlM7/rvh2 fTB02ien/eKSrzhdxMWauHRP4EPWrYg5aaklvhfobY1ftGD9al7e+u8qDT+3SVaWciXXTw MkYsfJwgcJ/0HDecZJ693xOqxg7g8ITMzutvTM+pgNuh+rOVZFuF7tb4y6obkq7uWhWkmo 63YRA5pcP3URgjQ0sCu8Vov2BT+TQok7gwzdsfzTjP3D4UWpr68HeRI0zCPmFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698757001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sRsJrwiQ3a9maB46JM2fwMHvgVFeK1qHbbcPl/VM8dQ=; b=E4Ss49LpMNMjTRQjcIDfRnY7fmvQ60zTq6yRR/fJmmtsqv+pTJITeE6tm+an4YDJzzKlm7 ZcMsVyliYliXQIwBrpFYyPtpgZV/nsiWqf+T5u0642rmwMurpE565uu1FwsP/kFgw57S3I IwMXjRTyCEdLMJZdDDye5XJ8zZSDJAVHD9PPTxD7WqTcw94LxxpWve4QtOGrDpVHXeo4so U3GcdTO7wjHhxngxsTDGJk9h+I2YAy0+OPvu3FWX5jfOzk5775NUlYFf98ZVOeYqZOdMVC vrY8VznwetRQMr/EJbh3+O9YGGVHUi06dPJyKh+5eb8D7XPb4WRzrd7N7uuiCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698757001; a=rsa-sha256; cv=none; b=rgqhHWcQ6gIQ80aTJXwiuE/GCaTVLjGq88g30AlSYSomFC+DmM4ZUgwFpvjDiPgVNNhK1U LO6+z273Xpj7YD3Gwve+IqBavV2xiuMl4wqd121QgTSzhjPSbpoxBLYVDnrF7etMKE/CW7 VNqxzje4Te7UAv5BmBZZF17dD3pTjvhxPvCcIMOJLa3Z2ZMera7dHLJU86iiAoVBT93y+I uwcU1wuEXMQQyt+Rh2LCyunr5DxJZzLzy3WE5/9OofS7HYl9lTUj+VXH6KMt8KMIOg4qPj 14Brj2Ikco998qCGKEZOoWIMLhpXMXQQT6M6tGwsM+SsCSjfNDf3McsxoxnbDw== 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 4SKVWs2NLYz13rM; Tue, 31 Oct 2023 12:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39VCufkh030561; Tue, 31 Oct 2023 12:56:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39VCufmS030558; Tue, 31 Oct 2023 12:56:41 GMT (envelope-from git) Date: Tue, 31 Oct 2023 12:56:41 GMT Message-Id: <202310311256.39VCufmS030558@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 59a0b140b063 - main - ports-mgmt/poudriere-devel: update to 3.4.99 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59a0b140b063fde5e9ca3bd74d8af9c4bdd7ccd0 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=59a0b140b063fde5e9ca3bd74d8af9c4bdd7ccd0 commit 59a0b140b063fde5e9ca3bd74d8af9c4bdd7ccd0 Author: Baptiste Daroussin AuthorDate: 2023-10-30 17:36:44 +0000 Commit: Baptiste Daroussin CommitDate: 2023-10-31 12:55:55 +0000 ports-mgmt/poudriere-devel: update to 3.4.99 This is the same code as what will become 3.4.0, please test and report bugs! The main change here is: support for upcoming subpackages! Other changes includes: - Add MAX_MEMORY_pkgname - Support creating jails from pkgbase - image: support create images with the pool named like on host pool names - Bump MAX Files to 8192 to allow building packages like qt5-webengine - poudriered: new -f switch to run in foreground - remove jexecd/rexec - native support for portconfig - Preserve SSH_AGENT variables --- ports-mgmt/poudriere-devel/Makefile | 5 ++- ports-mgmt/poudriere-devel/distinfo | 6 ++-- ports-mgmt/poudriere-devel/files/patch-portconfig | 43 ----------------------- ports-mgmt/poudriere-devel/pkg-plist | 3 +- 4 files changed, 6 insertions(+), 51 deletions(-) diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index b32a47902b9c..24f7bd0936c8 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -1,6 +1,5 @@ PORTNAME= poudriere -DISTVERSION= 3.3.99.20220831 -PORTREVISION= 3 +DISTVERSION= 3.4.99.20231030 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -17,7 +16,7 @@ CONFLICTS_INSTALL= poudriere USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 3.3.0-1135-g137c376a8 +GH_TAGNAME= 8d03be39 GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo index bb05915e64b9..e009fc10a7f6 100644 --- a/ports-mgmt/poudriere-devel/distinfo +++ b/ports-mgmt/poudriere-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661975486 -SHA256 (freebsd-poudriere-3.3.99.20220831-3.3.0-1135-g137c376a8_GH0.tar.gz) = ce4c36372e9bdfcd58ca1042c98751dd8108c2acff1f058f711ab5c1d792a79b -SIZE (freebsd-poudriere-3.3.99.20220831-3.3.0-1135-g137c376a8_GH0.tar.gz) = 4219043 +TIMESTAMP = 1698687297 +SHA256 (freebsd-poudriere-3.4.99.20231030-8d03be39_GH0.tar.gz) = f906a9d49516ba436c60542d53f7a3ad52193b821393d4bd20efbf3270af8d8b +SIZE (freebsd-poudriere-3.4.99.20231030-8d03be39_GH0.tar.gz) = 4207372 diff --git a/ports-mgmt/poudriere-devel/files/patch-portconfig b/ports-mgmt/poudriere-devel/files/patch-portconfig deleted file mode 100644 index ef7d75cc1471..000000000000 --- a/ports-mgmt/poudriere-devel/files/patch-portconfig +++ /dev/null @@ -1,43 +0,0 @@ -diff --git src/share/poudriere/options.sh src/share/poudriere/options.sh -index 745c20d8..51a9aff9 100755 ---- src/share/poudriere/options.sh -+++ src/share/poudriere/options.sh -@@ -155,7 +155,13 @@ fi - export PORTSDIR=`pget ${PTNAME} mnt` - [ -d "${PORTSDIR}/ports" ] && PORTSDIR="${PORTSDIR}/ports" - [ -z "${PORTSDIR}" ] && err 1 "No such ports tree: ${PTNAME}" --command -v dialog4ports >/dev/null 2>&1 || err 1 "You must have ports-mgmt/dialog4ports installed on the host to use this command." -+if command -v portconfig >/dev/null 2>&1; then -+ d4p=portconfig -+elif command -v dialog4ports >/dev/null 2>&1; then -+ d4p=dialog4ports -+else -+ err 1 "You must have ports-mgmt/dialog4ports or ports-mgmt/portconfig installed on the host to use this command." -+fi - - read_packages_from_params "$@" - -@@ -205,7 +211,7 @@ for originspec in $(listed_ports show_moved); do - env ${flavor:+FLAVOR=${flavor}} \ - make PORT_DBDIR=${PORT_DBDIR} \ - PKG_BIN=`which pkg-static` \ -- DIALOG4PORTS=`which dialog4ports` \ -+ DIALOG4PORTS=`which $d4p` \ - LOCALBASE=/nonexistent \ - -C ${PORTSDIR}/${origin} \ - ${RECURSE_COMMAND} -diff --git a/src/share/poudriere/testport.sh b/src/share/poudriere/testport.sh -index 07b788310..c684a3d27 100755 ---- src/share/poudriere/testport.sh -+++ src/share/poudriere/testport.sh -@@ -231,7 +231,9 @@ injail /usr/bin/make -C ${portdir} maintainer ECHO_CMD=true || \ - err 1 "Port is broken" - - 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." -+ command -v portconfig >/dev/null 2>&1 || \ -+ command -v dialog4ports >/dev/null 2>&1 || \ -+ err 1 "You must have ports-mgmt/dialog4ports or ports-mgmt/portconfig installed on the host to use -c." - __MAKE_CONF=$(mktemp -t poudriere-make.conf) - setup_makeconf "${__MAKE_CONF}" "${JAILNAME}" "${PTNAME}" "${SETNAME}" - PORTSDIR=${portsdir} \ diff --git a/ports-mgmt/poudriere-devel/pkg-plist b/ports-mgmt/poudriere-devel/pkg-plist index 083d82bf3229..8bdd4f325957 100644 --- a/ports-mgmt/poudriere-devel/pkg-plist +++ b/ports-mgmt/poudriere-devel/pkg-plist @@ -10,15 +10,14 @@ libexec/poudriere/clock libexec/poudriere/cpdup libexec/poudriere/dirempty libexec/poudriere/dirwatch -libexec/poudriere/jexecd libexec/poudriere/locked_mkdir libexec/poudriere/nc libexec/poudriere/poudriered libexec/poudriere/ptsort libexec/poudriere/pwait libexec/poudriere/rename -libexec/poudriere/rexec %%RM%%libexec/poudriere/rm +libexec/poudriere/setsid libexec/poudriere/sh libexec/poudriere/timeout libexec/poudriere/timestamp