!15 update ldns to 1.8.3

From: @sherlock2010 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw

ldns-1.7.0-Update-for-SWIG-4.patch

@@ -1,12 +0,0 @@
-diff -up ldns-1.7.0/ldns-1.7.0/contrib/python/ldns_key.i.swig4 ldns-1.7.0/ldns-1.7.0/contrib/python/ldns_key.i
---- ldns-1.7.0/contrib/python/ldns_key.i.swig4	2016-12-20 11:48:22.000000000 +0100
-+++ ldns-1.7.0/contrib/python/ldns_key.i	2019-03-15 12:21:22.608314831 +0100
-@@ -41,7 +41,7 @@
-   $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr($1_key), SWIGTYPE_p_ldns_struct_key, SWIG_POINTER_OWN |  0 ));
- }
- 
--%exception ldns_key_set_pubkey_owner(ldns_key *k, ldns_rdf *r)  %{ $action Py_INCREF(obj1); %}
-+%typemap(argout) ldns_rdf *r "Py_INCREF($input);"
- 
- %nodefaultctor ldns_struct_key; //no default constructor & destructor
- %nodefaultdtor ldns_struct_key;

ldns-1.7.0-parse-limit.patch

@@ -1,28 +0,0 @@
-From c8391790c96d4c8a2c10f9ab1460fda83b509fc2 Mon Sep 17 00:00:00 2001
-From: Willem Toorop <willem@nlnetlabs.nl>
-Date: Thu, 27 Apr 2017 00:14:58 +0200
-Subject: [PATCH] Check parse limit before t increment
-
-Thanks Stephan Zeisberg
----
- parse.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/parse.c b/parse.c
-index e68627c..947dbb8 100644
---- a/parse.c
-+++ b/parse.c
-@@ -118,6 +118,10 @@ ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *li
- 			if (line_nr) {
- 				*line_nr = *line_nr + 1;
- 			}
-+			if (limit > 0 && (i >= limit || (size_t)(t-token) >= limit)) {
-+				*t = '\0';
-+				return -1;
-+			}
- 			*t++ = ' ';
- 			prev_c = c;
- 			continue;
--- 
-2.9.5
-

ldns-1.7.0-realloc.patch

@@ -1,30 +0,0 @@
-From 3bdeed02505c9bbacb3b64a97ddcb1de967153b7 Mon Sep 17 00:00:00 2001
-From: Willem Toorop <willem@nlnetlabs.nl>
-Date: Thu, 27 Apr 2017 00:25:20 +0200
-Subject: [PATCH] bugfix #1257: Free after reallocing to 0 size
-
-Thanks Stephan Zeisberg
----
- str2host.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/str2host.c b/str2host.c
-index b274b17..f2a317b 100644
---- a/str2host.c
-+++ b/str2host.c
-@@ -1525,8 +1525,10 @@ ldns_str2rdf_long_str(ldns_rdf **rd, const char *str)
- 	if (! str) {
- 		return LDNS_STATUS_SYNTAX_BAD_ESCAPE;
- 	}
--	length = (size_t)(dp - data);
--
-+	if (!(length = (size_t)(dp - data))) {
-+		LDNS_FREE(data);
-+		return LDNS_STATUS_SYNTAX_EMPTY;
-+	}
- 	/* Lose the overmeasure */
- 	data = LDNS_XREALLOC(dp = data, uint8_t, length);
- 	if (! data) {
--- 
-2.9.5
-

ldns.spec

@@ -28,23 +28,19 @@
 %endif
 
 Name: 		ldns
-Version: 	1.7.0
-Release: 	27
+Version: 	1.8.3
+Release: 	1
 Summary:        Low-level DNS(SEC) library with API
 
-License: 	BSD
+License: 	BSD-3-Clause
 Url: 		https://www.nlnetlabs.nl/projects/%{name}/about/
 Source0:        https://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
 
-Patch1: 	%{name}-1.7.0-parse-limit.patch
-Patch2: 	%{name}-1.7.0-realloc.patch
-Patch3: 	%{name}-1.7.0-Update-for-SWIG-4.patch
-
 %if 0%{snapshot}
 BuildRequires: 	libtool autoconf automake 
 %endif
 
-BuildRequires: 	gcc make libpcap-devel gcc-c++ doxygen gdb
+BuildRequires: 	gcc make libpcap-devel gcc-c++ doxygen
 %if %{with dane_ta}
 BuildRequires: 	openssl-devel >= 1.1.0
 %else
@@ -116,10 +112,6 @@ Man pages and other related documents for %{name}.
 %setup -qcn %{pkgname}
 pushd %{pkgname}
 
-%patch1 -p1 -b .limit
-%patch2 -p1 -b .realloc
-%patch3 -p1
-
 %if 0%{snapshot}
   rm config.guess config.sub ltmain.sh
   aclocal
@@ -189,7 +181,8 @@ pushd %{pkgname}
   --with-pyldns PYTHON=%{__python3}
 %endif
 
-make %{?_smp_mflags}
+# Removing smp_mflags to prevent build from failing
+make
 make %{?_smp_mflags} doc
 
 %if %{with perl}
@@ -212,15 +205,14 @@ pushd %{pkgname}_python3
 pushd %{pkgname}
 %endif
 
-make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
-make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install-doc
+make DESTDIR=%{buildroot} INSTALL="%{__install} -pD" install
+make DESTDIR=%{buildroot} INSTALL="%{__install} -pD" install-doc
 
 %delete_la
 %if %{with_python3}
 rm -rf %{buildroot}%{python3_sitearch}/*.la
 %endif
 
-install -D -m644  packaging/libldns.pc %{buildroot}%{_libdir}/pkgconfig/ldns.pc
 %if %{with perl}
   make -C contrib/DNS-LDNS DESTDIR=%{buildroot} pure_install
   chmod 755 %{buildroot}%{perl_vendorarch}/auto/DNS/LDNS/LDNS.so
@@ -279,6 +271,30 @@ rm -rf doc/man
 %endif
 
 %changelog
+* Tue Mar 07 2023 zhouyihang <zhouyihang3@h-partners.com> - 1.8.3-1
+- Type:requirement
+- ID:NA
+- SUG:NA
+- DESC:update ldns to 1.8.3
+
+* Wed Jul 27 2022 zhouyihang <zhouyihang3@h-partners.com> - 1.8.1-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Removing smp_mflags to prevent build from failing
+
+* Tue Apr 19 2022 gaihuiying <eaglegai@163.com> - 1.8.1-1
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:update ldns to 1.8.1 to support python3.10
+
+* Mon Jul 19 2021 lijingyuan <lijingyuan3@huawei.com> - 1.7.0-28
+- Type:requirement
+- ID:NA
+- SUG:NA
+- DESC:cancel gdb in buildrequires
+
 * Thu Oct 29 2020 gaihuiying <gaihuiying1@huawei.com> - 1.7.0-27
 - Type:rquirement
 - ID:NA
@@ -291,7 +307,7 @@ rm -rf doc/man
 - SUG:NA
 - DESC:fix build fail with swig new version
 
-* Sat Mar 22 2020 openEuler Buildyeam <buildteam@openeuler.org> - 1.7.0-25
+* Sun Mar 22 2020 openEuler Buildyeam <buildteam@openeuler.org> - 1.7.0-25
 - fix build bug,add flag with_python2 and with_python3
 
 * Sat Jan 11 2020 openEuler Buildyeam <buildteam@openeuler.org> - 1.7.0-23