From ce705def195f70a47bd23c69d5255c479ded222b08f746f54bce53a9cab31554 Mon Sep 17 00:00:00 2001
From: Marguerite Su <i@marguerite.su>
Date: Wed, 26 Sep 2018 00:40:49 +0000
Subject: [PATCH] Accepting request 638258 from
 home:stroeder:branches:server:dns

- Update to upstream release 4.1.25

OBS-URL: https://build.opensuse.org/request/show/638258
OBS-URL: https://build.opensuse.org/package/show/server:dns/nsd?expand=0&rev=53
---
 nsd-4.1.24.tar.gz     |  3 ---
 nsd-4.1.24.tar.gz.asc | 16 ----------------
 nsd-4.1.25.tar.gz     |  3 +++
 nsd-4.1.25.tar.gz.asc | 16 ++++++++++++++++
 nsd.changes           | 25 +++++++++++++++++++++++++
 nsd.spec              |  4 ++--
 6 files changed, 46 insertions(+), 21 deletions(-)
 delete mode 100644 nsd-4.1.24.tar.gz
 delete mode 100644 nsd-4.1.24.tar.gz.asc
 create mode 100644 nsd-4.1.25.tar.gz
 create mode 100644 nsd-4.1.25.tar.gz.asc

diff --git a/nsd-4.1.24.tar.gz b/nsd-4.1.24.tar.gz
deleted file mode 100644
index 6829fc4..0000000
--- a/nsd-4.1.24.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4fb687c8e494610ad8692a127ac101ed73df851142a42766c33de06e54449311
-size 1107574
diff --git a/nsd-4.1.24.tar.gz.asc b/nsd-4.1.24.tar.gz.asc
deleted file mode 100644
index ad7a9b6..0000000
--- a/nsd-4.1.24.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABCAAGBQJbcWyXAAoJEJ9vHC1+BF+NwK4P+wYTvq62v7I0lygQCPwRzZEM
-v3Q6xqwV0/bKA7i0k41jq6d+Db0mKZ2MD+BLt0C7rTUeQPl0WjZs46fzuxDNQAvu
-R3WMslNenOGPxLDmd0Vx2h1ao8MrYM7D9x4fF5W8p3/HY1QDAOp4Xfd8l/r8pvWp
-gYPWT2lYERZcDUZW6b6lFXFt9vyALCTvW5/DM5ysPRL599a+1DQdKNcJUWs34irj
-VwNTtKyryOBm+bfGDd7pgsUy8dxfuZkKgZmMKJegKTjoDkYmMiSx6O4DZLx833p8
-HApZijnJcN2R38GWbwL/fvWASgTPmHaQOAfwuDksRBc3Im68ma6fwP4YogeKB0XG
-HFNfvyEZNVDqtXUdn85fEAyU9iT+5W9mlnRr4pMXzcr47MXLBFqxj66Yl7k6x+ck
-Cy/zJ2FqS0x0014sqshHND/7P5HiV8NZu1TJOHhHRrCpt1pxgPcUlWCkQHGEpjJl
-NYfGFh+EUILmb92WDToYn8Sd8tLchmyq7HsmNA3Bq1pjZBMuZ+4geqae9uwnYxjg
-FQAVkK/Qcz3hdufb30EjVKkLC0mOoUbC6bxIRDEjuuFL0cYt34MR5oQ7ECw+AawI
-unC2GOZm+kDLfUuBoMbdFgJZlrgNfnkrA46vBuUPEqufg0pXc+P1LSWG5rR4EOtT
-lvn/w3CUX9aCEFA6t5Ut
-=TjMI
------END PGP SIGNATURE-----
diff --git a/nsd-4.1.25.tar.gz b/nsd-4.1.25.tar.gz
new file mode 100644
index 0000000..5e475e4
--- /dev/null
+++ b/nsd-4.1.25.tar.gz
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..7bde307
--- /dev/null
+++ b/nsd-4.1.25.tar.gz.asc
@@ -0,0 +1,16 @@
+-----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.changes b/nsd.changes
index 4b2c2ca..e10c235 100644
--- a/nsd.changes
+++ b/nsd.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Tue Sep 25 18:17:03 UTC 2018 - Michael Ströder <michael@stroeder.com>
+
+- Update to upstream release 4.1.25:
+  * FEATURES:
+    - nsd-control prints neater errors for file failures.
+  * BUG FIXES:
+    - Fix that nsec3 precompile deletion happens before the RRs of
+      the zone are deleted.
+    - Fix printout of accepted remote control connection for unix sockets.
+    - Fix use_systemd typo/leftover in remote.c.
+    - Fix codingstyle in nsd-checkconf.c in patch from Sharp Liu.
+    - append_trailing_slash has one implementation and is not repeated
+      differently.
+    - Fix coding style in nsd.c
+    - Fix to combine the same error function into one, from Xiaobo Liu.
+    - Fix initialisation in remote.c.
+    - please clang analyzer and fix parse of IPSECKEY with bad gateway.
+    - Fix nsd-checkconf fail on bad zone name.
+    - Annotate exit functions with noreturn.
+    - Remove unused if clause during server service startup.
+    - Fix #4156: Fix systemd service manager state change notification
+      When it is compiled, systemd readiness signalling is enabled.
+      The option in nsd.conf is not used, it is ignored when read.
+
 -------------------------------------------------------------------
 Mon Aug 13 20:10:27 UTC 2018 - michael@stroeder.com
 
diff --git a/nsd.spec b/nsd.spec
index c70c02e..21f445c 100644
--- a/nsd.spec
+++ b/nsd.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -23,7 +23,7 @@
 %define zonesdir   %{configdir}/zones
 %define pidfile    %{_rundir}/nsd/nsd.pid
 Name:           nsd
-Version:        4.1.24
+Version:        4.1.25
 Release:        0
 #
 Summary:        An authoritative-only domain name server