From 51b4aa2e59496e71ecf2894f1f1ea0bb81ffcdaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Thu, 19 Dec 2019 19:39:39 +0100 Subject: [PATCH] Fix oot build gen would not compile under oot build --- bind-9.11-oot-gen.patch | 47 +++++++++++++++++++++++++++++++++++++++++ bind.spec | 2 ++ 2 files changed, 49 insertions(+) create mode 100644 bind-9.11-oot-gen.patch diff --git a/bind-9.11-oot-gen.patch b/bind-9.11-oot-gen.patch new file mode 100644 index 0000000..9a7f991 --- /dev/null +++ b/bind-9.11-oot-gen.patch @@ -0,0 +1,47 @@ +From cb654ddde5953cab9dfde7173ea1ed14b51c3727 Mon Sep 17 00:00:00 2001 +From: Mark Andrews +Date: Sun, 22 Dec 2019 21:51:21 +0000 +Subject: [PATCH] Merge branch + '1530-lib-dns-gen-c-29-26-fatal-error-isc-platform-h-no-such-file-or-directory-v9_11' + into 'v9_11' + +Resolve "lib/dns/gen.c:29:26: fatal error: isc/platform.h: No such file or directory" + +See merge request isc-projects/bind9!2794 + +(cherry picked from commit 335ab375d6a0227fb362722acad22f2a5b75d8b7) +--- + lib/dns/gen.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/dns/gen.c b/lib/dns/gen.c +index 81bc7ada1d..5fbdc3bfd3 100644 +--- a/lib/dns/gen.c ++++ b/lib/dns/gen.c +@@ -26,18 +26,18 @@ + + #include + +-#include +- + #include ++#include + #include + #include +-#include + #include + #include + #include + #include +-#include +-#include ++ ++#ifndef PATH_MAX ++#define PATH_MAX 1024 ++#endif + + #ifdef WIN32 + #include "gen-win32.h" +-- +2.21.0 + diff --git a/bind.spec b/bind.spec index 2322977..cfac492 100644 --- a/bind.spec +++ b/bind.spec @@ -165,6 +165,7 @@ Patch180: bind-9.11-rh1736762-5.patch Patch181: bind-9.11-rh1736762-6.patch Patch182: bind-9.11-rh1736762-7.patch Patch183: bind-9.11-rh1736762-8.patch +Patch184: bind-9.11-oot-gen.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -565,6 +566,7 @@ are used for building ISC DHCP. %patch181 -p1 -b .rh1736762-6 %patch182 -p1 -b .rh1736762-7 %patch183 -p1 -b .rh1736762-8 +%patch184 -p1 -b .oot-gen mkdir lib/dns/tests/testdata/dstrandom cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data