summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2020-02-06 06:53:22 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-08 13:20:02 +0000
commitcc7164836097a4100dce65e93b24a3a8874f65b3 (patch)
tree9c142562ffd15a09e3e6cb2876032268be171e19 /meta/recipes-connectivity/dhcp
parentd16884504627477496a39043e658ce0ebb69f830 (diff)
downloadpoky-cc7164836097a4100dce65e93b24a3a8874f65b3.tar.gz
dhcp: upgrade 4.4.1 -> 4.4.2
0001-Fix-a-NSUPDATE-compiling-issue.patch 0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch Removed since they are included in 4.4.2. refresh the following patch: 0004-Fix-out-of-tree-builds.patch (From OE-Core rev: d3c6f7e689a743fd060755eceb60353093013e84) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch68
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch79
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch6
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb (renamed from meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb)6
4 files changed, 6 insertions, 153 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch
deleted file mode 100644
index f12a112fcf..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0001-Fix-a-NSUPDATE-compiling-issue.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From a59cb98a473caa2afd64d7ae368480b6e9f91b3f Mon Sep 17 00:00:00 2001
2From: Ming Liu <liu.ming50@gmail.com>
3Date: Tue, 14 May 2019 11:07:15 +0200
4Subject: [PATCH] Fix a NSUPDATE compiling issue
5
6Upstream-Status: Pending [Patch sent to: https://gitlab.isc.org/isc-projects/dhcp/issues/16]
7
8A following error was observed when NSUPDATE is not defined:
9| omapip/isclib.c: In function 'dns_client_init':
10| omapip/isclib.c:356:18: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient'
11| if (dhcp_gbl_ctx.dnsclient == NULL) {
12| ^
13| omapip/isclib.c:363:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient'
14| &dhcp_gbl_ctx.dnsclient,
15| ^
16| omapip/isclib.c:364:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local4'
17| (dhcp_gbl_ctx.use_local4 ?
18| ^
19| omapip/isclib.c:365:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local4_sockaddr'
20| &dhcp_gbl_ctx.local4_sockaddr
21| ^
22| omapip/isclib.c:367:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local6'
23| (dhcp_gbl_ctx.use_local6 ?
24| ^
25| omapip/isclib.c:368:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local6_sockaddr'
26| &dhcp_gbl_ctx.local6_sockaddr
27
28Fix it by adding NSUPDATE conditional checking.
29
30Signed-off-by: Ming Liu <liu.ming50@gmail.com>
31---
32 includes/omapip/isclib.h | 2 ++
33 omapip/isclib.c | 2 ++
34 2 files changed, 4 insertions(+)
35
36diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
37index 538b927..6c20584 100644
38--- a/includes/omapip/isclib.h
39+++ b/includes/omapip/isclib.h
40@@ -141,6 +141,8 @@ void isclib_cleanup(void);
41 void dhcp_signal_handler(int signal);
42 extern int shutdown_signal;
43
44+#if defined (NSUPDATE)
45 isc_result_t dns_client_init();
46+#endif
47
48 #endif /* ISCLIB_H */
49diff --git a/omapip/isclib.c b/omapip/isclib.c
50index db3b895..ce4b4a1 100644
51--- a/omapip/isclib.c
52+++ b/omapip/isclib.c
53@@ -351,6 +351,7 @@ void dhcp_signal_handler(int signal) {
54 }
55 }
56
57+#if defined (NSUPDATE)
58 isc_result_t dns_client_init() {
59 isc_result_t result;
60 if (dhcp_gbl_ctx.dnsclient == NULL) {
61@@ -387,3 +388,4 @@ isc_result_t dns_client_init() {
62
63 return ISC_R_SUCCESS;
64 }
65+#endif
66--
672.7.4
68
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch
deleted file mode 100644
index 1bc1422475..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001
2From: Thomas Markwalder <tmark@isc.org>
3Date: Fri, 14 Sep 2018 13:41:41 -0400
4Subject: [master] Added includes of new BIND9 compatibility headers
5
6 Merges in rt48072.
7
8Upstream-Status: Backport
9Signed-off-by: Adrian Bunk <bunk@stusta.de>
10
11diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
12index 75a87ff6..538b927f 100644
13--- a/includes/omapip/isclib.h
14+++ b/includes/omapip/isclib.h
15@@ -48,6 +48,9 @@
16 #include <string.h>
17 #include <netdb.h>
18
19+#include <isc/boolean.h>
20+#include <isc/int.h>
21+
22 #include <isc/buffer.h>
23 #include <isc/lex.h>
24 #include <isc/lib.h>
25diff --git a/includes/omapip/result.h b/includes/omapip/result.h
26index 91243e1b..860298f6 100644
27--- a/includes/omapip/result.h
28+++ b/includes/omapip/result.h
29@@ -26,6 +26,7 @@
30 #ifndef DHCP_RESULT_H
31 #define DHCP_RESULT_H 1
32
33+#include <isc/boolean.h>
34 #include <isc/lang.h>
35 #include <isc/resultclass.h>
36 #include <isc/types.h>
37diff --git a/server/dhcpv6.c b/server/dhcpv6.c
38index a7110f98..cde4f617 100644
39--- a/server/dhcpv6.c
40+++ b/server/dhcpv6.c
41@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply,
42 shared_name,
43 inet_ntop(AF_INET6, &lease->addr,
44 tmp_addr, sizeof(tmp_addr)),
45- used, count);
46+ (long long unsigned)(used),
47+ (long long unsigned)(count));
48 }
49 return;
50 }
51@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply,
52 "address: %s; high threshold %d%% %llu/%llu.",
53 shared_name,
54 inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)),
55- poolhigh, used, count);
56+ poolhigh, (long long unsigned)(used),
57+ (long long unsigned)(count));
58
59 /* handle the low threshold now, if we don't
60 * have one we default to 0. */
61@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply)
62 log_debug("Unable to pick client address: "
63 "no addresses available - shared network %s: "
64 " 2^64-1 < total, %llu active, %llu abandoned",
65- shared_name, active - abandoned, abandoned);
66+ shared_name, (long long unsigned)(active - abandoned),
67+ (long long unsigned)(abandoned));
68 } else {
69 log_debug("Unable to pick client address: "
70 "no addresses available - shared network %s: "
71 "%llu total, %llu active, %llu abandoned",
72- shared_name, total, active - abandoned, abandoned);
73+ shared_name, (long long unsigned)(total),
74+ (long long unsigned)(active - abandoned),
75+ (long long unsigned)(abandoned));
76 }
77
78 return ISC_R_NORESOURCES;
79
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
index b71c93dd6d..7b57730ffb 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
@@ -85,9 +85,11 @@ Index: dhcp-4.4.1/relay/Makefile.am
85=================================================================== 85===================================================================
86--- dhcp-4.4.1.orig/relay/Makefile.am 86--- dhcp-4.4.1.orig/relay/Makefile.am
87+++ dhcp-4.4.1/relay/Makefile.am 87+++ dhcp-4.4.1/relay/Makefile.am
88@@ -1,4 +1,4 @@ 88@@ -1,6 +1,6 @@
89 SUBDIRS = . tests
90
89-AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' 91-AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
90+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes 92+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
91 93
92 sbin_PROGRAMS = dhcrelay 94 sbin_PROGRAMS = dhcrelay
93 dhcrelay_SOURCES = dhcrelay.c 95 dhcrelay_SOURCES = dhcrelay.c
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb
index 020777b8f2..b56a204821 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.4.2.bb
@@ -9,13 +9,11 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat
9 file://0009-remove-dhclient-script-bash-dependency.patch \ 9 file://0009-remove-dhclient-script-bash-dependency.patch \
10 file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \ 10 file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \
11 file://0013-fixup_use_libbind.patch \ 11 file://0013-fixup_use_libbind.patch \
12 file://0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch \
13 file://0001-Fix-a-NSUPDATE-compiling-issue.patch \
14 file://0001-workaround-busybox-limitation-in-linux-dhclient-script.patch \ 12 file://0001-workaround-busybox-limitation-in-linux-dhclient-script.patch \
15" 13"
16 14
17SRC_URI[md5sum] = "18c7f4dcbb0a63df25098216d47b1ede" 15SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1"
18SRC_URI[sha256sum] = "2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608" 16SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521"
19 17
20LDFLAGS_append = " -pthread" 18LDFLAGS_append = " -pthread"
21 19