facter 3.11.6.cfacter.20181031 → 3.12.0.cfacter.20180918

data/ext/facter/facter/lib/tests/CMakeLists.txt

@@ -40,7 +40,6 @@ set(LIBFACTER_TESTS_COMMON_SOURCES
     "logging/logging.cc"
     "log_capture.cc"
     "main.cc"
-    "mock_server.cc"
     "util/string.cc"
     "fixtures.cc"
     "collection_fixture.cc"
@@ -128,20 +127,37 @@ include_directories(
     ${CPPHOCON_INCLUDE_DIRS}
 )
 
+# On EL 4, we run into a linking error when trying to create libraries or
+# executables that link in a static library with code using threads. As I
+# described in https://gcc.gnu.org/ml/gcc-help/2015-08/msg00035.html, we get
+# the error undefined reference to symbol '__tls_get_addr@@GLIBC_2.3'.
+# Build mock_server as a separate shared library to avoid this error.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
-if (WIN32)
-    # On Windows with GCC 5.2, Boost.System emits warnings that aren't correctly
-    # suppressed by pragmas. Explicitly skip them.
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
-endif()
+add_library(mock-server SHARED mock_server.cc)
+target_link_libraries(mock-server PRIVATE
+    ${Boost_THREAD_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
+    ${LIBFACTER_TESTS_PLATFORM_LIBRARIES})
 
 add_executable(libfacter_test $<TARGET_OBJECTS:libfactersrc>
     ${LIBFACTER_TESTS_COMMON_SOURCES}
     ${LIBFACTER_TESTS_PLATFORM_SOURCES}
     ${LIBFACTER_TESTS_CATEGORY_SOURCES})
-target_link_libraries(libfacter_test
-    ${LIBS}
-    ${LIBFACTER_TESTS_PLATFORM_LIBRARIES})
+# On Windows, mock-server comes after Boost libraries to avoid double
+# definition of boost::system::system_category() on Windows. On Linux, it
+# comes before to avoid picking up incomplete Boost.Asio symbols included
+# by Boost.Log in Leatherman logging.
+if (WIN32)
+    target_link_libraries(libfacter_test
+        ${LIBS}
+        ${LIBFACTER_TESTS_PLATFORM_LIBRARIES}
+        mock-server)
+else()
+    target_link_libraries(libfacter_test
+        mock-server
+        ${LIBS}
+        ${LIBFACTER_TESTS_PLATFORM_LIBRARIES})
+endif()
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND BOOST_STATIC AND LEATHERMAN_USE_LOCALES)
     target_link_libraries(libfacter_test iconv)

data/ext/facter/facter/lib/tests/facts/collection.cc

@@ -67,7 +67,7 @@ struct multi_resolver : facter::facts::resolver
 
 struct temp_variable
 {
-    temp_variable(string&& name, string const& value) :
+    temp_variable(string name, string const& value) :
         _name(move(name))
     {
         environment::set(_name, value);

data/ext/facter/facter/lib/tests/fixtures.cc

@@ -6,6 +6,7 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#pragma GCC diagnostic ignored "-Wunused-variable"
 #include <boost/thread/thread.hpp>
 #include <boost/chrono/duration.hpp>
 #pragma GCC diagnostic pop

data/ext/facter/facter/locales/FACTER.pot

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FACTER 3.11.5\n"
+"Project-Id-Version: FACTER 3.12.0\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -1225,6 +1225,11 @@ msgstr ""
 msgid "failed adding platform facts that require WMI: {1}"
 msgstr ""
 
+#. debug
+#: lib/src/facts/windows/dmi_resolver.cc
+msgid "WMI query returned no results for {1} with value {2}."
+msgstr ""
+
 #. debug
 #: lib/src/facts/windows/dmi_resolver.cc
 msgid "WMI query returned no results for {1} with values {2} and {3}."
@@ -1289,13 +1294,6 @@ msgstr ""
 msgid "error finding SYSTEMROOT: {1}"
 msgstr ""
 
-#. debug
-#: lib/src/facts/windows/operating_system_resolver.cc
-msgid ""
-"Could not resolve the OS release and OS major version facts from the kernel "
-"version fact"
-msgstr ""
-
 #. debug
 #: lib/src/facts/windows/processor_resolver.cc
 msgid "WMI processor Name, Architecture query returned no results."
@@ -1531,16 +1529,6 @@ msgstr ""
 msgid "timeout= is not supported for custom facts and will be ignored."
 msgstr ""
 
-#. debug
-#: lib/src/ruby/ruby.cc
-msgid "Redirecting ruby's stdout to stderr"
-msgstr ""
-
-#. debug
-#: lib/src/ruby/ruby.cc
-msgid "Restoring Ruby's stdout"
-msgstr ""
-
 #. warning
 #: lib/src/ruby/ruby.cc
 msgid "Could not load puppet; some facts may be unavailable: {1}"
@@ -1559,6 +1547,18 @@ msgstr ""
 msgid "a block is unexpected when passing a String"
 msgstr ""
 
+#: lib/src/util/freebsd/geom.cc
+msgid "Skipping config {1} because it has a null value"
+msgstr ""
+
+#: lib/src/util/freebsd/geom.cc
+msgid "Unable to get GEOM tree"
+msgstr ""
+
+#: lib/src/util/freebsd/geom.cc
+msgid "The GEOM class \"{1}\" was not found"
+msgstr ""
+
 #: lib/src/util/posix/utmpx_file.cc
 msgid "only one utmpx_file instance can exist at a time!"
 msgstr ""

data/ext/facter/leatherman/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.2.2)
-project(leatherman VERSION 1.4.4)
+project(leatherman VERSION 1.5.0)
 
 if (WIN32)
     link_libraries("-Wl,--nxcompat -Wl,--dynamicbase")

data/ext/facter/leatherman/cmake/cflags.cmake

@@ -70,9 +70,9 @@ endif()
 if (WIN32)
     # Update standard link libraries to explicitly exclude kernel32. It isn't necessary, and when compiling with
     # MinGW makes the executable unusable on Microsoft Nano Server due to including __C_specific_handler.
-    SET(CMAKE_C_STANDARD_LIBRARIES "-luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32"
+    SET(CMAKE_C_STANDARD_LIBRARIES "-luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -lbcrypt"
         CACHE STRING "Standard C link libraries." FORCE)
-    SET(CMAKE_CXX_STANDARD_LIBRARIES "-luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32"
+    SET(CMAKE_CXX_STANDARD_LIBRARIES "-luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -lbcrypt"
         CACHE STRING "Standard C++ link libraries." FORCE)
 
     # We currently support Windows Vista and later APIs, see

data/ext/facter/leatherman/dynamic_library/CMakeLists.txt

@@ -1,4 +1,4 @@
-find_package(Boost 1.54 REQUIRED COMPONENTS regex)
+find_package(Boost 1.54 REQUIRED COMPONENTS regex system)
 
 add_leatherman_deps("${Boost_LIBRARIES}")
 add_leatherman_includes("${Boost_INCLUDE_DIRS}")

data/ext/facter/leatherman/locale/src/locale.cc

@@ -5,6 +5,7 @@
 // boost includes are not always warning-clean. Disable warnings that
 // cause problems before including the headers, then re-enable the warnings.
 #pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #include <boost/locale.hpp>
 #pragma GCC diagnostic pop

data/ext/facter/leatherman/ruby/inc/leatherman/ruby/api.hpp

@@ -207,10 +207,6 @@ namespace leatherman {  namespace ruby {
          * See MRI documentation.
          */
         VALUE (* const rb_gv_get)(char const*);
-        /**
-         * See MRI documentation.
-         */
-        VALUE (* const rb_gv_set)(char const*, VALUE);
         /**
          * See MRI documentation.
          */

data/ext/facter/leatherman/ruby/src/api.cc

@@ -51,7 +51,6 @@ namespace leatherman { namespace ruby {
         LOAD_SYMBOL(rb_define_singleton_method),
         LOAD_SYMBOL(rb_class_new_instance),
         LOAD_SYMBOL(rb_gv_get),
-        LOAD_SYMBOL(rb_gv_set),
         LOAD_SYMBOL(rb_eval_string),
         LOAD_SYMBOL(rb_funcall),
         LOAD_ALIASED_SYMBOL(rb_funcallv, rb_funcall2),

data/ext/facter/leatherman/util/inc/leatherman/util/strings.hpp

@@ -4,8 +4,11 @@
  */
 #pragma once
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/compare.hpp>
+#pragma GCC diagnostic pop
 #include <functional>
 #include <string>
 #include <vector>

data/ext/facter/leatherman/windows/CMakeLists.txt

@@ -1,4 +1,4 @@
-find_package(Boost 1.54 REQUIRED COMPONENTS filesystem)
+find_package(Boost 1.54 REQUIRED COMPONENTS filesystem regex system)
 
 add_leatherman_deps(Wbemuuid.lib userenv.lib "${Boost_LIBRARIES}")
 add_leatherman_includes("${Boost_INCLUDE_DIRS}")

data/ext/facter/leatherman/windows/inc/leatherman/windows/wmi.hpp

@@ -43,11 +43,6 @@ namespace leatherman { namespace windows {
          */
         constexpr static char const* computersystemproduct = "Win32_ComputerSystemProduct";
 
-        /**
-         * Identifier for the WMI property UUID
-         */
-        constexpr static char const* uuid = "UUID";
-
         /**
          * Identifier for the WMI class Win32_OperatingSystem
          */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 3.11.6.cfacter.20181031
+  version: 3.12.0.cfacter.20180918
 platform: ruby
 authors:
 - Puppet
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: info@puppet.com
@@ -203,7 +203,6 @@ files:
 - ext/facter/facter/acceptance/lib/puppet/acceptance/common_utils.rb
 - ext/facter/facter/acceptance/lib/puppet/acceptance/git_utils.rb
 - ext/facter/facter/acceptance/lib/puppet/acceptance/install_utils.rb
-- ext/facter/facter/acceptance/tests/custom_facts/conflicts_with_builtin_fact.rb
 - ext/facter/facter/acceptance/tests/custom_facts/custom_fact_with_10001_weight_overrides_external_fact.rb
 - ext/facter/facter/acceptance/tests/custom_facts/having_multiple_facts_in_one_file.rb
 - ext/facter/facter/acceptance/tests/custom_facts/using_win32ole_should_not_hang.rb
@@ -377,7 +376,9 @@ files:
 - ext/facter/facter/lib/inc/internal/facts/external/text_resolver.hpp
 - ext/facter/facter/lib/inc/internal/facts/external/windows/powershell_resolver.hpp
 - ext/facter/facter/lib/inc/internal/facts/external/yaml_resolver.hpp
+- ext/facter/facter/lib/inc/internal/facts/freebsd/disk_resolver.hpp
 - ext/facter/facter/lib/inc/internal/facts/freebsd/dmi_resolver.hpp
+- ext/facter/facter/lib/inc/internal/facts/freebsd/filesystem_resolver.hpp
 - ext/facter/facter/lib/inc/internal/facts/freebsd/memory_resolver.hpp
 - ext/facter/facter/lib/inc/internal/facts/freebsd/networking_resolver.hpp
 - ext/facter/facter/lib/inc/internal/facts/freebsd/operating_system_resolver.hpp
@@ -484,6 +485,7 @@ files:
 - ext/facter/facter/lib/inc/internal/util/aix/odm.hpp
 - ext/facter/facter/lib/inc/internal/util/aix/vmount.hpp
 - ext/facter/facter/lib/inc/internal/util/bsd/scoped_ifaddrs.hpp
+- ext/facter/facter/lib/inc/internal/util/freebsd/geom.hpp
 - ext/facter/facter/lib/inc/internal/util/posix/scoped_addrinfo.hpp
 - ext/facter/facter/lib/inc/internal/util/posix/scoped_bio.hpp
 - ext/facter/facter/lib/inc/internal/util/posix/scoped_descriptor.hpp
@@ -524,7 +526,9 @@ files:
 - ext/facter/facter/lib/src/facts/external/windows/powershell_resolver.cc
 - ext/facter/facter/lib/src/facts/external/yaml_resolver.cc
 - ext/facter/facter/lib/src/facts/freebsd/collection.cc
+- ext/facter/facter/lib/src/facts/freebsd/disk_resolver.cc
 - ext/facter/facter/lib/src/facts/freebsd/dmi_resolver.cc
+- ext/facter/facter/lib/src/facts/freebsd/filesystem_resolver.cc
 - ext/facter/facter/lib/src/facts/freebsd/memory_resolver.cc
 - ext/facter/facter/lib/src/facts/freebsd/networking_resolver.cc
 - ext/facter/facter/lib/src/facts/freebsd/operating_system_resolver.cc
@@ -642,6 +646,7 @@ files:
 - ext/facter/facter/lib/src/util/config/config.cc
 - ext/facter/facter/lib/src/util/config/posix/config.cc
 - ext/facter/facter/lib/src/util/config/windows/config.cc
+- ext/facter/facter/lib/src/util/freebsd/geom.cc
 - ext/facter/facter/lib/src/util/posix/scoped_addrinfo.cc
 - ext/facter/facter/lib/src/util/posix/scoped_bio.cc
 - ext/facter/facter/lib/src/util/posix/scoped_descriptor.cc
@@ -1081,7 +1086,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Facter gem wrapper

data/ext/facter/facter/acceptance/tests/custom_facts/conflicts_with_builtin_fact.rb

@@ -1,106 +0,0 @@
-test_name 'Facter should appropriately resolve a custom fact when it conflicts with a builtin fact' do
-  tag 'risk:medium'
-
-  def create_custom_fact_on(host, custom_fact_dir, fact_file_name, fact)
-    fact_file_contents = <<-CUSTOM_FACT
-Facter.add(:#{fact[:name]}) do
-  has_weight #{fact[:weight]}
-  setcode do
-    #{fact[:value]}
-  end
-end
-CUSTOM_FACT
-
-    fact_file_path = File.join(custom_fact_dir, fact_file_name) 
-    create_remote_file(host, fact_file_path, fact_file_contents)
-  end
-
-  def clear_custom_facts_on(host, custom_fact_dir)
-    step "Clean-up the previous test's custom facts" do
-      on(agent, "rm -f #{custom_fact_dir}/*")
-    end
-  end
-
-  agents.each do |agent|
-    custom_fact_dir = agent.tmpdir('facter')
-    teardown do
-      on(agent, "rm -rf '#{custom_fact_dir}'")
-    end
-
-    fact_name = 'timezone'
-    builtin_value = on(agent, facter('timezone')).stdout.chomp
-
-    step "Verify that Facter uses the custom fact's value when its weight is > 0" do
-      custom_fact_value = "custom_timezone"
-      create_custom_fact_on(
-        agent,
-        custom_fact_dir,
-        'custom_timezone.rb',
-        name: fact_name,
-        weight: 10,
-        value: "'#{custom_fact_value}'"
-      )
-
-      on(agent, facter("--custom-dir=#{custom_fact_dir} timezone")) do |result|
-        assert_match(/#{custom_fact_value}/, result.stdout.chomp, "Facter does not use the custom fact's value when its weight is > 0")
-      end
-    end
-
-    clear_custom_facts_on(agent, custom_fact_dir)
-
-    step "Verify that Facter uses the builtin fact's value when all conflicting custom facts fail to resolve" do
-      [ 'timezone_one.rb', 'timezone_two.rb'].each do |fact_file|
-        create_custom_fact_on(
-          agent,
-          custom_fact_dir,
-          fact_file,
-          { name: fact_name, weight: 10, value: nil }
-        )
-      end
-
-      on(agent, facter("--custom-dir=#{custom_fact_dir} timezone")) do |result|
-        assert_match(/#{builtin_value}/, result.stdout.chomp, "Facter does not use the builtin fact's value when all conflicting custom facts fail to resolve")
-      end
-    end
-
-    step "Verify that Facter gives precedence to the builtin fact over zero weight custom facts" do
-      step "when all custom facts have zero weight" do
-        {
-          'timezone_one.rb' => "'timezone_one'",
-          'timezone_two.rb' => "'timezone_two'"
-        }.each do |fact_file, fact_value|
-          create_custom_fact_on(
-            agent,
-            custom_fact_dir,
-            fact_file,
-            { name: fact_name, weight: 0, value: fact_value }
-          )
-        end
-
-        on(agent, facter("--custom-dir=#{custom_fact_dir} timezone")) do |result|
-          assert_match(/#{builtin_value}/, result.stdout.chomp, "Facter does not give precedence to the builtin fact when all custom facts have zero weight")
-        end
-      end
-
-      clear_custom_facts_on(agent, custom_fact_dir)
-
-      step "when some custom facts have zero weight" do
-        {
-          'timezone_one.rb' => { weight: 10, value: nil },
-          'timezone_two.rb' => { weight: 0, value: "'timezone_two'" }
-        }.each do |fact_file, fact|
-          create_custom_fact_on(
-            agent,
-            custom_fact_dir,
-            fact_file,
-            fact.merge(name: fact_name)
-          )
-        end
-
-        on(agent, facter("--custom-dir=#{custom_fact_dir} timezone")) do |result|
-          assert_match(/#{builtin_value}/, result.stdout.chomp, "Facter does not give precedence to the builtin fact when only some custom facts have zero weight")
-        end
-      end
-    end
-  end
-end