fixes for CVE-2014-3248 and bug 513290

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

7 files changed, 25 insertions, 143 deletions

diff --git a/dev-ruby/hiera/ChangeLog b/dev-ruby/hiera/ChangeLog
index 4db6e6b23dd1..fd99fdfd4e26 100644
--- a/dev-ruby/hiera/ChangeLog
+++ b/dev-ruby/hiera/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/hiera
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/ChangeLog,v 1.22 2014/05/24 05:55:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/ChangeLog,v 1.23 2014/06/15 03:39:23 prometheanfire Exp $
+
+*hiera-1.3.4 (15 Jun 2014)
+
+  15 Jun 2014; Matthew Thode <prometheanfire@gentoo.org> +hiera-1.3.4.ebuild,
+  -hiera-1.2.1-r1.ebuild, -hiera-1.3.0.ebuild, -hiera-1.3.1.ebuild,
+  -hiera-1.3.2.ebuild, -hiera-1.3.3.ebuild:
+  fixes for CVE-2014-3248 and bug 513290
 
 *hiera-1.3.3 (24 May 2014)
 
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index 766921c5ef7b..d77436fde4f2 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -2,22 +2,25 @@
 Hash: SHA256
 
 DIST hiera-1.2.1.gem 25600 SHA256 4847d2161f32654572e8944aadb273e75d8fb9c562fe390100a0632bb3440e71 SHA512 e7df2b144a80a2d993a12fdf9beb072b3882cc8b503ab74120be8d91586ce6e71eee3d83cafe64d8e81282958ea8baf1c1e660142a6a5f575d43161c229e0150 WHIRLPOOL 0e4f79abceeacecf11f47bbfdb001833235ae5b280390d75b6609f8a292653cfd752feb5b3b922871c6a7f5bc6e8076a6817555c6b0369a6a8a29d2e65ce92fb
-DIST hiera-1.3.0.gem 28672 SHA256 948a7e323a2f722d84d1e46224424a67e126c80d052667e94047f3e6fa2a460e SHA512 3438c0ac8a823dfccbd372d5e3b7f9960af9bcdd6a6f4aad6c295a8ba5f9a4e5a2d67c37414d6cbb76cfcabd286db7fd9bc692b95401db690e25ae68fd6985c1 WHIRLPOOL a7333e68cb8f70cdbbbfb7b3edd241b6e6fbbad071431c9a0e9e01247f0bcd09ba3cc449f859cfe7be27b3a01615d7c2819070a731ce814500e7160fad7c7e47
-DIST hiera-1.3.1.gem 29184 SHA256 5df6f67e36c1db217cb7a74c8f0754b0c10f78934a4e394d5dc7788cf4329943 SHA512 18d4d84d229d7bebf5088d2ef4fd3ffa31bf689b24b1ee44f64a84b1c32f638d711eba0932e45f1613fd9fb4e75943d27204ba74da0ded3597f3ad83e2bce8ba WHIRLPOOL a7aa5250bbd3faf8645bb46fea58d5192cd8fbf69212c4398716a98431da2e5b3456b6d73594b858a54dd91ebb46fd943bd09fb01f913b921a10dfc92ff79fb9
-DIST hiera-1.3.2.gem 29696 SHA256 425a4c50d68780a83a82ea8d82ac39b47bbca2ee40bed48f37829d56a8c314db SHA512 9fb894ac53f91b7eed47116a55d108f38ee8f664cd424c9740713a085d65f57e0ef671558b5f897e8ecca4ec0ffe3f0a5c81e1ad581c5462f3bb35e152e464cc WHIRLPOOL bb74d274f976a30545692acffd61c49324a6a21cd5d50af1af1fda3f162d2dfbf1d9e19bb72e8f80d053f962e74502739746a7d5b0b4a43526e0d7918a95b1de
-DIST hiera-1.3.3.gem 30208 SHA256 5239e24abe614b3253e1185725a9a158cc8cf265af45bc0b1e1d305af833e309 SHA512 6aa867815b30d3efb8cd191dee3a6f76fc88fcf376cb9913c3cb6d01e1a64b16645a2f2db2da5524ab4bf05de26a2aeb4e952d7d6e2dedc2912bc2ae821440f2 WHIRLPOOL 663ae789e2e3e24b823fff3da5e8ebfb3b4b267652440f96657dd3651c4cb9cf4b0149d5b6a1c11844e4c23fd2de9737183ae7f3117e89f07f2d9e3166b59a18
-EBUILD hiera-1.2.1-r1.ebuild 798 SHA256 aa546a02d073d82f306e9c6cd4ebba5eb40f5bf2057d0efd0b23ecaa31b1c136 SHA512 cfcbe7ed49380fb6d55f37785c83fea525cec5f3a18de8f909c2b1a21456261119fad2181e81afd52bcc9680e1892c27c16fdf2bdf74444d54ed3092e55adf36 WHIRLPOOL 3a58dc4949f40549a243c0a0a2f512be02c1ed6a8c0079fd4e1127253febb6fd60d11a701a2bf99af6aa835e8ce55da21a753c1d829a1a24c97171b1650ce40d
+DIST hiera-1.3.4.gem 30208 SHA256 a3c85385ddda64916d453efeeb965151dc2454428d88f04f40d539559af27020 SHA512 be3b702f0e3c2e61d8d6a8c1ff1280f9a1be3dc4adc2a605b4ee3b5db82d513bd58fb6b22ef546a625cf4eefa43d597365187b776ee92c2dd9946eaa4b147128 WHIRLPOOL 27334cb8b3aef8cd40eb74933fac99e30a5eda7770e980093092465f2eaf7e1e714e47428e3b585fc67f490b91eb4c22fd42ac66110b8cf6365650ace00840c8
 EBUILD hiera-1.2.1.ebuild 790 SHA256 f4634d5b7697ed5cfcf90a9744161b87798202b20257d1f634106c7bc72fe1f1 SHA512 f2d3f2bdfb0162220f32c9badd72e119200a8453ae8e498da3eb04514db3d3b02a425187f9c0f683b702411271701c08604897a2dff41132807cb20f7711ce6e WHIRLPOOL fab9a396c4ed977313abbc831a16ab1a7af6a4bf317e943340927cafee63eaa43b3555838371aab85b2137ca45152758fcff6336b369ddc59fed2291406c124b
-EBUILD hiera-1.3.0.ebuild 804 SHA256 c76c0db8f895b4ff1d9da50894691324f32326372bcc9abd18f97a8f4912078b SHA512 efe7a9e335c32820265d148bc3fdd1db6baf347bd7213acc9c527caa3b2358407dd2408ae36de765e803973adbdff2df09189467b8f29a37c10147bdaaafaa67 WHIRLPOOL 692c528c99cdf8f3a8120c708a4f5662c9c04ef231dccfd64748ab033bf16039d41de0cd568a0f3fedafbfa13514fd8254c754879432bd1370d9084b906686de
-EBUILD hiera-1.3.1.ebuild 804 SHA256 4a876e552de07cb3ac4daf7ed4eb50f6b9f51dca42e66e34618bfd41af3298a0 SHA512 29859743f5056235feae4b0008f0b7f88b351c8034f9403cde841d7e12fa189bf7334378f26584f586a1eb415ef2f3c077e4df69ac0790d49e5a404f62437d8a WHIRLPOOL 51d985484b60f8ed915e9b075dafbcfb1017a703719d5903834e7baf03eec60960ebe77ab3a1e509a3acbe6786fb21f2db250f61a6afd8d7456d9e6da16a2d9c
-EBUILD hiera-1.3.2.ebuild 802 SHA256 ee8f61712bd7d882b8260ba53b047040b2660bbb8f9aa131e65c94b1bbf03dc0 SHA512 e9373807efb08f418bb09aa5afab6c9b4be671cd2555eed8b6d746ba2fd667cdd11cfaca8231ee59512f845d0aaa49eebebd877d0e9fe8591562f7f0d4badeca WHIRLPOOL a4a462d3a019adcb7ff75139bd4bcc04ddecfe4bb1ccb70dd2f87cfa2f6951e16b358895231144d5a7b6ef6d4b684fe625415ead96055a13ec87e7173d322cab
-EBUILD hiera-1.3.3.ebuild 797 SHA256 cba91a8721fe385d08e3e68df19e0108b1f2f04079dcd7eae84ae00f0de8fcc2 SHA512 207e61777c34ba943ddb6274af4e6d5386cfd2b48233a31e44a4d7f58184a39ba6902e6c1ab5fac80ba456d28335ad4b0ca0ff87fe4aa135e351571ac2398a4c WHIRLPOOL e748672124ad27d68fa812452de1b1fa1470a49837a8385af426855d101b61e4980b81c0ff55c07fb1a9a9b0e7b549ceb507e751f3d29d6e1c4f7f0629ddaf6a
-MISC ChangeLog 2932 SHA256 5369a1b36379dccd0a412b04c5e0db3c0ea3e686941407b69442ff129cfe5424 SHA512 11977a8588252b6f13875fe5e7b66b1d5fd48b50bdc423048815a0f3f20e7cf5742bf86e219b6cc96e339968049897e6865aa497a25f1eaa7eddf0e9c0734ab2 WHIRLPOOL d395b9c7adaba89fc65cd4019003ec2d69f63a1a2260e8f1548f4263ab27293fd334bea544ae3be34ffc3b32724d56d5ace038bb5b5081d22638006e9e9e5da3
+EBUILD hiera-1.3.4.ebuild 805 SHA256 cf593e1a26f13f11c9cf7826c9049de6054685ef783e7d8316e9a0b48c8d1b50 SHA512 80425828b62ada033e9b0c8e32cae0a9a8579114cd4f5bd69b746db33908eb4ab2fd417ce76011dad00980ec17d07e73d310e178daa92d28b0c0b97fd4c2565d WHIRLPOOL 02f090da452316b8c2668534d7d884848affebbd2d32e356985e5516b87f200822f7031bb104f367f7392d972102c21f6f6a0ccb200cf0efd0518fbfb5d3c934
+MISC ChangeLog 3200 SHA256 3a8ef0feb2497887b036247fa4c528f321d8f497cb60c238f7b379af96a898a5 SHA512 70ef843e82051fd26464c64f37c635c97b2f552394110b57c1e3399544e9e3d4c2b50c77de338912ad32e59524570d360e0287ef308edfd2723bd881eac25c1c WHIRLPOOL 78914f83b208f6e8eb612bfa472b6bb7b15af43cc5d88478786eb3edcba8eb42945d1ea51fa54ac5ae4763ea4ce62921a34a9adf4d3b73b4b64ab2a2785bb882
 MISC metadata.xml 247 SHA256 85b95e8165c6378ff5abccc7a09589eefb34856e73e58334c1480a00aedfb2be SHA512 83c30112436ffe8516a2cb69fabaff17bbbdc5a0b4d48d5235135f122b489ab0f1a9b1f989d3a77ad374d6f90f751a8edf0f6db260bfa2a915e19531e7186df7 WHIRLPOOL beb688220d43265344dcb663f7ba0c44dbdd87fe26bd859ff18b6aa70141e418d38bc71dde9f36e977ad8bfb13fa1080dd468cfc082c0787f974101ed7f8a8c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlOANFkACgkQiIP6VqMIqNetZQD6Ai1VwK28QcDPhrOeTmlYpsAi
-PGptzWAWuifBmUgQP1kA/jaloqjY952uwwPWZygo0MBO+OzNy95nOO8tVsTjl6Iw
-=sxz9
+iQIcBAEBCAAGBQJTnRWLAAoJECRx6z5ArFrD28gP/3bkL2VR0sv9IKn4M21OTrfF
+5UOpasXi6fMak4YTT8QuXqnBkxtcc9Y2YKz2TA5hk39v8OtxBPXsLdfBlFTuXH1W
+5DiEXhl9SqyUrbDFGHlOmGHXax6V9Wqk4JnL6OaTzb1A2CegE8GXY+oFpcN1pvE5
+qowr0cVONWo15HN51fwzbIvyilwM+YDHL+E5Te819nXpnmHfqBbaqPSBLuCnxDy3
+h+TapbXOVhX8Q03YT9iOARYk9L1ztMmdThkMdVp+h68nPB4jSHxe4IFbA9iBKiie
+6tiDw+W1Lf/mT/ih2ftN7xnYVmfp27lCB/m9jR4ywWAZyQouNawRCQbOioyxYEPb
+vFGXxjV/kkZSrwZULAQeYi4y19U2XoWBQn9jS9xGhDMw4HKAytRUtpmln6b/UFDr
+EMl0Kt4wcNeAgAkc6DrOjapnYqSl3BhM5ETSzCUmfdessQyff88KMx2D8XQpo2cQ
+qa7+W2dFSi9KFYMR9ks6JkX4S7jLxpBy//GtdWt5OLtnm4ovlMKKZWh4JgZCtw/U
+PN4u76D23zaqF5QZkw91kv3dYoWqS+kYpzimzO5n2UmIJ9BNa47Ya8E67OGD1eY2
+nHXbrnkhXT1rP9XdPMp/0O2CknxvUP9/U7tg6PpGmNCEXAVwHx3wLMZ0UeZK/Tcz
+06iMB7DveqRWHd2VpZBG
+=5RTq
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/hiera/hiera-1.2.1-r1.ebuild b/dev-ruby/hiera/hiera-1.2.1-r1.ebuild
deleted file mode 100644
index 0868f982b70d..000000000000
--- a/dev-ruby/hiera/hiera-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.2.1-r1.ebuild,v 1.2 2014/04/05 17:56:45 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="http://projects.puppetlabs.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/json"
-
-all_ruby_prepare() {
-	# Our json package is either the compiled version or the pure
-	# version. Fix gemspec accordingly.
-	sed -i -e 's/json_pure/json/' ../metadata || die
-}
diff --git a/dev-ruby/hiera/hiera-1.3.0.ebuild b/dev-ruby/hiera/hiera-1.3.0.ebuild
deleted file mode 100644
index eb1e9d76e8f2..000000000000
--- a/dev-ruby/hiera/hiera-1.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.3.0.ebuild,v 1.1 2013/12/19 21:55:08 prometheanfire Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="http://projects.puppetlabs.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/json"
-
-all_ruby_prepare() {
-	# Our json package is either the compiled version or the pure
-	# version. Fix gemspec accordingly.
-	sed -i -e 's/json_pure/json/' ../metadata || die
-}
diff --git a/dev-ruby/hiera/hiera-1.3.1.ebuild b/dev-ruby/hiera/hiera-1.3.1.ebuild
deleted file mode 100644
index 08bd2f046c23..000000000000
--- a/dev-ruby/hiera/hiera-1.3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.3.1.ebuild,v 1.1 2014/01/26 07:26:25 prometheanfire Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="http://projects.puppetlabs.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/json"
-
-all_ruby_prepare() {
-	# Our json package is either the compiled version or the pure
-	# version. Fix gemspec accordingly.
-	sed -i -e 's/json_pure/json/' ../metadata || die
-}
diff --git a/dev-ruby/hiera/hiera-1.3.2.ebuild b/dev-ruby/hiera/hiera-1.3.2.ebuild
deleted file mode 100644
index 77094af6600a..000000000000
--- a/dev-ruby/hiera/hiera-1.3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.3.2.ebuild,v 1.1 2014/03/02 23:06:09 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="http://projects.puppetlabs.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/json"
-
-all_ruby_prepare() {
-	# Our json package is either the compiled version or the pure
-	# version. Fix gemspec accordingly.
-	sed -i -e 's/json_pure/json/' ../metadata || die
-}
diff --git a/dev-ruby/hiera/hiera-1.3.3.ebuild b/dev-ruby/hiera/hiera-1.3.4.ebuild
index feb4b6be5c23..2978b0bea871 100644
--- a/dev-ruby/hiera/hiera-1.3.3.ebuild
+++ b/dev-ruby/hiera/hiera-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.3.3.ebuild,v 1.1 2014/05/24 05:55:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.3.4.ebuild,v 1.1 2014/06/15 03:39:23 prometheanfire Exp $
 
 EAPI=5