[gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/files/

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/files/

[Aaron Bauman]

commit:     277f364af20b42e5e6bbe95a94e2bffa6d50a302
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Dec  8 13:17:52 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 15:53:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=277f364a

dev-ruby/facter: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13920
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-ruby/facter/files/00facterdir | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-ruby/facter/files/00facterdir b/dev-ruby/facter/files/00facterdir
deleted file mode 100644
index 45e29a2405a..00000000000
--- a/dev-ruby/facter/files/00facterdir
+++ /dev/null
@@ -1 +0,0 @@
-FACTERDIR=/usr

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/files/

[Conrad Kostecki]

commit:     b89305724da41e26cf0f3379e42750c8d7a34b89
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Mar 31 18:06:30 2025 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Apr  8 19:46:30 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8930572

dev-ruby/facter: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-ruby/facter/files/facter-3.14.23-gcc12.patch               | 10 ----------
 .../facter/files/facter-3.14.6-fix-static-libcpp-hocon.patch   |  9 ---------
 dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch     | 10 ----------
 3 files changed, 29 deletions(-)

diff --git a/dev-ruby/facter/files/facter-3.14.23-gcc12.patch b/dev-ruby/facter/files/facter-3.14.23-gcc12.patch
deleted file mode 100644
index 671b085a15b5..000000000000
--- a/dev-ruby/facter/files/facter-3.14.23-gcc12.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-https://bugs.gentoo.org/840116
---- a/lib/src/facts/glib/load_average_resolver.cc
-+++ b/lib/src/facts/glib/load_average_resolver.cc
-@@ -1,5 +1,6 @@
- #include <internal/facts/glib/load_average_resolver.hpp>
- #include <leatherman/logging/logging.hpp>
-+#include <array>
- #include <cstdlib>
- 
- #ifdef __sun

diff --git a/dev-ruby/facter/files/facter-3.14.6-fix-static-libcpp-hocon.patch b/dev-ruby/facter/files/facter-3.14.6-fix-static-libcpp-hocon.patch
deleted file mode 100644
index 26c193c12b57..000000000000
--- a/dev-ruby/facter/files/facter-3.14.6-fix-static-libcpp-hocon.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/cmake/FindCPPHOCON.cmake
-+++ b/cmake/FindCPPHOCON.cmake
-@@ -1,5 +1,5 @@
- include(FindDependency)
--find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.a")
-+find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.so")
- 
- include(FeatureSummary)
- set_package_properties(CPPHOCON PROPERTIES DESCRIPTION "A C++ parser for the HOCON configuration language" URL "https://github.com/puppetlabs/cpp-hocon")

diff --git a/dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch b/dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch
deleted file mode 100644
index bca424be1b8e..000000000000
--- a/dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -205,7 +205,7 @@
-     if (BUNDLER_PATH)
-         message(STATUS "Bundler found, installing dependencies for Ruby tests...")
-         execute_process(COMMAND ${BUNDLER_PATH} install --retry 2 --path=vendor/bundle WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
--        add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
-+        add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec-2 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
-     endif()
- endif()

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/files/

[Aaron Bauman]

commit:     33963cd2ad4880d3733f3dcd7f3e3078880034ed
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jun 14 07:34:56 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 02:33:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33963cd2

dev-ruby/facter: remove unused patch

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16234
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-ruby/facter/files/facter-3.14.6-explicit-rspec-2.patch | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/dev-ruby/facter/files/facter-3.14.6-explicit-rspec-2.patch b/dev-ruby/facter/files/facter-3.14.6-explicit-rspec-2.patch
deleted file mode 100644
index cd8f9f614d1..00000000000
--- a/dev-ruby/facter/files/facter-3.14.6-explicit-rspec-2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -205,7 +205,7 @@
- if (RUBY_FOUND)
-     find_program(BUNDLER_PATH NAMES bundle.bat bundle)
-     if (BUNDLER_PATH)
--        add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
-+        add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec-2 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
-     endif()
- endif()
- add_test(NAME "facter\\ smoke" COMMAND facter)

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/files/

[Matt Thode]

commit:     bd4f066f122c32363a6eaefdf73e9e5d851e2cfa
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Feb  4 08:31:44 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Feb  5 00:13:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4f066f

dev-ruby/facter: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/7046
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 .../facter/files/is-integer_fact-1624_3.6.5.patch  | 58 ----------------------
 1 file changed, 58 deletions(-)

diff --git a/dev-ruby/facter/files/is-integer_fact-1624_3.6.5.patch b/dev-ruby/facter/files/is-integer_fact-1624_3.6.5.patch
deleted file mode 100644
index c7b8d80b2c7..00000000000
--- a/dev-ruby/facter/files/is-integer_fact-1624_3.6.5.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 9cb17d9fdffabab3693f6548f6bfc54ed2251325 Mon Sep 17 00:00:00 2001
-From: Maggie Dreyer <maggie@puppet.com>
-Date: Tue, 2 May 2017 10:21:06 -0700
-Subject: [PATCH] (FACT-1624) Use `is_integer` instead of `is_fixednum` and
- `is_bignum`
-
-Ruby 2.4 unified Fixnum and Bignum into Integer. We updated the
-Leatherman API to match this. This commit updates Facter to use the new
-API.
----
- lib/src/ruby/module.cc     | 2 +-
- lib/src/ruby/ruby_value.cc | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/src/ruby/module.cc b/lib/src/ruby/module.cc
-index 2d7223e0f..b8aeeed09 100644
---- a/lib/src/ruby/module.cc
-+++ b/lib/src/ruby/module.cc
-@@ -866,7 +866,7 @@ namespace facter { namespace ruby {
-             // Unfortunately we have to call to_sym rather than using ID2SYM, which is Ruby version dependent
-             uint32_t timeout = 0;
-             volatile VALUE timeout_option = ruby.rb_hash_lookup(argv[1], ruby.to_symbol("timeout"));
--            if (ruby.is_fixednum(timeout_option)) {
-+            if (ruby.is_integer(timeout_option)) {
-                 timeout = ruby.num2size_t(timeout_option);
-             }
- 
-diff --git a/lib/src/ruby/ruby_value.cc b/lib/src/ruby/ruby_value.cc
-index d8ea20ce6..645472a3f 100644
---- a/lib/src/ruby/ruby_value.cc
-+++ b/lib/src/ruby/ruby_value.cc
-@@ -86,7 +86,7 @@ namespace facter { namespace ruby {
-             json.SetString(str, size, allocator);
-             return;
-         }
--        if (ruby.is_fixednum(value) || ruby.is_bignum(value)) {
-+        if (ruby.is_integer(value)) {
-             json.SetInt64(ruby.rb_num2ll(value));
-             return;
-         }
-@@ -155,7 +155,7 @@ namespace facter { namespace ruby {
-             }
-             return;
-         }
--        if (ruby.is_fixednum(value) || ruby.is_bignum(value)) {
-+        if (ruby.is_integer(value)) {
-             os << ruby.rb_num2ll(value);
-             return;
-         }
-@@ -241,7 +241,7 @@ namespace facter { namespace ruby {
-             emitter << str;
-             return;
-         }
--        if (ruby.is_fixednum(value) || ruby.is_bignum(value)) {
-+        if (ruby.is_integer(value)) {
-             emitter << ruby.rb_num2ll(value);
-             return;
-         }

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/files/

[Matt Thode]

commit:     9fc32c8470289d9bc32f2ab38f27368541c2402d
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug  8 16:33:07 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Aug  8 22:36:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc32c84

dev-ruby/facter: remove unused patch

 .../facter/files/facter-3.5.0-collection-fix.patch | 24 ----------------------
 1 file changed, 24 deletions(-)

diff --git a/dev-ruby/facter/files/facter-3.5.0-collection-fix.patch b/dev-ruby/facter/files/facter-3.5.0-collection-fix.patch
deleted file mode 100644
index edd10d2b903..00000000000
--- a/dev-ruby/facter/files/facter-3.5.0-collection-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur /var/tmp/portage/dev-ruby/facter-3.5.0/work/all/facter-3.5.0.old/lib/inc/facter/facts/collection.hpp /var/tmp/portage/dev-ruby/facter-3.5.0/work/all/facter-3.5.0/lib/inc/facter/facts/collection.hpp
---- facter-3.5.0.old/lib/inc/facter/facts/collection.hpp  2016-10-21 18:32:16.000000000 -0500
-+++ facter-3.5.0/lib/inc/facter/facts/collection.hpp  2016-11-28 19:36:55.025454011 -0600
-@@ -94,7 +94,7 @@
-          *        for the facts they resolve
-          */
-         collection(std::set<std::string> const& blocklist = std::set<std::string>(),
--                   std::unordered_map<std::string, int64_t> const& ttls = {});
-+                   std::unordered_map<std::string, int64_t> const& ttls = std::unordered_map<std::string, int64_t>{});
- 
-         /**
-          * Destructor for fact collection.
-diff -Naur /var/tmp/portage/dev-ruby/facter-3.5.0/work/all/facter-3.5.0.old/lib/tests/collection_fixture.hpp /var/tmp/portage/dev-ruby/facter-3.5.0/work/all/facter-3.5.0/lib/tests/collection_fixture.hpp
---- facter-3.5.0.old/lib/tests/collection_fixture.hpp 2016-10-21 18:32:16.000000000 -0500
-+++ facter-3.5.0/lib/tests/collection_fixture.hpp 2016-11-28 19:36:47.322311122 -0600
-@@ -10,7 +10,7 @@
-     {
-     public:
-         collection_fixture(std::set<std::string> const& blocklist = std::set<std::string>(),
--                std::unordered_map<std::string, int64_t> const& ttls = {});
-+                std::unordered_map<std::string, int64_t> const& ttls = std::unordered_map<std::string, int64_t>{});
- 
-     protected:
-         virtual std::vector<std::string> get_external_fact_directories() const override;

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/facter/files/

[Patrice Clement]

commit:     95cff65963c3ed101d91a0fea3cb4abb7bd98575
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Sep 21 16:59:48 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 20:33:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95cff659

dev-ruby/facter: remove unused patch.

Closes: https://github.com/gentoo/gentoo/pull/2380

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../files/facter-1.7.1-fix-proc-self-status.patch  | 39 ----------------------
 1 file changed, 39 deletions(-)

diff --git a/dev-ruby/facter/files/facter-1.7.1-fix-proc-self-status.patch b/dev-ruby/facter/files/facter-1.7.1-fix-proc-self-status.patch
deleted file mode 100644
index 1119bdf..00000000
--- a/dev-ruby/facter/files/facter-1.7.1-fix-proc-self-status.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d54c86abfba35f48cad78bb99b1d199afe8c2095 Mon Sep 17 00:00:00 2001
-From: Jeff McCune <jeff@puppetlabs.com>
-Date: Tue, 16 Apr 2013 11:27:30 -0400
-Subject: [PATCH] (#14522) Force /proc/self/status encoding to valid UTF-8 (try
- 2)
-
-Without this patch the previous attempt to fix issue 14522 is
-insufficient because the String#encode method is a no-op when the source
-and destination encodings are the same encoding, even if there are
-invalid byte sequences.
-
-This is a problem because we're still getting unhandled `invalid byte
-sequence in UTF-8` errors running the specs.
-
-This patch addresses the problem by changing encoding from UTF-8 to
-UTF-16, replacing all invalid byte sequences with the default unicode
-string of "uFFFD"  We then convert back to UTF-8 to guarantee only valid
-byte sequences remain.
----
- lib/facter/util/virtual.rb | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/facter/util/virtual.rb b/lib/facter/util/virtual.rb
-index 8223b41..65cf58a 100644
---- a/lib/facter/util/virtual.rb
-+++ b/lib/facter/util/virtual.rb
-@@ -63,7 +63,8 @@ def self.vserver?
-     return false unless FileTest.exists?("/proc/self/status")
-     txt = File.open("/proc/self/status", "rb").read
-     if txt.respond_to?(:encode!)
--      txt.encode!('UTF-8', 'UTF-8', :invalid => :replace)
-+      txt.encode!('UTF-16', 'UTF-8', :invalid => :replace)
-+      txt.encode!('UTF-8', 'UTF-16')
-     end
-     return true if txt =~ /^(s_context|VxID):[[:blank:]]*[0-9]/
-     return false
--- 
-1.8.1.6
-