fixes for CVE-2014-3248 and bug 513290

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

6 files changed, 9 insertions, 130 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/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