From c8f04680780ecf1316a2534ad8b97be51e332559 Mon Sep 17 00:00:00 2001 From: Petr Menšík Date: Mar 19 2020 10:13:20 +0000 Subject: Use autopatch for new patches Remove unused patch file, simplify adding a new patch. Just Patch: entry is required with patch file name, autopatch will apply it. Use new primary website for unbound upstream. --- diff --git a/unbound-1.8.3-dns64-again.patch b/unbound-1.8.3-dns64-again.patch deleted file mode 100644 index 1e66773..0000000 --- a/unbound-1.8.3-dns64-again.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 994755d..6c9c1a2 100644 --- a/unbound.spec +++ b/unbound.spec @@ -36,8 +36,8 @@ Name: unbound Version: 1.9.6 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 +Url: https://nlnetlabs.nl/projects/unbound/ +Source: https://nlnetlabs.nl/downloads/%{name}/%{name}-%{version}%{?extra_version}.tar.gz Source1: unbound.service Source2: unbound.conf Source3: unbound.munin @@ -156,10 +156,11 @@ Python 3 modules and extensions for unbound %global dir_primary %{pkgname} %endif -%setup -qcn %{pkgname} +%autosetup -c -N -n %{pkgname} pushd %{pkgname} # patches go here +%autopatch -p1 # only for snapshots # autoreconf -iv