From 97197ef78e6e717066f52e8fe2ad904b231bfba8 Mon Sep 17 00:00:00 2001 From: Aram Sargsyan Date: Mon, 5 Sep 2022 09:59:44 +0000 Subject: [PATCH 1/2] Do not use libxml2 deprecated functions The usage of xmlInitThreads() and xmlCleanupThreads() functions in libxml2 is now marked as deprecated, and these functions will be made private in the future. Use xmlInitParser() and xmlCleanupParser() instead of them. (cherry picked from commit a5d412d9243dc0404a321276364d5967fd69ea3a) --- bin/named/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/named/main.c b/bin/named/main.c index 33421faeaa..2645489aee 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -1384,7 +1384,7 @@ main(int argc, char *argv[]) { #endif /* ifdef HAVE_GPERFTOOLS_PROFILER */ #ifdef HAVE_LIBXML2 - xmlInitThreads(); + xmlInitParser(); #endif /* HAVE_LIBXML2 */ /* @@ -1520,7 +1520,7 @@ main(int argc, char *argv[]) { named_os_shutdown(); #ifdef HAVE_LIBXML2 - xmlCleanupThreads(); + xmlCleanupParser(); #endif /* HAVE_LIBXML2 */ #ifdef HAVE_GPERFTOOLS_PROFILER From 93c39696f427fee6b05bb65f1f09f535201ba568 Mon Sep 17 00:00:00 2001 From: Aram Sargsyan Date: Mon, 5 Sep 2022 10:01:33 +0000 Subject: [PATCH 2/2] Add CHANGES note for [GL #3518] (cherry picked from commit 87920661b11a25b4499f30f98ba39d5c47af6e44) --- CHANGES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index df6b87e38d..4104c9cda0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +5955. [port] The libxml2 library has deprecated the usage of + xmlInitThreads() and xmlCleanupThreads() functions. Use + xmlInitParser() and xmlCleanupParser() instead. + [GL #3518] + 5954. [func] Fallback to IDNA2003 processing in dig when IDNA2008 conversion fails. [GL #3485]