Comment 12 for bug 1552801

Revision history for this message
LaMont Jones (lamont) wrote :

diff -urN bind9-9.10.3.dfsg.P4-8/debian/changelog bind9-9.10.3.dfsg.P4-8ubuntu1/debian/changelog
--- bind9-9.10.3.dfsg.P4-8/debian/changelog 2016-04-13 13:20:25.000000000 -0600
+++ bind9-9.10.3.dfsg.P4-8ubuntu1/debian/changelog 2016-04-26 19:17:47.000000000 -0600
@@ -1,3 +1,10 @@
+bind9 (1:9.10.3.dfsg.P4-8ubuntu1) xenial-proposed; urgency=medium
+
+ * Fix bad patch from when we switched to quilt. Closes: #820847 LP:
+ #1552801, #1549788, #1553460
+
+ -- LaMont Jones <email address hidden> Tue, 26 Apr 2016 16:30:06 -0600
+
 bind9 (1:9.10.3.dfsg.P4-8) unstable; urgency=medium

   [Timo Aaltonen]
diff -urN bind9-9.10.3.dfsg.P4-8/debian/patches/20_random_1.diff bind9-9.10.3.dfsg.P4-8ubuntu1/debian/patches/20_random_1.diff
--- bind9-9.10.3.dfsg.P4-8/debian/patches/20_random_1.diff 2016-04-13 13:20:25.000000000 -0600
+++ bind9-9.10.3.dfsg.P4-8ubuntu1/debian/patches/20_random_1.diff 2016-04-26 19:17:47.000000000 -0600
@@ -28,15 +28,6 @@
   else if (!strcasecmp(str, "cyclic"))
    mode = 0;
   else
-@@ -6923,8 +6925,6 @@
- if (server->tkeyctx != NULL)
- dns_tkeyctx_destroy(&server->tkeyctx);
-
-- dst_lib_destroy();
--
- isc_event_free(&server->reload_event);
-
- INSIST(ISC_LIST_EMPTY(server->viewlist));
 --- a/lib/bind9/check.c
 +++ b/lib/bind9/check.c
 @@ -147,6 +147,7 @@