mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
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>
This commit is contained in:
Wang Mingyu
committed by
Richard Purdie
Richard Purdie
parent
d168845046
commit
cc71648360
@@ -1,68 +0,0 @@
|
||||
From a59cb98a473caa2afd64d7ae368480b6e9f91b3f Mon Sep 17 00:00:00 2001
|
||||
From: Ming Liu <liu.ming50@gmail.com>
|
||||
Date: Tue, 14 May 2019 11:07:15 +0200
|
||||
Subject: [PATCH] Fix a NSUPDATE compiling issue
|
||||
|
||||
Upstream-Status: Pending [Patch sent to: https://gitlab.isc.org/isc-projects/dhcp/issues/16]
|
||||
|
||||
A following error was observed when NSUPDATE is not defined:
|
||||
| omapip/isclib.c: In function 'dns_client_init':
|
||||
| omapip/isclib.c:356:18: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient'
|
||||
| if (dhcp_gbl_ctx.dnsclient == NULL) {
|
||||
| ^
|
||||
| omapip/isclib.c:363:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'dnsclient'
|
||||
| &dhcp_gbl_ctx.dnsclient,
|
||||
| ^
|
||||
| omapip/isclib.c:364:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local4'
|
||||
| (dhcp_gbl_ctx.use_local4 ?
|
||||
| ^
|
||||
| omapip/isclib.c:365:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local4_sockaddr'
|
||||
| &dhcp_gbl_ctx.local4_sockaddr
|
||||
| ^
|
||||
| omapip/isclib.c:367:24: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'use_local6'
|
||||
| (dhcp_gbl_ctx.use_local6 ?
|
||||
| ^
|
||||
| omapip/isclib.c:368:25: error: 'dhcp_context_t {aka struct dhcp_context}' has no member named 'local6_sockaddr'
|
||||
| &dhcp_gbl_ctx.local6_sockaddr
|
||||
|
||||
Fix it by adding NSUPDATE conditional checking.
|
||||
|
||||
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
|
||||
---
|
||||
includes/omapip/isclib.h | 2 ++
|
||||
omapip/isclib.c | 2 ++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
|
||||
index 538b927..6c20584 100644
|
||||
--- a/includes/omapip/isclib.h
|
||||
+++ b/includes/omapip/isclib.h
|
||||
@@ -141,6 +141,8 @@ void isclib_cleanup(void);
|
||||
void dhcp_signal_handler(int signal);
|
||||
extern int shutdown_signal;
|
||||
|
||||
+#if defined (NSUPDATE)
|
||||
isc_result_t dns_client_init();
|
||||
+#endif
|
||||
|
||||
#endif /* ISCLIB_H */
|
||||
diff --git a/omapip/isclib.c b/omapip/isclib.c
|
||||
index db3b895..ce4b4a1 100644
|
||||
--- a/omapip/isclib.c
|
||||
+++ b/omapip/isclib.c
|
||||
@@ -351,6 +351,7 @@ void dhcp_signal_handler(int signal) {
|
||||
}
|
||||
}
|
||||
|
||||
+#if defined (NSUPDATE)
|
||||
isc_result_t dns_client_init() {
|
||||
isc_result_t result;
|
||||
if (dhcp_gbl_ctx.dnsclient == NULL) {
|
||||
@@ -387,3 +388,4 @@ isc_result_t dns_client_init() {
|
||||
|
||||
return ISC_R_SUCCESS;
|
||||
}
|
||||
+#endif
|
||||
--
|
||||
2.7.4
|
||||
|
||||
-79
@@ -1,79 +0,0 @@
|
||||
From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Markwalder <tmark@isc.org>
|
||||
Date: Fri, 14 Sep 2018 13:41:41 -0400
|
||||
Subject: [master] Added includes of new BIND9 compatibility headers
|
||||
|
||||
Merges in rt48072.
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Adrian Bunk <bunk@stusta.de>
|
||||
|
||||
diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
|
||||
index 75a87ff6..538b927f 100644
|
||||
--- a/includes/omapip/isclib.h
|
||||
+++ b/includes/omapip/isclib.h
|
||||
@@ -48,6 +48,9 @@
|
||||
#include <string.h>
|
||||
#include <netdb.h>
|
||||
|
||||
+#include <isc/boolean.h>
|
||||
+#include <isc/int.h>
|
||||
+
|
||||
#include <isc/buffer.h>
|
||||
#include <isc/lex.h>
|
||||
#include <isc/lib.h>
|
||||
diff --git a/includes/omapip/result.h b/includes/omapip/result.h
|
||||
index 91243e1b..860298f6 100644
|
||||
--- a/includes/omapip/result.h
|
||||
+++ b/includes/omapip/result.h
|
||||
@@ -26,6 +26,7 @@
|
||||
#ifndef DHCP_RESULT_H
|
||||
#define DHCP_RESULT_H 1
|
||||
|
||||
+#include <isc/boolean.h>
|
||||
#include <isc/lang.h>
|
||||
#include <isc/resultclass.h>
|
||||
#include <isc/types.h>
|
||||
diff --git a/server/dhcpv6.c b/server/dhcpv6.c
|
||||
index a7110f98..cde4f617 100644
|
||||
--- a/server/dhcpv6.c
|
||||
+++ b/server/dhcpv6.c
|
||||
@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply,
|
||||
shared_name,
|
||||
inet_ntop(AF_INET6, &lease->addr,
|
||||
tmp_addr, sizeof(tmp_addr)),
|
||||
- used, count);
|
||||
+ (long long unsigned)(used),
|
||||
+ (long long unsigned)(count));
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply,
|
||||
"address: %s; high threshold %d%% %llu/%llu.",
|
||||
shared_name,
|
||||
inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)),
|
||||
- poolhigh, used, count);
|
||||
+ poolhigh, (long long unsigned)(used),
|
||||
+ (long long unsigned)(count));
|
||||
|
||||
/* handle the low threshold now, if we don't
|
||||
* have one we default to 0. */
|
||||
@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply)
|
||||
log_debug("Unable to pick client address: "
|
||||
"no addresses available - shared network %s: "
|
||||
" 2^64-1 < total, %llu active, %llu abandoned",
|
||||
- shared_name, active - abandoned, abandoned);
|
||||
+ shared_name, (long long unsigned)(active - abandoned),
|
||||
+ (long long unsigned)(abandoned));
|
||||
} else {
|
||||
log_debug("Unable to pick client address: "
|
||||
"no addresses available - shared network %s: "
|
||||
"%llu total, %llu active, %llu abandoned",
|
||||
- shared_name, total, active - abandoned, abandoned);
|
||||
+ shared_name, (long long unsigned)(total),
|
||||
+ (long long unsigned)(active - abandoned),
|
||||
+ (long long unsigned)(abandoned));
|
||||
}
|
||||
|
||||
return ISC_R_NORESOURCES;
|
||||
|
||||
@@ -85,9 +85,11 @@ Index: dhcp-4.4.1/relay/Makefile.am
|
||||
===================================================================
|
||||
--- dhcp-4.4.1.orig/relay/Makefile.am
|
||||
+++ dhcp-4.4.1/relay/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
@@ -1,6 +1,6 @@
|
||||
SUBDIRS = . tests
|
||||
|
||||
-AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
|
||||
+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
|
||||
|
||||
|
||||
sbin_PROGRAMS = dhcrelay
|
||||
dhcrelay_SOURCES = dhcrelay.c
|
||||
|
||||
+2
-4
@@ -9,13 +9,11 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat
|
||||
file://0009-remove-dhclient-script-bash-dependency.patch \
|
||||
file://0012-dhcp-correct-the-intention-for-xml2-lib-search.patch \
|
||||
file://0013-fixup_use_libbind.patch \
|
||||
file://0001-master-Added-includes-of-new-BIND9-compatibility-hea.patch \
|
||||
file://0001-Fix-a-NSUPDATE-compiling-issue.patch \
|
||||
file://0001-workaround-busybox-limitation-in-linux-dhclient-script.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "18c7f4dcbb0a63df25098216d47b1ede"
|
||||
SRC_URI[sha256sum] = "2a22508922ab367b4af4664a0472dc220cc9603482cf3c16d9aff14f3a76b608"
|
||||
SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1"
|
||||
SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521"
|
||||
|
||||
LDFLAGS_append = " -pthread"
|
||||
|
||||
Reference in New Issue
Block a user