summaryrefslogtreecommitdiff
path: root/pkg/unbound/patch/0001-Fix-ub_random_max-preprocessor-guard.patch
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2021-12-01 20:48:11 -0800
committerMichael Forney <mforney@mforney.org>2021-12-22 00:15:13 -0800
commit0e0f985268db5afae98c7f7f172064b34bdfe77c (patch)
tree9aa40662b7dd8cb7df7d9bd13bb1738de1c53020 /pkg/unbound/patch/0001-Fix-ub_random_max-preprocessor-guard.patch
parent8dc6169bcae4255a996f29ab59c839c559fcdc24 (diff)
Add unbound 1.14.0
Patched to use BearSSL for crypto.
Diffstat (limited to 'pkg/unbound/patch/0001-Fix-ub_random_max-preprocessor-guard.patch')
-rw-r--r--pkg/unbound/patch/0001-Fix-ub_random_max-preprocessor-guard.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/pkg/unbound/patch/0001-Fix-ub_random_max-preprocessor-guard.patch b/pkg/unbound/patch/0001-Fix-ub_random_max-preprocessor-guard.patch
new file mode 100644
index 00000000..d5ac8b35
--- /dev/null
+++ b/pkg/unbound/patch/0001-Fix-ub_random_max-preprocessor-guard.patch
@@ -0,0 +1,27 @@
+From b9f80118e406d60e0e41b2f6b2549a8502fd1886 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Wed, 1 Dec 2021 12:42:54 -0800
+Subject: [PATCH] Fix ub_random_max preprocessor guard
+
+|| has lower precedence than &&, so if HAVE_NETTLE and HAVE_LIBBSD
+are both defined, ub_random_max would get defined twice.
+---
+ util/random.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/random.c b/util/random.c
+index 6eb102c6..f7bb0a6f 100644
+--- a/util/random.c
++++ b/util/random.c
+@@ -186,7 +186,7 @@ long int ub_random(struct ub_randstate* s)
+ #endif /* HAVE_SSL or HAVE_LIBBSD or HAVE_NSS or HAVE_NETTLE */
+
+
+-#if defined(HAVE_NSS) || defined(HAVE_NETTLE) && !defined(HAVE_LIBBSD)
++#if (defined(HAVE_NSS) || defined(HAVE_NETTLE)) && !defined(HAVE_LIBBSD)
+ long int
+ ub_random_max(struct ub_randstate* state, long int x)
+ {
+--
+2.34.0
+