From 83edc4b568017a2fc4137ac51e8301cd95d38b61 Mon Sep 17 00:00:00 2001
From: Andrei Pavel <andrei@isc.org>
Date: Mon, 28 Jul 2025 21:43:34 +0300
Subject: [PATCH] [#3931] Update libyang and sysrepo to fixed versions

---
 doc/sphinx/arm/ext-netconf.rst             | 8 ++++----
 src/bin/netconf/netconf.h                  | 4 +++-
 src/lib/yang/tests/translator_unittests.cc | 5 +----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/doc/sphinx/arm/ext-netconf.rst b/doc/sphinx/arm/ext-netconf.rst
index 580e72ab94..285d61dd83 100644
--- a/doc/sphinx/arm/ext-netconf.rst
+++ b/doc/sphinx/arm/ext-netconf.rst
@@ -22,8 +22,8 @@ Installing NETCONF
 To get its NETCONF capabilities, Kea requires the v3 versions of libyang and
 Sysrepo. The specific versions that have been thoroughly tested with Kea are:
 
-* libyang v3.12.2 (da7272e19d9e27d1bfdd68108fa9dce25fbdf5e8)
-* sysrepo v3.6.11 (b2d60c137aa5179af2af0ce1243d4147c4e5f974)
+* libyang v3.13.3 (7783869951e1494d6f4366892baebb32132c360d)
+* sysrepo v3.7.10 (3bdc1ab2988adbe935fd0f26f31f820d087c0804)
 * libyang-cpp v3 (f3cd4e05462a16e81d6bfd0c4a5b385cf88a8549)
 * sysrepo-cpp v3 (fe4edfa3998fdf312099ee1fb08a06983b6907f6)
 
@@ -78,7 +78,7 @@ Installing ``libyang-cpp`` From Sources
 
     $ git clone https://github.com/CESNET/libyang-cpp.git
     $ cd libyang-cpp
-    $ git checkout ae7d649ea75da081725c119dd553b2ef3121a6f8
+    $ git checkout v3
     $ mkdir build
     $ cd build
     $ cmake -DBUILD_TESTING=OFF ..
@@ -94,7 +94,7 @@ Installing ``sysrepo-cpp`` From Sources
 
     $ git clone https://github.com/sysrepo/sysrepo-cpp.git
     $ cd sysrepo-cpp
-    $ git checkout 02634174ffc60568301c3d9b9b7cf710cff6a586
+    $ git checkout v3
     $ mkdir build
     $ cd build
     $ cmake -DBUILD_TESTING=OFF ..
diff --git a/src/bin/netconf/netconf.h b/src/bin/netconf/netconf.h
index e5b363e928..57510d045b 100644
--- a/src/bin/netconf/netconf.h
+++ b/src/bin/netconf/netconf.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2025 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -17,7 +17,9 @@
 
 #include <map>
 
+// #include <sysrepo-cpp/Changes.hpp>  // Will be required on newer sysrepo-cpp
 #include <sysrepo-cpp/Session.hpp>
+// #include <sysrepo-cpp/Subscription.hpp>  // Will be required on newer sysrepo-cpp
 
 namespace isc {
 namespace netconf {
diff --git a/src/lib/yang/tests/translator_unittests.cc b/src/lib/yang/tests/translator_unittests.cc
index 2976cd75fe..4ec7518e7f 100644
--- a/src/lib/yang/tests/translator_unittests.cc
+++ b/src/lib/yang/tests/translator_unittests.cc
@@ -35,10 +35,7 @@ private:
     void cleanUp() {
         Session session(sysrepo::Connection{}.sessionStart());
         session.switchDatastore(sysrepo::Datastore::Candidate);
-        // remove the 'if' statement when a fix is provided in sysrepo branch.
-        if (session.getData("/keatest-module:container/list")) {
-            session.deleteItem("/keatest-module:container/list");
-        }
+        session.deleteItem("/keatest-module:container");
         session.deleteItem("/keatest-module:kernel-modules");
         session.deleteItem("/keatest-module:list");
         session.deleteItem("/keatest-module:main");
-- 
2.47.3