gentoo resync : 13.06.2020

3 files changed, 67 insertions, 1 deletions

diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index b1c0f018149a..0679d30e4f40 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,5 +1,6 @@
 AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e
 AUX patches/syslog-ng-fno-common.patch 8521 BLAKE2B 6dc0654aefed1c480507269766f18eb9c1c88e8d9a5fe3c5394c108ea750aafe33858bc3c99957e3989b121a39345b6feffc80c588551145720573d5991fcae9 SHA512 c011f0973c8e3c3220bf9e7dc68176b6b4ec36d7e3030680a42862d31d951c499c81b5bd438622c9f7d41af61c2e24750d38b1c869e3e240e7c22ff8cd5d1f2f
+AUX patches/syslog-ng-glib-2.64-support.patch 2751 BLAKE2B bf80fb569292f4a467b3fcc39776943e847d1900bda7e80d7f279259a8f82b9b4c9f85d06bca5629c69a0ca0aedfe955017718d96094e48603a387f73af82476 SHA512 1eead04652764352f9ef0064ecec4b408b4fe8f9cf94c2e9f1a985b6383de0e1098df9bf2dcd352aeb17dd6dae2cda8313a1bfc0a70b2cf56bf8f323bbe1f169
 AUX syslog-ng.conf.gentoo.hardened.in 4509 BLAKE2B 39f130c008df8d5e31c121246997f8f31d2d8e2a78f1a881f4ca07ade0b3a5386c6e8c3fd8518e2ae471751564263886b8e3b78e8651efe0eeccd1d06c23c2a5 SHA512 0670952e6f5d0405e90bb5cb1ea168832bb2293095250c01a9baaf9e4fcdf8578ecf5b60809bd9e5089096a4d97fa966fcc47324fbe70cfd14266a10eb0001c6
 AUX syslog-ng.conf.gentoo.in 1198 BLAKE2B a95b1fb9f46655502a41b0381c7388c9b54cfe9b8c3fd68dc68bd473175688e8ae72145a0ef718ef65220ecced7ecab00b39755cf41d4e21a6d375059cf6f309 SHA512 2830d1c5071a50c4aea6288b35c2880988111f29a11a641ee89f001a4ca4319943f87fdb1fd7079988888efa55401e2ed62f7a507c452de137f2e97a445d60e1
 AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44
@@ -13,5 +14,5 @@ DIST syslog-ng-3.26.1.tar.gz 5040993 BLAKE2B 235971547c8febe61191014d971b9e5d715
 EBUILD syslog-ng-3.22.1.ebuild 4936 BLAKE2B 04f1a6919c18f56ac8a3bc7603deb39b6b8813211f459c893006d9accad4df75fc594cbd1fd95ecb86fc913e324db31014be9732ffca8a86137effef2f33ecf8 SHA512 f693d5c9a4171ae85c4a37d595ff613dcda4966bbdbcf47b3bee41022320f1d18e54ed2cd5931000b485cdce85cdc557418f683739efc12728623084dfa62acb
 EBUILD syslog-ng-3.24.1.ebuild 4883 BLAKE2B e48c762ee8d64e1519444632f9db25561cda743e2312726efdfd1f5c931e735a6fa0a6b361d408681c1a2fe5dd34b1549115d0d09b6293097c87603282668d65 SHA512 6e37630522517a83d80fcf97c644c6a434d439b76d53ec267ecf460f11c245b438d0d7439299f8c8260ef88007f96383f06d8e61c1e5469b750c2bfc25592ef4
 EBUILD syslog-ng-3.25.1.ebuild 4909 BLAKE2B 2023e42d14273f411e66e33b5ae3213126ec3de11c24ced371db5e6f5da2bd5b08a535981031db30ca9b753e718956f1dac8fc0ca79f63102f631d0158c4988e SHA512 5f104319d94922cd0e25db9dad30a897243eb271215ed5dab2a6bb05d21c33a69cf60f00713a63115a3ddde9ff79b4f59c1912bb1a5bb7f970e6189df872b63c
-EBUILD syslog-ng-3.26.1.ebuild 4851 BLAKE2B 0939c95da5db558006964feb5e3ced95e0df0bad58ebeeebd3221ef63aacb1c89d1144defe90176ad029b8f718250eacf67e454a2c0a3509ef2afe94abe26f57 SHA512 87290fe3d96181dcb4b55fa6103102f41da9da5d0bb2eae2719bc09153e91a95fba85320c2dd9f64030645f0328c7386bb4523a6a18ee00643eb13854cef791b
+EBUILD syslog-ng-3.26.1-r1.ebuild 4920 BLAKE2B ae8410d9cb5d82886987a6a0eb7b7e23dec0ac2108604a2f7a91a45f2afbbfbae71af732fa188836c8461c4408a485693f01981952a5df2c1e5c505f4ca398b8 SHA512 2ab568d049380f335a6ff61c3ebcb05360f84f7a2a8816ee09f057dadfa991d89d8aa1d845818ddb0c33148be0cab5d8ced20bfe074c74f45c4b80a1bbc65738
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch b/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch
new file mode 100644
index 000000000000..fdd98624a6ea
--- /dev/null
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch
@@ -0,0 +1,63 @@
+diff --git a/lib/compat/glib.c b/lib/compat/glib.c
+index 8b6e52447..5b8ed8891 100644
+--- a/lib/compat/glib.c
++++ b/lib/compat/glib.c
+@@ -315,3 +315,18 @@ slng_g_hash_table_insert(GHashTable *hash_table, gpointer key, gpointer value)
+   return exists;
+ }
+ #endif
++
++
++#if !GLIB_CHECK_VERSION(2, 64, 0)
++gunichar
++g_utf8_get_char_validated_fixed(const gchar *p, gssize max_len)
++{
++  // https://github.com/GNOME/glib/commit/1963821a57584b4674c20895e8a5adccd2d9effd
++
++#undef g_utf8_get_char_validated
++  if (*p == '\0' && max_len > 0)
++    return (gunichar)-2;
++
++  return g_utf8_get_char_validated(p, max_len);
++}
++#endif
+diff --git a/lib/compat/glib.h b/lib/compat/glib.h
+index a9782ed2d..0fbdbd12d 100644
+--- a/lib/compat/glib.h
++++ b/lib/compat/glib.h
+@@ -109,4 +109,9 @@ gchar *g_base64_encode_fixed(const guchar *data, gsize len);
+ gboolean slng_g_hash_table_insert (GHashTable *hash_table, gpointer key, gpointer value);
+ #endif
+ 
++#if !GLIB_CHECK_VERSION(2, 64, 0)
++#define g_utf8_get_char_validated g_utf8_get_char_validated_fixed
++gunichar g_utf8_get_char_validated_fixed (const gchar *p, gssize max_len);
++#endif
++
+ #endif
+diff --git a/modules/cef/tests/test-format-cef-extension.c b/modules/cef/tests/test-format-cef-extension.c
+index d7f6ee3c1..f4233f96f 100644
+--- a/modules/cef/tests/test-format-cef-extension.c
++++ b/modules/cef/tests/test-format-cef-extension.c
+@@ -104,7 +104,7 @@ Test(format_cef, test_null_in_value)
+ 
+   configuration->template_options.on_error = ON_ERROR_DROP_MESSAGE | ON_ERROR_SILENT;
+   log_msg_set_value_by_name(msg, ".cef.k", "a\0b", 3);
+-  assert_template_format_msg("$(format-cef-extension --subkeys .cef.)", "k=a\\u0000b", msg);
++  assert_template_format_msg("$(format-cef-extension --subkeys .cef.)", "k=a\\x00b", msg);
+   log_msg_unref(msg);
+ }
+ 
+diff --git a/modules/json/tests/test_format_json.c b/modules/json/tests/test_format_json.c
+index 92c61e9f1..1224ddb33 100644
+--- a/modules/json/tests/test_format_json.c
++++ b/modules/json/tests/test_format_json.c
+@@ -55,7 +55,7 @@ Test(format_json, test_format_json)
+   assert_template_format("$(format-json MSG=$escaping)",
+                          "{\"MSG\":\"binary stuff follows \\\"\\\\xad árvíztűrőtükörfúrógép\"}");
+   assert_template_format("$(format-json MSG=$escaping2)", "{\"MSG\":\"\\\\xc3\"}");
+-  assert_template_format("$(format-json MSG=$null)", "{\"MSG\":\"binary\\u0000stuff\"}");
++  assert_template_format("$(format-json MSG=$null)", "{\"MSG\":\"binary\\\\x00stuff\"}");
+   assert_template_format_with_context("$(format-json MSG=$MSG)",
+                                       "{\"MSG\":\"árvíztűrőtükörfúrógép\"}{\"MSG\":\"árvíztűrőtükörfúrógép\"}");
+   assert_template_format("$(format-json --scope rfc3164)",
diff --git a/app-admin/syslog-ng/syslog-ng-3.26.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
index fffd41d24832..834c32ffc4ad 100644
--- a/app-admin/syslog-ng/syslog-ng-3.26.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
@@ -50,6 +50,8 @@ DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunO
 	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
 	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
 
+PATCHES=( "${FILESDIR}/patches/syslog-ng-glib-2.64-support.patch" )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }