Use already stable mocha 0.13 to facilitate stabling this for security bug 540260.

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

diff --git a/dev-ruby/facter/ChangeLog b/dev-ruby/facter/ChangeLog
index abfaf5148a8f347fe01a5c85cf8ec0b875955b84..1d2ed1247d7086c78723c79aab449ebff202ed59 100644 (file)
--- a/dev-ruby/facter/ChangeLog
+++ b/dev-ruby/facter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/facter
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.120 2015/02/17 06:45:10 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.121 2015/02/17 06:57:07 graaff Exp $
+
+  17 Feb 2015; Hans de Graaff <graaff@gentoo.org> facter-2.4.1.ebuild:
+  Use already stable mocha 0.13 to facilitate stabling this for security bug
+  540260.
 
 *facter-2.4.1-r1 (17 Feb 2015)
 

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index ce7d298db799516a429f0f79962abb483ffb0791..28e6047acfd7644f4d9d96bd08b9f073632a905e 100644 (file)
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -12,13 +12,13 @@ EBUILD facter-2.2.0.ebuild 1839 SHA256 8e1884f36f42bacbb1f9749047c9a2b6ded6246ce
 EBUILD facter-2.3.0.ebuild 2134 SHA256 cd269fcf367f198750d52e5235fdac2c5fd28a89f3c905fcd4a6dae86654a6e9 SHA512 791e1cce618e618f2c8ba3e044fb86d1c2034f862b5b3a4f0fb1be74496f411fcf3397623d88e0d8f485df75b210274c3f379a526ffa25a8e837d4f9f0369f21 WHIRLPOOL 76f71d089f40aa578dc6482635530de6a94383dc6c260e3de294b37f78541ae6c67724a7fcaa57cdf3d5bd0b69c435ba49690d1a0c1fee416dc1880a2d9844b0
 EBUILD facter-2.4.0.ebuild 2021 SHA256 abf9b39dfa516792f1e74ad6911768c01b4e7c60bc31e7ae07d5cf7cd2190f4d SHA512 a2e4e563942d0aebe7531340529a991a22b6dc4f9805ec8490fc160a47fa1a40bdc2d2466d403cf261be956a50fd9f418580606234e8abf10467afdba17d390f WHIRLPOOL 0c957ff71431ecaf3e21ccc7dec0a2f4006d0695d80a0bc3806b83bd0bad8821dcc4faa62f512b8b629b13805ad5b7e5be3c4ef70d3450db347e5c222fa5920d
 EBUILD facter-2.4.1-r1.ebuild 2024 SHA256 f37ed369296f224df670c458da18e30cbca4e52a5c7e0bcf5c92514b24c8d24a SHA512 26f8dbf4f0d68ac5efc16810e00fe9d966eb9aab2d41a3ac931352c765b2202d412b4a2679004ca5a7b102afafad9e4e6557908ae6a2519a4cafdf6236350c75 WHIRLPOOL 1dec4b7ff6a06a4cf5a508b621cf6b88b54b3262dc421e012d96e8be5abe3a011a0702745fdbfb4cac5ef00aa940b79b14777433cdce6e7fbbc8c469b1e329c3
-EBUILD facter-2.4.1.ebuild 2014 SHA256 98965697e57ca0b1c703421a5d23c3806d3af15421085ab9812eed5d8877aa07 SHA512 c4b002581d036d1346c34aed3cbf72ab0ca419023c1da28ccce686fc159be3fe6f2a6dcbddf749a59e6efc4cb45d8967ddb85021bd39784dd142804b15995ea2 WHIRLPOOL 3bd78bb3ae4a0f01b2dc8a7fb096e18dbce4566799b6062316b5e4f9ac1fbf5aa529feef486130e151a2d13467c541344cb2460b5b1c7bc598129f534789183b
-MISC ChangeLog 16732 SHA256 a51b4c26211e134a0fa33ace350fa298a113af1784f9e3b5ea375d5b696cb95b SHA512 eb2204bf6f54caaa70367d1828fda603f775bb5793cc0609e9569693d3c19a3fde14697a571cd9d6d9e96a12f61987e89f5cc9a2b51f3689935e7c3dd91a343c WHIRLPOOL 841c7783b0c7c6ad5c67d59fb5c40ad614c5820dbdc92d9341ad28b280453c5f01444751323562ea8b4bd7095086ba6d0ed3d786d0c71af60ef0b09fd5a48733
+EBUILD facter-2.4.1.ebuild 2016 SHA256 42140fc264566c255681beb29892bc0f96a73a382b7a7949c2366c03605ddd74 SHA512 9e7812cd692edc3f9c2ba8f86cfd430e68446f0d2962d8fbbd6cf628eb400b0c42f3eea0a305ca5fc187d5241578e68c325134cce2066e72200ee9681483f628 WHIRLPOOL e685e42a5046d480c6472d70e62bb3cbc87d5618dc54b2e7c7c98cafd7b39b1b640f2b6b57b577efafeb5534d3060f70dceb7a3917aab767582dcd3d99f8944b
+MISC ChangeLog 16891 SHA256 0f23c7a5dfab8f7f44cf4a6369ab6458848f52552dcc7f2e24f66164d306cd3e SHA512 99e0bff8681e895c2891d4f118bfaeaf332b37a0e053334138bcd34d0461df1012a89d3e166b746b21ead27a94c7e9958236c81e55d944a650394664bf3863a1 WHIRLPOOL 217398b97e3998d3d35099cf71a0f11ebc45d53cd7abe27c89119cf4fc81e537ba309afca90cc13626ae2b100bbf98f8b7d44e18805da0fd8122a125b2fbc6df
 MISC metadata.xml 568 SHA256 42e1960b3fa66b2bdbc939c389c59eca3c00736b3f88e8aefa4ffb85fdab8685 SHA512 92bc2c3743019e44faea40dd4dba228cabd7945c98bd07e8c5465347928a37e9e12fff8d84db5480fecdc8d8e29f84a5765b0baebaab6b00d4a4246a6968dca5 WHIRLPOOL e00bdad66ad8a155d9f071c551ac093641fb7f51646d2e20ca0baf357ffd2e4cd86f1774764d143432f92f4a7296a7ddddd96e3205b4b5cfdb4babb58ab5109f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTi438ACgkQiIP6VqMIqNeyVwEAjhyqKKpMltu/+jNCAoCk3XI+
-PT4931yd/licR3uZh/kA+wSsah/uOaydQ8gCxTloT4jRtRC0jjCxd9X0tQSL92Wg
-=+kOo
+iF4EAREIAAYFAlTi5kQACgkQiIP6VqMIqNdnIgD7BG2g2XajhENoQYGGWek1veL3
+vI0+ORk53EHFwarAuuUA+wYqN6mvT4HzHi+lO0rzqwkSwks/9g1sGqoWK38GicHW
+=2V+7
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/facter/facter-2.4.1.ebuild b/dev-ruby/facter/facter-2.4.1.ebuild
index f93ced58215d361542dc1e3e2cea632bae0dc1ac..f4cedaa02a4dc01aa92943c144e61e5df8f37a3d 100644 (file)
--- a/dev-ruby/facter/facter-2.4.1.ebuild
+++ b/dev-ruby/facter/facter-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.4.1.ebuild,v 1.2 2015/02/17 06:45:10 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.4.1.ebuild,v 1.3 2015/02/17 06:57:07 graaff Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ CDEPEND="
 RDEPEND+=" ${CDEPEND}"
 DEPEND+=" test? ( ${CDEPEND} )"
 
-ruby_add_bdepend "test? ( dev-ruby/mocha:1.0 )"
+ruby_add_bdepend "test? ( dev-ruby/mocha:0.13 )"
 
 all_ruby_prepare() {
        # Provide explicit path since /sbin is not in the default PATH on
@@ -38,7 +38,7 @@ all_ruby_prepare() {
        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 '1igem "mocha", "~>1.0"' spec/spec_helper.rb || die
+       sed -i -e '1igem "mocha", "~>0.13"' spec/spec_helper.rb || die
 
        # Avoid because tests try to access outside stuff, e.g. /sys/block
        sed -i -e '/should load facts on the facter search path only once/,/^  end/ s:^:#:' spec/unit/util/loader_spec.rb || die