From nobody@FreeBSD.org  Tue Jan  7 12:29:29 2014
Return-Path: <nobody@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 924DB719
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  7 Jan 2014 12:29:29 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 7D622129C
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  7 Jan 2014 12:29:29 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id s07CTSxf035089
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 7 Jan 2014 12:29:28 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id s07CTSl3035076;
	Tue, 7 Jan 2014 12:29:28 GMT
	(envelope-from nobody)
Message-Id: <201401071229.s07CTSl3035076@oldred.freebsd.org>
Date: Tue, 7 Jan 2014 12:29:28 GMT
From: Bartek Rutkowski <ports@robakdesign.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [port-update] sysutils/puppet updated to latest 3.4.2 version with various bug fixes
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         185549
>Category:       ports
>Synopsis:       [port-update] sysutils/puppet updated to latest 3.4.2 version with various bug fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 07 12:30:00 UTC 2014
>Closed-Date:    Wed Jan 15 17:01:51 UTC 2014
>Last-Modified:  Thu Jan 16 17:40:00 UTC 2014
>Originator:     Bartek Rutkowski
>Release:        10.0-RC4
>Organization:
Pixeware LTD
>Environment:
FreeBSD brukselka 10.0-RC4 FreeBSD 10.0-RC4 #0 r260130: Tue Dec 31 17:10:01 UTC 2013     root@snap.freebsd.org:/usr/obj/usr/src/sys/BRUKSELKA  amd64
>Description:
This is update to sysutils/puppet port with latest version full of improvements anf bug fixes.
>How-To-Repeat:
Apply the patch, build the port and package, install, test.
>Fix:
Patch applied.

Patch attached with submission follows:

diff -ruN puppet.orig/Makefile puppet/Makefile
--- puppet.orig/Makefile	2014-01-07 12:51:51.072953997 +0100
+++ puppet/Makefile	2014-01-07 13:21:53.274976996 +0100
@@ -2,8 +2,7 @@
 # $FreeBSD: sysutils/puppet/Makefile 338168 2013-12-30 20:55:18Z ohauer $
 
 PORTNAME=	puppet
-PORTVERSION=	3.3.1
-PORTREVISION=	6
+PORTVERSION=	3.4.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
@@ -69,7 +68,7 @@
 	@${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \
 		${WRKSRC}/lib/puppet/defaults.rb
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \
-		${WRKSRC}/ext/rack/files/config.ru
+		${WRKSRC}/ext/rack/config.ru
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR}
@@ -93,11 +92,10 @@
 	@${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/public
-	${INSTALL_DATA} ${WRKSRC}/ext/rack/files/config.ru ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/ext/rack/files/apache2.conf ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
diff -ruN puppet.orig/distinfo puppet/distinfo
--- puppet.orig/distinfo	2014-01-07 12:51:51.072953997 +0100
+++ puppet/distinfo	2014-01-07 13:15:58.322937996 +0100
@@ -1,2 +1,2 @@
-SHA256 (puppet-3.3.1.tar.gz) = 152f9eaa6767c5f6cbd52befff891bd54e074d2f6487a649373da0113c09e284
-SIZE (puppet-3.3.1.tar.gz) = 1896023
+SHA256 (puppet-3.4.2.tar.gz) = 40ad847e7f8f7a2eb2b968280dcc60427de6770710bbdd289b8bd7d1ced69210
+SIZE (puppet-3.4.2.tar.gz) = 1951200
diff -ruN puppet.orig/files/patch-ext__rack__config.ru puppet/files/patch-ext__rack__config.ru
--- puppet.orig/files/patch-ext__rack__config.ru	1970-01-01 01:00:00.000000000 +0100
+++ puppet/files/patch-ext__rack__config.ru	2014-01-07 13:15:58.332956996 +0100
@@ -0,0 +1,13 @@
+--- ./ext/rack/config.ru.orig	2014-01-06 12:04:56.000000000 +0100
++++ ./ext/rack/config.ru	2014-01-06 12:05:33.000000000 +0100
+@@ -14,8 +14,8 @@
+ # Rack applications typically don't start as root.  Set --confdir and --vardir
+ # to prevent reading configuration from ~puppet/.puppet/puppet.conf and writing
+ # to ~puppet/.puppet
+-ARGV << "--confdir" << "/etc/puppet"
+-ARGV << "--vardir"  << "/var/lib/puppet"
+++ARGV << "--confdir" << "%%PREFIX%%/etc/puppet"
+++ARGV << "--vardir"  << "/var/puppet"
+ 
+ # NOTE: it's unfortunate that we have to use the "CommandLine" class
+ #  here to launch the app, but it contains some initialization logic
diff -ruN puppet.orig/files/patch-ext__rack__files__config.ru puppet/files/patch-ext__rack__files__config.ru
--- puppet.orig/files/patch-ext__rack__files__config.ru	2014-01-07 12:51:51.072953997 +0100
+++ puppet/files/patch-ext__rack__files__config.ru	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
---- ./ext/rack/files/config.ru.orig	2013-12-20 16:47:22.876896492 +0000
-+++ ./ext/rack/files/config.ru	2013-12-20 16:47:33.826895721 +0000
-@@ -14,8 +14,8 @@
- # Rack applications typically don't start as root.  Set --confdir and --vardir
- # to prevent reading configuration from ~puppet/.puppet/puppet.conf and writing
- # to ~puppet/.puppet
--ARGV << "--confdir" << "/etc/puppet"
--ARGV << "--vardir"  << "/var/lib/puppet"
-+ARGV << "--confdir" << "%%PREFIX%%/etc/puppet"
-+ARGV << "--vardir"  << "/var/puppet"
- 
- # NOTE: it's unfortunate that we have to use the "CommandLine" class
- #  here to launch the app, but it contains some initialization logic


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jan 7 12:30:08 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185549 
State-Changed-From-To: open->closed 
State-Changed-By: swills 
State-Changed-When: Wed Jan 15 17:01:50 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185549 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185549: commit references a PR
Date: Wed, 15 Jan 2014 17:08:41 +0000 (UTC)

 Author: swills
 Date: Wed Jan 15 17:01:38 2014
 New Revision: 339793
 URL: http://svnweb.freebsd.org/changeset/ports/339793
 QAT: https://qat.redports.org/buildarchive/r339793/
 
 Log:
   - Update to 3.4.2 [1]
   - Remove Ruby 1.9 conditional, as 1.8 is gone.
   
   PR:		ports/185549 [1]
   Submitted by:	Bartek Rutkowski <ports@robakdesign.com> [1]
 
 Added:
   head/sysutils/puppet/files/patch-ext__rack__config.ru
      - copied, changed from r339618, head/sysutils/puppet/files/patch-ext__rack__files__config.ru
 Deleted:
   head/sysutils/puppet/files/patch-ext__rack__files__config.ru
 Modified:
   head/sysutils/puppet/Makefile
   head/sysutils/puppet/distinfo
 
 Modified: head/sysutils/puppet/Makefile
 ==============================================================================
 --- head/sysutils/puppet/Makefile	Wed Jan 15 16:44:14 2014	(r339792)
 +++ head/sysutils/puppet/Makefile	Wed Jan 15 17:01:38 2014	(r339793)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	puppet
 -PORTVERSION=	3.3.1
 -PORTREVISION=	6
 +PORTVERSION=	3.4.2
  CATEGORIES=	sysutils
  MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
  
 @@ -50,10 +49,8 @@ BROKEN=	PACKAGE_ROOT option patch is inc
  
  .if ${PORT_OPTIONS:MPACKAGE_ORIGIN}
  EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
 -.if ${RUBY_VER} == 1.9
  RUN_DEPENDS+=	rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
  .endif
 -.endif
  
  post-patch:
  	@${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \
 @@ -69,7 +66,7 @@ post-patch:
  	@${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \
  		${WRKSRC}/lib/puppet/defaults.rb
  	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \
 -		${WRKSRC}/ext/rack/files/config.ru
 +		${WRKSRC}/ext/rack/config.ru
  
  do-install:
  	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR}
 @@ -93,11 +90,10 @@ post-install:
  	@${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
  		${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
  	@${MKDIR} ${STAGEDIR}${WWWDIR}/public
 -	${INSTALL_DATA} ${WRKSRC}/ext/rack/files/config.ru ${STAGEDIR}${WWWDIR}
 +	${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR}
  	@${MKDIR} ${STAGEDIR}${DOCSDIR}
  	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
  	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
  	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 -	${INSTALL_DATA} ${WRKSRC}/ext/rack/files/apache2.conf ${STAGEDIR}${EXAMPLESDIR}
  
  .include <bsd.port.post.mk>
 
 Modified: head/sysutils/puppet/distinfo
 ==============================================================================
 --- head/sysutils/puppet/distinfo	Wed Jan 15 16:44:14 2014	(r339792)
 +++ head/sysutils/puppet/distinfo	Wed Jan 15 17:01:38 2014	(r339793)
 @@ -1,2 +1,2 @@
 -SHA256 (puppet-3.3.1.tar.gz) = 152f9eaa6767c5f6cbd52befff891bd54e074d2f6487a649373da0113c09e284
 -SIZE (puppet-3.3.1.tar.gz) = 1896023
 +SHA256 (puppet-3.4.2.tar.gz) = 40ad847e7f8f7a2eb2b968280dcc60427de6770710bbdd289b8bd7d1ced69210
 +SIZE (puppet-3.4.2.tar.gz) = 1951200
 
 Copied and modified: head/sysutils/puppet/files/patch-ext__rack__config.ru (from r339618, head/sysutils/puppet/files/patch-ext__rack__files__config.ru)
 ==============================================================================
 --- head/sysutils/puppet/files/patch-ext__rack__files__config.ru	Mon Jan 13 18:21:51 2014	(r339618, copy source)
 +++ head/sysutils/puppet/files/patch-ext__rack__config.ru	Wed Jan 15 17:01:38 2014	(r339793)
 @@ -1,5 +1,5 @@
 ---- ./ext/rack/files/config.ru.orig	2013-12-20 16:47:22.876896492 +0000
 -+++ ./ext/rack/files/config.ru	2013-12-20 16:47:33.826895721 +0000
 +--- ./ext/rack/config.ru.orig	2013-12-20 16:47:22.876896492 +0000
 ++++ ./ext/rack/config.ru	2013-12-20 16:47:33.826895721 +0000
  @@ -14,8 +14,8 @@
   # Rack applications typically don't start as root.  Set --confdir and --vardir
   # to prevent reading configuration from ~puppet/.puppet/puppet.conf and writing
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185549: commit references a PR
Date: Thu, 16 Jan 2014 17:36:37 +0000 (UTC)

 Author: swills
 Date: Thu Jan 16 17:36:28 2014
 New Revision: 339944
 URL: http://svnweb.freebsd.org/changeset/ports/339944
 QAT: https://qat.redports.org/buildarchive/r339944/
 
 Log:
   MFH: r339793
   
   - Update to 3.4.2 [1]
   - Remove Ruby 1.9 conditional, as 1.8 is gone.
   
   PR:		ports/185549 [1]
   Submitted by:	Bartek Rutkowski <ports@robakdesign.com> [1]
   Approved by:	portmgr (implicit)
 
 Added:
   branches/2014Q1/sysutils/puppet/files/patch-ext__rack__config.ru
      - copied unchanged from r339793, head/sysutils/puppet/files/patch-ext__rack__config.ru
 Deleted:
   branches/2014Q1/sysutils/puppet/files/patch-ext__rack__files__config.ru
 Modified:
   branches/2014Q1/sysutils/puppet/Makefile
   branches/2014Q1/sysutils/puppet/distinfo
 Directory Properties:
   branches/2014Q1/   (props changed)
 
 Modified: branches/2014Q1/sysutils/puppet/Makefile
 ==============================================================================
 --- branches/2014Q1/sysutils/puppet/Makefile	Thu Jan 16 17:34:03 2014	(r339943)
 +++ branches/2014Q1/sysutils/puppet/Makefile	Thu Jan 16 17:36:28 2014	(r339944)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	puppet
 -PORTVERSION=	3.3.1
 -PORTREVISION=	6
 +PORTVERSION=	3.4.2
  CATEGORIES=	sysutils
  MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
  
 @@ -50,10 +49,8 @@ BROKEN=	PACKAGE_ROOT option patch is inc
  
  .if ${PORT_OPTIONS:MPACKAGE_ORIGIN}
  EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
 -.if ${RUBY_VER} == 1.9
  RUN_DEPENDS+=	rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
  .endif
 -.endif
  
  post-patch:
  	@${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \
 @@ -69,7 +66,7 @@ post-patch:
  	@${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \
  		${WRKSRC}/lib/puppet/defaults.rb
  	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \
 -		${WRKSRC}/ext/rack/files/config.ru
 +		${WRKSRC}/ext/rack/config.ru
  
  do-install:
  	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR}
 @@ -93,11 +90,10 @@ post-install:
  	@${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
  		${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
  	@${MKDIR} ${STAGEDIR}${WWWDIR}/public
 -	${INSTALL_DATA} ${WRKSRC}/ext/rack/files/config.ru ${STAGEDIR}${WWWDIR}
 +	${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR}
  	@${MKDIR} ${STAGEDIR}${DOCSDIR}
  	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
  	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
  	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 -	${INSTALL_DATA} ${WRKSRC}/ext/rack/files/apache2.conf ${STAGEDIR}${EXAMPLESDIR}
  
  .include <bsd.port.post.mk>
 
 Modified: branches/2014Q1/sysutils/puppet/distinfo
 ==============================================================================
 --- branches/2014Q1/sysutils/puppet/distinfo	Thu Jan 16 17:34:03 2014	(r339943)
 +++ branches/2014Q1/sysutils/puppet/distinfo	Thu Jan 16 17:36:28 2014	(r339944)
 @@ -1,2 +1,2 @@
 -SHA256 (puppet-3.3.1.tar.gz) = 152f9eaa6767c5f6cbd52befff891bd54e074d2f6487a649373da0113c09e284
 -SIZE (puppet-3.3.1.tar.gz) = 1896023
 +SHA256 (puppet-3.4.2.tar.gz) = 40ad847e7f8f7a2eb2b968280dcc60427de6770710bbdd289b8bd7d1ced69210
 +SIZE (puppet-3.4.2.tar.gz) = 1951200
 
 Copied: branches/2014Q1/sysutils/puppet/files/patch-ext__rack__config.ru (from r339793, head/sysutils/puppet/files/patch-ext__rack__config.ru)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ branches/2014Q1/sysutils/puppet/files/patch-ext__rack__config.ru	Thu Jan 16 17:36:28 2014	(r339944, copy of r339793, head/sysutils/puppet/files/patch-ext__rack__config.ru)
 @@ -0,0 +1,13 @@
 +--- ./ext/rack/config.ru.orig	2013-12-20 16:47:22.876896492 +0000
 ++++ ./ext/rack/config.ru	2013-12-20 16:47:33.826895721 +0000
 +@@ -14,8 +14,8 @@
 + # Rack applications typically don't start as root.  Set --confdir and --vardir
 + # to prevent reading configuration from ~puppet/.puppet/puppet.conf and writing
 + # to ~puppet/.puppet
 +-ARGV << "--confdir" << "/etc/puppet"
 +-ARGV << "--vardir"  << "/var/lib/puppet"
 ++ARGV << "--confdir" << "%%PREFIX%%/etc/puppet"
 ++ARGV << "--vardir"  << "/var/puppet"
 + 
 + # NOTE: it's unfortunate that we have to use the "CommandLine" class
 + #  here to launch the app, but it contains some initialization logic
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
