parent
43f4de9bf3
commit
b4802c2e65
|
@ -0,0 +1,47 @@
|
||||||
|
From cb654ddde5953cab9dfde7173ea1ed14b51c3727 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mark Andrews <marka@isc.org>
|
||||||
|
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 <sys/types.h>
|
||||||
|
|
||||||
|
-#include <isc/platform.h>
|
||||||
|
-
|
||||||
|
#include <ctype.h>
|
||||||
|
+#include <errno.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
-#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
-#include <errno.h>
|
||||||
|
-#include <limits.h>
|
||||||
|
+
|
||||||
|
+#ifndef PATH_MAX
|
||||||
|
+#define PATH_MAX 1024
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
|
#include "gen-win32.h"
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
|
@ -168,6 +168,7 @@ Patch183: bind-9.11-rh1736762-5.patch
|
||||||
Patch184: bind-9.11-rh1736762-6.patch
|
Patch184: bind-9.11-rh1736762-6.patch
|
||||||
Patch185: bind-9.11-rh1736762-7.patch
|
Patch185: bind-9.11-rh1736762-7.patch
|
||||||
Patch186: bind-9.11-rh1736762-8.patch
|
Patch186: bind-9.11-rh1736762-8.patch
|
||||||
|
Patch187: bind-9.11-oot-gen.patch
|
||||||
|
|
||||||
# SDB patches
|
# SDB patches
|
||||||
Patch11: bind-9.3.2b2-sdbsrc.patch
|
Patch11: bind-9.3.2b2-sdbsrc.patch
|
||||||
|
@ -577,6 +578,7 @@ are used for building ISC DHCP.
|
||||||
%patch184 -p1 -b .rh1736762-6
|
%patch184 -p1 -b .rh1736762-6
|
||||||
%patch185 -p1 -b .rh1736762-7
|
%patch185 -p1 -b .rh1736762-7
|
||||||
%patch186 -p1 -b .rh1736762-8
|
%patch186 -p1 -b .rh1736762-8
|
||||||
|
%patch187 -p1 -b .oot-gen
|
||||||
|
|
||||||
mkdir lib/dns/tests/testdata/dstrandom
|
mkdir lib/dns/tests/testdata/dstrandom
|
||||||
cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data
|
cp -a %{SOURCE50} lib/dns/tests/testdata/dstrandom/random.data
|
||||||
|
|
Loading…
Reference in New Issue