diff options
Diffstat (limited to 'sysutils/facter/files')
7 files changed, 0 insertions, 90 deletions
diff --git a/sysutils/facter/files/patch-CMakeLists.txt b/sysutils/facter/files/patch-CMakeLists.txt deleted file mode 100644 index 05e68a065e7d..000000000000 --- a/sysutils/facter/files/patch-CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- CMakeLists.txt.orig 2022-07-18 15:00:22 UTC -+++ CMakeLists.txt -@@ -121,7 +121,7 @@ if (NOT WITHOUT_JRUBY AND NOT WIN32) - - if (Java_JAVAC_EXECUTABLE) - set(JRUBY_SUPPORT TRUE) -- set(CMAKE_JAVA_COMPILE_FLAGS -source 1.6 -target 1.6) -+ set(CMAKE_JAVA_COMPILE_FLAGS -source 8 -target 8) - add_definitions(-DUSE_JRUBY_SUPPORT) - endif() - endif() -@@ -233,7 +233,7 @@ endif() - add_test(NAME "facter\\ smoke" COMMAND facter) - - # Install the man page --if ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD|FreeBSD") -+if ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD") - set(MANDIR man/man8/) - else() - set(MANDIR share/man/man8/) diff --git a/sysutils/facter/files/patch-cmake_FindCPPHOCON.cmake b/sysutils/facter/files/patch-cmake_FindCPPHOCON.cmake deleted file mode 100644 index 9d31e19c92be..000000000000 --- a/sysutils/facter/files/patch-cmake_FindCPPHOCON.cmake +++ /dev/null @@ -1,9 +0,0 @@ ---- cmake/FindCPPHOCON.cmake.orig 2017-09-12 21:43:10 UTC -+++ 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 "liblibcpp-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/sysutils/facter/files/patch-lib_CMakeLists.txt b/sysutils/facter/files/patch-lib_CMakeLists.txt deleted file mode 100644 index c7d071bcee19..000000000000 --- a/sysutils/facter/files/patch-lib_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/CMakeLists.txt.orig 2022-07-18 15:00:22 UTC -+++ lib/CMakeLists.txt -@@ -331,12 +331,15 @@ include_directories( - - # Set include directories - include_directories( -+ BEFORE -+ ${LEATHERMAN_INCLUDE_DIRS} -+) -+include_directories( - inc - ${Boost_INCLUDE_DIRS} - ${OPENSSL_INCLUDE_DIRS} - ${YAMLCPP_INCLUDE_DIRS} - ${CURL_INCLUDE_DIRS} -- ${LEATHERMAN_INCLUDE_DIRS} - ${CPPHOCON_INCLUDE_DIRS} - ) - diff --git a/sysutils/facter/files/patch-lib_src_facts_glib_load__average__resolver.cc b/sysutils/facter/files/patch-lib_src_facts_glib_load__average__resolver.cc deleted file mode 100644 index c56303c3c21f..000000000000 --- a/sysutils/facter/files/patch-lib_src_facts_glib_load__average__resolver.cc +++ /dev/null @@ -1,10 +0,0 @@ -https://bugs.gentoo.org/840116 ---- lib/src/facts/glib/load_average_resolver.cc.orig 2022-07-18 15:00:22 UTC -+++ 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/sysutils/facter/files/patch-lib_src_facts_posix_cache.cc b/sysutils/facter/files/patch-lib_src_facts_posix_cache.cc deleted file mode 100644 index 98170c7572ba..000000000000 --- a/sysutils/facter/files/patch-lib_src_facts_posix_cache.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/src/facts/posix/cache.cc.orig 2017-09-12 21:43:10 UTC -+++ lib/src/facts/posix/cache.cc -@@ -3,7 +3,7 @@ - namespace facter { namespace facts { namespace cache { - - std::string fact_cache_location() { -- return "/opt/puppetlabs/facter/cache/cached_facts/"; -+ return "/var/facter/cache/cached_facts/"; - } - - }}} // namespace facter::facts::cache diff --git a/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc b/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc deleted file mode 100644 index b82d683ccf5e..000000000000 --- a/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/src/facts/posix/collection.cc.orig 2022-07-18 15:00:22 UTC -+++ lib/src/facts/posix/collection.cc -@@ -25,6 +25,8 @@ namespace facter { namespace facts { - directories.emplace_back("/opt/puppetlabs/facter/facts.d"); - directories.emplace_back("/etc/facter/facts.d"); - directories.emplace_back("/etc/puppetlabs/facter/facts.d"); -+ directories.emplace_back("%%PREFIX%%/etc/facter/facts.d"); -+ directories.emplace_back("%%PREFIX%%/etc/puppetlabs/facter/facts.d"); - } - return directories; - } diff --git a/sysutils/facter/files/patch-lib_src_util_config_posix_config.cc b/sysutils/facter/files/patch-lib_src_util_config_posix_config.cc deleted file mode 100644 index b704f4f69070..000000000000 --- a/sysutils/facter/files/patch-lib_src_util_config_posix_config.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/src/util/config/posix/config.cc.orig 2017-09-12 21:43:10 UTC -+++ lib/src/util/config/posix/config.cc -@@ -7,6 +7,6 @@ namespace facter { namespace util { name - } - - std::string default_config_location() { -- return "/etc/puppetlabs/facter/facter.conf"; -+ return "%%PREFIX%%/etc/facter/facter.conf"; - } - }}} // namespace facter::util::config |