svn commit: r415468 - in head/ports-mgmt/poudriere-devel: . files

[Bryan Drewery]

Author: bdrewery
Date: Wed May 18 22:59:51 2016
New Revision: 415468
URL: https://svnweb.freebsd.org/changeset/ports/415468

Log:
  - Update to 3.0-1657-g0b204f0
  
  Changes:
    - jail/ports -u: Default git pull to use --rebase.
    - destroyfs: Run chflags -R 0 and on a smaller subset of files.
    - ports: Ignore failures when removing the ports tree
    - jail: Ignore errors trying to remove the jail
    - Create port-specific directories in do_portbuild_mounts.
    - Rework the cleanup to respect -x inside of the directory.
    - Support -(j|p|z)<param> without space for poudriere.conf lookups
    - hash_var_name: Quote the pattern to _gsub to avoid globbing local files.
    - Update sh from head @ r296813
    - Switch BUILD_AS_NON_ROOT as default to on.

Modified:
  head/ports-mgmt/poudriere-devel/Makefile
  head/ports-mgmt/poudriere-devel/distinfo
  head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh

Modified: head/ports-mgmt/poudriere-devel/Makefile
==============================================================================
--- head/ports-mgmt/poudriere-devel/Makefile	Wed May 18 22:34:40 2016	(r415467)
+++ head/ports-mgmt/poudriere-devel/Makefile	Wed May 18 22:59:51 2016	(r415468)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
-DISTVERSION=	3.1.99.20160216
+DISTVERSION=	3.1.99.20160518
 PORTREVISION=	0
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
@@ -18,7 +18,7 @@ CONFLICTS_INSTALL=	poudriere-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
-GH_TAGNAME=	3.0-1641-gf976ae1
+GH_TAGNAME=	3.0-1657-g0b204f0
 #DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}
 
 GNU_CONFIGURE=	yes

Modified: head/ports-mgmt/poudriere-devel/distinfo
==============================================================================
--- head/ports-mgmt/poudriere-devel/distinfo	Wed May 18 22:34:40 2016	(r415467)
+++ head/ports-mgmt/poudriere-devel/distinfo	Wed May 18 22:59:51 2016	(r415468)
@@ -1,2 +1,3 @@
-SHA256 (freebsd-poudriere-3.1.99.20160216-3.0-1641-gf976ae1_GH0.tar.gz) = 3e56f6ffef10829f7aa73a062a60bf3f585df7079d3c99a9e75e3a3a901cdc9a
-SIZE (freebsd-poudriere-3.1.99.20160216-3.0-1641-gf976ae1_GH0.tar.gz) = 2936737
+TIMESTAMP = 1463612045
+SHA256 (freebsd-poudriere-3.1.99.20160518-3.0-1657-g0b204f0_GH0.tar.gz) = b64e9635f8d73a839ad44479db50672bc471c9d9b350da6a1a314e89c11bf75f
+SIZE (freebsd-poudriere-3.1.99.20160518-3.0-1657-g0b204f0_GH0.tar.gz) = 2937267

Modified: head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh
==============================================================================
--- head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh	Wed May 18 22:34:40 2016	(r415467)
+++ head/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh	Wed May 18 22:59:51 2016	(r415468)
@@ -1,10 +1,15 @@
---- src/share/poudriere/include/fs.sh.orig	2015-11-30 17:26:08 UTC
+--- src/share/poudriere/include/fs.sh.orig	2016-05-18 22:58:28 UTC
 +++ src/share/poudriere/include/fs.sh
-@@ -181,6 +181,6 @@ destroyfs() {
+@@ -191,10 +191,10 @@ destroyfs() {
+ 		zfs destroy -rf ${fs}
  		rmdir ${mnt}
  	else
- 		chflags -R noschg ${mnt}
--		rm -rfx ${mnt}
-+		rm -rf ${mnt}
+-		rm -rfx ${mnt} || :
++		rm -rf ${mnt} || :
+ 		if [ -d "${mnt}" ]; then
+ 			chflags -R 0 ${mnt}
+-			rm -rfx ${mnt}
++			rm -rf ${mnt}
+ 		fi
  	fi
  }