From owner-svn-ports-all@FreeBSD.ORG  Mon Mar 31 19:13:05 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5EFC6595;
 Mon, 31 Mar 2014 19:13:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 4B8F09DD;
 Mon, 31 Mar 2014 19:13:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2VJD5R3040495;
 Mon, 31 Mar 2014 19:13:05 GMT (envelope-from cy@svn.freebsd.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2VJD4kS040493;
 Mon, 31 Mar 2014 19:13:04 GMT (envelope-from cy@svn.freebsd.org)
Message-Id: <201403311913.s2VJD4kS040493@svn.freebsd.org>
From: Cy Schubert <cy@FreeBSD.org>
Date: Mon, 31 Mar 2014 19:13:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349792 - in head/sysutils/cfengine35: . 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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Mar 2014 19:13:05 -0000

Author: cy
Date: Mon Mar 31 19:13:04 2014
New Revision: 349792
URL: http://svnweb.freebsd.org/changeset/ports/349792
QAT: https://qat.redports.org/buildarchive/r349792/

Log:
  Fix upstream bug.
  
  PR:		188147
  Submitted by:	skreuzer

Added:
  head/sysutils/cfengine35/files/patch-libpromises-expand.c   (contents, props changed)
Modified:
  head/sysutils/cfengine35/Makefile

Modified: head/sysutils/cfengine35/Makefile
==============================================================================
--- head/sysutils/cfengine35/Makefile	Mon Mar 31 19:09:09 2014	(r349791)
+++ head/sysutils/cfengine35/Makefile	Mon Mar 31 19:13:04 2014	(r349792)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	3.5.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 

Added: head/sysutils/cfengine35/files/patch-libpromises-expand.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/cfengine35/files/patch-libpromises-expand.c	Mon Mar 31 19:13:04 2014	(r349792)
@@ -0,0 +1,10 @@
+--- libpromises/expand.c.orig	2014-03-31 18:24:39.000000000 +0000
++++ libpromises/expand.c	2014-03-31 18:25:10.000000000 +0000
+@@ -787,6 +787,7 @@
+             ScopeNewSpecial(ctx, "this", "promise_linenumber", number, DATA_TYPE_STRING);
+         }
+ 
++        ScopeNewSpecial(ctx, "this", "promiser", pp->promiser, DATA_TYPE_STRING);
+         snprintf(v, CF_MAXVARSIZE, "%d", (int) getuid());
+         ScopeNewSpecial(ctx, "this", "promiser_uid", v, DATA_TYPE_INT);
+         snprintf(v, CF_MAXVARSIZE, "%d", (int) getgid());