- Update puppet to 3.2.2 which fixes CVE-2013-3567 [1]

- Update puppet27 to 2.7.22 which fixes CVE-2013-3567
- Document security issue

PR:		ports/179816 [1]
Submitted by:	mat [1]
Security:	b162b218-c547-4ba2-ae31-6fdcb61bc763

5 files changed, 14 insertions, 21 deletions

diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index 2d3b2aeded1b..aec3bcc49e8d 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppet
-PORTVERSION=	3.1.1
-PORTREVISION=	2
+PORTVERSION=	3.2.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
@@ -41,11 +40,14 @@ MAN8=	extlookup2hiera.8 puppet-agent.8 puppet-apply.8 puppet-ca.8 \
 	puppet-resource_type.8 puppet-secret_agent.8 puppet-status.8 \
 	puppet.8
 
-OPTIONS_DEFINE=		MONGREL PACKAGE_ORIGIN PACKAGE_ROOT
+OPTIONS_DEFINE=		MONGREL
 OPTIONS_DEFAULT=	PACKAGE_ORIGIN
+OPTIONS_SINGLE=         PATCHES
+OPTIONS_SINGLE_PATCHES=	PACKAGE_ORIGIN PACKAGE_ROOT
 MONGREL_DESC=		Run puppet server as a mongrel service
 PACKAGE_ORIGIN_DESC=	Use port origin as package name
 PACKAGE_ROOT_DESC=	Use PACKAGEROOT insted of PACKAGESITE
+PATCHES_DESC=           Optional exclusive patches
 
 .include <bsd.port.options.mk>
 
diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo
index 87d756c46015..eff28b981347 100644
--- a/sysutils/puppet/distinfo
+++ b/sysutils/puppet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (puppet-3.1.1.tar.gz) = 4401f6388bb96b1301a107f247af6fa558127d78467bb5cef1a1e0ff66b4463d
-SIZE (puppet-3.1.1.tar.gz) = 1587190
+SHA256 (puppet-3.2.2.tar.gz) = c47745aa73912b2cb1a20b07e8741b8af37a920b9bc8dc8afb14b23d8df7d13d
+SIZE (puppet-3.2.2.tar.gz) = 1784340
diff --git a/sysutils/puppet/files/patch-service-freebsd.rb b/sysutils/puppet/files/patch-service-freebsd.rb
deleted file mode 100644
index b0d6d867c86f..000000000000
--- a/sysutils/puppet/files/patch-service-freebsd.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/puppet/provider/service/freebsd.rb.orig	2013-04-28 02:55:36.017584743 +0000
-+++ lib/puppet/provider/service/freebsd.rb	2013-04-28 02:55:52.581583782 +0000
-@@ -41,7 +41,7 @@
-   def rcvar_name
-     name = self.rcvar[1]
-     self.error("No rcvar name found in rcvar") if name.nil?
--    name = name.gsub!(/(.*)(_enable)?=(.*)/, '\1')
-+    name = name.gsub!(/(.*?)(_enable)?=(.*)/, '\1')
-     self.error("rcvar name is empty") if name.nil?
-     self.debug("rcvar name is #{name}")
-     name
diff --git a/sysutils/puppet27/Makefile b/sysutils/puppet27/Makefile
index dfc5ff6a661a..9f8716069781 100644
--- a/sysutils/puppet27/Makefile
+++ b/sysutils/puppet27/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppet
-PORTVERSION=	2.7.21
-PORTREVISION=	1
+PORTVERSION=	2.7.22
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
@@ -43,11 +42,14 @@ MAN8=	filebucket.8 pi.8 puppet-agent.8 puppet-apply.8 puppet-ca.8 \
 	puppet.8 puppetca.8 puppetd.8 puppetdoc.8 puppetmasterd.8 \
 	puppetqd.8 puppetrun.8 ralsh.8
 
-OPTIONS_DEFINE=		MONGREL PACKAGE_ORIGIN PACKAGE_ROOT
+OPTIONS_DEFINE=		MONGREL
 OPTIONS_DEFAULT=	PACKAGE_ORIGIN
+OPTIONS_SINGLE=		PATCHES
+OPTIONS_SINGLE_PATCHES=	PACKAGE_ORIGIN PACKAGE_ROOT
 MONGREL_DESC=		Run puppet server as a mongrel service
 PACKAGE_ORIGIN_DESC=	Use port origin as package name
 PACKAGE_ROOT_DESC=	Use PACKAGEROOT insted of PACKAGESITE
+PATCHES_DESC=		Optional exclusive patches
 
 .include <bsd.port.options.mk>
 
diff --git a/sysutils/puppet27/distinfo b/sysutils/puppet27/distinfo
index a385c01d8ee8..7774558141b8 100644
--- a/sysutils/puppet27/distinfo
+++ b/sysutils/puppet27/distinfo
@@ -1,2 +1,2 @@
-SHA256 (puppet-2.7.21.tar.gz) = c18b426457d023e87745f0a98b7dd257f8e94722b5b0d3cafb6048ef2499273f
-SIZE (puppet-2.7.21.tar.gz) = 1998848
+SHA256 (puppet-2.7.22.tar.gz) = bfd79c0aecdeea4e1a8573e9325fbcb48778603d908180e88897458f01fe06de
+SIZE (puppet-2.7.22.tar.gz) = 2023230