fixes bug 513286 CVE-2014-3248

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

8 files changed, 15 insertions, 234 deletions

diff --git a/dev-ruby/facter/ChangeLog b/dev-ruby/facter/ChangeLog
index 8ec7dbdb636b..3a835f7fdbf6 100644
--- a/dev-ruby/facter/ChangeLog
+++ b/dev-ruby/facter/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/facter
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.94 2014/05/26 05:20:27 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.95 2014/06/15 03:29:57 prometheanfire Exp $
+
+*facter-2.0.2 (15 Jun 2014)
+
+  15 Jun 2014; Matthew Thode <prometheanfire@gentoo.org> +facter-2.0.2.ebuild,
+  -facter-1.6.16.ebuild, -facter-1.6.18.ebuild, -facter-1.7.3.ebuild,
+  -facter-1.7.4.ebuild, -facter-1.7.5-r1.ebuild, -facter-1.7.5.ebuild,
+  metadata.xml:
+  fixes bug 513286 CVE-2014-3248
 
   26 May 2014; Manuel Rüger <mrueg@gentoo.org> facter-1.6.16.ebuild,
   facter-1.6.18.ebuild, facter-1.7.1-r1.ebuild, facter-1.7.3.ebuild:
diff --git a/dev-ruby/facter/facter-1.6.16.ebuild b/dev-ruby/facter/facter-1.6.16.ebuild
deleted file mode 100644
index 236f67348ddf..000000000000
--- a/dev-ruby/facter/facter-1.6.16.ebuild
+++ /dev/null
@@ -1,34 +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/facter/facter-1.6.16.ebuild,v 1.9 2014/05/26 05:20:27 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 jruby"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="facter"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+dmi"
-KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86"
-
-CDEPEND="
-	>=sys-apps/net-tools-1.60_p20120127084908[old-output]
-	dmi? ( sys-apps/dmidecode )
-	sys-apps/lsb-release
-	sys-apps/pciutils"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-RUBY_PATCHES=( ${P}-ifconfig-path.patch )
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
diff --git a/dev-ruby/facter/facter-1.6.18.ebuild b/dev-ruby/facter/facter-1.6.18.ebuild
deleted file mode 100644
index 61211849531a..000000000000
--- a/dev-ruby/facter/facter-1.6.18.ebuild
+++ /dev/null
@@ -1,38 +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/facter/facter-1.6.18.ebuild,v 1.3 2014/05/26 05:20:27 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 jruby"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="facter"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+dmi"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="
-	>=sys-apps/net-tools-1.60_p20120127084908
-	dmi? ( sys-apps/dmidecode )
-	sys-apps/lsb-release
-	sys-apps/pciutils"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-ruby_add_bdepend "test? ( =dev-ruby/mocha-0.10.5 )"
-
-ruby_all_prepare() {
-	# Provide explicit path since /sbin is not in the default PATH on
-	# Gentoo.
-	sed -i -e 's:arp -an:/sbin/arp -an:' lib/facter/util/ec2.rb || die
-}
diff --git a/dev-ruby/facter/facter-1.7.3.ebuild b/dev-ruby/facter/facter-1.7.3.ebuild
deleted file mode 100644
index f3c1a90f22ad..000000000000
--- a/dev-ruby/facter/facter-1.7.3.ebuild
+++ /dev/null
@@ -1,50 +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/facter/facter-1.7.3.ebuild,v 1.2 2014/05/26 05:20:27 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 jruby"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="facter"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+dmi +pciutils"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="
-	sys-apps/net-tools
-	sys-apps/lsb-release
-	dmi? ( sys-apps/dmidecode )
-	pciutils? ( sys-apps/pciutils )"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-#RUBY_PATCHES=( ${P}-fix-proc-self-status.patch )
-
-ruby_add_bdepend "test? ( >=dev-ruby/mocha-0.10.5:0.10 <dev-ruby/rspec-2.14:2 )"
-
-all_ruby_prepare() {
-	# Provide explicit path since /sbin is not in the default PATH on
-	# Gentoo.
-	sed -i -e 's:arp -an:/sbin/arp -an:' lib/facter/util/ec2.rb spec/unit/util/ec2_spec.rb || die
-
-	# Ensure the correct version of mocha is used without using bundler.
-	sed -i -e '9igem "mocha", "~>0.10.5"' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# Create the directory for custom facts.
-	keepdir /etc/facter/facts.d
-}
diff --git a/dev-ruby/facter/facter-1.7.4.ebuild b/dev-ruby/facter/facter-1.7.4.ebuild
deleted file mode 100644
index 9da72b0f3f60..000000000000
--- a/dev-ruby/facter/facter-1.7.4.ebuild
+++ /dev/null
@@ -1,50 +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/facter/facter-1.7.4.ebuild,v 1.1 2013/12/19 21:21:40 prometheanfire Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 jruby"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="facter"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+dmi +pciutils"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="
-	sys-apps/net-tools
-	sys-apps/lsb-release
-	dmi? ( sys-apps/dmidecode )
-	pciutils? ( sys-apps/pciutils )"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-#RUBY_PATCHES=( ${P}-fix-proc-self-status.patch )
-
-ruby_add_bdepend "test? ( >=dev-ruby/mocha-0.10.5:0.10 <dev-ruby/rspec-2.14:2 )"
-
-all_ruby_prepare() {
-	# Provide explicit path since /sbin is not in the default PATH on
-	# Gentoo.
-	sed -i -e 's:arp -an:/sbin/arp -an:' lib/facter/util/ec2.rb spec/unit/util/ec2_spec.rb || die
-
-	# Ensure the correct version of mocha is used without using bundler.
-	sed -i -e '9igem "mocha", "~>0.10.5"' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# Create the directory for custom facts.
-	keepdir /etc/facter/facts.d
-}
diff --git a/dev-ruby/facter/facter-1.7.5.ebuild b/dev-ruby/facter/facter-1.7.5.ebuild
deleted file mode 100644
index feb569594c32..000000000000
--- a/dev-ruby/facter/facter-1.7.5.ebuild
+++ /dev/null
@@ -1,58 +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/facter/facter-1.7.5.ebuild,v 1.1 2014/02/14 07:10:58 prometheanfire Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 jruby"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="facter"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+dmi +pciutils"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="
-	sys-apps/net-tools
-	sys-apps/lsb-release
-	dmi? ( sys-apps/dmidecode )
-	pciutils? ( sys-apps/pciutils )"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-#RUBY_PATCHES=( ${P}-fix-proc-self-status.patch )
-
-ruby_add_bdepend "test? ( >=dev-ruby/mocha-0.10.5:0.10 <dev-ruby/rspec-2.14:2 )"
-
-all_ruby_prepare() {
-	# Provide explicit path since /sbin is not in the default PATH on
-	# Gentoo.
-	sed -i -e 's:arp -an:/sbin/arp -an:' lib/facter/util/ec2.rb spec/unit/util/ec2_spec.rb || die
-
-	#removing because tests try to access outside stuffs
-	#1) Facter::Util::Loader should load facts on the facter search path only once
-	#     Failure/Error: Facter::Util::Loader.new.load_all
-	#     Errno::EACCES:
-	#       Permission denied - /sys/block/
-
-	rm spec/unit/util/loader_spec.rb || die
-
-	# Ensure the correct version of mocha is used without using bundler.
-	sed -i -e '9igem "mocha", "~>0.10.5"' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# Create the directory for custom facts.
-	keepdir /etc/facter/facts.d
-}
diff --git a/dev-ruby/facter/facter-1.7.5-r1.ebuild b/dev-ruby/facter/facter-2.0.2.ebuild
index 09621572518b..e0e87ea6e907 100644
--- a/dev-ruby/facter/facter-1.7.5-r1.ebuild
+++ b/dev-ruby/facter/facter-2.0.2.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/facter/facter-1.7.5-r1.ebuild,v 1.4 2014/03/02 23:47:50 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.0.2.ebuild,v 1.1 2014/06/15 03:29:57 prometheanfire Exp $
 
 EAPI=5
 
@@ -17,10 +17,12 @@ HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="+dmi +pciutils"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+dmi +pciutils +virt"
+#KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 
 CDEPEND="
+	app-emulation/virt-what
 	sys-apps/net-tools
 	sys-apps/lsb-release
 	dmi? ( sys-apps/dmidecode )
diff --git a/dev-ruby/facter/metadata.xml b/dev-ruby/facter/metadata.xml
index 4d7c3df7b1b8..dd12a79f6c15 100644
--- a/dev-ruby/facter/metadata.xml
+++ b/dev-ruby/facter/metadata.xml
@@ -8,6 +8,7 @@
 	<herd>ruby</herd>
 	<use>
 		<flag name='dmi'>Use <pkg>sys-apps/dmidecode</pkg> to determine hardware system properties</flag>
+		<flag name='virt'>Use <pkg>app-emulation/virt-what</pkg> for virtual machine detection</flag>
 		<flag name='pciutils'>Use <pkg>sys-apps/pciutils</pkg> to determine hardware system properties</flag>
 	</use>
 </pkgmetadata>