From 45e4820b87293bb2f859f935244dfae29b12255110830f6bd62060a43600139a Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Tue, 10 Sep 2019 17:40:14 +0000
Subject: [PATCH] Accepting request 729935 from
 home:stroeder:branches:server:dns

update to 4.2.2

OBS-URL: https://build.opensuse.org/request/show/729935
OBS-URL: https://build.opensuse.org/package/show/server:dns/nsd?expand=0&rev=63
---
 nsd-4.2.1.tar.gz     |  3 ---
 nsd-4.2.1.tar.gz.asc | 16 ----------------
 nsd-4.2.2.tar.gz     |  3 +++
 nsd-4.2.2.tar.gz.asc | 16 ++++++++++++++++
 nsd.changes          | 26 ++++++++++++++++++++++++++
 nsd.spec             |  2 +-
 6 files changed, 46 insertions(+), 20 deletions(-)
 delete mode 100644 nsd-4.2.1.tar.gz
 delete mode 100644 nsd-4.2.1.tar.gz.asc
 create mode 100644 nsd-4.2.2.tar.gz
 create mode 100644 nsd-4.2.2.tar.gz.asc

diff --git a/nsd-4.2.1.tar.gz b/nsd-4.2.1.tar.gz
deleted file mode 100644
index 6b8b154..0000000
--- a/nsd-4.2.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d17c0ea3968cb0eb2be79f2f83eb299b7bfcc554b784007616eed6ece828871f
-size 1145713
diff --git a/nsd-4.2.1.tar.gz.asc b/nsd-4.2.1.tar.gz.asc
deleted file mode 100644
index 0834e49..0000000
--- a/nsd-4.2.1.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE7fqj8spObrBWga+On28cLX4EX40FAl0kQSwACgkQn28cLX4E
-X400yg//VnDdzMDrpcVQiGoufX+zEzhuCnMPsVzLT+xwizluk70QdfYQEuuAl/Wp
-OTYArJxjcNTOXr+XuhUf+NhJtiZYQFSCrt2X4ueQucCX/w+dVHvYL2p6xw9XQAF5
-wB/Yor7GLigBOzbCjCSwoe70VnT2+y8t3TFwgC00SlJa1Bzau1ju58h4ntur/Dor
-U8Nokx60eObx8q4VyMi9ooWoPNtDJlg80tNJAez1NL85/+LHu/xOVINpE8jwkGYY
-TPOitTep9WD8BnWE/jVd2+eS7tPOC84LFTRvvtQxCxIf0VI6H5qX2hePijTc6JFb
-KL4wNxog+mTblfgVGWDJRO9+QzrTsKX7yMtVnoLtH3GwGVeHWmvfLz9NE6C/pD/v
-iVyzCkBdnxr4z4Ekk594hyqD/RXEe2+8soNM9ODKSX9hUjMkd9lBYq92SnYfhbv0
-IJKkwUA33DbnfjZy8uC7/jPkyAFPnevvcw8mdsNwfvxZpZVp2FrWAtUaDE5IfLP8
-UW/LmjB+A+V9KmWqcxWtqPoQJI4QHRH7rgOoBdnJUzrITDQtulA4IpOAzaSdw1PN
-xz8aTDsE+POJQM/Bj46XKS2Ghnkuckc83DS/LN5cD2bFWr0rZyJdcYyhwuS19FMA
-cgm+B3HLhS0DMspKuND61sxU9+o7JGi2wgZ2CnvwXPV8xTLx3M4=
-=sg7r
------END PGP SIGNATURE-----
diff --git a/nsd-4.2.2.tar.gz b/nsd-4.2.2.tar.gz
new file mode 100644
index 0000000..f204fce
--- /dev/null
+++ b/nsd-4.2.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83b333940a25fe6d453bcac6ea39edfa244612a879117c4a624c97eb250246fb
+size 1149182
diff --git a/nsd-4.2.2.tar.gz.asc b/nsd-4.2.2.tar.gz.asc
new file mode 100644
index 0000000..564fe9b
--- /dev/null
+++ b/nsd-4.2.2.tar.gz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE7fqj8spObrBWga+On28cLX4EX40FAl1aZ5kACgkQn28cLX4E
+X43iQQ/8D3IXpwc1VhdEeySuCuPwS5aikaZA9440te4xbecxaqvsgra3Z8LorJf2
+i+NnDDG/9GlLHheoHvK3ri9v8kPeaKKDI1wrNuddxK9gkmQFRfNRFKMqDm/UQuot
+vSZi+OHIcm8fHlqBFQMJe09PZmKXTsTWWPwS0fiyN5tf9YOL12+f8/er8KtezY5R
+5sCdh4sWBOYkMlqZnEy/PwVgLudCTF1SrPNFiWu1Oh1R8zFP21jrUaArLr/dBd0F
+bKvjEcKJr01iX+QWyFlHMeOx85nSj3KYrGX16OwmZPTZMmHfCnhy/nSbBtGPsmss
+z8JShsDplZpyXA20mQUEUtT3PkYsUL2KbWhtGuJo9eHvumRC7B/yBYqRW0ho33bm
+0P8h6P+FaNvlG75qK8TWEhh0wBG1Jr/Ng8PdVaCjfCqtlKf4HYFWwmrkc0mqgkXP
+dccO2y06pw9XeZw4qGbBSpUaMzytELG1eXnScxKXkkq0HxTCsaded2CFxEucnDQI
+0djnM/Bs6FVWnPeuR1pyJbVnKP9zi33ay0qZ++yG7WI9xyaWjT4mxMN1YM6NW/7B
+BpQrpDaBoY1sz3yv0M+bOO4Gl9q02JLd4pS5tthQE25O5lA5iXWLNeylyMbP9qPz
+zzC/WU/PhjTedAFYpIOP7vIwAK+4b5vyUHoYdUdMR/ULxw4gqjc=
+=1aEu
+-----END PGP SIGNATURE-----
diff --git a/nsd.changes b/nsd.changes
index 1dddcc5..b630b77 100644
--- a/nsd.changes
+++ b/nsd.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Sun Sep  8 14:13:02 UTC 2019 - Michael Ströder <michael@stroeder.com>
+
+- New upstream release 4.2.2:
+  * Fix #20: CVE-2019-13207 Stack-based Buffer Overflow in the
+    dname_concatenate() function.  Reported by Frederic Cambus.
+    It causes the zone parser to crash on a malformed zone file,
+    with assertions enabled, an assertion catches it.
+  * Fix #19: Out-of-bounds read caused by improper validation of
+    array index.  Reported by Frederic Cambus.  The zone parser
+    fails on type SIG because of mismatched definition with RRSIG.
+  * PR #23: Fix typo in nsd.conf man-page.
+  * Fix that NSD warns for wrong length of the hash in SSHFP records.
+  * Fix #25: NSD doesn't refresh zones after extended downtime,
+    it refreshes the old zones.
+  * Set no renegotiation on the SSL context to stop client
+    session renegotiation.
+  * Fix #29: SSHFP check NULL pointer dereference.
+  * Fix #30: SSHFP check failure due to missing domain name.
+  * Fix to timeval_add in minievent for remaining second in microseconds.
+  * PR #31: nsd-control: Add missing stdio header.
+  * PR #32: tsig: Fix compilation without HAVE_SSL.
+  * Cleanup tls context on xfrd exit.
+  * Fix #33: Fix segfault in service of remaining streams on exit.
+  * Fix error message for out of zone data to have more information.
+
 -------------------------------------------------------------------
 Tue Jul  9 17:52:44 UTC 2019 - Michael Ströder <michael@stroeder.com>
 
diff --git a/nsd.spec b/nsd.spec
index eef17e4..6f5e96e 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.2.1
+Version:        4.2.2
 Release:        0
 #
 Summary:        An authoritative-only domain name server