puppet fix for bug 470998

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 42 insertions, 11 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index c9e48dfd4c26..444905ea7061 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.154 2013/03/22 13:24:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.155 2013/06/07 21:07:41 prometheanfire Exp $
+
+*puppet-3.1.1-r2 (07 Jun 2013)
+
+  07 Jun 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +files/puppet-openrc-status-fix.patch, +puppet-3.1.1-r2.ebuild,
+  -puppet-3.1.1-r1.ebuild:
+  puppet fix for bug 470998
 
 *puppet-3.1.1-r1 (22 Mar 2013)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index c5f334f467ca..95f92bbf48ec 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX 50puppet-mode-gentoo.el 217 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a WHIRLPOOL 60d02a9b70d418cb453d08c17fbeb1133a6ddd924ba18565e30f7c655f5abeebf71af6f17797d3045483ae8775c905efdc11396f4f9829ab2c6b95fbafc2584f
 AUX puppet-2.7.18-eix_fix.patch 1370 SHA256 9414e985fe18c673256dbe5e654018de3d4f8c3c33765e873e1873da7d06a4d1 SHA512 7a5aa71c6ce987c95224c79be55a4b14b4c37aef3960e1aa34e96397564042192f30f8c9f935949768e33a7191ab3ae6335830c68e9bfb2d02c654dbfdbe1fd4 WHIRLPOOL e318b8f60d787bb7947598b91168b96c6d4886602f5f6b90db7336feac00fee61f0c8b3c4c60d0de25f7bc029172a8b10ab6ce1d2115df7755db4344ccd57a3a
+AUX puppet-openrc-status-fix.patch 709 SHA256 76d320e7a5f8922e3f438b3baf09fb7c86dcd70e821e364cee19fd5f33596a82 SHA512 2959646f3d2a5ceed41faff64debe2dae08ef524679ee1a117ce709a22284f055d40a7a28848a8e1cee0a2603a0a6ad417560714d4bc000b3288fe7a3a5e0d81 WHIRLPOOL 030d85bfef14d74e2ccabdf249fca657beaeba36d0dcd26cf706abf1ecdb81b79a4dd95063cf0781cb9006523cd1fa86a35ac2efd70821c1f3623bd2ea11ae77
 AUX puppet.init 916 SHA256 edad76953e36dab793010955cb4775242271c3e4a22a193ecf1ade4f0716d2bf SHA512 1528e2c9f8d145663f9dab37a5928049ae1063570048f372ceeec3892b3b9e30aa84849056d7799a4a6d292c8227f8132142e115d6019f64050f4989e6584df8 WHIRLPOOL 6295f9eceda2ad94c5e5c9beee5a7549b043c646e8884c01375ec089805a40b037a533a8ce4c04c8f9ccbab0688ac75adceda14e528854ebfcf2d3462e26757c
 AUX puppet.init-CVE-2012-6120 1027 SHA256 d2d9175d9c78490b2227a011227741fde27aeb3a9a099e2003b751b254ba3c95 SHA512 06d8b2fbf62d70d7722a36c28e1200e9f1e8d927e159a747c163cf617023ba772c4bf90b5e96577fdd66e227ed478c53c30d16e906e2b0b3251dd0ad01b4a3a4 WHIRLPOOL 77bc90a44f1151cb3ed346b905da13d9a02884bc821c27555c9e8f6b62ad669f023b3794898d271c01c72cfef25229a55ba91486aab219996806baf87590fa87
 AUX puppet.init-r1 609 SHA256 1ba2b2c08e056adcb261bce51acf47dba6200246f199f25cdf44c9c3bcd3c390 SHA512 b170b7e3ed943e6cb51745288862943bcd08a6680c0b40d1211295dffda698dc4da4596599ba4540b61c786c970ec1b8a5f03f15f249fe32169d0f558bc35923 WHIRLPOOL da5c9e8e309a162d1b04be0222edb252d39be8bc17772ed6ac16f2990ca64adec6e469dd2522e3078ae0cc1bc4c7f2383bc776ec1a05868515ce35bb845e9125
@@ -15,18 +16,24 @@ AUX puppetmaster.init-r1 920 SHA256 00a66031624de13e28b43c186765c36f02632a614b86
 DIST puppet-2.7.21.gem 2031616 SHA256 a5eecdbe68cde5ebfd576a9af5ddb0c8c17dae224a7d0b3ec240ef54e6bd88a1 SHA512 638c188b945791fe86c1657343f9d7ec3ef7e86342c35e03dacfae4e99e63d8c09160dd1faf840f244b275e6a0aea3b969668debe9dc1b60cef68cb2513068b5 WHIRLPOOL a4bcb4181e57bda6aaf79fdd484903114e94dcf5196105203538d6d8a1bfefcd6db44f74cbef1c209b086d7b2bfab53d62069da1be034e6c35fe686fd00898bc
 DIST puppet-3.1.1.tar.gz 1587190 SHA256 4401f6388bb96b1301a107f247af6fa558127d78467bb5cef1a1e0ff66b4463d SHA512 48759776b68f83a125a0c703ecc9ad3efe34f10e6cfd9ddcd9e596ff082c9f40bdb7e0489bf7eb0bb0ce8bdb4ad0ae87049d2ad3133e839d0a5a6caa8419074e WHIRLPOOL d7152ba5397edadba9784f3c1800c8cf31ddd547691b35567ad52a42e82e741256326d2ee0bccec0642e82f533ffb74babcaddf3a0ee54361626b875cc618b2f
 EBUILD puppet-2.7.21.ebuild 4731 SHA256 bfe02b716ade3d16d07f1faed6f76b70e91f03a3c4bc75d80815a6963637af6c SHA512 6483b205b96b62ca29378b51bf188b6d0367b389ad4bac4afc5a5b86eb164764dee87da00e0027dbc17eb634ab938bc550b7b98019948cab14d9cbd4ccdb5e52 WHIRLPOOL c876e707366ec3d058db8ee696e3e3b781502b4f8b5da2c6416c1fa0979dd7a9ddcc3278c7dffdbc6c3ad3c8313b9f2036872461e1538595192192cdeb98a697
-EBUILD puppet-3.1.1-r1.ebuild 4233 SHA256 fb00642ac6f410927720448f0c80a1519c1282c47b76bb9ca1961692fbbe27fa SHA512 8281161f77d2c68c7355e1d223b0cc7bb0205f8e9b7131a6b08a62f6ad12fb1fa32064bd46bc092d8c1414867d7068f57c1a8c07c1ee046e7cf0a94b3d13c83b WHIRLPOOL f3e0c92209782602f06dcf3c05e2b0f8bc0eda64594505a4df3690baf3bd2a7511b8cd2b3179a948443cf0bf96ee531de0b2720f3b98f84596bfc15156e6b030
+EBUILD puppet-3.1.1-r2.ebuild 4301 SHA256 ce57dd8598b3c8a98faba4e2afa190f2837fcddaddc7cce8cbd9afdb7477dd8b SHA512 954e393e7eb6ba48dcdd25a2c0d0ea4c6a3db42772d58fc2dbd10af97e330665b11a580c132c7d5a746b0d2809b1d489e24bcd0c0f34f23eee575c3c1e78903e WHIRLPOOL bc0e5304b6ce38af165c5d8181429088b4068a5f04ca41aaee51174ddd28c41f9452a0b64443b7eb04a685e14729070ec7447d5ec5d463a4521324670b02d8c5
 EBUILD puppet-3.1.1.ebuild 4232 SHA256 4830d8083f7adff8b38bc367225d8a514513cb90d8e31b11d9fe7d4b99b46c29 SHA512 384f9f6e82d306390d67b6516fc82a27cc336d6166147825888b35dc49237d34015877ff1b3bdea4cf283d3b3810e007ca66654caa303038986abc1a17cd13e4 WHIRLPOOL a88bd973a41fe9c6050fba047904650df11582e48a5cde27a2eb80b341cb6b79634a46de01ce85cc75755f266e3a8634028be470352585e79e0a9ccd9423d877
-MISC ChangeLog 25278 SHA256 0ad1f50d81c91db48608d3c71db2d7bbfef1857a349fb7ed5066f3c55e0790c5 SHA512 b9d626a2e85d0f398ab91c9984c4791de80570347ea3df43cf797b0c3cf1a93bb60e02c6050b1f9049e9bfc8a3845286b624f38f9eac1996c53a6b528c244b0f WHIRLPOOL 65d1fc6715da98dcac16ec4fb4b9c327990993f6c0f0259282659922461931fb0780724f038d3d807bd60a058f784f2e4d5dbd948f0d4650a61581f2a7f6d5dc
+MISC ChangeLog 25494 SHA256 5389bbf10e4fcd33ded415a2a8c03d300ae93f982610cd540831c5f2c45eb45f SHA512 dcfc99c89488815a868ae84c7afcac766475bd34577c39599258666bea94d17293ffabcc4d5780865323b8a3d6bd315c72ef2d288a79805aba1408cc19fa9b39 WHIRLPOOL 31ea3673a4877c3a339abea0bf306ddb24264e4d6de513f32bf712b9d3c5a6ab3052ea15e7573995bbbb77badffae208e12c05406b02e697083b696fbe5d7e3c
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRTFugAAoJEBzRPIrUMBNC/8sIAJ2p6a5L35nfHVO3ULuicPEm
-/BEGSkyLMvLU6EpxQQPdIru5MEDGyPzx65/lOi+EvPtls6YB0mPyhHpktRKZtbHj
-iLSghiaOyGB3jgsyrUv4OGnczL0UEmpeurzwF7Inq3NNJ6NpJ49q5di9fvolCHeJ
-Eig9jfbI2wzoiMc2WOVazibFQxG7m1bOKVcLo2HC73RotLyJaN90wI2/uze11hK2
-aYBJ8bP2vVufd7MEzh6/84jQiTmJQHCRpgDFhDJP/dHcY7iu+hrj9a8Tl27nZrBU
-VPfvhboWfVgL4ue/GKtZM/jualDwPQMN0JK/gTJtjB7ooN4kMIsvgf7pjVAYmvw=
-=WWSQ
+iQIcBAEBCAAGBQJRskvwAAoJECRx6z5ArFrDbS0P/0UyZ4tWrsvHdv/OKFkyA87s
+Zg1oQ8UB0IizG4KYFCBduIcC+wKv0unqL7dZRPwcLi2D36ZIgPyW3qDGDuSmMma9
+AvREZMtyT7aUsNBHbz/h9gHfWJA2dMLG/BKnxa83dka1ZEA9bHsV/yb78Uxsu4wj
+sQU7LtI1QQuwOaX4yhkuMx8wEGLgOYZEN5++LEhel4l7xjUdXJPKtO2t98GZNjiN
+3pz8s33Rq7CYbVH5a/DHG7wdq4n6GRuJPRyAKCk6VvkkobHN539qd+mStBwSzGT/
+3k5fJBaT0M3Nr93RIO+b6/iUQYFtwvJVTeAJLJAt5/p1nv/SEM7QnXL5ySgl6D0J
+iDda0kCCuuo8Aq5AwenCqiABEicbnC68F+zcouHhP5hh50RVBwOMrGV7dTZy61J1
+bLqu6DHMD7688yHP4WCivE9I7SzPeisopCnC6lD4sx70BOEt8eEh7Ty4qULwTBKh
+ZeEHr598iqPMEVQsp2dgCEyfXzlWZDdy/bBnDkYts7k73Too8qlCpl9GtYaHY4xK
+7wjNQ53vQcCJnjbwjmlOm49OvqTCxi0b7nK1A1dWZOMqWUza6OFdhE2XE1WkWds8
+XIN4lZWbATMbKhoaq46gqUxRpm/ZpBNUXimV7IW8J5y2e+RgiJm8av54oxKPPNFj
+fB1sY1zMZ4yOSJXbRaLB
+=5yWq
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/files/puppet-openrc-status-fix.patch b/app-admin/puppet/files/puppet-openrc-status-fix.patch
new file mode 100644
index 000000000000..af568098d594
--- /dev/null
+++ b/app-admin/puppet/files/puppet-openrc-status-fix.patch
@@ -0,0 +1,15 @@
+diff -Naur puppet-3.1.1-r2.orig/lib/puppet/provider/service/openrc.rb puppet-3.1.1-r2/lib/puppet/provider/service/openrc.rb
+--- all/puppet-3.1.1.orig/lib/puppet/provider/service/openrc.rb   2013-06-05 03:32:53.646824966 -0400
++++ all/puppet-3.1.1/lib/puppet/provider/service/openrc.rb        2013-06-05 03:37:25.333824967 -0400
+@@ -10,8 +10,10 @@
+   defaultfor :operatingsystem => :gentoo
+   defaultfor :operatingsystem => :funtoo
+ 
++  has_command(:rcstatus, '/bin/rc-status') do
++    environment :RC_SVCNAME => nil
++  end
+   commands :rcservice => '/sbin/rc-service'
+-  commands :rcstatus  => '/bin/rc-status'
+   commands :rcupdate  => '/sbin/rc-update'
+ 
+   self::STATUSLINE = /^\s+(.*?)\s*\[\s*(.*)\s*\]$/
diff --git a/app-admin/puppet/puppet-3.1.1-r1.ebuild b/app-admin/puppet/puppet-3.1.1-r2.ebuild
index b73c47f3a727..b62af2c32617 100644
--- a/app-admin/puppet/puppet-3.1.1-r1.ebuild
+++ b/app-admin/puppet/puppet-3.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.1.1-r1.ebuild,v 1.1 2013/03/22 13:24:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.1.1-r2.ebuild,v 1.1 2013/06/07 21:07:41 prometheanfire Exp $
 
 EAPI="4"
 
@@ -44,6 +44,8 @@ RDEPEND="${RDEPEND}
 
 SITEFILE="50${PN}-mode-gentoo.el"
 
+RUBY_PATCHES=( "${FILESDIR}/puppet-openrc-status-fix.patch" )
+
 pkg_setup() {
 	enewgroup puppet
 	enewuser puppet -1 -1 /var/lib/puppet puppet