git: 59a0b140b063 - main - ports-mgmt/poudriere-devel: update to 3.4.99

The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=59a0b140b063fde5e9ca3bd74d8af9c4bdd7ccd0

commit 59a0b140b063fde5e9ca3bd74d8af9c4bdd7ccd0
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2023-10-30 17:36:44 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
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