diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile index 2337a91c8cdb..bfb11bbf822e 100644 --- a/ports-mgmt/poudriere-devel/Makefile +++ b/ports-mgmt/poudriere-devel/Makefile @@ -1,70 +1,70 @@ PORTNAME= poudriere -DISTVERSION= 3.3.99.20210303 -PORTREVISION= 2 +DISTVERSION= 3.3.99.20210521 +PORTREVISION= 0 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ GH PKGNAMESUFFIX= -devel MAINTAINER= bdrewery@FreeBSD.org COMMENT= Port build and test system LICENSE= BSD2CLAUSE CONFLICTS_INSTALL= poudriere-[0-9]* USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= 3.3.0-542-g8bf6e594a +GH_TAGNAME= 3.3.0-704-g8c78cfb24 GNU_CONFIGURE= yes ETCDIR= ${PREFIX}/etc/poudriere.d OPTIONS_DEFINE= BASH CERTS DIALOG4PORTS EXAMPLES QEMU ZSH OPTIONS_DEFAULT=BASH CERTS DIALOG4PORTS ZSH OPTIONS_SUB= yes CERTS_DESC= Install checksum and SSL certificates for jail creation CERTS_RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss CERTS_RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests DIALOG4PORTS_DESC= Install dialog4ports for options command DIALOG4PORTS_RUN_DEPENDS= dialog4ports>0:ports-mgmt/dialog4ports 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: ${REINPLACE_CMD} \ -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \ ${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-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo index 1a7c1316f97f..8934a3301206 100644 --- a/ports-mgmt/poudriere-devel/distinfo +++ b/ports-mgmt/poudriere-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614803358 -SHA256 (freebsd-poudriere-3.3.99.20210303-3.3.0-542-g8bf6e594a_GH0.tar.gz) = 72d8f755851ffe69381f5bb945e64c6b412a3d1ea941470ea78313ee34df8372 -SIZE (freebsd-poudriere-3.3.99.20210303-3.3.0-542-g8bf6e594a_GH0.tar.gz) = 4176348 +TIMESTAMP = 1621621832 +SHA256 (freebsd-poudriere-3.3.99.20210521-3.3.0-704-g8c78cfb24_GH0.tar.gz) = 1310a0f4279deb798c45e1c784d837b95f710efc25f2457a5e4e32a927db82f4 +SIZE (freebsd-poudriere-3.3.99.20210521-3.3.0-704-g8c78cfb24_GH0.tar.gz) = 4185276 diff --git a/ports-mgmt/poudriere-devel/files/patch-1c9357d08e35f2bb248533ce043b2e61920ebf9e b/ports-mgmt/poudriere-devel/files/patch-1c9357d08e35f2bb248533ce043b2e61920ebf9e deleted file mode 100644 index 487e88c71f87..000000000000 --- a/ports-mgmt/poudriere-devel/files/patch-1c9357d08e35f2bb248533ce043b2e61920ebf9e +++ /dev/null @@ -1,29 +0,0 @@ -commit 1c9357d08e35f2bb248533ce043b2e61920ebf9e -Author: Bryan Drewery -Date: Tue Mar 23 16:06:36 2021 -0700 - - Partially revert #844 for createfs; still use -p. - - This restores the -p and atime/mountpoint/compression setting - for /jails and /ports. - - It changes compression=lz4 to compression=on as well. - - Fixes #844 - -diff --git src/share/poudriere/include/fs.sh src/share/poudriere/include/fs.sh -index fed4a5b08..cad0aa69d 100644 ---- src/share/poudriere/include/fs.sh -+++ src/share/poudriere/include/fs.sh -@@ -34,7 +34,10 @@ createfs() { - - if [ -n "${fs}" -a "${fs}" != "none" ]; then - msg_n "Creating ${name} fs at ${mnt}..." -- if ! zfs create ${fs}; then -+ if ! zfs create -p \ -+ -o compression=on \ -+ -o atime=off \ -+ -o mountpoint=${mnt} ${fs}; then - echo " fail" - err 1 "Failed to create FS ${fs}" - fi diff --git a/ports-mgmt/poudriere-devel/pkg-plist b/ports-mgmt/poudriere-devel/pkg-plist index 62c9e7f43694..b442c55ece66 100644 --- a/ports-mgmt/poudriere-devel/pkg-plist +++ b/ports-mgmt/poudriere-devel/pkg-plist @@ -1,112 +1,120 @@ bin/poudriere @sample etc/poudriere.conf.sample %%ETCDIR%%/hooks/bulk.sh.sample %%ETCDIR%%/hooks/pkgbuild.sh.sample @sample(0,0,0) etc/poudriered.conf.sample etc/rc.d/poudriered @comment 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 %%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%%/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_iso.sh +%%DATADIR%%/image_mfs.sh +%%DATADIR%%/image_rawdisk.sh +%%DATADIR%%/image_tar.sh +%%DATADIR%%/image_usb.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/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