Version bump. Depend on specific mocha version that does not blow up. Drop requirement on old-output for net-tools. Fixes bug 456140.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 164 insertions, 5 deletions

diff --git a/dev-ruby/facter/ChangeLog b/dev-ruby/facter/ChangeLog
index 0f696ba435e2..fee7bbc4be25 100644
--- a/dev-ruby/facter/ChangeLog
+++ b/dev-ruby/facter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/facter
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.71 2013/02/08 14:31:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.72 2013/03/04 21:13:13 graaff Exp $
+
+*facter-1.6.17 (04 Mar 2013)
+
+  04 Mar 2013; Hans de Graaff <graaff@gentoo.org> +facter-1.6.17.ebuild,
+  +files/facter-1.6.17-ifconfig-path.patch:
+  Version bump. Depend on specific mocha version that does not blow up. Drop
+  requirement on old-output for net-tools. Fixes bug 456140.
 
   08 Feb 2013; Jeroen Roovers <jer@gentoo.org> facter-1.6.16.ebuild:
   Stable for HPPA (bug #446954).
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 1f0a14964be3..4437989bef2b 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -2,16 +2,19 @@
 Hash: SHA256
 
 AUX facter-1.6.16-ifconfig-path.patch 5253 SHA256 f3b62a255d6c46b7c537a0b0a1c1673cdb485a951d453ae14238c12fdf482b3b SHA512 0aa4cdef4359f4e75ef5348342208327b587df782f7b9220b87c89a5d4f93bd5fb0d872c77928dd2e7b2e72f245b355af86f5a61d2690948b0d8a84f1d4287c4 WHIRLPOOL 0d1f1969aef374eb8a088d1f94a14945dde70381f863e834d2a13d83a3942cd2f1f94a63807ff4cf4958b4f21ec8b5db171cc80068877d1bcd67c8d28f639bee
+AUX facter-1.6.17-ifconfig-path.patch 5218 SHA256 d6ee06a72fe66d972a4d77927d62f257593eea7262ae8d08d871ebbf87c89f03 SHA512 cb35937623dcdfbce88f1a16297a4c6d5405af2456f271aa175ea20e009aeef8ffc03a374e8e8766be5c6324bc32233e7a16ff59a48845b50abd5039423d3c04 WHIRLPOOL 7b129d18cf36ea3c2c0a44e081de3590401787fc5b0ffd554cd90dd0a44eadbf4f3fff686c935f375ff21e2877953be04e2e1fcabe68b7479e7c8645fdbcadcf
 DIST facter-1.6.0.gem 90624 SHA256 f28b45c5b05ce203c8a75fa7e39e513335244c930ee51ddd154a932e1f34d6a6 SHA512 67c027149ddd6ef56903393495d8acd04c29279e57fa70a51abc36ab0627bf5bf8bd69984e232386d709b7bc84b0af3fe5da641fbcc637e5844b7da9cf35b303 WHIRLPOOL 4c0dd067f549583075ef6dcda66c980d1e1adae2ff8b1266294b7b26534d98e8072eba2705bc5bda92f432c67a33e01d6973da96e0e23c51bf018482b042751c
 DIST facter-1.6.16.gem 138752 SHA256 0c7f23e89aa7641dc36e8ca005fe10a709745701c944e579effa50009c877689 SHA512 f3f1c7b464817fd062f2c72c901db376b80aa38a71fb9fd9e32451547e4fca1ba314b868c6b6146367f9ae5ca2e39fa89f83adca64c05fd2d59e7789c8d72ad3 WHIRLPOOL 2a74a1fed144bc1e6df6f085f944de93a8c4b58495223d7b376efc58d546d6815350fccbf33a02da3f4867cd9babf856ef74c3115aa11affcb7b1829ea7f8c77
+DIST facter-1.6.17.gem 144896 SHA256 22a41d2e4470ff261bf64027c5045e669d3970bd7d469f30e3a236b52cc330a8 SHA512 1c8c5c4a872e069af61019c8d69bc309292eaebcd33cf69a30fa09620b312764d24c31ad651b0d5529e7c47acf78bd26eb378fab9cec5ec7c9c6bc76c8077f63 WHIRLPOOL 51eed37258a15b3328bdd6a909865c649e58b3325c088b9dfb7b540f86ffac90e38b1b28bfdf705031d0439edd0e03398cfd8f87d58032c0600e71f6fa54ec8a
 EBUILD facter-1.6.0.ebuild 742 SHA256 7b893a28c11e0b1452b29a41af1139957d2f6ed4a17e54fb4257f130b1d72157 SHA512 62e52bbaa354f92d336760441df6656bcf67aaf2d2e11d2de2572baacb8fad37de282b292732c089f9ed87073ba54d34333cd194076d9eaf2d7ac413c4b12a85 WHIRLPOOL ff7eed58fa4935b212d01798a9906ec90460bd5b61cd64c69c70a3cac55361f81acbcdb53fd8fe1ef7f9ac6c438e821239570171c60784adb9b767a2389fe6b1
 EBUILD facter-1.6.16.ebuild 930 SHA256 f0d90f6acd940807ec034acdfc821be234f5b27d48bf4ba5fe57fdb14b2de4dd SHA512 72cd1cf9eb27638b04c657369805e051b856b27fb01610738be461ed930a82413477e392d5b59d548b5efc317c6f23327e3f97c0910e8e7edd076bb1148a4aab WHIRLPOOL f8f8c01f12336b93f16790de060e18481d507b56a1f837f4c16af52408b0ebe8ec404ba21cb896e2e3dd127fa1bf5c6734d33d1f94f917e8049ea25212ad39a5
-MISC ChangeLog 9836 SHA256 f9ff14d2f6d1847c0a1ae693ae7ed759fd68785e105e59122f5511457600c5c5 SHA512 5cb961a5b2cea880756797e96cd735ce9c1ea362d475ffaf4646ab61cef4c937e74d875a096903c510cbb728c958ee394f787e04115dde8fd2441fc91fb98eb1 WHIRLPOOL 9a4c23899328a4216db2d0cdfdefce4b05b0a3cc69043f0eaa99d7903534081fe023fc30f8b40280beb8c03a250403974b7141604fd3b9000aa7d8dce4b1abb3
+EBUILD facter-1.6.17.ebuild 1104 SHA256 90af42936fa9923484e64526e4e75f63f2c0a9901f4eb59f1d9316d42b8d323c SHA512 4004a098f94bb1b00b885c4ede739969b31fd44ba74af30d71e377aa36d7f0e8be286975cc18955c0a5f4af7de3953c8c5a31c5f9382b13998eef2e9b4e7eece WHIRLPOOL 9ae97d4e5acc615ea5bced8e1e17d38a2509e795744c9ff6bd871b325871fdf37d2b10f5078091df2a6de1dfaf5bcd96f65154c1fd7d032022db070dbbfe2b35
+MISC ChangeLog 10125 SHA256 6c6ff815defae04e1f5def248400f76aa406abf628e4f1ccff8f5e655da36ae3 SHA512 420adc70519f364b5fec5b73c97479b67e088f226ccd9a6853cc890e97baa201f2a27f7de65b3f17e70d88a5588e7fb482eb8c49fd8466c2ea3bdeae0a0be04c WHIRLPOOL c3f5dcede7191ce60113a81e31742b603a8f9affd534a6f0d8f812b2bb42eb06a567c9f233ce29fb6a6954864a991b915a7ba7b41974d5c5f762ef4d531f9b34
 MISC metadata.xml 338 SHA256 58c20c7f2ff634f521be31c6d423cd6e5ff31a01e2304652fa32364d988bbc8a SHA512 598a57fbbb544e4446c4fd0febb7fee93414ca69177607c6b1c55cb80dc73232613feec1e0c3127e6d8e288e7f11cd9e7bbb916626bc4f5b055c095db755749a WHIRLPOOL 1c7ff0c2e9f5956576c04a7b723970bd79d9d9ba5cec918f46cabb06fb6a83868435dd46f4d65f2d705671dfde475954058a9c1922821840edc95fdd1dfda415
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEVDEQACgkQVWmRsqeSphMMHACeKZ7buxAtBlvBc878bttQC2yx
-FFkAn0nfBEmdDItWu/IDwtDzgDehJRCQ
-=wdlT
+iF4EAREIAAYFAlE1DnIACgkQiIP6VqMIqNfZhwD/U5N7JLCBRN3in2uE0ywpIOGH
+swO1vULxOo6JY+blPhIA+gP85Muv+BiWnO2yACqQgsAqwvOA0Uyzxqxy9xOjf+RF
+=PzGv
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/facter/facter-1.6.17.ebuild b/dev-ruby/facter/facter-1.6.17.ebuild
new file mode 100644
index 000000000000..2f00233deb88
--- /dev/null
+++ b/dev-ruby/facter/facter-1.6.17.ebuild
@@ -0,0 +1,40 @@
+# 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.6.17.ebuild,v 1.1 2013/03/04 21:13:13 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 ree18 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_PATCHES=( ${P}-ifconfig-path.patch )
+
+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/files/facter-1.6.17-ifconfig-path.patch b/dev-ruby/facter/files/facter-1.6.17-ifconfig-path.patch
new file mode 100644
index 000000000000..9ba4db751254
--- /dev/null
+++ b/dev-ruby/facter/files/facter-1.6.17-ifconfig-path.patch
@@ -0,0 +1,109 @@
+diff -ru ruby19/facter-1.6.16/lib/facter/ipaddress6.rb all/facter-1.6.16/lib/facter/ipaddress6.rb
+--- ruby19/facter-1.6.16/lib/facter/ipaddress6.rb	2012-12-02 20:01:43.841753654 +0100
++++ all/facter-1.6.16/lib/facter/ipaddress6.rb	2012-12-02 20:07:19.076607117 +0100
+@@ -38,7 +38,7 @@
+ Facter.add(:ipaddress6) do
+   confine :kernel => :linux
+   setcode do
+-    output = Facter::Util::Resolution.exec('/sbin/ifconfig 2>/dev/null')
++    output = Facter::Util::Resolution.exec('/bin/ifconfig 2>/dev/null')
+ 
+     get_address_after_token(output, 'inet6 addr:')
+   end
+diff -ru ruby19/facter-1.6.16/lib/facter/macaddress.rb all/facter-1.6.16/lib/facter/macaddress.rb
+--- ruby19/facter-1.6.16/lib/facter/macaddress.rb	2012-12-02 20:01:43.845753542 +0100
++++ all/facter-1.6.16/lib/facter/macaddress.rb	2012-12-02 20:06:44.049562697 +0100
+@@ -26,7 +26,7 @@
+   confine :kernel => 'Linux'
+   setcode do
+     ether = []
+-    output = Facter::Util::Resolution.exec("/sbin/ifconfig -a 2>/dev/null")
++    output = Facter::Util::Resolution.exec("/bin/ifconfig -a 2>/dev/null")
+     output.each_line do |s|
+       ether.push($1) if s =~ /(?:ether|HWaddr) ((\w{1,2}:){5,}\w{1,2})/
+     end
+diff -ru ruby19/facter-1.6.16/lib/facter/util/ip.rb all/facter-1.6.16/lib/facter/util/ip.rb
+--- ruby19/facter-1.6.16/lib/facter/util/ip.rb	2012-12-02 20:01:43.845753542 +0100
++++ all/facter-1.6.16/lib/facter/util/ip.rb	2012-12-02 20:05:58.594802786 +0100
+@@ -76,7 +76,9 @@
+ 
+   def self.get_all_interface_output
+     case Facter.value(:kernel)
+-    when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD', 'DragonFly'
++    when 'Linux'
++      output = %x{/bin/ifconfig -a 2>/dev/null}
++    when 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD', 'DragonFly'
+       output = %x{/sbin/ifconfig -a 2>/dev/null}
+     when 'SunOS'
+       output = %x{/usr/sbin/ifconfig -a}
+@@ -103,7 +103,7 @@
+   #
+   # @return [String] the output of `/sbin/ifconfig 2>/dev/null` or nil
+   def self.get_ifconfig
+-    Facter::Util::Resolution.exec("/sbin/ifconfig 2>/dev/null")
++    Facter::Util::Resolution.exec("/bin/ifconfig 2>/dev/null")
+   end
+ 
+   ##
+@@ -127,7 +127,7 @@
+   end
+ 
+   def self.ifconfig_interface(interface)
+-    %x{/sbin/ifconfig #{interface} 2>/dev/null}
++    %x{/bin/ifconfig #{interface} 2>/dev/null}
+   end
+ 
+   def self.get_single_interface_output(interface)
+diff -ru ruby19/facter-1.6.16/lib/facter/util/netmask.rb all/facter-1.6.16/lib/facter/util/netmask.rb
+--- ruby19/facter-1.6.16/lib/facter/util/netmask.rb	2012-12-02 20:01:43.845753542 +0100
++++ all/facter-1.6.16/lib/facter/util/netmask.rb	2012-12-02 20:04:39.664956233 +0100
+@@ -7,7 +7,7 @@
+     case Facter.value(:kernel)
+     when 'Linux'
+       ops = {
+-        :ifconfig => '/sbin/ifconfig 2>/dev/null',
++        :ifconfig => '/bin/ifconfig 2>/dev/null',
+         :regex => %r{\s+ inet\saddr: #{Facter.ipaddress} .*? Mask: (#{ipregex})}x,
+         :munge => nil,
+       }
+diff -ru ruby19/facter-1.6.16/spec/unit/ipaddress6_spec.rb all/facter-1.6.16/spec/unit/ipaddress6_spec.rb
+--- ruby19/facter-1.6.16/spec/unit/ipaddress6_spec.rb	2012-12-02 20:01:43.857753215 +0100
++++ all/facter-1.6.16/spec/unit/ipaddress6_spec.rb	2012-12-02 20:10:38.379170335 +0100
+@@ -25,7 +25,7 @@
+ 
+   it "should return ipaddress6 information for Linux" do
+     Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('Linux')
+-    Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig 2>/dev/null').
++    Facter::Util::Resolution.stubs(:exec).with('/bin/ifconfig 2>/dev/null').
+       returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
+ 
+     Facter.value(:ipaddress6).should == "2610:10:20:209:212:3fff:febe:2201"
+diff -ru ruby19/facter-1.6.16/spec/unit/macaddress_spec.rb all/facter-1.6.16/spec/unit/macaddress_spec.rb
+--- ruby19/facter-1.6.16/spec/unit/macaddress_spec.rb	2012-12-02 20:01:43.857753215 +0100
++++ all/facter-1.6.16/spec/unit/macaddress_spec.rb	2012-12-02 20:10:01.604173469 +0100
+@@ -22,14 +22,14 @@
+     end
+ 
+     it "should return the macaddress of the first interface" do
+-      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a 2>/dev/null').
++      Facter::Util::Resolution.stubs(:exec).with('/bin/ifconfig -a 2>/dev/null').
+         returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
+ 
+       Facter.value(:macaddress).should == "00:12:3f:be:22:01"
+     end
+ 
+     it "should return nil when no macaddress can be found" do
+-      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a 2>/dev/null').
++      Facter::Util::Resolution.stubs(:exec).with('/bin/ifconfig -a 2>/dev/null').
+         returns(ifconfig_fixture('linux_ifconfig_no_mac'))
+ 
+       proc { Facter.value(:macaddress) }.should_not raise_error
+@@ -38,7 +38,7 @@
+ 
+     # some interfaces dont have a real mac addresses (like venet inside a container)
+     it "should return nil when no interface has a real macaddress" do
+-      Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a 2>/dev/null').
++      Facter::Util::Resolution.stubs(:exec).with('/bin/ifconfig -a 2>/dev/null').
+         returns(ifconfig_fixture('linux_ifconfig_venet'))
+ 
+       proc { Facter.value(:macaddress) }.should_not raise_error