diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile index 1b7dab000346..30fe2745e786 100644 --- a/ports-mgmt/poudriere/Makefile +++ b/ports-mgmt/poudriere/Makefile @@ -1,70 +1,67 @@ PORTNAME= poudriere -DISTVERSION= 3.3.7 -PORTREVISION= 4 +DISTVERSION= 3.4.0 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ GH MAINTAINER= bdrewery@FreeBSD.org COMMENT= Port build and test system WWW= https://github.com/freebsd/poudriere/wiki LICENSE= BSD2CLAUSE CONFLICTS_INSTALL= poudriere-devel USE_GITHUB= yes GH_ACCOUNT= freebsd GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d OPTIONS_DEFINE= BASH MANIFESTS PORTCONFIG EXAMPLES QEMU ZSH OPTIONS_DEFAULT=BASH MANIFESTS PORTCONFIG ZSH OPTIONS_SUB= yes MANIFESTS_DESC= Install manifests for jail creation MANIFESTS_RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests PORTCONFIG_DESC= Install portconfig for options command PORTCONFIG_RUN_DEPENDS= portconfig>0:ports-mgmt/portconfig QEMU_DESC= Add qemu-user-static for non-x86 architectures QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static .include # rm -x support came in 10.0. A bundled rm is used if not supported in base. # While <10 is technically not supported in the Ports Tree, Poudriere # detects this and it being a package build tool it should still be # supported as a user may be installing this to build packages for upgrading # their system to a supported release. .if ${OSVERSION} < 1000000 PLIST_SUB+= RM="" .else PLIST_SUB+= RM="@comment " .endif post-patch: - ${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere ${REINPLACE_CMD} \ -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \ - ${WRKSRC}/poudriere - ${REINPLACE_CMD} '/.PHONY: poudriere/d' ${WRKSRC}/Makefile.* + ${WRKSRC}/src/bin/poudriere.in post-install: ${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \ ${STAGEDIR}${DATADIR}/MANIFESTS post-install-BASH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ ${INSTALL_DATA} ${WRKSRC}/completions/bash/poudriere \ ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ post-install-ZSH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ ${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ .include diff --git a/ports-mgmt/poudriere/distinfo b/ports-mgmt/poudriere/distinfo index 6ef82ef0ca7d..bd45ff2b7dbf 100644 --- a/ports-mgmt/poudriere/distinfo +++ b/ports-mgmt/poudriere/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629310335 -SHA256 (freebsd-poudriere-3.3.7_GH0.tar.gz) = a85cfeb601455758bcc777182c1ef59e5172f9c2171d66c994e4c00cfac572ee -SIZE (freebsd-poudriere-3.3.7_GH0.tar.gz) = 4423394 +TIMESTAMP = 1702284621 +SHA256 (freebsd-poudriere-3.4.0_GH0.tar.gz) = 73bc59732555aa2f9cc4586e7bd4ea8d38528e0017c27e4cd7c7479c67465223 +SIZE (freebsd-poudriere-3.4.0_GH0.tar.gz) = 4163633 diff --git a/ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 b/ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 deleted file mode 100644 index 892ab3d338ae..000000000000 --- a/ports-mgmt/poudriere/files/patch-8bfaa898b32370bbfff9bf37fc833d7abc4b8b67 +++ /dev/null @@ -1,24 +0,0 @@ -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" diff --git a/ports-mgmt/poudriere/files/patch-portconfig b/ports-mgmt/poudriere/files/patch-portconfig deleted file mode 100644 index ef7d75cc1471..000000000000 --- a/ports-mgmt/poudriere/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/pkg-plist b/ports-mgmt/poudriere/pkg-plist index 1a724e592533..8bffd5711b0e 100644 --- a/ports-mgmt/poudriere/pkg-plist +++ b/ports-mgmt/poudriere/pkg-plist @@ -1,112 +1,124 @@ bin/poudriere @sample etc/poudriere.conf.sample %%ETCDIR%%/hooks/bulk.sh.sample %%ETCDIR%%/hooks/pkgbuild.sh.sample @sample etc/poudriered.conf.sample etc/rc.d/poudriered +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Caddyfile.sample libexec/poudriere/cachec libexec/poudriere/cached 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 +libexec/poudriere/setsid %%RM%%libexec/poudriere/rm libexec/poudriere/sh libexec/poudriere/timeout libexec/poudriere/timestamp man/man8/poudriere.8.gz man/man8/poudriere-bulk.8.gz man/man8/poudriere-distclean.8.gz man/man8/poudriere-image.8.gz man/man8/poudriere-jail.8.gz man/man8/poudriere-logclean.8.gz man/man8/poudriere-options.8.gz man/man8/poudriere-pkgclean.8.gz man/man8/poudriere-ports.8.gz man/man8/poudriere-queue.8.gz man/man8/poudriere-status.8.gz man/man8/poudriere-testport.8.gz man/man8/poudriere-version.8.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpd.conf.sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx.conf.sample %%DATADIR%%/MANIFESTS +%%DATADIR%%/api.sh %%DATADIR%%/awk/dependency_loop.awk %%DATADIR%%/awk/humanize.awk %%DATADIR%%/awk/json.awk %%DATADIR%%/awk/json_jail.awk %%DATADIR%%/awk/json_top.awk %%DATADIR%%/awk/parse_MOVED.awk %%DATADIR%%/awk/processonelog2.awk %%DATADIR%%/awk/siginfo_buildtime.awk %%DATADIR%%/awk/unique_pkgnames_from_flavored_origins.awk -%%DATADIR%%/api.sh %%DATADIR%%/bulk.sh %%DATADIR%%/common.sh %%DATADIR%%/daemon.sh %%DATADIR%%/distclean.sh %%DATADIR%%/foreachport.sh %%DATADIR%%/html/assets/DataTables-1.10.0/css/jquery.dataTables.min.css %%DATADIR%%/html/assets/DataTables-1.10.0/css/jquery.dataTables_themeroller.min.css %%DATADIR%%/html/assets/DataTables-1.10.0/images/back_disabled.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/back_enabled.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/back_enabled_hover.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/forward_disabled.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/forward_enabled.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/forward_enabled_hover.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_asc.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_asc_disabled.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_both.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_desc.png %%DATADIR%%/html/assets/DataTables-1.10.0/images/sort_desc_disabled.png %%DATADIR%%/html/assets/DataTables-1.10.0/js/jquery.dataTables.min.js %%DATADIR%%/html/assets/bootstrap-3.1.1/css/bootstrap-theme.min.css %%DATADIR%%/html/assets/bootstrap-3.1.1/css/bootstrap.min.css %%DATADIR%%/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.eot %%DATADIR%%/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.svg %%DATADIR%%/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.ttf %%DATADIR%%/html/assets/bootstrap-3.1.1/fonts/glyphicons-halflings-regular.woff %%DATADIR%%/html/assets/bootstrap-3.1.1/js/bootstrap.min.js %%DATADIR%%/html/assets/favicon.ico %%DATADIR%%/html/assets/jquery-1.11.1.js %%DATADIR%%/html/assets/jquery-1.11.1.min.js %%DATADIR%%/html/assets/jquery-1.11.1.min.map %%DATADIR%%/html/assets/jquery.dataTables.rowGrouping-1.2.9.js %%DATADIR%%/html/assets/logo.svg %%DATADIR%%/html/assets/poudriere.css %%DATADIR%%/html/assets/poudriere.js %%DATADIR%%/html/build.html %%DATADIR%%/html/index.html %%DATADIR%%/html/jail.html %%DATADIR%%/html/robots.txt %%DATADIR%%/image.sh +%%DATADIR%%/image_dump.sh +%%DATADIR%%/image_firmware.sh +%%DATADIR%%/image_hybridiso.sh +%%DATADIR%%/image_iso.sh +%%DATADIR%%/image_mfs.sh +%%DATADIR%%/image_rawdisk.sh +%%DATADIR%%/image_tar.sh +%%DATADIR%%/image_usb.sh +%%DATADIR%%/image_zfs.sh +%%DATADIR%%/image_zsnapshot.sh %%DATADIR%%/include/cache.sh %%DATADIR%%/include/colors.pre.sh %%DATADIR%%/include/colors.sh %%DATADIR%%/include/common.sh.dragonfly %%DATADIR%%/include/common.sh.freebsd %%DATADIR%%/include/display.sh %%DATADIR%%/include/fs.sh %%DATADIR%%/include/hash.sh %%DATADIR%%/include/html.sh %%DATADIR%%/include/parallel.sh +%%DATADIR%%/include/pkg.sh +%%DATADIR%%/include/pkgqueue.sh %%DATADIR%%/include/shared_hash.sh %%DATADIR%%/include/util.sh %%DATADIR%%/jail.sh %%DATADIR%%/logclean.sh %%DATADIR%%/options.sh %%DATADIR%%/pkgclean.sh %%DATADIR%%/ports.sh %%DATADIR%%/processonelog.sh %%DATADIR%%/queue.sh %%DATADIR%%/status.sh %%DATADIR%%/testport.sh %%BASH%%share/bash-completion/completions/poudriere %%ZSH%%share/zsh/site-functions/_poudriere