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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: afe360c36458b45cc2a34eef17d00a04bb36133c
-  data.tar.gz: 17e96e89e110a7111e8f48086f8164640db13bbb
+SHA256:
+  metadata.gz: cc8cd770cb6a9b5a1b68e1cbc7bd8b233759bdb698b7b62da8e27506d2db26a5
+  data.tar.gz: c45b8f95b9399b73e0be9f33c466ff5ea37ca921ca37d76cca58e3ebf9730162
 SHA512:
-  metadata.gz: 4d906bb20920e66c5a9cd6e42dc82cc261371d3d36cc161e16681a1ef59da89d77de50d0ffa79a04aa722580ed1fca1b9418a2fa43b0d7751cf73d88a7ed0d61
-  data.tar.gz: fe980db4156cc3a91639d38d85059b989cf5745e439d17dced82a28c92bd646878df2088e165873487f05a5c1ad76c8d40b5ef2159dad1ca5c03e58fb533e489
+  metadata.gz: b7555cfcc4c436b0d78507ec3e5eed077384cdf234166e8c33607e6d89d239bc083a2350610aaa1b77a1746061616da6be99096babeafd25686bc2fa3ed3ef70
+  data.tar.gz: 92c59436e8c16749fdd4a39c8c133f64885999e672cd09adaa14f42f1146382eae6cf0e518d176bd09a74f896c8591b4317f3ba0974abbe2fff516ccb869a687

data/ext/facter/cpp-hocon/CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.2.2)
 # Project Setup - modify to match project naming
 ## Source code for a simple command-line executable for a dynamic library will be generated from the project name.
 ## The command-line and library names will be based off the project name.
-project(cpp-hocon VERSION 0.1.7)
+project(cpp-hocon VERSION 0.2.0)
 
 string(MAKE_C_IDENTIFIER ${PROJECT_NAME} PROJECT_C_NAME)
 string(TOUPPER ${PROJECT_C_NAME} PROJECT_NAME_UPPER)

data/ext/facter/cpp-hocon/lib/inc/hocon/types.hpp

@@ -3,7 +3,13 @@
 #include <memory>
 #include <vector>
 #include <unordered_map>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Waddress"
+#if defined(__GNUC__) && __GNUC__ > 5
+#pragma GCC diagnostic ignored "-Wnonnull-compare"
+#endif
 #include "boost/variant.hpp"
+#pragma GCC diagnostic pop
 
 namespace hocon {
 

data/ext/facter/cpp-hocon/lib/src/parseable.cc

@@ -11,7 +11,10 @@
 #include <internal/config_document_parser.hpp>
 #include <internal/simple_include_context.hpp>
 #include <internal/config_parser.hpp>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
 #include <boost/thread/tss.hpp>
+#pragma GCC diagnostic pop
 #include <vector>
 #include <numeric>
 #include <leatherman/util/scope_exit.hpp>

data/ext/facter/facter/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.2.2)
-project(FACTER VERSION 3.11.6)
+project(FACTER VERSION 3.12.0)
 
 # Set this early, so it's available. AIX gets weird, man.
 if("${CMAKE_SYSTEM_NAME}" MATCHES "AIX")

data/ext/facter/facter/acceptance/lib/facter/acceptance/base_fact_utils.rb

@@ -523,13 +523,11 @@ module Facter
         elsif agent['platform'] =~ /2008/
           os_version = '2008 R2'
         elsif agent['platform'] =~ /2012/
-          os_version = agent['platform'] =~ /R2/ ? '2012 R2' : '2012'
+          os_version = '2012 R2'
         elsif agent['platform'] =~ /-10/
           os_version = '10'
         elsif agent['platform'] =~ /2016/
           os_version = '2016'
-        elsif agent['platform'] =~ /2019/
-          os_version = '2019'
         else
           fail_test "Unknown Windows version #{agent['platform']}"
         end

data/ext/facter/facter/acceptance/tests/facts/dmi.rb

@@ -15,13 +15,13 @@ test_name "C96148: verify dmi facts" do
     expected_facts = {
         'dmi.manufacturer' => /\w+/,
         'dmi.product.name' => /\w+/,
-        'dmi.product.uuid' => /[-0-9A-Fa-f]+/,
     }
     unless agent['platform'] =~ /windows/
       expected_facts.merge!({'dmi.bios.release_date' => /\d+\/\d+\/\d+/,
                              'dmi.bios.vendor'       => /\w+/,
                              'dmi.bios.version'      => /\d+/,
                              'dmi.chassis.type'      => /\w+/,
+                             'dmi.product.uuid'      => /[-0-9A-Fa-f]+/,
                             })
     end
     unless agent['platform'] =~ /windows|cisco|aarch64|el-/

data/ext/facter/facter/appveyor.yml

@@ -1,21 +1,27 @@
 version: 3.1.0.{build}
 clone_depth: 10
 environment:
-  LEATHERMAN_VERSION: 1.4.4
-  CPPHOCON_VERSION: 0.1.8
+  LEATHERMAN_VERSION: 0.99.0
+  CPPHOCON_VERSION: 0.1.4
 
 init:
   - |
-      choco install -y mingw-w64 -Version 5.2.0 -source https://www.myget.org/F/puppetlabs
-      choco install -y cmake -Version 3.2.2 -source https://www.myget.org/F/puppetlabs
+      choco install mingw-w64 -y -Version 4.8.3 -source https://www.myget.org/F/puppetlabs
       choco install -y gettext -Version 0.19.6 -source https://www.myget.org/F/puppetlabs
-      choco install -y pl-toolchain-x64 -Version 2015.12.01.1 -source https://www.myget.org/F/puppetlabs
-      choco install -y pl-boost-x64 -Version 1.58.0.2 -source https://www.myget.org/F/puppetlabs
-      choco install -y pl-openssl-x64 -Version 1.0.24.1 -source https://www.myget.org/F/puppetlabs
-      choco install -y pl-curl-x64 -Version 7.46.0.1 -source https://www.myget.org/F/puppetlabs
-      choco install -y pl-yaml-cpp-x64 -Version 0.5.1.2 -source https://www.myget.org/F/puppetlabs
       cmake --version
   - ps: |
+      $env:PATH = $env:PATH.Replace("Git\bin", "Git\cmd")
+      $env:PATH = $env:PATH.Replace("Git\usr\bin", "Git\cmd")
+
+      wget 'https://s3.amazonaws.com/kylo-pl-bucket/boost_1_57_0-x86_64_mingw-w64_4.8.3_win32_seh.7z' -OutFile "$env:temp\boost.7z"
+      7z.exe x $env:temp\boost.7z -oC:\tools | FIND /V "ing  "
+
+      wget 'https://s3.amazonaws.com/kylo-pl-bucket/yaml-cpp-0.5.1-x86_64_mingw-w64_4.8.3_win32_seh.7z' -OutFile "$env:temp\yaml-cpp.7z"
+      7z.exe x $env:temp\yaml-cpp.7z -oC:\tools | FIND /V "ing  "
+
+      wget 'https://s3.amazonaws.com/kylo-pl-bucket/curl-7.42.1-x86_64_mingw-w64_4.8.3_win32_seh.7z' -OutFile "$env:temp\curl-7.42.1-x86_64_mingw-w64_4.8.3_win32_seh.7z"
+      7z.exe x "$env:temp\curl-7.42.1-x86_64_mingw-w64_4.8.3_win32_seh.7z" -oC:\tools | FIND /V "ing "
+
       wget "https://github.com/puppetlabs/leatherman/releases/download/$env:LEATHERMAN_VERSION/leatherman.7z" -OutFile "$env:temp\leatherman.7z"
       7z.exe x $env:temp\leatherman.7z -oC:\tools | FIND /V "ing "
 
@@ -23,15 +29,12 @@ init:
       7z.exe x $env:temp\cpp-hocon.7z -oC:\tools | FIND /V "ing "
 
 install:
-    # Minimize environment polution; previously we were linking against the wrong OpenSSL DLLs.
-    # Include Ruby and Powershell for unit tests.
-  - SET PATH=C:\tools\pl-build-tools\bin;C:\tools\mingw64\bin;C:\ProgramData\chocolatey\bin;C:\Ruby22-x64\bin;C:\Program Files\7-Zip;C:\Windows\system32;C:\Windows;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Program Files\gettext-iconv
-  - ps: rm -r C:\OpenSSL-Win64
+  - SET PATH=C:\Ruby21-x64\bin;C:\tools\mingw64\bin;C:\Program Files\gettext-iconv;%PATH%
   - bundle install --jobs 4 --retry 2 --gemfile=lib/Gemfile --quiet
 
 build_script:
   - ps: |
-      cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE="C:\tools\pl-build-tools\pl-build-toolchain.cmake" -DCMAKE_PREFIX_PATH="C:\tools\leatherman;C:\tools\cpp-hocon" -DCMAKE_INSTALL_PREFIX="C:\Program Files\FACTER" -DBOOST_STATIC=ON .
+      cmake -G "MinGW Makefiles" -DBOOST_ROOT="C:\tools\boost_1_57_0-x86_64_mingw-w64_4.8.3_win32_seh" -DYAMLCPP_ROOT="C:\tools\yaml-cpp-0.5.1-x86_64_mingw-w64_4.8.3_win32_seh" -DBOOST_STATIC=ON -DCURL_STATIC=ON -DCMAKE_INSTALL_PREFIX="C:\Program Files\FACTER" -DCMAKE_PREFIX_PATH="C:\tools\leatherman;C:\tools\curl-7.42.1-x86_64_mingw-w64_4.8.3_win32_seh;C:\tools\cpp-hocon" .
       mingw32-make -j2
 
 test_script:

data/ext/facter/facter/exe/facter.cc

@@ -332,8 +332,7 @@ int main(int argc, char **argv)
             if (vm.count("custom-dir")) {
                 custom_directories = vm["custom-dir"].as<vector<string>>();
             }
-            bool redirect_ruby_stdout = vm.count("json") || vm.count("yaml");
-            facter::ruby::load_custom_facts(facts, vm.count("puppet"), redirect_ruby_stdout, custom_directories);
+            facter::ruby::load_custom_facts(facts, vm.count("puppet"), custom_directories);
         }
 
         if (!vm["no-external-facts"].as<bool>()) {

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

@@ -203,6 +203,7 @@ elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
         "src/facts/freebsd/collection.cc"
         "src/facts/glib/load_average_resolver.cc"
         "src/facts/bsd/filesystem_resolver.cc"
+        "src/facts/freebsd/filesystem_resolver.cc"
         "src/facts/bsd/networking_resolver.cc"
         "src/facts/bsd/uptime_resolver.cc"
         "src/facts/freebsd/processor_resolver.cc"
@@ -214,6 +215,11 @@ elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
         "src/facts/freebsd/virtualization_resolver.cc"
         "src/facts/freebsd/memory_resolver.cc"
         "src/facts/freebsd/operating_system_resolver.cc"
+        "src/util/freebsd/geom.cc"
+        "src/facts/freebsd/disk_resolver.cc"
+    )
+    set(LIBFACTER_PLATFORM_LIBRARIES
+        geom
     )
 elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
     set(LIBFACTER_PLATFORM_SOURCES
@@ -279,8 +285,18 @@ if (JRUBY_SUPPORT)
 
     # javah does not atomically write the header file, so parallel builds can
     # read it before it finishes writing if not careful.
+    # JDK versions after 9 don't provide javah. Use javac in these cases
+
+    if(Java_VERSION VERSION_LESS "10")
+	    set(JAVAH_COMMAND javah)
+	    set(JAVAH_ARG -classpath facter.jar -d "${CMAKE_CURRENT_LIST_DIR}/src/java" com.puppetlabs.Facter)
+    else()
+	    set(JAVAH_COMMAND javac)
+	    set(JAVAH_ARG -h  "${CMAKE_CURRENT_LIST_DIR}/src/java" com/puppetlabs/Facter.java)
+    endif()
+
     add_custom_command(OUTPUT "${CMAKE_CURRENT_LIST_DIR}/src/java/com_puppetlabs_Facter.h"
-                       COMMAND javah ARGS -classpath facter.jar -d "${CMAKE_CURRENT_LIST_DIR}/src/java" com.puppetlabs.Facter
+                       COMMAND ${JAVAH_COMMAND} ARGS ${JAVAH_ARG}
                        WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
                        DEPENDS facter-jruby-jar)
     # Anything that depends on facter-jruby wants both the jar AND the completely written header.

data/ext/facter/facter/lib/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = facter
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.11.6
+PROJECT_NUMBER         = 3.12.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

data/ext/facter/facter/lib/inc/facter/facts/os.hpp

@@ -41,6 +41,10 @@ namespace facter { namespace facts {
          * The Cloud Linux operating system.
          */
         constexpr static char const* cloud_linux = "CloudLinux";
+        /**
+         * The Virtuozzo Linux operating system.
+         */
+        constexpr static char const* virtuozzo_linux = "VirtuozzoLinux";
         /**
          * The Parallels Server Bare Metal operating system.
          */
@@ -65,6 +69,10 @@ namespace facter { namespace facts {
          * The Xen Server Linux operating system.
          */
         constexpr static char const* xen_server = "XenServer";
+        /**
+         * The XCP-ng Linux operating system.
+         */
+        constexpr static char const* xcp_ng = "XCP-ng";
         /**
          * The Mint Linux operating system.
          */

data/ext/facter/facter/lib/inc/facter/ruby/ruby.hpp

@@ -21,17 +21,6 @@ namespace facter { namespace ruby {
      */
     LIBFACTER_EXPORT bool initialize(bool include_stack_trace = false);
 
-    /**
-     * Loads custom facts into the given collection.
-     * Important: this function should be called from main().
-     * Calling this function from an arbitrary stack depth may result in segfaults during Ruby GC.
-     * @param facts The collection to populate with custom facts.
-     * @param initialize_puppet Whether puppet should be loaded to find additional facts.
-     * @param redirect_stdout Whether Ruby's stdout should be redirected to stderr
-     * @param paths The paths to search for custom facts.
-     */
-    LIBFACTER_EXPORT void load_custom_facts(facter::facts::collection& facts, bool initialize_puppet, bool redirect_stdout, std::vector<std::string> const& paths = {});
-
     /**
      * Loads custom facts into the given collection.
      * Important: this function should be called from main().

data/ext/facter/facter/lib/inc/internal/facts/freebsd/disk_resolver.hpp

@@ -0,0 +1,25 @@
+/**
+ * @file
+ * Declares the FreeBSD disk fact resolver.
+ */
+#pragma once
+
+#include "../resolvers/disk_resolver.hpp"
+
+namespace facter { namespace facts { namespace freebsd {
+
+    /**
+     * Responsible for resolving disk facts.
+     */
+    struct disk_resolver : resolvers::disk_resolver
+    {
+     protected:
+        /**
+         * Collects the resolver data.
+         * @param facts The fact collection that is resolving facts.
+         * @return Returns the resolver data.
+         */
+        virtual data collect_data(collection& facts) override;
+    };
+
+}}}  // namespace facter::facts::freebsd

data/ext/facter/facter/lib/inc/internal/facts/freebsd/filesystem_resolver.hpp

@@ -0,0 +1,25 @@
+/**
+ * @file
+ * Declares the FreeBSD file system fact resolver.
+ */
+#pragma once
+
+#include "../bsd/filesystem_resolver.hpp"
+
+namespace facter { namespace facts { namespace freebsd {
+
+    /**
+     * Responsible for resolving FreeBSD file system facts.
+     */
+    struct filesystem_resolver : bsd::filesystem_resolver
+    {
+     protected:
+        /**
+         * Collects the file system data.
+         * @param facts The fact collection that is resolving facts.
+         * @return Returns the file system data.
+         */
+        virtual data collect_data(collection& facts) override;
+    };
+
+}}}  // namespace facter::facts::freebsd

data/ext/facter/facter/lib/inc/internal/util/freebsd/geom.hpp

@@ -0,0 +1,149 @@
+/**
+ * @file
+ * Declares geom.
+ */
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <libgeom.h>
+
+namespace facter { namespace util { namespace freebsd {
+
+    /**
+     * geom exceptions
+     */
+    struct geom_exception : std::runtime_error
+    {
+        /**
+         * Constructs a geom_exception.
+         * @param message the exception message.
+         */
+        explicit geom_exception(std::string const& message);
+    };
+
+    /**
+     * GEOM configuration.
+     * This is a wrapper for struct gconfig.
+     */
+    class geom_config {
+    private:
+        std::string _name;
+        std::string _value;
+    public:
+        /**
+         * Constructs a GEOM configuration item.
+         * @param name the name of the item.
+         * @param value the valure of the item.
+         */
+        geom_config(std::string name, std::string value);
+        /**
+         * Returns the name of the item.
+	 * @return the name of the item.
+         */
+        std::string name();
+        /**
+         * Returns the value of the item.
+         * @return the value of the item.
+         */
+        std::string value();
+    };
+
+    /**
+     * Base GEOM class capable of storing configuration.
+     */
+    class geom_object_with_config {
+    private:
+        std::vector<geom_config> _configs;
+    protected:
+        /**
+         * Loads GEOM configuration.
+         * @param conf the first configuration item.
+         */
+        geom_object_with_config(struct gconf *conf);
+    public:
+        /**
+         * Fetches a configuration value from the object.
+         * @param name the name of the configuration to get.
+         * @return the value of the configuration.
+         */
+        std::string config(std::string name);
+    };
+
+    /**
+     * GEOM providers.
+     * This is a wrapper for struct gprovider.
+     */
+    class geom_provider : public geom_object_with_config {
+    private:
+        std::string _name;
+        std::string _mode;
+        off_t _mediasize;
+        u_int _sectorsize;
+        off_t _stripeoffset;
+        off_t _stripesize;
+    public:
+        /**
+         * Loads a GEOM provider.
+         * @param provider the provider to load.
+         */
+        geom_provider(struct gprovider* provider);
+        /**
+         * Returns the provider name.
+         * @return the name of the provider.
+         */
+        std::string name();
+        /**
+         * Returns the provider media size.
+         * @return the media size in bytes.
+         */
+        off_t mediasize();
+    };
+
+    /**
+     * GEOM geoms (sic).
+     * This is a wrapper for struct ggeom.
+     */
+    class geom_geom : public geom_object_with_config {
+    private:
+        std::string _name;
+    public:
+        /**
+         * Loads a GEOM Geom.
+         * @param geom the Geom to load.
+         */
+        geom_geom(struct ggeom *geom);
+        /**
+         * Providers attached to this Geom.
+         */
+        std::vector<geom_provider> providers;
+        /**
+         * Returns the name of the Geom.
+         * @return the name of the Geom.
+         */
+        std::string name();
+    };
+
+    /**
+     * GEOM classes.
+     * This is a wrapper for struct gclass.
+     */
+    class geom_class {
+    private:
+        struct gmesh _mesh;
+        struct gclass *_class;
+    public:
+        /**
+         * Loads a GEOM class. Throws a geom_exception on failure.
+         * @param type the GEOM class to load.
+         */
+        geom_class(std::string type);
+        ~geom_class();
+        /**
+         * Geoms attached to this class.
+         */
+        std::vector<geom_geom> geoms;
+    };
+
+}}}  // namespace facter::util::freebsd