293446 2026-02-25 19:20:44 +0000 devel/catch: fix build with clang 21 2026-03-13 08:53:03 +0000 1 1 1 Unclassified Ports & Packages Individual Port(s) Latest Any Any Closed FIXED --- Affects Only Me --- 292067 1 dim dim oldest_to_newest 1408972 0 dim 2026-02-25 19:20:44 +0000 With clang 21 devel/catch fails to build, with errors similar to: /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/internal/catch_stringref.h:95:32: error: identifier '_sr' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] 95 | constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { | ~~~~~~~~~~~~^~~ | operator""_sr /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/internal/catch_stringref.h:100:28: error: identifier '_catch_sr' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] 100 | constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { | ~~~~~~~~~~~~^~~~~~~~~ | operator""_catch_sr /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/IntrospectiveTests/String.tests.cpp:144:33: error: identifier '_sr' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] 144 | using Catch::operator"" _sr; | ~~~~~~~~~~~^~~ | operator""_sr and later: /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp:13:14: error: function 'operator=' could be declared with attribute 'noreturn' [-Werror,-Wmissing-noreturn] 13 | MyType1& operator=(MyType1 const&) { throw 3; } | ^ /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp:18:14: error: function 'operator=' could be declared with attribute 'noreturn' [-Werror,-Wmissing-noreturn] 18 | MyType2& operator=(MyType2 const&) { throw 4; } | ^ The former can be fixed by removing the space between the identifier and the double quotes, the latter by declaring the functions with [[noreturn]]. 1408973 1 268355 dim 2026-02-25 19:21:43 +0000 Created attachment 268355 devel/catch: fix build with clang 21 1410611 2 sunpoet 2026-03-09 18:05:55 +0000 LGTM. Please name the patch file as patch-clang21. Thanks. 1411218 3 commit-hook 2026-03-13 08:34:40 +0000 A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=a080335cdc0d1c38ab913096650e4b0cbcd9454e commit a080335cdc0d1c38ab913096650e4b0cbcd9454e Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2026-02-25 19:21:07 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2026-03-13 08:33:17 +0000 devel/catch: fix build with clang 21 With clang 21 devel/catch fails to build, with errors similar to: /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/internal/catch_stringref.h:95:32: error: identifier '_sr' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] 95 | constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { | ~~~~~~~~~~~~^~~ | operator""_sr /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/internal/catch_stringref.h:100:28: error: identifier '_catch_sr' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] 100 | constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { | ~~~~~~~~~~~~^~~~~~~~~ | operator""_catch_sr /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/IntrospectiveTests/String.tests.cpp:144:33: error: identifier '_sr' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] 144 | using Catch::operator"" _sr; | ~~~~~~~~~~~^~~ | operator""_sr and later: /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp:13:14: error: function 'operator=' could be declared with attribute 'noreturn' [-Werror,-Wmissing-noreturn] 13 | MyType1& operator=(MyType1 const&) { throw 3; } | ^ /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp:18:14: error: function 'operator=' could be declared with attribute 'noreturn' [-Werror,-Wmissing-noreturn] 18 | MyType2& operator=(MyType2 const&) { throw 4; } | ^ The former can be fixed by removing the space between the identifier and the double quotes, the latter by declaring the functions with [[noreturn]]. PR: 293446 Approved by: maintainer timeout (2 weeks) MFH: 2026Q1 .../patch-include_internal_catch__approx.cpp (new) | 15 +++++++++++++++ .../files/patch-include_internal_catch__approx.h (new) | 13 +++++++++++++ .../patch-include_internal_catch__stringref.h (new) | 17 +++++++++++++++++ ...s_SelfTest_IntrospectiveTests_String.tests.cpp (new) | 11 +++++++++++ ..._SelfTest_UsageTests_ToStringVariant.tests.cpp (new) | 17 +++++++++++++++++ 5 files changed, 73 insertions(+) 1411219 4 commit-hook 2026-03-13 08:35:41 +0000 A commit in branch 2026Q1 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=d92ebd379aa5c7098ce4ba2aab8ca7fd2f8f3657 commit d92ebd379aa5c7098ce4ba2aab8ca7fd2f8f3657 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2026-02-25 19:21:07 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2026-03-13 08:34:37 +0000 devel/catch: fix build with clang 21 With clang 21 devel/catch fails to build, with errors similar to: /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/internal/catch_stringref.h:95:32: error: identifier '_sr' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] 95 | constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef { | ~~~~~~~~~~~~^~~ | operator""_sr /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/include/internal/catch_stringref.h:100:28: error: identifier '_catch_sr' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] 100 | constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef { | ~~~~~~~~~~~~^~~~~~~~~ | operator""_catch_sr /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/IntrospectiveTests/String.tests.cpp:144:33: error: identifier '_sr' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] 144 | using Catch::operator"" _sr; | ~~~~~~~~~~~^~~ | operator""_sr and later: /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp:13:14: error: function 'operator=' could be declared with attribute 'noreturn' [-Werror,-Wmissing-noreturn] 13 | MyType1& operator=(MyType1 const&) { throw 3; } | ^ /wrkdirs/usr/ports/devel/catch/work/Catch2-2.13.10/projects/SelfTest/UsageTests/ToStringVariant.tests.cpp:18:14: error: function 'operator=' could be declared with attribute 'noreturn' [-Werror,-Wmissing-noreturn] 18 | MyType2& operator=(MyType2 const&) { throw 4; } | ^ The former can be fixed by removing the space between the identifier and the double quotes, the latter by declaring the functions with [[noreturn]]. PR: 293446 Approved by: maintainer timeout (2 weeks) MFH: 2026Q1 (cherry picked from commit a080335cdc0d1c38ab913096650e4b0cbcd9454e) .../patch-include_internal_catch__approx.cpp (new) | 15 +++++++++++++++ .../files/patch-include_internal_catch__approx.h (new) | 13 +++++++++++++ .../patch-include_internal_catch__stringref.h (new) | 17 +++++++++++++++++ ...s_SelfTest_IntrospectiveTests_String.tests.cpp (new) | 11 +++++++++++ ..._SelfTest_UsageTests_ToStringVariant.tests.cpp (new) | 17 +++++++++++++++++ 5 files changed, 73 insertions(+) 1411220 5 dim 2026-03-13 08:45:44 +0000 Sorry, I committed this while in a workflow where I had to commit another dozen bugs that had a maintainer timeout. I'll gather up the patches in to patch-clang21 and then re-commit with the correct message! 1411221 6 commit-hook 2026-03-13 08:50:43 +0000 A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c2cb42fd6cfda42888e61feb6e287661125edcc commit 9c2cb42fd6cfda42888e61feb6e287661125edcc Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2026-03-13 08:48:39 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2026-03-13 08:49:55 +0000 devel/catch: fix build with clang 21, take 2 Move the separate patches into patch-clang21, as requested by the maintainer. PR: 293446 Approved by: sunpoet (maintainer) MFH: 2026Q1 devel/catch/files/patch-clang21 (new) | 73 ++++++++++++++++++++++ ...patch-include_internal_catch__approx.cpp (gone) | 15 ----- .../patch-include_internal_catch__approx.h (gone) | 13 ---- ...atch-include_internal_catch__stringref.h (gone) | 17 ----- ...Test_IntrospectiveTests_String.tests.cpp (gone) | 11 ---- ...est_UsageTests_ToStringVariant.tests.cpp (gone) | 17 ----- 6 files changed, 73 insertions(+), 73 deletions(-) 1411222 7 commit-hook 2026-03-13 08:51:44 +0000 A commit in branch 2026Q1 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=a35bcf1c6849d1d3c5979f936eac77a54e6f44f7 commit a35bcf1c6849d1d3c5979f936eac77a54e6f44f7 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2026-03-13 08:48:39 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2026-03-13 08:51:21 +0000 devel/catch: fix build with clang 21, take 2 Move the separate patches into patch-clang21, as requested by the maintainer. PR: 293446 Approved by: sunpoet (maintainer) MFH: 2026Q1 (cherry picked from commit 9c2cb42fd6cfda42888e61feb6e287661125edcc) devel/catch/files/patch-clang21 (new) | 73 ++++++++++++++++++++++ ...patch-include_internal_catch__approx.cpp (gone) | 15 ----- .../patch-include_internal_catch__approx.h (gone) | 13 ---- ...atch-include_internal_catch__stringref.h (gone) | 17 ----- ...Test_IntrospectiveTests_String.tests.cpp (gone) | 11 ---- ...est_UsageTests_ToStringVariant.tests.cpp (gone) | 17 ----- 6 files changed, 73 insertions(+), 73 deletions(-) 268355 2026-02-25 19:21:43 +0000 2026-02-25 19:21:43 +0000 devel/catch: fix build with clang 21 devel__catch-fix-clang21-build-1.diff text/plain 7072 dim Y29tbWl0IGY1ZGJjNTM5MmRkZTMwNDVlYjE0MjRmYjVmYmFkZTZmZTlmMjk3YmMKQXV0aG9yOiBE aW1pdHJ5IEFuZHJpYyA8ZGltQEZyZWVCU0Qub3JnPgpEYXRlOiAgIDIwMjYtMDItMjVUMjA6MjE6 MDcrMDE6MDAKCiAgICBkZXZlbC9jYXRjaDogZml4IGJ1aWxkIHdpdGggY2xhbmcgMjEKICAgIAog ICAgV2l0aCBjbGFuZyAyMSBkZXZlbC9jYXRjaCBmYWlscyB0byBidWlsZCwgd2l0aCBlcnJvcnMg c2ltaWxhciB0bzoKICAgIAogICAgICAgIC93cmtkaXJzL3Vzci9wb3J0cy9kZXZlbC9jYXRjaC93 b3JrL0NhdGNoMi0yLjEzLjEwL2luY2x1ZGUvaW50ZXJuYWwvY2F0Y2hfc3RyaW5ncmVmLmg6OTU6 MzI6IGVycm9yOiBpZGVudGlmaWVyICdfc3InIHByZWNlZGVkIGJ5IHdoaXRlc3BhY2UgaW4gYSBs aXRlcmFsIG9wZXJhdG9yIGRlY2xhcmF0aW9uIGlzIGRlcHJlY2F0ZWQgWy1XZXJyb3IsLVdkZXBy ZWNhdGVkLWxpdGVyYWwtb3BlcmF0b3JdCiAgICAgICAgICAgOTUgfCAgICAgY29uc3RleHByIGF1 dG8gb3BlcmF0b3IgIiIgX3NyKCBjaGFyIGNvbnN0KiByYXdDaGFycywgc3RkOjpzaXplX3Qgc2l6 ZSApIG5vZXhjZXB0IC0+IFN0cmluZ1JlZiB7CiAgICAgICAgICAgICAgfCAgICAgICAgICAgICAg ICAgICAgfn5+fn5+fn5+fn5+Xn5+CiAgICAgICAgICAgICAgfCAgICAgICAgICAgICAgICAgICAg b3BlcmF0b3IiIl9zcgogICAgICAgIC93cmtkaXJzL3Vzci9wb3J0cy9kZXZlbC9jYXRjaC93b3Jr L0NhdGNoMi0yLjEzLjEwL2luY2x1ZGUvaW50ZXJuYWwvY2F0Y2hfc3RyaW5ncmVmLmg6MTAwOjI4 OiBlcnJvcjogaWRlbnRpZmllciAnX2NhdGNoX3NyJyBwcmVjZWRlZCBieSB3aGl0ZXNwYWNlIGlu IGEgbGl0ZXJhbCBvcGVyYXRvciBkZWNsYXJhdGlvbiBpcyBkZXByZWNhdGVkIFstV2Vycm9yLC1X ZGVwcmVjYXRlZC1saXRlcmFsLW9wZXJhdG9yXQogICAgICAgICAgMTAwIHwgY29uc3RleHByIGF1 dG8gb3BlcmF0b3IgIiIgX2NhdGNoX3NyKCBjaGFyIGNvbnN0KiByYXdDaGFycywgc3RkOjpzaXpl X3Qgc2l6ZSApIG5vZXhjZXB0IC0+IENhdGNoOjpTdHJpbmdSZWYgewogICAgICAgICAgICAgIHwg ICAgICAgICAgICAgICAgfn5+fn5+fn5+fn5+Xn5+fn5+fn5+CiAgICAgICAgICAgICAgfCAgICAg ICAgICAgICAgICBvcGVyYXRvciIiX2NhdGNoX3NyCiAgICAgICAgL3dya2RpcnMvdXNyL3BvcnRz L2RldmVsL2NhdGNoL3dvcmsvQ2F0Y2gyLTIuMTMuMTAvcHJvamVjdHMvU2VsZlRlc3QvSW50cm9z cGVjdGl2ZVRlc3RzL1N0cmluZy50ZXN0cy5jcHA6MTQ0OjMzOiBlcnJvcjogaWRlbnRpZmllciAn X3NyJyBwcmVjZWRlZCBieSB3aGl0ZXNwYWNlIGluIGEgbGl0ZXJhbCBvcGVyYXRvciBkZWNsYXJh dGlvbiBpcyBkZXByZWNhdGVkIFstV2Vycm9yLC1XZGVwcmVjYXRlZC1saXRlcmFsLW9wZXJhdG9y XQogICAgICAgICAgMTQ0IHwgICAgICAgICB1c2luZyBDYXRjaDo6b3BlcmF0b3IiIiBfc3I7CiAg ICAgICAgICAgICAgfCAgICAgICAgICAgICAgICAgICAgICB+fn5+fn5+fn5+fl5+fgogICAgICAg ICAgICAgIHwgICAgICAgICAgICAgICAgICAgICAgb3BlcmF0b3IiIl9zcgogICAgCiAgICBhbmQg bGF0ZXI6CiAgICAKICAgICAgICAvd3JrZGlycy91c3IvcG9ydHMvZGV2ZWwvY2F0Y2gvd29yay9D YXRjaDItMi4xMy4xMC9wcm9qZWN0cy9TZWxmVGVzdC9Vc2FnZVRlc3RzL1RvU3RyaW5nVmFyaWFu dC50ZXN0cy5jcHA6MTM6MTQ6IGVycm9yOiBmdW5jdGlvbiAnb3BlcmF0b3I9JyBjb3VsZCBiZSBk ZWNsYXJlZCB3aXRoIGF0dHJpYnV0ZSAnbm9yZXR1cm4nIFstV2Vycm9yLC1XbWlzc2luZy1ub3Jl dHVybl0KICAgICAgICAgICAxMyB8ICAgICBNeVR5cGUxJiBvcGVyYXRvcj0oTXlUeXBlMSBjb25z dCYpIHsgdGhyb3cgMzsgfQogICAgICAgICAgICAgIHwgICAgICAgICAgICAgIF4KICAgICAgICAv d3JrZGlycy91c3IvcG9ydHMvZGV2ZWwvY2F0Y2gvd29yay9DYXRjaDItMi4xMy4xMC9wcm9qZWN0 cy9TZWxmVGVzdC9Vc2FnZVRlc3RzL1RvU3RyaW5nVmFyaWFudC50ZXN0cy5jcHA6MTg6MTQ6IGVy cm9yOiBmdW5jdGlvbiAnb3BlcmF0b3I9JyBjb3VsZCBiZSBkZWNsYXJlZCB3aXRoIGF0dHJpYnV0 ZSAnbm9yZXR1cm4nIFstV2Vycm9yLC1XbWlzc2luZy1ub3JldHVybl0KICAgICAgICAgICAxOCB8 ICAgICBNeVR5cGUyJiBvcGVyYXRvcj0oTXlUeXBlMiBjb25zdCYpIHsgdGhyb3cgNDsgfQogICAg ICAgICAgICAgIHwgICAgICAgICAgICAgIF4KICAgIAogICAgVGhlIGZvcm1lciBjYW4gYmUgZml4 ZWQgYnkgcmVtb3ZpbmcgdGhlIHNwYWNlIGJldHdlZW4gdGhlIGlkZW50aWZpZXIgYW5kCiAgICB0 aGUgZG91YmxlIHF1b3RlcywgdGhlIGxhdHRlciBieSBkZWNsYXJpbmcgdGhlIGZ1bmN0aW9ucyB3 aXRoCiAgICBbW25vcmV0dXJuXV0uCiAgICAKICAgIFBSOiAgICAgICAgICAgICAyOTM0NDYKICAg IE1GSDogICAgICAgICAgICAyMDI2UTEKCmRpZmYgLS1naXQgYS9kZXZlbC9jYXRjaC9maWxlcy9w YXRjaC1pbmNsdWRlX2ludGVybmFsX2NhdGNoX19hcHByb3guY3BwIGIvZGV2ZWwvY2F0Y2gvZmls ZXMvcGF0Y2gtaW5jbHVkZV9pbnRlcm5hbF9jYXRjaF9fYXBwcm94LmNwcApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLmE1NTJhNzUzMTJhMgotLS0gL2Rldi9udWxsCisr KyBiL2RldmVsL2NhdGNoL2ZpbGVzL3BhdGNoLWluY2x1ZGVfaW50ZXJuYWxfY2F0Y2hfX2FwcHJv eC5jcHAKQEAgLTAsMCArMSwxNSBAQAorLS0tIGluY2x1ZGUvaW50ZXJuYWwvY2F0Y2hfYXBwcm94 LmNwcC5vcmlnCTIwMjItMTAtMTYgMDk6MDI6MTcgVVRDCisrKysgaW5jbHVkZS9pbnRlcm5hbC9j YXRjaF9hcHByb3guY3BwCitAQCAtNzMsMTAgKzczLDEwIEBAIG5hbWVzcGFjZSBsaXRlcmFscyB7 CisgfSAvLyBlbmQgbmFtZXNwYWNlIERldGFpbAorIAorIG5hbWVzcGFjZSBsaXRlcmFscyB7Cist ICAgIERldGFpbDo6QXBwcm94IG9wZXJhdG9yICIiIF9hKGxvbmcgZG91YmxlIHZhbCkgeworKyAg ICBEZXRhaWw6OkFwcHJveCBvcGVyYXRvciAiIl9hKGxvbmcgZG91YmxlIHZhbCkgeworICAgICAg ICAgcmV0dXJuIERldGFpbDo6QXBwcm94KHZhbCk7CisgICAgIH0KKy0gICAgRGV0YWlsOjpBcHBy b3ggb3BlcmF0b3IgIiIgX2EodW5zaWduZWQgbG9uZyBsb25nIHZhbCkgeworKyAgICBEZXRhaWw6 OkFwcHJveCBvcGVyYXRvciAiIl9hKHVuc2lnbmVkIGxvbmcgbG9uZyB2YWwpIHsKKyAgICAgICAg IHJldHVybiBEZXRhaWw6OkFwcHJveCh2YWwpOworICAgICB9CisgfSAvLyBlbmQgbmFtZXNwYWNl IGxpdGVyYWxzCmRpZmYgLS1naXQgYS9kZXZlbC9jYXRjaC9maWxlcy9wYXRjaC1pbmNsdWRlX2lu dGVybmFsX2NhdGNoX19hcHByb3guaCBiL2RldmVsL2NhdGNoL2ZpbGVzL3BhdGNoLWluY2x1ZGVf aW50ZXJuYWxfY2F0Y2hfX2FwcHJveC5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMC4uNGFjNTg3ZmQ0MDJkCi0tLSAvZGV2L251bGwKKysrIGIvZGV2ZWwvY2F0Y2gvZmls ZXMvcGF0Y2gtaW5jbHVkZV9pbnRlcm5hbF9jYXRjaF9fYXBwcm94LmgKQEAgLTAsMCArMSwxMyBA QAorLS0tIGluY2x1ZGUvaW50ZXJuYWwvY2F0Y2hfYXBwcm94Lmgub3JpZwkyMDIyLTEwLTE2IDA5 OjAyOjE3IFVUQworKysrIGluY2x1ZGUvaW50ZXJuYWwvY2F0Y2hfYXBwcm94LmgKK0BAIC0xMTgs OCArMTE4LDggQEAgbmFtZXNwYWNlIGxpdGVyYWxzIHsKKyB9IC8vIGVuZCBuYW1lc3BhY2UgRGV0 YWlsCisgCisgbmFtZXNwYWNlIGxpdGVyYWxzIHsKKy0gICAgRGV0YWlsOjpBcHByb3ggb3BlcmF0 b3IgIiIgX2EobG9uZyBkb3VibGUgdmFsKTsKKy0gICAgRGV0YWlsOjpBcHByb3ggb3BlcmF0b3Ig IiIgX2EodW5zaWduZWQgbG9uZyBsb25nIHZhbCk7CisrICAgIERldGFpbDo6QXBwcm94IG9wZXJh dG9yICIiX2EobG9uZyBkb3VibGUgdmFsKTsKKysgICAgRGV0YWlsOjpBcHByb3ggb3BlcmF0b3Ig IiJfYSh1bnNpZ25lZCBsb25nIGxvbmcgdmFsKTsKKyB9IC8vIGVuZCBuYW1lc3BhY2UgbGl0ZXJh bHMKKyAKKyB0ZW1wbGF0ZTw+CmRpZmYgLS1naXQgYS9kZXZlbC9jYXRjaC9maWxlcy9wYXRjaC1p bmNsdWRlX2ludGVybmFsX2NhdGNoX19zdHJpbmdyZWYuaCBiL2RldmVsL2NhdGNoL2ZpbGVzL3Bh dGNoLWluY2x1ZGVfaW50ZXJuYWxfY2F0Y2hfX3N0cmluZ3JlZi5oCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uY2Y4MGI2MDU3YTAyCi0tLSAvZGV2L251bGwKKysrIGIv ZGV2ZWwvY2F0Y2gvZmlsZXMvcGF0Y2gtaW5jbHVkZV9pbnRlcm5hbF9jYXRjaF9fc3RyaW5ncmVm LmgKQEAgLTAsMCArMSwxNyBAQAorLS0tIGluY2x1ZGUvaW50ZXJuYWwvY2F0Y2hfc3RyaW5ncmVm Lmgub3JpZwkyMDIyLTEwLTE2IDA5OjAyOjE3IFVUQworKysrIGluY2x1ZGUvaW50ZXJuYWwvY2F0 Y2hfc3RyaW5ncmVmLmgKK0BAIC05MiwxMiArOTIsMTIgQEAgbmFtZXNwYWNlIENhdGNoIHsKKyAg ICAgYXV0byBvcGVyYXRvciA8PCAoIHN0ZDo6b3N0cmVhbSYgb3MsIFN0cmluZ1JlZiBjb25zdCYg c3IgKSAtPiBzdGQ6Om9zdHJlYW0mOworIAorIAorLSAgICBjb25zdGV4cHIgYXV0byBvcGVyYXRv ciAiIiBfc3IoIGNoYXIgY29uc3QqIHJhd0NoYXJzLCBzdGQ6OnNpemVfdCBzaXplICkgbm9leGNl cHQgLT4gU3RyaW5nUmVmIHsKKysgICAgY29uc3RleHByIGF1dG8gb3BlcmF0b3IgIiJfc3IoIGNo YXIgY29uc3QqIHJhd0NoYXJzLCBzdGQ6OnNpemVfdCBzaXplICkgbm9leGNlcHQgLT4gU3RyaW5n UmVmIHsKKyAgICAgICAgIHJldHVybiBTdHJpbmdSZWYoIHJhd0NoYXJzLCBzaXplICk7CisgICAg IH0KKyB9IC8vIG5hbWVzcGFjZSBDYXRjaAorIAorLWNvbnN0ZXhwciBhdXRvIG9wZXJhdG9yICIi IF9jYXRjaF9zciggY2hhciBjb25zdCogcmF3Q2hhcnMsIHN0ZDo6c2l6ZV90IHNpemUgKSBub2V4 Y2VwdCAtPiBDYXRjaDo6U3RyaW5nUmVmIHsKKytjb25zdGV4cHIgYXV0byBvcGVyYXRvciAiIl9j YXRjaF9zciggY2hhciBjb25zdCogcmF3Q2hhcnMsIHN0ZDo6c2l6ZV90IHNpemUgKSBub2V4Y2Vw dCAtPiBDYXRjaDo6U3RyaW5nUmVmIHsKKyAgICAgcmV0dXJuIENhdGNoOjpTdHJpbmdSZWYoIHJh d0NoYXJzLCBzaXplICk7CisgfQorIApkaWZmIC0tZ2l0IGEvZGV2ZWwvY2F0Y2gvZmlsZXMvcGF0 Y2gtcHJvamVjdHNfU2VsZlRlc3RfSW50cm9zcGVjdGl2ZVRlc3RzX1N0cmluZy50ZXN0cy5jcHAg Yi9kZXZlbC9jYXRjaC9maWxlcy9wYXRjaC1wcm9qZWN0c19TZWxmVGVzdF9JbnRyb3NwZWN0aXZl VGVzdHNfU3RyaW5nLnRlc3RzLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAuLjM0ZTFhZjcyY2U0MgotLS0gL2Rldi9udWxsCisrKyBiL2RldmVsL2NhdGNoL2ZpbGVz L3BhdGNoLXByb2plY3RzX1NlbGZUZXN0X0ludHJvc3BlY3RpdmVUZXN0c19TdHJpbmcudGVzdHMu Y3BwCkBAIC0wLDAgKzEsMTEgQEAKKy0tLSBwcm9qZWN0cy9TZWxmVGVzdC9JbnRyb3NwZWN0aXZl VGVzdHMvU3RyaW5nLnRlc3RzLmNwcC5vcmlnCTIwMjItMTAtMTYgMDk6MDI6MTcgVVRDCisrKysg cHJvamVjdHMvU2VsZlRlc3QvSW50cm9zcGVjdGl2ZVRlc3RzL1N0cmluZy50ZXN0cy5jcHAKK0BA IC0xNDEsNyArMTQxLDcgQEAgVEVTVF9DQVNFKCJTdHJpbmdSZWYgYXQgY29tcGlsYXRpb24gdGlt ZSIsICJbU3RyaW5nc11bCisgICAgICAgICBTVEFUSUNfUkVRVUlSRShzcjEuc2l6ZSgpID09IDMp OworICAgICAgICAgU1RBVElDX1JFUVVJUkUoc3IxLmlzTnVsbFRlcm1pbmF0ZWQoKSk7CisgCist ICAgICAgICB1c2luZyBDYXRjaDo6b3BlcmF0b3IiIiBfc3I7CisrICAgICAgICB1c2luZyBDYXRj aDo6b3BlcmF0b3IiIl9zcjsKKyAgICAgICAgIGNvbnN0ZXhwciBhdXRvIHNyMiA9ICIiX3NyOwor ICAgICAgICAgU1RBVElDX1JFUVVJUkUoc3IyLmVtcHR5KCkpOworICAgICAgICAgU1RBVElDX1JF UVVJUkUoc3IyLnNpemUoKSA9PSAwKTsKZGlmZiAtLWdpdCBhL2RldmVsL2NhdGNoL2ZpbGVzL3Bh dGNoLXByb2plY3RzX1NlbGZUZXN0X1VzYWdlVGVzdHNfVG9TdHJpbmdWYXJpYW50LnRlc3RzLmNw cCBiL2RldmVsL2NhdGNoL2ZpbGVzL3BhdGNoLXByb2plY3RzX1NlbGZUZXN0X1VzYWdlVGVzdHNf VG9TdHJpbmdWYXJpYW50LnRlc3RzLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAuLjdkYTcxYjI2Zjc3OQotLS0gL2Rldi9udWxsCisrKyBiL2RldmVsL2NhdGNoL2Zp bGVzL3BhdGNoLXByb2plY3RzX1NlbGZUZXN0X1VzYWdlVGVzdHNfVG9TdHJpbmdWYXJpYW50LnRl c3RzLmNwcApAQCAtMCwwICsxLDE3IEBACistLS0gcHJvamVjdHMvU2VsZlRlc3QvVXNhZ2VUZXN0 cy9Ub1N0cmluZ1ZhcmlhbnQudGVzdHMuY3BwLm9yaWcJMjAyMi0xMC0xNiAwOTowMjoxNyBVVEMK KysrKyBwcm9qZWN0cy9TZWxmVGVzdC9Vc2FnZVRlc3RzL1RvU3RyaW5nVmFyaWFudC50ZXN0cy5j cHAKK0BAIC0xMCwxMiArMTAsMTIgQEAgc3RydWN0IE15VHlwZTEgeworIHN0cnVjdCBNeVR5cGUx IHsKKyAgICAgTXlUeXBlMSgpID0gZGVmYXVsdDsKKyAgICAgW1tub3JldHVybl1dIE15VHlwZTEo TXlUeXBlMSBjb25zdCYpIHsgdGhyb3cgMTsgfQorLSAgICBNeVR5cGUxJiBvcGVyYXRvcj0oTXlU eXBlMSBjb25zdCYpIHsgdGhyb3cgMzsgfQorKyAgICBbW25vcmV0dXJuXV0gTXlUeXBlMSYgb3Bl cmF0b3I9KE15VHlwZTEgY29uc3QmKSB7IHRocm93IDM7IH0KKyB9OworIHN0cnVjdCBNeVR5cGUy IHsKKyAgICAgTXlUeXBlMigpID0gZGVmYXVsdDsKKyAgICAgW1tub3JldHVybl1dIE15VHlwZTIo TXlUeXBlMiBjb25zdCYpIHsgdGhyb3cgMjsgfQorLSAgICBNeVR5cGUyJiBvcGVyYXRvcj0oTXlU eXBlMiBjb25zdCYpIHsgdGhyb3cgNDsgfQorKyAgICBbW25vcmV0dXJuXV0gTXlUeXBlMiYgb3Bl cmF0b3I9KE15VHlwZTIgY29uc3QmKSB7IHRocm93IDQ7IH0KKyB9OworIAorIFRFU1RfQ0FTRSgg InZhcmlhbnQ8c3RkOjptb25vc3RhdGU+IiwgIlt0b1N0cmluZ11bdmFyaWFudF1bYXBwcm92YWxz XSIpCg==