Version bump. Depend on latest net-tools and patch location of ifconfig. Fixes bug 432452.

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

4 files changed, 152 insertions, 5 deletions

diff --git a/dev-ruby/facter/ChangeLog b/dev-ruby/facter/ChangeLog
index 7733feb58956..1798c84d6a9f 100644
--- a/dev-ruby/facter/ChangeLog
+++ b/dev-ruby/facter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/facter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.61 2012/12/02 18:58:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.62 2012/12/02 19:24:11 graaff Exp $
+
+*facter-1.6.16 (02 Dec 2012)
+
+  02 Dec 2012; Hans de Graaff <graaff@gentoo.org> +facter-1.6.16.ebuild,
+  +files/facter-1.6.16-ifconfig-path.patch:
+  Version bump. Depend on latest net-tools and patch location of ifconfig.
+  Fixes bug 432452.
 
   02 Dec 2012; Hans de Graaff <graaff@gentoo.org> facter-1.6.0.ebuild,
   facter-1.6.3.ebuild, facter-1.6.14.ebuild:
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index f5a696f96b63..5abe3d686244 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -6,18 +6,21 @@ AUX facter-1.5.7-fqdn.patch 2543 SHA256 45023c1d89d16bf2d7b34b8017d9307155938d17
 AUX facter-1.5.7-ruby19.patch 1990 SHA256 2bcb71fa3df001197da7f2da34fe507b72321fad680e517edf2450b885220409 SHA512 d316b0fd61047d9e63e185893b9ee2adec3e84355cda3985c223e35d14ef34bf99f4699c4b606c18ebde6c2222872e3092b0a2dfeca06703c7004d5213813b6f WHIRLPOOL 548847d84b174fd8625f09730a89cdcb455d2c07be61393720f247c2a9fb694bf780956cbf080385de14be23e06444e5fd29bdfc0ca10715e6c1b80d9f46402a
 AUX facter-1.5.7-virtual.patch 443 SHA256 1e299f05f5af715e4ffac68ed432f8c94f96126db53516485e315e40471be3e4 SHA512 2d440ea385a4172935434a6fc6c9e08e55bba57e33d318730f761c8ad72d3c89f65af6a4e5bc4810ac7eeaba2620f120d61c8184a7afd47fd82046b800699660 WHIRLPOOL 26d5202c4bd77f5ecc2f31fcdf668f470d48dbe2b8814cf7effabea9e48d1b9c93fbc673e0613af6a3c9637324d36679710cea6f72e16de5447d9d2afe757dfe
 AUX facter-1.5.8-freebsd-spec.patch 776 SHA256 a9050ea73df0a156050e7d4c8100c5838f3f3b52a900df1e1251b22ec5e03518 SHA512 9970033592d5c9cb3e102ce38227fb425f768efcf98bf4c7ea4b1672ac800f5caeb3a9cfb6ad26853eeae5f3919f5e958f6e86406291d4a88c33f1c5b62f3909 WHIRLPOOL 03626662758bff14b9aab5994b11a4680d369eeb24ccbfc06292c34b9e938b2ecb9348c0a4483d5429ea8695cebaab58e765b4bccc8241541cf9b7fc6cb92f99
+AUX facter-1.6.16-ifconfig-path.patch 5253 SHA256 f3b62a255d6c46b7c537a0b0a1c1673cdb485a951d453ae14238c12fdf482b3b SHA512 0aa4cdef4359f4e75ef5348342208327b587df782f7b9220b87c89a5d4f93bd5fb0d872c77928dd2e7b2e72f245b355af86f5a61d2690948b0d8a84f1d4287c4 WHIRLPOOL 0d1f1969aef374eb8a088d1f94a14945dde70381f863e834d2a13d83a3942cd2f1f94a63807ff4cf4958b4f21ec8b5db171cc80068877d1bcd67c8d28f639bee
 DIST facter-1.6.0.gem 90624 SHA256 f28b45c5b05ce203c8a75fa7e39e513335244c930ee51ddd154a932e1f34d6a6 SHA512 67c027149ddd6ef56903393495d8acd04c29279e57fa70a51abc36ab0627bf5bf8bd69984e232386d709b7bc84b0af3fe5da641fbcc637e5844b7da9cf35b303 WHIRLPOOL 4c0dd067f549583075ef6dcda66c980d1e1adae2ff8b1266294b7b26534d98e8072eba2705bc5bda92f432c67a33e01d6973da96e0e23c51bf018482b042751c
 DIST facter-1.6.14.gem 119808 SHA256 7c6a1648460047c767a1200bc401d51cafd982e4cc002c5d3e166e91027dfa03 SHA512 c0804d5a4bee576a2f954e6729dd6bafec472be714fa41b90c96224be3f22ccbaa7da602f6192928b0244bd59ff47f0ecc32f5c1aa0bfdd25ffb77250d409143 WHIRLPOOL 7fa7605ed7a9dfb2dbe2a3ad0e2f1862bc0ce82b0a6bd9ad903a8c4f6f93cbdb865a0b6af78a4d29e8e2b6d614ad24d4510e10107d7ddab617ea4c576e48e889
+DIST facter-1.6.16.gem 138752 SHA256 0c7f23e89aa7641dc36e8ca005fe10a709745701c944e579effa50009c877689 SHA512 f3f1c7b464817fd062f2c72c901db376b80aa38a71fb9fd9e32451547e4fca1ba314b868c6b6146367f9ae5ca2e39fa89f83adca64c05fd2d59e7789c8d72ad3 WHIRLPOOL 2a74a1fed144bc1e6df6f085f944de93a8c4b58495223d7b376efc58d546d6815350fccbf33a02da3f4867cd9babf856ef74c3115aa11affcb7b1829ea7f8c77
 DIST facter-1.6.3.gem 113664 SHA256 37380028778326ac750909b07a728d9fbe77d143acd05e56ad57cfcfdb3903d7 SHA512 b78d55d857be61bb5ec422a66d9dd8b62bb102a6ebf922f089e777e160ff46a6487b43f85eb9b69819e9285d7fbfca6f73fed38428954b493d4b8a1f826c30da WHIRLPOOL 95760b1a864cc1f392603f33d551857cc8f443eec3dababf9a342fc0d36f3b09a158188c3f85226be9dcfe294ba360c1de368c04ff6c90cdb60a84478fc760bc
 EBUILD facter-1.6.0.ebuild 839 SHA256 0052b7cb4bc81f25986184d9a40967ad957dd2844670791ca2237315a85697e8 SHA512 cf451f596cba4a539cd8b0b57cfa3d668cc0a17454e55d40098f62c7033c91ae26f128ca2c14be9c46fc5d0dc1e3060c5d4627a198ae3103b2f28d65bd7a48b7 WHIRLPOOL c69cf9c354ce6ed39ce4c739d8bb3da4bea3f3710c927bf456a1e325e212ee423a7d2e1a3224fbb75d58972425171882822b4bf24c6f78cce388573879681a13
 EBUILD facter-1.6.14.ebuild 865 SHA256 c77b583b30b82fad469e9dda4d5ce35e46ac9f00f9b6f8dc144869d5fb427834 SHA512 62873eb42ba99662339e24a0c67250904e1070c95b27151849354b39682bf54851c4a3a16e933d996ccf29e805909e702f4c59cf9efaa1b89c16471de8e069e1 WHIRLPOOL e94fbe5ab3634bca956d3cb694fbd4fc9d4c3fa40db3e864f853e223fc299ec86486935ec69aafce86266ae1f04ff2deb6fb1c05b7f27bcf5b494baf786451e0
+EBUILD facter-1.6.16.ebuild 919 SHA256 5694e2f5a5941d5e46cb3794259c38a2f10832acae8598f909864955ba29895f SHA512 61322d349e0059f44b7423a0371194409cb2df63ce52d01762b973435c05c7fbe8244be879240eb38fe2c9be6b16007c1118cef2d2e6f87974aba9a8594035cb WHIRLPOOL 16b0a42540a81459c41e44584b1493a1cd5a251733c68fb02136db0998b97a79fb48d1d08e88e91f4bbef3b64e341c282715f16b671592d2a3f6e515d3983689
 EBUILD facter-1.6.3.ebuild 851 SHA256 f4ab6c9610473159c52daf9e402013fabbfa39a0896e3426dd53b14248a5a25c SHA512 83bac75ef499d0bb4ed167177d1d5bf8a887a6a86e5ac286406802679468b60538c43b992878bbd489f682578a987c59be641b25391836ed4407cfa81c8d042e WHIRLPOOL f119d496329d90bb2fb3d411906cccd7ba98d42fa6ca423c6ea0be0a57b8897dab23832ee36d670e84e9d89ce9a7f2e39f0a5352fd3d71a4aa229c13a31b2e2f
-MISC ChangeLog 8336 SHA256 dc04ce7718143ea76a1e229662be9881ef97e472b70ce835732f9de03430a57f SHA512 c4cb4d637ba18973d81ef0e9b3fb6171717425a1dfde2c6956626115d7a40371ba85ef1c12d642228264fb50cd2e27c0dc9039f8eb6e60802fb89b0fea29f12d WHIRLPOOL 60ddc7c6b689792d7b066e6e11acd08ac119d111e48c57f91ad922b62ebdf5f7870a8c17dc6c4f53325e34fba4e9980ebe2e21ebf370e2aeb506a3b10b7a9df0
+MISC ChangeLog 8579 SHA256 bceed4af4f390eb58f8efaf738c12b3b12b359f4b7d0cce7b4fc2ec3ba7d96a6 SHA512 5bf6b50c4cbc2e5eeb5d15533f6b4c87a84f3e38301d76d896ebd811d468c6f137852ca18ef626d0471e20f0589eaa9c5edbc151883b33340aa1318bda1480dc WHIRLPOOL d36cbae3bebd0a682e4367abcba48cd49525cad9f92a6f9d6508c71e5e1986f3bdb2f76d6c3cc1a4245f8bd0ddbf83224cab460871a1c8e9345fc779fb9d1541
 MISC metadata.xml 241 SHA256 75e52543259bf1db821e54ae9bf850c7a388b44bce3329173d1f11a823dd7122 SHA512 043804d3040c1a0a9d8c3f9ac33a3b4b6fd4b73e79804a38ea0bdd03e661467243917c336c5b94ed00868cc5e0e5ae3dcb35eac2a6de0b7302528aff9302ecdd WHIRLPOOL 7dd29937ac2991b19096ec182b3ffc2f13b8777a3aeac99ddfeb36ff5fbda090509f07a517ec5aa32e3c06cc31ab6f049a1146c8fc19bf617b810dae2623aa65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlC7pNcACgkQiIP6VqMIqNeAPQD/TMpzdAlq1W+0tfzphCnBawLm
-PWzge5uL1p7SluHuv4ABAIgP020HL/uIpTyj6xZFYGFOjtqvMBDqqels4DzPjXwe
-=xgRn
+iF4EAREIAAYFAlC7qtwACgkQiIP6VqMIqNeGagD+LZXj8sZQIrHmH6DmhLjqFtnX
+UyG1YkGcNQc+yvIhzC4A/jFhAnlT/oHF7Ck+fhEGairiIpoO02BIzJ42gDOpUzCq
+=WEEh
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/facter/facter-1.6.16.ebuild b/dev-ruby/facter/facter-1.6.16.ebuild
new file mode 100644
index 000000000000..76f239a491f7
--- /dev/null
+++ b/dev-ruby/facter/facter-1.6.16.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 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.1 2012/12/02 19:24:11 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=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="
+	>=sys-apps/net-tools-1.60_p20120127084908[old-output]
+	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/files/facter-1.6.16-ifconfig-path.patch b/dev-ruby/facter/files/facter-1.6.16-ifconfig-path.patch
new file mode 100644
index 000000000000..347eefca8a26
--- /dev/null
+++ b/dev-ruby/facter/files/facter-1.6.16-ifconfig-path.patch
@@ -0,0 +1,103 @@
+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/ipaddress.rb all/facter-1.6.16/lib/facter/ipaddress.rb
+--- ruby19/facter-1.6.16/lib/facter/ipaddress.rb	2012-12-02 20:01:43.841753654 +0100
++++ all/facter-1.6.16/lib/facter/ipaddress.rb	2012-12-02 20:07:28.368353632 +0100
+@@ -26,7 +26,7 @@
+   confine :kernel => :linux
+   setcode do
+     ip = nil
+-    output = %x{/sbin/ifconfig 2>/dev/null}
++    output = %x{/bin/ifconfig 2>/dev/null}
+ 
+     output.split(/^\S/).each { |str|
+       if str =~ /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+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}
+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