From owner-svn-ports-all@freebsd.org  Wed May  4 12:52:34 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F176B2B459;
 Wed,  4 May 2016 12:52:34 +0000 (UTC)
 (envelope-from skreuzer@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6E8651FF7;
 Wed,  4 May 2016 12:52:34 +0000 (UTC)
 (envelope-from skreuzer@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u44CqXlS077529;
 Wed, 4 May 2016 12:52:33 GMT (envelope-from skreuzer@FreeBSD.org)
Received: (from skreuzer@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u44CqX1Z077527;
 Wed, 4 May 2016 12:52:33 GMT (envelope-from skreuzer@FreeBSD.org)
Message-Id: <201605041252.u44CqX1Z077527@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: skreuzer set sender to
 skreuzer@FreeBSD.org using -f
From: Steven Kreuzer <skreuzer@FreeBSD.org>
Date: Wed, 4 May 2016 12:52:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r414601 - in head/sysutils/cfengine38: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2016 12:52:34 -0000

Author: skreuzer
Date: Wed May  4 12:52:33 2016
New Revision: 414601
URL: https://svnweb.freebsd.org/changeset/ports/414601

Log:
  Add a patch to address upstream bug CFE-1803 (Storage promises do not unmount
  the filesystem as promised)
  
  Reviewed by:	cy@, gjb@
  Approved by:	cy@
  Differential Revision:	D6186

Added:
  head/sysutils/cfengine38/files/patch-cf-agent_verify__storage.c   (contents, props changed)
Modified:
  head/sysutils/cfengine38/Makefile

Modified: head/sysutils/cfengine38/Makefile
==============================================================================
--- head/sysutils/cfengine38/Makefile	Wed May  4 12:41:08 2016	(r414600)
+++ head/sysutils/cfengine38/Makefile	Wed May  4 12:52:33 2016	(r414601)
@@ -3,6 +3,7 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	3.8.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
 

Added: head/sysutils/cfengine38/files/patch-cf-agent_verify__storage.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/cfengine38/files/patch-cf-agent_verify__storage.c	Wed May  4 12:52:33 2016	(r414601)
@@ -0,0 +1,11 @@
+--- cf-agent/verify_storage.c.orig	2016-05-03 13:42:49 UTC
++++ cf-agent/verify_storage.c
+@@ -132,7 +132,7 @@ PromiseResult VerifyStoragePromise(EvalC
+     PromiseResult result = PROMISE_RESULT_NOOP;
+ 
+ #ifndef __MINGW32__
+-    if ((SeqLength(GetGlobalMountedFSList())) && (!LoadMountInfo(GetGlobalMountedFSList())))
++    if ((!SeqLength(GetGlobalMountedFSList())) && (!LoadMountInfo(GetGlobalMountedFSList())))
+     {
+         Log(LOG_LEVEL_ERR, "Couldn't obtain a list of mounted filesystems - aborting");
+         YieldCurrentLock(thislock);