From f1b945331805268d719ba8b4f1e43b0fd7cc68dd Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Wed, 22 Feb 2012 20:51:05 -0500
Subject: [PATCH] Update to 2.6.14, fixes CVE-2012-1053 and CVE-2012-1054

---
 puppet-2.6.13.tar.gz.asc | 18 ------------------
 puppet-2.6.14.tar.gz.asc | 17 +++++++++++++++++
 puppet.spec              |  7 +++++--
 sources                  |  2 +-
 4 files changed, 23 insertions(+), 21 deletions(-)
 delete mode 100644 puppet-2.6.13.tar.gz.asc
 create mode 100644 puppet-2.6.14.tar.gz.asc

diff --git a/puppet-2.6.13.tar.gz.asc b/puppet-2.6.13.tar.gz.asc
deleted file mode 100644
index a08605c..0000000
--- a/puppet-2.6.13.tar.gz.asc
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
-Comment: GPGTools - http://gpgtools.org
-
-iQIcBAABAgAGBQJO5oXOAAoJEBBUt6JL1uwwpXcQAKOsWL+65lJh2lUExw7fuMsq
-injUsJ+Xh5VufrKqFIiJBqJ9jj7OCeB02I8mEn+vJPmdHg9w6EgAzrmV9QBZIisQ
-GpJWDo/o7AyPzFyEiNY2Z3zu2NALdo6sINya7BpIOqPrhHyEn4zVH5i8kSrD7c9U
-RG6j2PMNjOWVZb1S69aFeIkFoSpX4ri6uve8zC2VBa2pLA3jbedUHJku9EI4R52d
-OeEB71P4wi9OaoaebOCXDrgcmUH1BG6+YT6YhAJwGclpLVtd6bGkjnVKE7l5wuCW
-6F94ZZWOo5OSx56LB+gVjOcV3GQ7SQkpOrIrS3AjEm+y8ZTzHXpHOyNmeNIqYj3l
-CUWcU1ip9gK4fYU7JxNchzeQJFVPe794EIeiKW2mXRajStwnaI4SXYCVmXnTxJrL
-29bzbBBiwl4xQu38MZdyrQ+a8d6EOVcTgG46dWe1COX6cKT67azx0zsdulpzPaTM
-0ix9kchR0U7wVISubgyRmccZfrQ1zhoOS8EAexqDzWbAsL0046RTP5yQcIG5NGCh
-MDJQFTaP/9CW075sXqe31vKjy91zOqf49Uy4PuMOuZ6mLyg3/CabLkpew7Q2L7PJ
-dV3Bek2ia5tEBiYIHxuVeAVqboyBgeRvRvWooEn4Ie3MFmikXSvnddhhrk7wrTqK
-6iokskdLK8l59X3bc9bz
-=aeT+
------END PGP SIGNATURE-----
diff --git a/puppet-2.6.14.tar.gz.asc b/puppet-2.6.14.tar.gz.asc
new file mode 100644
index 0000000..7529f04
--- /dev/null
+++ b/puppet-2.6.14.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (Darwin)
+
+iQIcBAABAgAGBQJPRWJBAAoJEBBUt6JL1uww7d4QALRon+57AbTHl8MSfLTELmlS
+RFcmgtA0lx0gptWpVRLiLYYwlsC/UB2zcZDbfmoc9gbY7XhbjpDSSxmKemshRjnQ
+afWl7b/mAkGFEDaCC0isRPmjvUFANbq9ruYuVXm7WuW/eRVW5ksZH5yZXapTgQRk
+pDn+KrKEJo73HnYluQt2s9ykn4Mhex1RDhaLzhYNXfFwDqJa2jPrwVsu7rObLoFF
+8FATHDU+CI3t1Tl9/NJ1OtU7R5ufC7EQIXcDZ22J7ncjiv+RMkckIosgnwxgHwCY
+mIEeU9Y6ONZbRcRsVxTMCw/eyXdtM2H91K2bb84jEoEITLX5+F7MXayozJE3+Gy5
+57lA3WXCor4VcOHjLaq+oWOXGXV4aueD4gLW4ND3omT0yVH8RQVrGFkCXpAffQQu
+lU9jPEt6pZMhI4REyBBYROEldZyQ+CESM5Y7R6LzUkR/tHjqRWWbTwGld2zwJOoD
+w1pKbbRPt5ewP4dknJRxrdE69W5CQOudT+TQu1FJ1czNr05s6I9DK8SQeA3wdCnm
+LMdRHQkMp+zJBZQ7Ub/u12l/Oc3TdmFxVrroY0Zx4XvkyRmEywBtHKWj3veFMpmw
+7whEnDSXoVOXHNdHzS2xh+vsSI7gIV9gEuClJJwThLNqHZbu0Hx1vI9ebAp+5CGW
+a0oLp+BJ8aBRoJvoMhiJ
+=BQvK
+-----END PGP SIGNATURE-----
diff --git a/puppet.spec b/puppet.spec
index fbc7835..f3fd96e 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -12,8 +12,8 @@
 %global ruby_version    %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]')
 
 Name:           puppet
-Version:        2.6.13
-Release:        3%{?dist}
+Version:        2.6.14
+Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2
 URL:            http://puppetlabs.com
@@ -279,6 +279,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Wed Feb 22 2012 Todd Zullinger <tmz@pobox.com> - 2.6.14-1
+- Update to 2.6.14, fixes CVE-2012-1053 and CVE-2012-1054
+
 * Mon Feb 13 2012 Todd Zullinger <tmz@pobox.com> - 2.6.13-3
 - Move rpmlint fixes to %%prep, add a few additional fixes
 - Bump minimum ruby version to 1.8.5 now that EL-4 is all but dead
diff --git a/sources b/sources
index 16f8fec..bbc309b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7d684c4d0b0f130aa54de4bb6759824  puppet-2.6.13.tar.gz
+0da78d7d6c059aaf859abbea64af2b8f  puppet-2.6.14.tar.gz