git: 4f7a0060c2ab - main - ports-mgmt/poudriere-devel: - Update to 3.3.0-704-g8c78cfb24

[Bryan Drewery]

The branch main has been updated by bdrewery:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4f7a0060c2ab8c1eb13183c3497813e0a5f0e881

commit 4f7a0060c2ab8c1eb13183c3497813e0a5f0e881
Author:     Bryan Drewery <bdrewery at FreeBSD.org>
AuthorDate: 2021-05-21 18:31:16 +0000
Commit:     Bryan Drewery <bdrewery at FreeBSD.org>
CommitDate: 2021-05-21 18:39:35 +0000

    ports-mgmt/poudriere-devel: - Update to 3.3.0-704-g8c78cfb24
    
    Changes:
    * testport|bulk -b: New feature to fetch remote packages. See PACKAGE_FETCH options in poudriere.conf.sample.
      This feature has pitfalls like downloading and deleting packages. That may be improved with
      upcoming improved incremental build supoport.
    * ports now defaults to using FreeBSD's git repository for checkout when no method is specified.
    * jail: Add support for fetching from artifact.ci.freebsd.org
    * ports -m git: Remove default --single-branch.
    * ports: Support -D to not shallow clone with git
    * ports: Properly detect vcs checkout errors
    * ports/jail -m git: Properly check for git being installed
    * logclean -N <n>: Fix to keep latest <n>.
    * bulk -n: Don't remove .building dir unless this ran made it
    * bulk -f: Ignore anything after first column.
    * Update cpdup to v1.22 68cb3cb4e14d9c
    * ports/jail -m git: Support -U /local/path.
    * jail: Allow poudriere -v to override -q for git/svn
    * jail -cm git: Allow -v to be excluded to default to remote branch
    * ports: Fix -B being rejected with git.
    * jail -r: Fix this to work again
    
    ** Some git handling and the PACKAGE_FETCH support is not yet stable and may change in the future.
---
 ports-mgmt/poudriere-devel/Makefile                |  6 ++---
 ports-mgmt/poudriere-devel/distinfo                |  6 ++---
 .../patch-1c9357d08e35f2bb248533ce043b2e61920ebf9e | 29 ----------------------
 ports-mgmt/poudriere-devel/pkg-plist               |  8 ++++++
 4 files changed, 14 insertions(+), 35 deletions(-)

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,6 +1,6 @@
 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}/ \
@@ -16,7 +16,7 @@ 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
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 <bryan at shatow.net>
-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
@@ -87,6 +87,14 @@ man/man8/poudriere-version.8.gz
 %%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