Date: Friday, February 22, 2019 @ 10:39:32
Author: seblu
Revision: 346652
upgpkg: bind 9.13.7-1
Modified:
bind/trunk/PKGBUILD
Deleted:
bind/trunk/01-fs60913.patch
------------------+
01-fs60913.patch | 45 ---------------------------------------------
PKGBUILD | 17 ++++++-----------
2 files changed, 6 insertions(+), 56 deletions(-)
Deleted: 01-fs60913.patch
===================================================================
--- 01-fs60913.patch 2019-02-22 10:31:40 UTC (rev 346651)
+++ 01-fs60913.patch 2019-02-22 10:39:32 UTC (rev 346652)
@@ -1,45 +0,0 @@
-From 0e5dd25fc5c70d656666f6d537e93cf346e7f419 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= <w...@isc.org>
-Date: Thu, 3 Jan 2019 13:06:39 +0100
-Subject: [PATCH] When a forwarder fails and we're not in a forward-only mode
- we go back to regular resolution. When this happens the fetch timer is
- already running, and we might end up in a situation where we we create a
- fetch for qname-minimized query and after that the timer is triggered and the
- query is retried (fctx_try) - which causes relaunching of qname-minimization
- fetch - and since we already have a qmin fetch for this fctx - assertion
- failure.
-
-
-diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
-index 8beecbcb07..ea122bd30c 100644
---- a/lib/dns/resolver.c
-+++ b/lib/dns/resolver.c
-@@ -4012,6 +4012,7 @@ fctx_try(fetchctx_t *fctx, bool retrying, bool badcache)
{
- options &= ~DNS_FETCHOPT_QMINIMIZE;
- fctx_increference(fctx);
- task = res->buckets[bucketnum].task;
-+ fctx_stoptimer(fctx);
- result = dns_resolver_createfetch(fctx->res, &fctx->qminname,
- fctx->qmintype, &fctx->domain,
- &fctx->nameservers, NULL,
NULL, 0,
-@@ -4343,13 +4344,12 @@ fctx_timeout(isc_task_t *task, isc_event_t *event) {
- * timer.
- */
- result = fctx_starttimer(fctx);
-- if (result != ISC_R_SUCCESS)
-+ if (result != ISC_R_SUCCESS) {
- fctx_done(fctx, result, __LINE__);
-- else
-- /*
-- * Keep trying.
-- */
-+ } else {
-+ /* Keep trying */
- fctx_try(fctx, true, false);
-+ }
- }
-
- isc_event_free(&event);
---
-2.18.1
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-02-22 10:31:40 UTC (rev 346651)
+++ PKGBUILD 2019-02-22 10:39:32 UTC (rev 346652)
@@ -5,9 +5,9 @@
pkgbase=bind
pkgname=(bind bind-tools)
-_pkgver=9.13.5
+_pkgver=9.13.7
pkgver=${_pkgver//-/.}
-pkgrel=5
+pkgrel=1
url='https://www.isc.org/software/bind/'
license=('MPL2')
arch=('x86_64')
@@ -15,10 +15,7 @@
makedepends=('libcap' 'libxml2' 'zlib' 'krb5' 'e2fsprogs' 'openssl' 'readline'
'libidn2' 'geoip' 'dnssec-anchors' 'python' 'json-c' 'python-ply' 'lmdb'
'zlib' 'icu' 'xz')
-validpgpkeys=('2B48A38AE1CF9886435F89EE45AC7857189CDBC5'
- 'ADBE9446286C794905F1E0756FA6EBC9911A4C02' #ISC, Inc)
- 'BE0E9748B718253A28BB89FFF1B11BF05CF02E57' #Internet Systems
Consortium, Inc.
- )
+validpgpkeys=('AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38') #ISC Code Signing
Key 2019 – 2020 (codes...@isc.org)
source=("https://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc}
'tmpfiles.conf'
'sysusers.conf'
@@ -27,9 +24,8 @@
'localhost.zone'
'localhost.ip6.zone'
'127.0.0.zone'
- 'empty.zone'
- '01-fs60913.patch')
-sha1sums=('8c01018e6928e9117cd8e0cdd464efe3b68894c5'
+ 'empty.zone')
+sha1sums=('63632f6e930bdcbbb46214aeb09e8430aa9eef16'
'SKIP'
'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
'9537f4835a1f736788d0733c7996a10db2d4eee4'
@@ -38,8 +34,7 @@
'6704303a6ed431a29b1d8fe7b12decd4d1f2f50f'
'52da8f1c0247a11b16daa4e03d920e8f09315cbe'
'9c33726088342207ad06d33b2c13408290a0c8ad'
- '4f4457b310cbbeadca2272eced062a9c2b2b42fe'
- 'a71c39b6073be96589e3c0a8cc7430f0e22ebe9c')
+ '4f4457b310cbbeadca2272eced062a9c2b2b42fe')
prepare() {
msg2 'Getting a fresh version of root DNS'
