.gitignore

@@ -1 +1 @@
-SOURCES/libyang-1.0.184.tar.gz
+SOURCES/v2.0.7.tar.gz

.libyang.metadata

@@ -1 +1 @@
-89842305651e76696a0b79370659763f55be4398 SOURCES/libyang-1.0.184.tar.gz
+3882fb9a6e40f1a6bdfbce21546ff8aec3f6144c SOURCES/v2.0.7.tar.gz

SPECS/libyang.spec

@@ -1,4 +1,4 @@
-# valgrind finds invalid writes in libcmocka on arm
+# valgrind finds invalid writes in libcmocka on arm and power
 # see bug #1699304 for more information
 %ifarch %arm ppc64le
 %global run_valgrind_tests OFF
@@ -7,17 +7,16 @@
 %endif
 
 Name: libyang
-Version: 1.0.184
-Release: 1%{?dist}
+Version: 2.0.7
+Release: 2%{?dist}
 Summary: YANG data modeling language library
 Url: https://github.com/CESNET/libyang
-Source: %{url}/archive/libyang-%{version}.tar.gz
+Source: %{url}/archive/v%{version}.tar.gz
 License: BSD
 
-Requires:  pcre
 BuildRequires:  cmake
 BuildRequires:  doxygen
-BuildRequires:  pcre-devel
+BuildRequires:  pcre2-devel
 BuildRequires:  gcc
 BuildRequires:  valgrind
 BuildRequires:  gcc-c++
@@ -27,6 +26,8 @@ BuildRequires:  python3-devel
 BuildRequires:  flex
 BuildRequires:  bison
 BuildRequires:  graphviz
+BuildRequires:  make
+BuildRequires:  git-core
 
 %package devel
 Summary:    Development files for libyang
@@ -36,30 +37,6 @@ Requires:   pcre-devel
 %package devel-doc
 Summary:    Documentation of libyang API
 Requires:   %{name} = %{version}-%{release}
-BuildArch:  noarch
-
-%package -n libyang-cpp
-Summary:    C++ bindings for libyang
-Requires:   %{name}%{?_isa} = %{version}-%{release}
-
-%package -n libyang-cpp-devel
-Summary:    Development files for libyang-cpp
-Requires:   libyang-cpp%{?_isa} = %{version}-%{release}
-Requires:   pcre-devel
-
-%package -n python3-libyang
-Summary:    Python3 bindings for libyang
-Requires:   libyang-cpp%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python3-libyang}
-
-%description -n libyang-cpp
-Bindings of libyang library to C++ language.
-
-%description -n libyang-cpp-devel
-Headers of bindings to c++ language.
-
-%description -n python3-libyang
-Bindings of libyang library to python language.
 
 %description devel
 Headers of libyang library.
@@ -73,12 +50,9 @@ written (and providing API) in C.
 
 %prep
 %autosetup -S git
-mkdir build
 
 %build
-cd build
 %cmake \
-   %{?_smp_mflags} \
    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
    -DCMAKE_BUILD_TYPE:String="Package" \
    -DENABLE_LYD_PRIV=ON \
@@ -86,17 +60,20 @@ cd build
    -DGEN_JAVASCRIPT_BINDINGS=OFF \
    -DGEN_LANGUAGE_BINDINGS=ON \
    -DENABLE_VALGRIND_TESTS=%{run_valgrind_tests} ..
-%make_build
+%cmake_build
+mkdir build
+cp ./src/libyang.h ./build/libyang.h
+pushd redhat-linux-build
 make doc
+popd
 
 %check
-cd build
+pushd redhat-linux-build
 ctest --output-on-failure -V %{?_smp_mflags}
+popd
 
 %install
-pushd build
-%make_install DESTDIR=%{buildroot}
-popd
+%cmake_install
 mkdir -m0755 -p %{buildroot}/%{_docdir}/libyang
 cp -r doc/html %{buildroot}/%{_docdir}/libyang/html
 
@@ -105,9 +82,8 @@ cp -r doc/html %{buildroot}/%{_docdir}/libyang/html
 %{_bindir}/yanglint
 %{_bindir}/yangre
 %{_datadir}/man/man1/yanglint.1.gz
-%{_datadir}/man/man1/yangre.1.gz
-%{_libdir}/libyang.so.*
-%{_libdir}/libyang1
+%{_libdir}/libyang.so.2
+%{_libdir}/libyang.so.2.*
 
 %files devel
 %{_libdir}/libyang.so
@@ -118,39 +94,80 @@ cp -r doc/html %{buildroot}/%{_docdir}/libyang/html
 %files devel-doc
 %{_docdir}/libyang
 
-%files -n libyang-cpp
-%{_libdir}/libyang-cpp.so.*
-
-%files -n libyang-cpp-devel
-%{_libdir}/libyang-cpp.so
-%{_includedir}/libyang/*.hpp
-%{_libdir}/pkgconfig/libyang-cpp.pc
-%dir %{_includedir}/libyang/
-
-%files -n python3-libyang
-%{python3_sitearch}/yang.py
-%{python3_sitearch}/_yang.so
-%{python3_sitearch}/__pycache__/yang*
-
 %changelog
-* Thu Jan 07 2021 Michal Ruprich <mruprich@redhat.com> - 1.0.184-1
-- Resolves: #1910046 - [RFE] Rebase libyang to 1.0.184
+* Thu Jun 30 2022 Michal Ruprich <mruprich@redhat.com> - 2.0.7-2
+- Resolves: #2100938 - libyang FTBFS in rhel-9.1
 
-* Mon Dec 16 2019 Michal Ruprich <mruprich@redhat.com> - 0.16.105-5
-- Related: #1780311 - Fixing a few covscan issues
+* Tue Aug 10 2021 Michal Ruprich <mruprich@redhat.com> - 2.0.7-1
+- Resolves: #1991915 - Rebase libyang to new version
 
-* Tue Dec 10 2019 Michal Ruprich <mruprich@redhat.com> - 0.16.105-4
-- Resolves: #1780311 - CVE-2019-19333 libyang: stack-based buffer overflow in make_canonical when bits leaf type is used
-- Resolves: #1780313 - CVE-2019-19334 libyang: stack-based buffer overflow in make_canonical when identityref leaf type is used
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.225-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Mon May 27 2019 Michal Ruprich <mruprich@redhat.com> - 0.16.105-3
-- Related: #1698076 - Adding gating file
+* Wed Jun 30 2021 Michal Ruprich <mruprich@redhat.com> - 1.0.225-3
+- Resolves: #1965253 - CVE-2021-28902 libyang: NULL pointer dereference in read_yin_container()
+- Resolves: #1965255 - CVE-2021-28903 libyang: recursive call to lyxml_parse_mem() lead to crash
 
-* Tue May 14 2019 Michal Ruprich <mruprich@redhat.com> - 0.16.105-2
-- Related: #1698076 - turning off valgrind on tests on ppc64le
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.225-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Mon May 13 2019 Michal Ruprich <mruprich@redhat.com> - 0.16.105-1
-- Resolves: #1698076 - [RFE] Add libyang package as a build-time dependency for FRR
+* Tue Mar 09 2021 Tomas Korbar <tkorbar@redhat.com> - 1.0.225-1
+- Rebase to version 1.0.225
+- Resolves: rhbz#1936718
+
+* Wed Feb 03 2021 Tomas Korbar <tkorbar@redhat.com> - 1.0.215-1
+- Rebase to version 1.0.215
+- Resolves: rhbz#1921779
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.184-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Sep 02 2020 Merlin Mathesius <mmathesi@redhat.com> - 1.0.184-3
+- Fix FTBFS by disabling valgrind on power since it finds bogus invalid
+  writes in libcmocka
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.184-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 22 2020 Tomas Korbar <tkorbar@redhat.com> - 1.0.184-1
+- Update to 1.0.184
+- Fix build
+
+* Fri Jun 19 2020 Tomas Korbar <tkorbar@redhat.com> - 1.0.176-1
+- Update to 1.0.176
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.167-2
+- Rebuilt for Python 3.9
+
+* Mon May 18 2020 Tomas Korbar <tkorbar@redhat.com> - 1.0.167-1
+- Update to 1.0.167
+
+* Fri Feb 07 2020 Tomas Korbar <tkorbar@redhat.com> - 1.0.130-1
+- Rebase to version 1.0.130 (#1797495)
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.101-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Dec 09 2019 Tomas Korbar <tkorbar@redhat.com> - 1.0.101-1
+- Rebase to version 1.0.101
+- Fix CVE-2019-19333 (#1780495)
+- Fix CVE-2019-19334 (#1780494)
+
+* Fri Oct 25 2019 Tomas Korbar <tkorbar@redhat.com> - 1.0.73-1
+- Rebase to version 1.0.73 (#1758512)
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.16.105-4
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.16.105-3
+- Rebuilt for Python 3.8
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.105-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue May 07 2019 Tomas Korbar <tkorbar@redhat.com> - 0.16.105-1
+- Initial import (#1699846).
 
 * Fri Apr 26 2019 Tomas Korbar <tkorbar@redhat.com> - 0.16.105-1
 - Change specfile accordingly to mosvald's review