Commit f40fc5b0f2200306e2a4e5e3a29e84ad28d894d8 - facter

+2

-0

debian/patches/0001-use-shared-cpp-hocon.patch less more

6	6	cmake/FindCPPHOCON.cmake \| 2 +-
7	7	1 file changed, 1 insertion(+), 1 deletion(-)
8	8
	9	diff --git a/cmake/FindCPPHOCON.cmake b/cmake/FindCPPHOCON.cmake
	10	index 00ba8bd..0df0a51 100644
9	11	--- a/cmake/FindCPPHOCON.cmake
10	12	+++ b/cmake/FindCPPHOCON.cmake
11	13	@@ -1,5 +1,5 @@

+3

-1

debian/patches/0002-ruby-fix-library-name.patch less more

7	7	lib/facter.rb.in \| 12 +-----------
8	8	1 file changed, 1 insertion(+), 11 deletions(-)
9	9
	10	diff --git a/lib/facter.rb.in b/lib/facter.rb.in
	11	index ce55c8e..b820c7a 100644
10	12	--- a/lib/facter.rb.in
11	13	+++ b/lib/facter.rb.in
12		@@ -31,17 +31,7 @@
	14	@@ -31,17 +31,7 @@ module Facter
13	15	else
14	16	# Simply require libfacter.so; this will define all of the Facter API
15	17	begin

+3

-1

debian/patches/0003-disable-facter-smoke.patch less more

9	9	CMakeLists.txt \| 4 +++-
10	10	1 file changed, 3 insertions(+), 1 deletion(-)
11	11
	12	diff --git a/CMakeLists.txt b/CMakeLists.txt
	13	index d0c0366..4d27ea0 100644
12	14	--- a/CMakeLists.txt
13	15	+++ b/CMakeLists.txt
14		@@ -214,7 +214,9 @@
	16	@@ -230,7 +230,9 @@ if (RUBY_FOUND)
15	17	add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
16	18	endif()
17	19	endif()

+9

-3

debian/patches/0004-rapidjson-1.1-compat.patch less more

15	15	lib/src/facts/resolvers/gce_resolver.cc \| 2 +-
16	16	3 files changed, 3 insertions(+), 2 deletions(-)
17	17
	18	diff --git a/lib/inc/facter/facts/collection.hpp b/lib/inc/facter/facts/collection.hpp
	19	index d5da4c1..11c845f 100644
18	20	--- a/lib/inc/facter/facts/collection.hpp
19	21	+++ b/lib/inc/facter/facts/collection.hpp
20		@@ -46,6 +46,7 @@
	22	@@ -48,6 +48,7 @@ namespace facter { namespace facts {
21	23	*/
22	24	struct stream_adapter
23	25	{

25	27	/**
26	28	* Constructs an adapter for use with rapidjson around the given stream.
27	29	* @param stream an output stream to which JSON will be written
	30	diff --git a/lib/src/facts/external/json_resolver.cc b/lib/src/facts/external/json_resolver.cc
	31	index 7fa9f40..db5aebe 100644
28	32	--- a/lib/src/facts/external/json_resolver.cc
29	33	+++ b/lib/src/facts/external/json_resolver.cc
30		@@ -24,7 +24,7 @@
	34	@@ -24,7 +24,7 @@ using namespace rapidjson;
31	35	namespace facter { namespace facts { namespace external {
32	36
33	37	// Helper event handler for parsing JSON data

36	40	{
37	41	explicit json_event_handler(collection& facts, vector<string>& names) :
38	42	_initialized(false),
	43	diff --git a/lib/src/facts/resolvers/gce_resolver.cc b/lib/src/facts/resolvers/gce_resolver.cc
	44	index e2bf689..85d0fa6 100644
39	45	--- a/lib/src/facts/resolvers/gce_resolver.cc
40	46	+++ b/lib/src/facts/resolvers/gce_resolver.cc
41		@@ -35,7 +35,7 @@
	47	@@ -35,7 +35,7 @@ namespace facter { namespace facts { namespace resolvers {
42	48	#endif
43	49
44	50	// Helper event handler for parsing JSON data

+5

-3

debian/patches/0005-Don-t-run-rspec-via-bundler.patch less more

3	3
4	4	Closes: #956300
5	5	---
6		CMakeLists.txt \| 6 +++---
7		1 file changed, 3 insertions(+), 3 deletions(-)
	6	CMakeLists.txt \| 8 +++-----
	7	1 file changed, 3 insertions(+), 5 deletions(-)
8	8
	9	diff --git a/CMakeLists.txt b/CMakeLists.txt
	10	index 4d27ea0..9315fda 100644
9	11	--- a/CMakeLists.txt
10	12	+++ b/CMakeLists.txt
11		@@ -223,11 +223,9 @@
	13	@@ -223,11 +223,9 @@ add_subdirectory(locales)
12	14	# Add test executables for unit testing
13	15	add_test(NAME "libfacter\\ tests" COMMAND libfacter_test)
14	16	if (RUBY_FOUND)

+18

-10

debian/patches/0006-fix-double-tests.patch less more

0		Description: Fix yaml tests with double values.
1		As of yaml-cpp 0.6.3, the maximal precision for serializing floating
2		point values is used. See
3		https://github.com/jbeder/yaml-cpp/commit/abf941b20d21342cd207df0f8ffe09f41a4d3042
4		.
5		This changes the output of the YAML serializer slightly and breaks the tests.
6		Fix this by using approximate matching while checking the YAML output, as is
7		done for JSON.
8		Author: Sebastian Ramacher <sramacher@debian.org>
	0	From: Sebastian Ramacher <sramacher@debian.org>
	1	Date: Tue, 25 Aug 2020 16:36:43 +0300
	2	Subject: Fix yaml tests with double values.
	3
9	4	Bug-Debian: https://bugs.debian.org/959573
10	5	Updated-By: Apollon Oikonomopoulos <apoikos@debian.org>
11	6	Last-Update: 2020-08-25
12	7
	8	As of yaml-cpp 0.6.3, the maximal precision for serializing floating
	9	point values is used. See
	10	https://github.com/jbeder/yaml-cpp/commit/abf941b20d21342cd207df0f8ffe09f41a4d3042
	11
	12	This changes the output of the YAML serializer slightly and breaks the tests.
	13	Fix this by using approximate matching while checking the YAML output, as is
	14	done for JSON.
	15	---
	16	lib/tests/facts/double_value.cc \| 3 ++-
	17	1 file changed, 2 insertions(+), 1 deletion(-)
	18
	19	diff --git a/lib/tests/facts/double_value.cc b/lib/tests/facts/double_value.cc
	20	index cd740a6..e3ce842 100644
13	21	--- a/lib/tests/facts/double_value.cc
14	22	+++ b/lib/tests/facts/double_value.cc
15	23	@@ -3,6 +3,7 @@

20	28	#include <cmath>
21	29	#include <limits>
22	30
23		@@ -27,7 +28,7 @@
	31	@@ -27,7 +28,7 @@ SCENARIO("using a double fact value") {
24	32	THEN("it should have the same value") {
25	33	Emitter emitter;
26	34	value.write(emitter);