!32 【openEuler-20.03-LTS-SP4】Fix segv in t-json.c

From: @yixiangzhike 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen

backport-tests-Fix-segv-in-t-json.c.patch

@@ -0,0 +1,26 @@
+From ac4bf86bb65a1e228550cce9314ad17239343c5d Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Tue, 21 May 2024 14:36:07 +0200
+Subject: [PATCH] tests: Fix segv in t-json.c
+
+* tests/json/t-json.c (test_contains): Avoid calling recusivly with no child.
+---
+ tests/json/t-json.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/json/t-json.c b/tests/json/t-json.c
+index e1fb6c1..105b981 100644
+--- a/tests/json/t-json.c
++++ b/tests/json/t-json.c
+@@ -258,7 +258,7 @@ test_contains (cjson_t needle, cjson_t hay)
+           fprintf (stderr, "Depth mismatch. Expected child for %s\n",
+                    nonnull (needle->string));
+         }
+-      if (test_contains (needle->child, hay->child))
++      else if (test_contains (needle->child, hay->child))
+         {
+           int found = 0;
+           for (cjson_t hit = hay->child; hit; hit = hit->next)
+-- 
+2.33.0
+

gpgme.spec

@@ -1,6 +1,6 @@
 Name:           gpgme
-Version:        1.13.1
-Release:        4
+Version:        1.14.0
+Release:        3
 Summary:        GnuPG Made Easy
 License:        GPLv2+ and LGPLv2+
 URL:            https://gnupg.org/related_software/gpgme/
@@ -13,10 +13,12 @@ Patch6000:      0001-don-t-add-extra-libraries-for-linking.patch
 Patch6001:      gpgme-1.3.2-largefile.patch
 # Let's fix stupid AX_PYTHON_DEVEL
 Patch6002:      0001-fix-stupid-ax_python_devel.patch
+Patch6003:      backport-tests-Fix-segv-in-t-json.c.patch
 
 BuildRequires:  autoconf automake gcc gcc-c++ gawk gnupg2 >= 2.1.18
 BuildRequires:  libgpg-error-devel >= 1.24 libassuan-devel >= 2.4.2
 BuildRequires:  swig chrpath cmake qt5-qtbase-devel python2-devel python3-devel
+BuildRequires:  gdb
 Requires:       gnupg2 >= 2.1.18
 Provides:       %{name}%{?_isa} <= %{version}-%{release}
 
@@ -102,7 +104,7 @@ chrpath -d  $(find %{buildroot} -name gpgme-json)
 
 # Delete unpackaged files
 rm -fv %{buildroot}%{_infodir}/dir
-rm -fv %{buildroot}%{_libdir}/{lib*.la,pkgconfig/gpgme*.pc}
+rm -fv %{buildroot}%{_libdir}/lib*.la
 
 chrpath -d %{buildroot}%{_bindir}/%{name}-tool
 chrpath -d %{buildroot}%{_libdir}/lib%{name}pp.so*
@@ -152,6 +154,7 @@ fi
 %{_includedir}/{%{name}.h,%{name}++/,q%{name}/,QGpgME/}
 %{_libdir}/{lib%{name}.so,lib%{name}pp.so,cmake/Gpgmepp/,libq%{name}.so,cmake/QGpgme/}
 %{_datadir}/aclocal/%{name}.m4
+%{_libdir}/pkgconfig/%{name}*.pc
 
 %files help
 %defattr(-,root,root)
@@ -159,6 +162,21 @@ fi
 
 
 %changelog
+* Fri Oct 18 2024 yixiangzhike <yixiangzhike007@163.com> - 1.14.0-3
+- fix segv in t-json.c
+
+* Thu May 30 2024 yixiangzhike <yixiangzhike007@163.com> - 1.14.0-2
+- add gpgme.pc file
+
+* Fri Aug 21 2020 wangchen <wangchen137@huawei.com> - 1.14.0-1
+- update to 1.14.0
+
+* Tue Aug 18 2020 chenyaqiang <chenyaqiang@huawei.com> - 1.13.1-6
+- rebuild for package build
+
+* Thu Mar 19 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.13.1-5
+- add BuildRequires: gdb
+
 * Fri Sep 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.13.1-4
 - Adjust buildrequires as gnupg2-smime is provided by gnupg2