Merging upstream version 1.46.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

37 files changed, 0 insertions, 81 deletions

diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/encoded-surrogate-half/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/encoded-surrogate-half/error
deleted file mode 100644
index 762d2c4b1..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/encoded-surrogate-half/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 2 2
-unable to decode byte 0xed near '"'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/encoded-surrogate-half/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/encoded-surrogate-half/input
deleted file mode 100644
index 515dd933c..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/encoded-surrogate-half/input
+++ /dev/null
@@ -1 +0,0 @@
-["��� <-- encoded surrogate half"]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-after-backslash/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-after-backslash/error
deleted file mode 100644
index b16dc171e..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-after-backslash/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 3 3
-unable to decode byte 0xe5 near '"\'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-after-backslash/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-after-backslash/input
deleted file mode 100644
index 57c8beef6..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-after-backslash/input
+++ /dev/null
@@ -1 +0,0 @@
-["\�"]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-array/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-array/error
deleted file mode 100644
index be15386df..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-array/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 1 1
-unable to decode byte 0xe5
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-array/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-array/input
deleted file mode 100644
index ebefcd6f8..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-array/input
+++ /dev/null
@@ -1 +0,0 @@
-[�]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-bigger-int/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-bigger-int/error
deleted file mode 100644
index 01b447639..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-bigger-int/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 4 4
-unable to decode byte 0xe5 near '123'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-bigger-int/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-bigger-int/input
deleted file mode 100644
index e512f9ae0..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-bigger-int/input
+++ /dev/null
@@ -1 +0,0 @@
-[123�]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-escape/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-escape/error
deleted file mode 100644
index c13583dd8..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-escape/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 4 4
-unable to decode byte 0xe5 near '"\u'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-escape/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-escape/input
deleted file mode 100644
index 2b271b82f..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-escape/input
+++ /dev/null
@@ -1 +0,0 @@
-["\u�"]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-exponent/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-exponent/error
deleted file mode 100644
index c7b20b7a2..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-exponent/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 4 4
-unable to decode byte 0xe5 near '1e1'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-exponent/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-exponent/input
deleted file mode 100644
index d8e83c595..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-exponent/input
+++ /dev/null
@@ -1 +0,0 @@
-[1e1�]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-identifier/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-identifier/error
deleted file mode 100644
index 33dfc2324..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-identifier/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 2 2
-unable to decode byte 0xe5 near 'a'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-identifier/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-identifier/input
deleted file mode 100644
index ef038514a..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-identifier/input
+++ /dev/null
@@ -1 +0,0 @@
-[a�]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-int/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-int/error
deleted file mode 100644
index 8f08970c1..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-int/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 2 2
-unable to decode byte 0xe5 near '0'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-int/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-int/input
deleted file mode 100644
index 371226e4c..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-int/input
+++ /dev/null
@@ -1 +0,0 @@
-[0�]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-real-after-e/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-real-after-e/error
deleted file mode 100644
index b7660e327..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-real-after-e/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 3 3
-unable to decode byte 0xe5 near '1e'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-real-after-e/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-real-after-e/input
deleted file mode 100644
index 17fc29c90..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-real-after-e/input
+++ /dev/null
@@ -1 +0,0 @@
-[1e�]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-string/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-string/error
deleted file mode 100644
index 0b7039a52..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-string/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 2 2
-unable to decode byte 0xe5 near '"'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-string/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-string/input
deleted file mode 100644
index 00b79c0af..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/invalid-utf-8-in-string/input
+++ /dev/null
@@ -1 +0,0 @@
-["� <-- invalid UTF-8"]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/lone-invalid-utf-8/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/lone-invalid-utf-8/error
deleted file mode 100644
index 8e9a51119..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/lone-invalid-utf-8/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 0 0
-unable to decode byte 0xe5
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/lone-invalid-utf-8/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/lone-invalid-utf-8/input
deleted file mode 100644
index eb8079699..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/lone-invalid-utf-8/input
+++ /dev/null
@@ -1 +0,0 @@
-�
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/lone-utf-8-continuation-byte/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/lone-utf-8-continuation-byte/error
deleted file mode 100644
index 86bbad3c8..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/lone-utf-8-continuation-byte/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 2 2
-unable to decode byte 0x81 near '"'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/lone-utf-8-continuation-byte/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/lone-utf-8-continuation-byte/input
deleted file mode 100644
index 62a26b6fb..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/lone-utf-8-continuation-byte/input
+++ /dev/null
@@ -1 +0,0 @@
-["�"]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/not-in-unicode-range/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/not-in-unicode-range/error
deleted file mode 100644
index d07ccb3e5..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/not-in-unicode-range/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 2 2
-unable to decode byte 0xf4 near '"'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/not-in-unicode-range/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/not-in-unicode-range/input
deleted file mode 100644
index 1216186a7..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/not-in-unicode-range/input
+++ /dev/null
@@ -1 +0,0 @@
-["����"]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-3-byte-encoding/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-3-byte-encoding/error
deleted file mode 100644
index 8a05abaed..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-3-byte-encoding/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 2 2
-unable to decode byte 0xe0 near '"'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-3-byte-encoding/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-3-byte-encoding/input
deleted file mode 100644
index 0bf909f7b..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-3-byte-encoding/input
+++ /dev/null
@@ -1 +0,0 @@
-["��� <-- overlong encoding"]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-4-byte-encoding/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-4-byte-encoding/error
deleted file mode 100644
index 7e19c5fe4..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-4-byte-encoding/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 2 2
-unable to decode byte 0xf0 near '"'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-4-byte-encoding/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-4-byte-encoding/input
deleted file mode 100644
index c6b631350..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-4-byte-encoding/input
+++ /dev/null
@@ -1 +0,0 @@
-["���� <-- overlong encoding"]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-ascii-encoding/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-ascii-encoding/error
deleted file mode 100644
index 1d382edd7..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-ascii-encoding/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 2 2
-unable to decode byte 0xc1 near '"'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-ascii-encoding/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-ascii-encoding/input
deleted file mode 100644
index ef6e10a34..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/overlong-ascii-encoding/input
+++ /dev/null
@@ -1 +0,0 @@
-["�"]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/restricted-utf-8/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/restricted-utf-8/error
deleted file mode 100644
index d018f5ff3..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/restricted-utf-8/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 2 2
-unable to decode byte 0xfd near '"'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/restricted-utf-8/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/restricted-utf-8/input
deleted file mode 100644
index ba6017002..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/restricted-utf-8/input
+++ /dev/null
@@ -1 +0,0 @@
-["�"]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/run b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/run
deleted file mode 100755
index 369c43da5..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/run
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
-#
-# Jansson is free software; you can redistribute it and/or modify
-# it under the terms of the MIT license. See LICENSE for details.
-
-is_test() {
-    test -d $test_path
-}
-
-run_test() {
-    $json_process --env <$test_path/input >$test_log/stdout 2>$test_log/stderr
-    valgrind_check $test_log/stderr || return 1
-    cmp -s $test_path/error $test_log/stderr
-}
-
-show_error() {
-    valgrind_show_error && return
-
-    echo "EXPECTED ERROR:"
-    nl -bn $test_path/error
-    echo "ACTUAL ERROR:"
-    nl -bn $test_log/stderr
-}
-
-. $top_srcdir/test/scripts/run-tests.sh
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/truncated-utf-8/error b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/truncated-utf-8/error
deleted file mode 100644
index 8a05abaed..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/truncated-utf-8/error
+++ /dev/null
@@ -1,2 +0,0 @@
-1 2 2
-unable to decode byte 0xe0 near '"'
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/truncated-utf-8/input b/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/truncated-utf-8/input
deleted file mode 100644
index bce9e18bf..000000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/invalid-unicode/truncated-utf-8/input
+++ /dev/null
@@ -1 +0,0 @@
-["�� <-- truncated UTF-8"]