From 49fb50430cfa48cb4e19c12af793e1beb4704a71 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Tue, 11 Dec 2018 22:05:14 -0500 Subject: [PATCH 1/3] - Updated to 1.8.3 with fixes the dns64 bug and has some other minor fixes --- .gitignore | 1 + sources | 2 +- unbound.spec | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d2824e0..489444f 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ unbound-1.4.5.tar.gz /unbound-1.8.0.tar.gz /unbound-1.8.1.tar.gz /unbound-1.8.2.tar.gz +/unbound-1.8.3.tar.gz diff --git a/sources b/sources index 808f2d2..9020756 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (unbound-1.8.2.tar.gz) = a775c799d41ede3c2df82a5cf4d419ec1d037d84c9bb7f2f4216727afc1e3d82c991d1a1ee99baf315530c094a416004e836312ba1ee2b7b17a4a60454878cb5 +SHA512 (unbound-1.8.3.tar.gz) = 545486ccce288a6ef1937d82653a43a11dbd3aec7b8d0036e7fd107e537cdfc935def9db9178c2eb418d6f4b0849a242a0be1dea966f3e9e0145aa7266e483ad diff --git a/unbound.spec b/unbound.spec index f6ca388..14dfce2 100644 --- a/unbound.spec +++ b/unbound.spec @@ -33,8 +33,8 @@ Summary: Validating, recursive, and caching DNS(SEC) resolver Name: unbound -Version: 1.8.2 -Release: 2%{?extra_version:.%{extra_version}}%{?dist} +Version: 1.8.3 +Release: 1%{?extra_version:.%{extra_version}}%{?dist} License: BSD Url: https://www.unbound.net/ Source: https://www.unbound.net/downloads/%{name}-%{version}%{?extra_version}.tar.gz @@ -55,8 +55,6 @@ Source15: unbound-anchor.timer Source16: unbound-munin.README Source17: unbound-anchor.service -Patch1: unbound-1.8.2-dns64.patch - BuildRequires: gcc, make BuildRequires: flex, openssl-devel BuildRequires: libevent-devel expat-devel @@ -151,7 +149,6 @@ Python 3 modules and extensions for unbound %setup -qcn %{pkgname} pushd %{pkgname} -%patch1 -p1 # only for snapshots # autoreconf -iv @@ -423,6 +420,9 @@ popd %attr(0644,root,root) %config %{_sysconfdir}/%{name}/root.key %changelog +* Wed Dec 12 2018 Paul Wouters - 1.8.3-1 +- Updated to 1.8.3 with fixes the dns64 bug and has some other minor fixes + * Mon Dec 10 2018 Paul Wouters - 1.8.2-2 - Fix dns64 allocation in wrong region for returned internal queries. From 3cfe3a46e07131b6fc818dd012c24976986e50f7 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Wed, 12 Dec 2018 12:41:37 -0500 Subject: [PATCH 2/3] - Another dns64 fixup --- unbound-1.8.3-dns64-again.patch | 11 +++++++++++ unbound.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 unbound-1.8.3-dns64-again.patch diff --git a/unbound-1.8.3-dns64-again.patch b/unbound-1.8.3-dns64-again.patch new file mode 100644 index 0000000..1e66773 --- /dev/null +++ b/unbound-1.8.3-dns64-again.patch @@ -0,0 +1,11 @@ +diff -Naur dns64/dns64.c dns64/dns64.c +--- dns64/dns64.c 2018-12-11 04:46:02.000000000 -0500 ++++ dns64/dns64.c 2018-12-12 12:39:30.589057421 -0500 +@@ -628,6 +628,7 @@ + + /* Store the response in cache. */ + if ( (!iq || !iq->started_no_cache_store) && ++ qstate->return_msg && qstate->return_msg->rep && + !dns_cache_store(qstate->env, &qstate->qinfo, qstate->return_msg->rep, + 0, 0, 0, NULL, qstate->query_flags)) + log_err("out of memory"); diff --git a/unbound.spec b/unbound.spec index 14dfce2..a6776e6 100644 --- a/unbound.spec +++ b/unbound.spec @@ -34,7 +34,7 @@ Summary: Validating, recursive, and caching DNS(SEC) resolver Name: unbound Version: 1.8.3 -Release: 1%{?extra_version:.%{extra_version}}%{?dist} +Release: 2%{?extra_version:.%{extra_version}}%{?dist} License: BSD Url: https://www.unbound.net/ Source: https://www.unbound.net/downloads/%{name}-%{version}%{?extra_version}.tar.gz @@ -55,6 +55,8 @@ Source15: unbound-anchor.timer Source16: unbound-munin.README Source17: unbound-anchor.service +Patch1: unbound-1.8.3-dns64-again.patch + BuildRequires: gcc, make BuildRequires: flex, openssl-devel BuildRequires: libevent-devel expat-devel @@ -149,6 +151,7 @@ Python 3 modules and extensions for unbound %setup -qcn %{pkgname} pushd %{pkgname} +%patch1 # only for snapshots # autoreconf -iv @@ -420,6 +423,9 @@ popd %attr(0644,root,root) %config %{_sysconfdir}/%{name}/root.key %changelog +* Wed Dec 12 2018 Paul Wouters - 1.8.3-2 +- Another dns64 fixup + * Wed Dec 12 2018 Paul Wouters - 1.8.3-1 - Updated to 1.8.3 with fixes the dns64 bug and has some other minor fixes From 487492d6c04cd05af91fc2ccee607f15c928d3a0 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Fri, 11 Jan 2019 10:27:06 -0500 Subject: [PATCH 3/3] - Remove KSK-2010 from configs - it has been revoked --- root.anchor | 1 - root.key | 2 -- unbound.spec | 5 ++++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/root.anchor b/root.anchor index 4a5f11e..c78ee03 100644 --- a/root.anchor +++ b/root.anchor @@ -1,2 +1 @@ . 172800 IN DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b} -. 98799 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b} diff --git a/root.key b/root.key index 077ca98..6c5622c 100644 --- a/root.key +++ b/root.key @@ -3,6 +3,4 @@ trusted-keys { "." 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU="; // key id = 20326 -"." 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0="; // key id = 19036 - }; diff --git a/unbound.spec b/unbound.spec index a6776e6..4a09be9 100644 --- a/unbound.spec +++ b/unbound.spec @@ -34,7 +34,7 @@ Summary: Validating, recursive, and caching DNS(SEC) resolver Name: unbound Version: 1.8.3 -Release: 2%{?extra_version:.%{extra_version}}%{?dist} +Release: 3%{?extra_version:.%{extra_version}}%{?dist} License: BSD Url: https://www.unbound.net/ Source: https://www.unbound.net/downloads/%{name}-%{version}%{?extra_version}.tar.gz @@ -423,6 +423,9 @@ popd %attr(0644,root,root) %config %{_sysconfdir}/%{name}/root.key %changelog +* Fri Jan 11 2019 Paul Wouters - 1.8.3-3 +- Remove KSK-2010 from configs - it has been revoked + * Wed Dec 12 2018 Paul Wouters - 1.8.3-2 - Another dns64 fixup