diff --git a/ldns-1.7.0-Update-for-SWIG-4.patch b/ldns-1.7.0-Update-for-SWIG-4.patch deleted file mode 100644 index b6caaa6ac9669b2864639752dcbc78a185e9981f..0000000000000000000000000000000000000000 --- a/ldns-1.7.0-Update-for-SWIG-4.patch +++ /dev/null @@ -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; diff --git a/ldns-1.7.0-parse-limit.patch b/ldns-1.7.0-parse-limit.patch deleted file mode 100644 index 2c2abe8a4f0d2807419e4f4b93fc4a69c4fcd223..0000000000000000000000000000000000000000 --- a/ldns-1.7.0-parse-limit.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c8391790c96d4c8a2c10f9ab1460fda83b509fc2 Mon Sep 17 00:00:00 2001 -From: Willem Toorop -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 - diff --git a/ldns-1.7.0-realloc.patch b/ldns-1.7.0-realloc.patch deleted file mode 100644 index 25be44dc53c5bbbf929f641574d220fb76e9e7d7..0000000000000000000000000000000000000000 --- a/ldns-1.7.0-realloc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3bdeed02505c9bbacb3b64a97ddcb1de967153b7 Mon Sep 17 00:00:00 2001 -From: Willem Toorop -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 - diff --git a/ldns-1.7.0.tar.gz b/ldns-1.7.0.tar.gz deleted file mode 100644 index 4128ef2e80d08a4543e74e43eb1dceb2bd199495..0000000000000000000000000000000000000000 Binary files a/ldns-1.7.0.tar.gz and /dev/null differ diff --git a/ldns-1.8.1.tar.gz b/ldns-1.8.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..29c0b2038b519e9959ed5b5033f9d8a0467f3404 Binary files /dev/null and b/ldns-1.8.1.tar.gz differ diff --git a/ldns.spec b/ldns.spec index 45adab3996c25b9ff7bbf2dd5753f4c45029c077..18121f1bfb7d9b9a0de98d94b22c471b17f38987 100644 --- a/ldns.spec +++ b/ldns.spec @@ -28,18 +28,14 @@ %endif Name: ldns -Version: 1.7.0 -Release: 28 +Version: 1.8.1 +Release: 1 Summary: Low-level DNS(SEC) library with API License: BSD 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 @@ -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 @@ -212,15 +204,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 +270,12 @@ rm -rf doc/man %endif %changelog +* Tue Apr 19 2022 gaihuiying - 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 - 1.7.0-28 - Type:requirement - ID:NA