Hi Michael,

attached are patches for two open RC bugs of isc-dhcp.
The third one could be solved by creating a team[1] within the tracker.

  Thorsten


[1] https://tracker.debian.org/teams/
diff -Nru isc-dhcp-4.3.5/debian/changelog isc-dhcp-4.3.5/debian/changelog
--- isc-dhcp-4.3.5/debian/changelog     2018-04-01 07:37:25.000000000 +0200
+++ isc-dhcp-4.3.5/debian/changelog     2018-11-12 19:00:00.000000000 +0100
@@ -1,3 +1,12 @@
+isc-dhcp (4.3.5-5) unstable; urgency=medium
+
+  * update patches/bind-includes.patch for new location of include file
+    (Closes: #911975)
+  * remove stale pid files in postrm
+    (Closes: #867362)
+
+ -- Thorsten Alteholz <deb...@alteholz.de>  Mon, 12 Nov 2018 19:00:00 +0100
+
 isc-dhcp (4.3.5-4) unstable; urgency=medium
 
   * Acknowledge and apply the non-maintainer upload.
diff -Nru isc-dhcp-4.3.5/debian/isc-dhcp-server.postrm 
isc-dhcp-4.3.5/debian/isc-dhcp-server.postrm
--- isc-dhcp-4.3.5/debian/isc-dhcp-server.postrm        2018-04-01 
07:35:40.000000000 +0200
+++ isc-dhcp-4.3.5/debian/isc-dhcp-server.postrm        2018-11-12 
19:00:00.000000000 +0100
@@ -21,7 +21,9 @@
        ;;
 
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-       # Nothing to do
+       # take care of stale pid files
+       rm -f /var/run/dhcpd.pid
+       rm -f /var/run/dhcpd6.pid
        ;;
 esac
 
diff -Nru isc-dhcp-4.3.5/debian/patches/bind-includes.patch 
isc-dhcp-4.3.5/debian/patches/bind-includes.patch
--- isc-dhcp-4.3.5/debian/patches/bind-includes.patch   2018-04-01 
07:37:25.000000000 +0200
+++ isc-dhcp-4.3.5/debian/patches/bind-includes.patch   2018-11-12 
19:00:00.000000000 +0100
@@ -2,14 +2,30 @@
 author: Michael Gilbert <mgilb...@debian.org>
 bug-debian: http://bugs.debian.org/894093
 
---- a/includes/dhcpd.h
-+++ b/includes/dhcpd.h
-@@ -62,6 +62,8 @@
+Index: isc-dhcp-4.3.5/includes/dhcpd.h
+===================================================================
+--- isc-dhcp-4.3.5.orig/includes/dhcpd.h       2018-11-12 18:58:06.569872662 
+0100
++++ isc-dhcp-4.3.5/includes/dhcpd.h    2018-11-12 18:58:06.557872662 +0100
+@@ -62,6 +62,10 @@
  # include <net/if_dl.h>
  #endif
  
++#include <bind-export/isc/boolean.h>
++#include <bind-export/isc/int.h>
 +#include <isc/util.h>
 +
  #include <setjmp.h>
  
  #include "cdefs.h"
+Index: isc-dhcp-4.3.5/includes/omapip/omapip.h
+===================================================================
+--- isc-dhcp-4.3.5.orig/includes/omapip/omapip.h       2016-09-27 
21:16:50.000000000 +0200
++++ isc-dhcp-4.3.5/includes/omapip/omapip.h    2018-11-12 18:59:47.037869650 
+0100
+@@ -32,6 +32,7 @@
+ #include "result.h"
+ #include <stdarg.h>
+ 
++#include <bind-export/isc/boolean.h>
+ #include <dns/tsec.h>
+ 
+ typedef unsigned int omapi_handle_t;

Reply via email to