From 978f40fd41b94e0bbc8960b83ff20e41fe0095ab0682c02200c7708db7f6fd4a Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Wed, 5 Dec 2018 10:03:47 +0000
Subject: [PATCH] Accepting request 654103 from
 home:stroeder:branches:server:dns

Update to upstream release 4.1.26

OBS-URL: https://build.opensuse.org/request/show/654103
OBS-URL: https://build.opensuse.org/package/show/server:dns/nsd?expand=0&rev=55
---
 nsd-4.1.25.tar.gz     |  3 ---
 nsd-4.1.25.tar.gz.asc | 16 ----------------
 nsd-4.1.26.tar.gz     |  3 +++
 nsd-4.1.26.tar.gz.asc | 16 ++++++++++++++++
 nsd.changes           | 22 ++++++++++++++++++++++
 nsd.spec              |  2 +-
 6 files changed, 42 insertions(+), 20 deletions(-)
 delete mode 100644 nsd-4.1.25.tar.gz
 delete mode 100644 nsd-4.1.25.tar.gz.asc
 create mode 100644 nsd-4.1.26.tar.gz
 create mode 100644 nsd-4.1.26.tar.gz.asc

diff --git a/nsd-4.1.25.tar.gz b/nsd-4.1.25.tar.gz
deleted file mode 100644
index 5e475e4..0000000
--- a/nsd-4.1.25.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f5bff5abbbb03c396afd7be575806cde1217e884c189fa34445e0ca4793df7f
-size 1108285
diff --git a/nsd-4.1.25.tar.gz.asc b/nsd-4.1.25.tar.gz.asc
deleted file mode 100644
index 7bde307..0000000
--- a/nsd-4.1.25.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABCAAGBQJbqhsqAAoJEJ9vHC1+BF+NGpQP/3NJdzDOEflu+vV6rXSBmSfu
-olYv5dpOv2y51LbrUHeDO/yTDUpDyJctH9ijbZpUzNVvY4g0VWjdBXO6LZcyO3ci
-jw7PPl9JqYFh8SSJdReIuUYIrGpc1KxktIKmbPy1KQrvo6Ifx8fB2SNqczFAPcCc
-0paZD86Xrd4vO+PPlEPSIhUT9rX/Fuyo8BVYA28sLWHi6ZQrgeM3qImr9xurGw9w
-zs/uWUHwfxOklKemDQKbWUbCCD4LXxnRk8/3BFxhp6+F3bubUUsbllfNeo7YV0aD
-yZgjxV9r8NlR5iyeg0St3JG8xSw5hvOt3aBvkpiPJC1mIaGaPSs0ft6ESKyW7l5N
-AgIleYkOdINXBCnmJJdT42qK00IMpRp749LrABYwEKHoqZXycJRe4hlse1im2sUv
-O38P8VDwExLYozXCA0rjY5AkRUSlrB2VXihCnJthR6AgzoTfrlSAgYxzgFo9k/Qo
-0b/iENP48tvkHdOyVUqL2VNoAAo2B9iF4STUG6wsdS7RKUT4TowA1smpaMfpc9nA
-HJIS7LkGrsK9lPQyF0zjK8lcv4sTMjGnMg0/hmVLlQg2eLWkQyc1oQAm/Z00URpQ
-IUSd4TQpEF63rl87RdGQYxHJAVkezVT8OWJcp32zyFwnKcgdoh4gF83pp7rDnUIH
-PpVbEl/Fnwbepr/TcC94
-=LpkB
------END PGP SIGNATURE-----
diff --git a/nsd-4.1.26.tar.gz b/nsd-4.1.26.tar.gz
new file mode 100644
index 0000000..f12e56e
--- /dev/null
+++ b/nsd-4.1.26.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f8a41431d21034d64b9a910567b201636521b64b6a9947390bf898388dc15f4
+size 1127895
diff --git a/nsd-4.1.26.tar.gz.asc b/nsd-4.1.26.tar.gz.asc
new file mode 100644
index 0000000..8b1358b
--- /dev/null
+++ b/nsd-4.1.26.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCAAGBQJcBloaAAoJEJ9vHC1+BF+N/QAP/jrOlTodtCJ3pbkigj4WBHIA
+sBnBSCnO+7LFsotV3HvfUEJgFRVSWvGBZtgbbE80qJnRmebDdDlXTwouiJa3e/ef
+lAUbrBvUCRJehnE0A+ISL9HtxUP4z9DkOdgX60PvrOs5+doBqjKTr6UlNMh4ggXR
+S8u/BarEOEcu1mUoKnqz7V01UIbVBbrLZeggtX11c0JchPsgZxuvWIKMS2YGdqHE
+4wUU6CFFIDszTrgGYESxPeXUbiRHo4Zl3RiMvVIjW0S/tZl8zQM0ty5mxctp5aam
+7T5VsbHVzveGI3xkUDhfbMc1CN+u/b3gp2ducLMzcVunag3P3pjf4fiPE/xyAfR/
+QcHDGufCeHf4NkqsvBp/aJ1WLf5kI3Feec223B638WfGHRov8Z+BY8qHi556SpC3
+PxOsNX75NigjLYX5fcbxSH7v9uPeGgUBHGhWiAnyE+Z4pqpdok+Y9s1GtuiojNyV
+VMVWHhlGjKm1JxeKMRsTFoEOqH0LwjxHe1ta2WNZkhY49GHFCnnIQC4pn3o4b7Nu
+BHEBArwhmKRajGqIdSTZ8+kK1OJBtkuAwOuMQyyV3GfrhSA/ukjbt11HD+SzDE8b
+aAslQYOdTz/srbSzI8ma4K8JZudY3bjznSn7rb5ywK+xH6/VSVRfqVX0UZum8AE5
+tTBb9gBFNxpB2Ze2pOJF
+=i6Zc
+-----END PGP SIGNATURE-----
diff --git a/nsd.changes b/nsd.changes
index e10c235..6910a99 100644
--- a/nsd.changes
+++ b/nsd.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Dec  4 19:37:05 UTC 2018 - Michael Ströder <michael@stroeder.com>
+
+- Update to upstream release 4.1.26:
+  * FEATURES:
+    - DNSTAP support for NSD, --enable-dnstap and then config in nsd.conf.
+    - Support SO_REUSEPORT_LB in FreeBSD 12 with the reuseport: yes
+      option in nsd.conf.
+    - Added nsd-control changezone.  nsd-control changezone name pattern
+      allows the change of a zone pattern option without downtime for
+      the zone, in one operation.
+  * BUG FIXES:
+    - Fix #4194: Zone file parser derailed by non-FQDN names in RHS of
+      DNSSEC RRs.
+    - Fix #4202: nsd-control delzone incorrect exit code on error.
+    - Tab style fix to use tab for 8 spaces, from Xiaobo Liu.
+    - Fix #4205: enable-recvmmsg in mixed IPv4/IPv6 environment fails.
+      This sets the msg_hdr.msg_namelen correctly after receipt.
+    - Fix to not set GLOB_NOSORT so the nsd.conf include: files are
+      sorted and in a predictable order.
+    - Fix #3433: document that reconfig does not change per-zone stats.
+
 -------------------------------------------------------------------
 Tue Sep 25 18:17:03 UTC 2018 - Michael Ströder <michael@stroeder.com>
 
diff --git a/nsd.spec b/nsd.spec
index 21f445c..3783ee4 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -23,7 +23,7 @@
 %define zonesdir   %{configdir}/zones
 %define pidfile    %{_rundir}/nsd/nsd.pid
 Name:           nsd
-Version:        4.1.25
+Version:        4.1.26
 Release:        0
 #
 Summary:        An authoritative-only domain name server