From 9f09f84b2dd5a5d0f85d8eb36efbeace95ad7b94 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Tue, 14 Oct 2025 21:45:00 -0700 Subject: ports-mgmt/poudriere-devel: Update to 3.3.0-2209-g282bb7247 Changes: - bulk: Fix an old build queue race that could lead to "stuck_in_queue". - no need to bundle lockf; only useful for tests. - bulk: Fix a new error with saving datadir. (cherry picked from commit 83cf180b6da08fd4761825c6eb01812399b11526) --- ports-mgmt/poudriere-devel/Makefile | 6 +++--- ports-mgmt/poudriere-devel/distinfo | 6 +++--- .../poudriere-devel/files/patch-src_share_poudriere_common.sh | 11 ----------- ports-mgmt/poudriere-devel/pkg-plist | 1 - 4 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index f705989bd412..c63849f9e8c4 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= poudriere -DISTVERSION= 3.4.99.20251013 -PORTREVISION= 1 +DISTVERSION= 3.4.99.20251014 +PORTREVISION= 0 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -17,7 +17,7 @@ CONFLICTS_INSTALL= poudriere USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 3.3.0-2186-gdb737522d +GH_TAGNAME= 3.3.0-2209-g282bb7247 GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo index 84a7927f6d13..b177df903f28 100644 --- a/ports-mgmt/poudriere-devel/distinfo +++ b/ports-mgmt/poudriere-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1760367143 -SHA256 (freebsd-poudriere-3.4.99.20251013-3.3.0-2186-gdb737522d_GH0.tar.gz) = a5e2cee424da3c28670f5642e1adb94f16d1a19e088d6312d5a46d0b5e2af7c4 -SIZE (freebsd-poudriere-3.4.99.20251013-3.3.0-2186-gdb737522d_GH0.tar.gz) = 5791450 +TIMESTAMP = 1760503468 +SHA256 (freebsd-poudriere-3.4.99.20251014-3.3.0-2209-g282bb7247_GH0.tar.gz) = 6e818620356111d2530109a601cd5fd50e3b995380ac1553c6dd97827084ee3c +SIZE (freebsd-poudriere-3.4.99.20251014-3.3.0-2209-g282bb7247_GH0.tar.gz) = 5793201 diff --git a/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh b/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh deleted file mode 100644 index 09f5aa5c9b34..000000000000 --- a/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- src/share/poudriere/common.sh.orig 2025-10-13 14:51:41 UTC -+++ src/share/poudriere/common.sh -@@ -993,7 +993,7 @@ jstart() { - jail -c persist "name=${name:?}" \ - "path=${mpath:?}" \ - "host.hostname=${BUILDER_HOSTNAME-${name}}" \ -- "${network}" ${JAIL_PARAMS-} -+ ${network} ${JAIL_PARAMS-} - # Allow networking in -n jail - jail -c persist "name=${name}-n" \ - "path=${mpath:?}" \ diff --git a/ports-mgmt/poudriere-devel/pkg-plist b/ports-mgmt/poudriere-devel/pkg-plist index 7b6c76761eae..f024cc384f39 100644 --- a/ports-mgmt/poudriere-devel/pkg-plist +++ b/ports-mgmt/poudriere-devel/pkg-plist @@ -10,7 +10,6 @@ libexec/poudriere/cpdup libexec/poudriere/dirempty libexec/poudriere/dirwatch libexec/poudriere/locked_mkdir -libexec/poudriere/lockf libexec/poudriere/nc libexec/poudriere/poudriered libexec/poudriere/ptsort -- cgit v1.2.3