summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc4
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch (renamed from meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch)12
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch117
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch (renamed from meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch)20
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch (renamed from meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch)9
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch36
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch (renamed from meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch)17
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch42
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch (renamed from meta/recipes-connectivity/dhcp/dhcp/tweak-to-support-external-bind.patch)12
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch28
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch (renamed from meta/recipes-connectivity/dhcp/dhcp/build-shared-libs.patch)30
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch (renamed from meta/recipes-connectivity/dhcp/dhcp/Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch)10
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch70
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch86
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch38
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch55
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch188
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch23
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb20
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb20
20 files changed, 318 insertions, 519 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index db4a963321..58f4a6fd24 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1
13DEPENDS = "openssl bind" 13DEPENDS = "openssl bind"
14 14
15SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ 15SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
16 file://define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \
17 file://init-relay file://default-relay \ 16 file://init-relay file://default-relay \
18 file://init-server file://default-server \ 17 file://init-server file://default-server \
19 file://dhclient.conf file://dhcpd.conf \ 18 file://dhclient.conf file://dhcpd.conf \
@@ -21,8 +20,7 @@ SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
21 file://dhclient.service \ 20 file://dhclient.service \
22 file://dhcpd.service file://dhcrelay.service \ 21 file://dhcpd.service file://dhcrelay.service \
23 file://dhcpd6.service \ 22 file://dhcpd6.service \
24 file://search-for-libxml2.patch " 23 "
25
26UPSTREAM_CHECK_URI = "ftp://ftp.isc.org/isc/dhcp/" 24UPSTREAM_CHECK_URI = "ftp://ftp.isc.org/isc/dhcp/"
27UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/" 25UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
28 26
diff --git a/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
index 32bdaf08e7..e5b3cf9bc5 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
@@ -1,17 +1,21 @@
1define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF 1From 7cc29144535a622fc671dc86eb1da65b0473a7c4 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 16:14:22 +0800
4Subject: [PATCH 01/11] define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF
2 5
3Upstream-Status: Inappropriate [OE specific] 6Upstream-Status: Inappropriate [OE specific]
4 7
8Rebase to 4.3.6
5Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
6--- 10---
7 includes/site.h | 3 ++- 11 includes/site.h | 3 ++-
8 1 file changed, 2 insertions(+), 1 deletion(-) 12 1 file changed, 2 insertions(+), 1 deletion(-)
9 13
10diff --git a/includes/site.h b/includes/site.h 14diff --git a/includes/site.h b/includes/site.h
11index d87b309..17bc40d 100644 15index b2f7fd7..280fbb9 100644
12--- a/includes/site.h 16--- a/includes/site.h
13+++ b/includes/site.h 17+++ b/includes/site.h
14@@ -139,7 +139,8 @@ 18@@ -149,7 +149,8 @@
15 /* Define this if you want the dhcpd.conf file to go somewhere other than 19 /* Define this if you want the dhcpd.conf file to go somewhere other than
16 the default location. By default, it goes in /etc/dhcpd.conf. */ 20 the default location. By default, it goes in /etc/dhcpd.conf. */
17 21
@@ -22,5 +26,5 @@ index d87b309..17bc40d 100644
22 /* Network API definitions. You do not need to choose one of these - if 26 /* Network API definitions. You do not need to choose one of these - if
23 you don't choose, one will be chosen for you in your system's config 27 you don't choose, one will be chosen for you in your system's config
24-- 28--
251.9.1 291.8.3.1
26 30
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch b/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
new file mode 100644
index 0000000000..6459dc0090
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
@@ -0,0 +1,117 @@
1From be7540d31c356e80ee02e90e8bf162b7ac6e5ba5 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 14:56:56 +0800
4Subject: [PATCH 02/11] dhclient dbus
5
6upstream-Status: Inappropriate [distribution]
7
8Rebase to 4.3.6
9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10---
11 client/scripts/bsdos | 5 +++++
12 client/scripts/freebsd | 5 +++++
13 client/scripts/linux | 5 +++++
14 client/scripts/netbsd | 5 +++++
15 client/scripts/openbsd | 5 +++++
16 client/scripts/solaris | 5 +++++
17 6 files changed, 30 insertions(+)
18
19diff --git a/client/scripts/bsdos b/client/scripts/bsdos
20index d69d0d8..095b143 100755
21--- a/client/scripts/bsdos
22+++ b/client/scripts/bsdos
23@@ -45,6 +45,11 @@ exit_with_hooks() {
24 . /etc/dhclient-exit-hooks
25 fi
26 # probably should do something with exit status of the local script
27+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
28+ dbus-send --system --dest=com.redhat.dhcp \
29+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
30+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
31+ fi
32 exit $exit_status
33 }
34
35diff --git a/client/scripts/freebsd b/client/scripts/freebsd
36index 8f3e2a2..ad7fb44 100755
37--- a/client/scripts/freebsd
38+++ b/client/scripts/freebsd
39@@ -89,6 +89,11 @@ exit_with_hooks() {
40 . /etc/dhclient-exit-hooks
41 fi
42 # probably should do something with exit status of the local script
43+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
44+ dbus-send --system --dest=com.redhat.dhcp \
45+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
46+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
47+ fi
48 exit $exit_status
49 }
50
51diff --git a/client/scripts/linux b/client/scripts/linux
52index 5fb1612..3d447b6 100755
53--- a/client/scripts/linux
54+++ b/client/scripts/linux
55@@ -174,6 +174,11 @@ exit_with_hooks() {
56 exit_status=$?
57 fi
58
59+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
60+ dbus-send --system --dest=com.redhat.dhcp \
61+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
62+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
63+ fi
64 exit $exit_status
65 }
66
67diff --git a/client/scripts/netbsd b/client/scripts/netbsd
68index 07383b7..aaba8e8 100755
69--- a/client/scripts/netbsd
70+++ b/client/scripts/netbsd
71@@ -45,6 +45,11 @@ exit_with_hooks() {
72 . /etc/dhclient-exit-hooks
73 fi
74 # probably should do something with exit status of the local script
75+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
76+ dbus-send --system --dest=com.redhat.dhcp \
77+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
78+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
79+ fi
80 exit $exit_status
81 }
82
83diff --git a/client/scripts/openbsd b/client/scripts/openbsd
84index e7f4746..56b980c 100644
85--- a/client/scripts/openbsd
86+++ b/client/scripts/openbsd
87@@ -45,6 +45,11 @@ exit_with_hooks() {
88 . /etc/dhclient-exit-hooks
89 fi
90 # probably should do something with exit status of the local script
91+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
92+ dbus-send --system --dest=com.redhat.dhcp \
93+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
94+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
95+ fi
96 exit $exit_status
97 }
98
99diff --git a/client/scripts/solaris b/client/scripts/solaris
100index af553b9..4a2aa69 100755
101--- a/client/scripts/solaris
102+++ b/client/scripts/solaris
103@@ -26,6 +26,11 @@ exit_with_hooks() {
104 . /etc/dhclient-exit-hooks
105 fi
106 # probably should do something with exit status of the local script
107+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
108+ dbus-send --system --dest=com.redhat.dhcp \
109+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
110+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
111+ fi
112 exit $exit_status
113 }
114
115--
1161.8.3.1
117
diff --git a/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch b/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
index 0d0e0dd08e..810c7b6dad 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/link-with-lcrypto.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
@@ -1,24 +1,28 @@
1Author: Andrei Gherzan <andrei@gherzan.ro> 1From d80bd792323dbd56269309f85b4506eb6b1b60e9 Mon Sep 17 00:00:00 2001
2Date: Thu Feb 2 23:59:11 2012 +0200 2From: Andrei Gherzan <andrei@gherzan.ro>
3Date: Tue, 15 Aug 2017 15:05:47 +0800
4Subject: [PATCH 03/11] link with lcrypto
3 5
4From 4.2.0 final release, -lcrypto check was removed and we compile static libraries 6From 4.2.0 final release, -lcrypto check was removed and we compile
5from bind that are linked to libcrypto. This is why i added a patch in order to add 7static libraries
8from bind that are linked to libcrypto. This is why i added a patch in
9order to add
6-lcrypto to LIBS. 10-lcrypto to LIBS.
7 11
8Upstream-Status: Pending 12Upstream-Status: Pending
9Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> 13Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
10 14
11Rebase to 4.3.4 15Rebase to 4.3.6
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13--- 17---
14 configure.ac | 4 ++++ 18 configure.ac | 4 ++++
15 1 file changed, 4 insertions(+) 19 1 file changed, 4 insertions(+)
16 20
17diff --git a/configure.ac b/configure.ac 21diff --git a/configure.ac b/configure.ac
18index 097b0c3..726c88e 100644 22index cdfa352..44fb57e 100644
19--- a/configure.ac 23--- a/configure.ac
20+++ b/configure.ac 24+++ b/configure.ac
21@@ -584,6 +584,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn)); 25@@ -591,6 +591,10 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn));
22 # Look for optional headers. 26 # Look for optional headers.
23 AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h) 27 AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
24 28
@@ -30,5 +34,5 @@ index 097b0c3..726c88e 100644
30 AC_SEARCH_LIBS(socket, [socket]) 34 AC_SEARCH_LIBS(socket, [socket])
31 AC_SEARCH_LIBS(inet_ntoa, [nsl]) 35 AC_SEARCH_LIBS(inet_ntoa, [nsl])
32-- 36--
332.8.1 371.8.3.1
34 38
diff --git a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
index 2f44147ad6..7d1d867986 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
@@ -1,10 +1,13 @@
1Fix out of tree builds 1From cccec0344d68dac4100b6f260ee24e7c2da9dfda Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 15:08:22 +0800
4Subject: [PATCH 04/11] Fix out of tree builds
2 5
3Upstream-Status: Pending 6Upstream-Status: Pending
4 7
5RP 2013/03/21 8RP 2013/03/21
6 9
7Rebase to 4.3.4 10Rebase to 4.3.6
8 11
9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10--- 13---
@@ -93,5 +96,5 @@ index 54feedf..3990b9c 100644
93 dist_sysconf_DATA = dhcpd.conf.example 96 dist_sysconf_DATA = dhcpd.conf.example
94 sbin_PROGRAMS = dhcpd 97 sbin_PROGRAMS = dhcpd
95-- 98--
962.8.1 991.8.3.1
97 100
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch b/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
new file mode 100644
index 0000000000..dd56381b1d
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
@@ -0,0 +1,36 @@
1From 2e8ff0e4f6d39e346ea86b8c514ab4ccc78fa359 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 15:24:14 +0800
4Subject: [PATCH 05/11] dhcp-client: fix invoke dhclient-script failed on
5 Read-only file system
6
7In read-only file system, '/etc' is on the readonly partition,
8and '/etc/resolv.conf' is symlinked to a separate writable
9partition.
10
11In this situation, we create temp files 'resolv.conf.dhclient-new'
12in /tmp dir.
13
14Upstream-Status: Pending
15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17---
18 client/scripts/linux | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/client/scripts/linux b/client/scripts/linux
22index 3d447b6..3122a75 100755
23--- a/client/scripts/linux
24+++ b/client/scripts/linux
25@@ -40,7 +40,7 @@ make_resolv_conf() {
26 # DHCPv4
27 if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
28 [ -n "$new_domain_name_servers" ]; then
29- new_resolv_conf=/etc/resolv.conf.dhclient-new
30+ new_resolv_conf=/tmp/resolv.conf.dhclient-new
31 rm -f $new_resolv_conf
32
33 if [ -n "$new_domain_name" ]; then
34--
351.8.3.1
36
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch b/meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch
index 47443a50ef..c62b283d50 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/0001-site.h-enable-gentle-shutdown.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch
@@ -1,17 +1,22 @@
1Upstream-Status: Inappropriate [configuration] 1From 01641d146e4e6bea954e4a4ee1f6230b822665b4 Mon Sep 17 00:00:00 2001
2 2From: Chen Qi <Qi.Chen@windriver.com>
3Subject: [PATCH] site.h: enable gentle shutdown 3Date: Tue, 15 Aug 2017 15:37:49 +0800
4Subject: [PATCH 06/11] site.h: enable gentle shutdown
4 5
6Upstream-Status: Inappropriate [configuration]
5Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 7Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
8
9Rebase to 4.3.6
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
6--- 11---
7 includes/site.h | 2 +- 12 includes/site.h | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
9 14
10diff --git a/includes/site.h b/includes/site.h 15diff --git a/includes/site.h b/includes/site.h
11index 1dd1251..abb66e4 100644 16index 280fbb9..e6c2972 100644
12--- a/includes/site.h 17--- a/includes/site.h
13+++ b/includes/site.h 18+++ b/includes/site.h
14@@ -289,7 +289,7 @@ 19@@ -296,7 +296,7 @@
15 situations. We plan to revisit this feature and may 20 situations. We plan to revisit this feature and may
16 make non-backwards compatible changes including the 21 make non-backwards compatible changes including the
17 removal of this define. Use at your own risk. */ 22 removal of this define. Use at your own risk. */
@@ -21,5 +26,5 @@ index 1dd1251..abb66e4 100644
21 /* Include old error codes. This is provided in case you 26 /* Include old error codes. This is provided in case you
22 are building an external program similar to omshell for 27 are building an external program similar to omshell for
23-- 28--
242.8.1 291.8.3.1
25 30
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch b/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
new file mode 100644
index 0000000000..43c26ea21c
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
@@ -0,0 +1,42 @@
1From 7107511fd209f08f9a96f8938041ae48f3295895 Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com>
3Date: Tue, 15 Aug 2017 16:17:49 +0800
4Subject: [PATCH 07/11] Add configure argument to make the libxml2 dependency
5 explicit and determinisitic.
6
7Upstream-Status: Pending
8
9Signed-off-by: Christopher Larson <chris_larson@mentor.com>
10
11Rebase to 4.3.6
12
13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14---
15 configure.ac | 11 +++++++++++
16 1 file changed, 11 insertions(+)
17
18diff --git a/configure.ac b/configure.ac
19index 44fb57e..8e9f509 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -611,6 +611,17 @@ AC_CHECK_FUNCS(strlcat)
23 # For HP/UX we need -lipv6 for if_nametoindex, perhaps others.
24 AC_SEARCH_LIBS(if_nametoindex, [ipv6])
25
26+AC_ARG_WITH(libxml2,
27+ AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
28+ with_libxml2="$withval", with_libxml2="no")
29+
30+if test x$with_libxml2 != xno; then
31+ AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
32+ [if test x$with_libxml2 != xauto; then
33+ AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
34+ fi])
35+fi
36+
37 # check for /dev/random (declares HAVE_DEV_RANDOM)
38 AC_MSG_CHECKING(for random device)
39 AC_ARG_WITH(randomdev,
40--
411.8.3.1
42
diff --git a/meta/recipes-connectivity/dhcp/dhcp/tweak-to-support-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch
index 03c6abb799..006d18ae7f 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/tweak-to-support-external-bind.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch
@@ -1,7 +1,7 @@
1From ad7bb401f47714fc30c408853b796ce0f1c7e65f Mon Sep 17 00:00:00 2001 1From 92875f5cc44914515e50c11c503a09cec90497b2 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 11 Jun 2016 22:51:44 -0400 3Date: Sat, 11 Jun 2016 22:51:44 -0400
4Subject: [PATCH] tweak to support external bind 4Subject: [PATCH 08/11] tweak to support external bind
5 5
6Tweak the external bind to oe-core's sysroot rather than 6Tweak the external bind to oe-core's sysroot rather than
7external bind source build. 7external bind source build.
@@ -34,7 +34,7 @@ index 4730bb3..84d8131 100644
34 AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ 34 AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
35 -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes 35 -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes
36diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am 36diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am
37index da69ea9..fe35e57 100644 37index 5031d0c..a8dfd26 100644
38--- a/client/tests/Makefile.am 38--- a/client/tests/Makefile.am
39+++ b/client/tests/Makefile.am 39+++ b/client/tests/Makefile.am
40@@ -1,6 +1,6 @@ 40@@ -1,6 +1,6 @@
@@ -46,7 +46,7 @@ index da69ea9..fe35e57 100644
46 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes 46 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
47 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) 47 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
48diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am 48diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
49index f8d6b0e..05cd9c1 100644 49index f6a43e4..2f98d22 100644
50--- a/common/tests/Makefile.am 50--- a/common/tests/Makefile.am
51+++ b/common/tests/Makefile.am 51+++ b/common/tests/Makefile.am
52@@ -1,6 +1,6 @@ 52@@ -1,6 +1,6 @@
@@ -101,7 +101,7 @@ index 3990b9c..b5d8c2d 100644
101 AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes 101 AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
102 102
103diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am 103diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
104index 65a9f74..2892309 100644 104index a87c5e7..9821081 100644
105--- a/server/tests/Makefile.am 105--- a/server/tests/Makefile.am
106+++ b/server/tests/Makefile.am 106+++ b/server/tests/Makefile.am
107@@ -1,6 +1,6 @@ 107@@ -1,6 +1,6 @@
@@ -113,5 +113,5 @@ index 65a9f74..2892309 100644
113 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes 113 AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
114 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) 114 AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
115-- 115--
1162.8.1 1161.8.3.1
117 117
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch b/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
new file mode 100644
index 0000000000..912b6d6312
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
@@ -0,0 +1,28 @@
1From f3f8b7726e50e24ef3edf5fa5a17e31d39118d7e Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 15 Aug 2017 15:49:31 +0800
4Subject: [PATCH 09/11] remove dhclient-script bash dependency
5
6Upstream-Status: Inappropriate [OE specific]
7
8Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
9
10Rebase to 4.3.6
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 client/scripts/linux | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/client/scripts/linux b/client/scripts/linux
17index 3122a75..1712d7d 100755
18--- a/client/scripts/linux
19+++ b/client/scripts/linux
20@@ -1,4 +1,4 @@
21-#!/bin/bash
22+#!/bin/sh
23 # dhclient-script for Linux. Dan Halbert, March, 1997.
24 # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
25 # No guarantees about this. I'm a novice at the details of Linux
26--
271.8.3.1
28
diff --git a/meta/recipes-connectivity/dhcp/dhcp/build-shared-libs.patch b/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
index 0b3d6e42b0..f128731c64 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/build-shared-libs.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
@@ -1,9 +1,28 @@
1From 76c370a929e5ab5dbc81c2fbcf4e50f4fbc08ce9 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Tue, 15 Aug 2017 15:53:37 +0800
4Subject: [PATCH 10/11] build shared libs
5
1Upstream-Status: Pending 6Upstream-Status: Pending
2 7
3Port patches from Fedora to build shared libs rather than static libs. 8Port patches from Fedora to build shared libs rather than static libs.
4 9
5Signed-off-by: Kai Kang <kai.kang@windriver.com> 10Signed-off-by: Kai Kang <kai.kang@windriver.com>
11
12Rebase to 4.3.6
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
6--- 15---
16 client/Makefile.am | 4 ++--
17 common/tests/Makefile.am | 13 +++++--------
18 configure.ac | 12 ++----------
19 dhcpctl/Makefile.am | 14 ++++++--------
20 omapip/Makefile.am | 7 +++----
21 relay/Makefile.am | 5 ++---
22 server/Makefile.am | 7 +++----
23 server/tests/Makefile.am | 7 +++----
24 8 files changed, 26 insertions(+), 43 deletions(-)
25
7diff --git a/client/Makefile.am b/client/Makefile.am 26diff --git a/client/Makefile.am b/client/Makefile.am
8index 84d8131..e776bf0 100644 27index 84d8131..e776bf0 100644
9--- a/client/Makefile.am 28--- a/client/Makefile.am
@@ -19,7 +38,7 @@ index 84d8131..e776bf0 100644
19 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 38 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
20 EXTRA_DIST = $(man_MANS) 39 EXTRA_DIST = $(man_MANS)
21diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am 40diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
22index 05cd9c1..ab7a5a3 100644 41index 2f98d22..8745e88 100644
23--- a/common/tests/Makefile.am 42--- a/common/tests/Makefile.am
24+++ b/common/tests/Makefile.am 43+++ b/common/tests/Makefile.am
25@@ -15,26 +15,23 @@ ATF_TESTS += alloc_unittest dns_unittest misc_unittest ns_name_unittest 44@@ -15,26 +15,23 @@ ATF_TESTS += alloc_unittest dns_unittest misc_unittest ns_name_unittest
@@ -53,9 +72,9 @@ index 05cd9c1..ab7a5a3 100644
53+ -ldns -lisccfg -lisc 72+ -ldns -lisccfg -lisc
54 73
55 check: $(ATF_TESTS) 74 check: $(ATF_TESTS)
56 -cp -n $(top_srcdir)/common/tests/Atffile Atffile 75 @if test $(top_srcdir) != ${top_builddir}; then \
57diff --git a/configure.ac b/configure.ac 76diff --git a/configure.ac b/configure.ac
58index 1684df1..dadc3f1 100644 77index 8e9f509..bfe988a 100644
59--- a/configure.ac 78--- a/configure.ac
60+++ b/configure.ac 79+++ b/configure.ac
61@@ -47,16 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes") 80@@ -47,16 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes")
@@ -167,7 +186,7 @@ index b5d8c2d..d7f876d 100644
167 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 186 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
168 EXTRA_DIST = $(man_MANS) 187 EXTRA_DIST = $(man_MANS)
169diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am 188diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
170index 2892309..056978b 100644 189index 9821081..de95872 100644
171--- a/server/tests/Makefile.am 190--- a/server/tests/Makefile.am
172+++ b/server/tests/Makefile.am 191+++ b/server/tests/Makefile.am
173@@ -19,10 +19,9 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \ 192@@ -19,10 +19,9 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \
@@ -184,3 +203,6 @@ index 2892309..056978b 100644
184 203
185 ATF_TESTS = 204 ATF_TESTS =
186 if HAVE_ATF 205 if HAVE_ATF
206--
2071.8.3.1
208
diff --git a/meta/recipes-connectivity/dhcp/dhcp/Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch b/meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
index 9b43f96a85..67bb4631ae 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
@@ -1,8 +1,8 @@
1From e8c30bac53f8baeb80f87b445f42259cc8984fb5 Mon Sep 17 00:00:00 2001 1From 37725f3e22edb50e0ca2d1fff971321a5a4d5112 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 12 Jul 2017 03:05:13 -0400 3Date: Wed, 12 Jul 2017 03:05:13 -0400
4Subject: [PATCH] Moved the call to isc_app_ctxstart() to not get signal block 4Subject: [PATCH 11/11] Moved the call to isc_app_ctxstart() to not get signal
5 by all threads 5 block by all threads
6 6
7Signed-off-by: Francis Dupont <fdupont@isc.org> 7Signed-off-by: Francis Dupont <fdupont@isc.org>
8 8
@@ -34,7 +34,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
34 1 file changed, 15 insertions(+), 10 deletions(-) 34 1 file changed, 15 insertions(+), 10 deletions(-)
35 35
36diff --git a/omapip/isclib.c b/omapip/isclib.c 36diff --git a/omapip/isclib.c b/omapip/isclib.c
37index 13f0d3e..4af04b6 100644 37index ce86490..6a04345 100644
38--- a/omapip/isclib.c 38--- a/omapip/isclib.c
39+++ b/omapip/isclib.c 39+++ b/omapip/isclib.c
40@@ -185,16 +185,6 @@ dhcp_context_create(int flags, 40@@ -185,16 +185,6 @@ dhcp_context_create(int flags,
@@ -77,5 +77,5 @@ index 13f0d3e..4af04b6 100644
77 77
78 #if defined (NSUPDATE) 78 #if defined (NSUPDATE)
79-- 79--
802.8.1 801.8.3.1
81 81
diff --git a/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch b/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
deleted file mode 100644
index 96095a5e08..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/dhclient-script-drop-resolv.conf.dhclient.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1dhcp-client: fix invoke dhclient-script failed on Read-only file system
2
3In read-only file system, '/etc' is on the readonly partition,
4and '/etc/resolv.conf' is symlinked to a separate writable
5partition.
6
7In this situation, we should use shell variable to instead of
8temp files '/etc/resolv.conf.dhclient' and '/etc/resolv.conf.dhclient6'.
9
10Upstream-Status: Pending
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 client/scripts/linux | 20 +++++++++-----------
14 1 file changed, 9 insertions(+), 11 deletions(-)
15
16diff --git a/client/scripts/linux b/client/scripts/linux
17--- a/client/scripts/linux
18+++ b/client/scripts/linux
19@@ -27,27 +27,25 @@ ip=/sbin/ip
20
21 make_resolv_conf() {
22 if [ x"$new_domain_name_servers" != x ]; then
23- cat /dev/null > /etc/resolv.conf.dhclient
24- chmod 644 /etc/resolv.conf.dhclient
25+ resolv_conf=""
26 if [ x"$new_domain_search" != x ]; then
27- echo search $new_domain_search >> /etc/resolv.conf.dhclient
28+ resolv_conf="search ${new_domain_search}\n"
29 elif [ x"$new_domain_name" != x ]; then
30 # Note that the DHCP 'Domain Name Option' is really just a domain
31 # name, and that this practice of using the domain name option as
32 # a search path is both nonstandard and deprecated.
33- echo search $new_domain_name >> /etc/resolv.conf.dhclient
34+ resolv_conf="search ${new_domain_name}\n"
35 fi
36 for nameserver in $new_domain_name_servers; do
37- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
38+ resolv_conf="${resolv_conf}nameserver ${nameserver}\n"
39 done
40
41- mv /etc/resolv.conf.dhclient /etc/resolv.conf
42+ echo -e "${resolv_conf}" > /etc/resolv.conf
43 elif [ "x${new_dhcp6_name_servers}" != x ] ; then
44- cat /dev/null > /etc/resolv.conf.dhclient6
45- chmod 644 /etc/resolv.conf.dhclient6
46+ resolv_conf=""
47
48 if [ "x${new_dhcp6_domain_search}" != x ] ; then
49- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
50+ resolv_conf="search ${new_dhcp6_domain_search}\n"
51 fi
52 shopt -s nocasematch
53 for nameserver in ${new_dhcp6_name_servers} ; do
54@@ -59,11 +57,11 @@ make_resolv_conf() {
55 else
56 zone_id=
57 fi
58- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
59+ resolv_conf="${resolv_conf}nameserver ${nameserver}$zone_id\n"
60 done
61 shopt -u nocasematch
62
63- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
64+ echo -e "${resolv_conf}" > /etc/resolv.conf
65 fi
66 }
67
68--
692.8.1
70
diff --git a/meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch b/meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch
deleted file mode 100644
index b4a666d106..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/dhcp-3.0.3-dhclient-dbus.patch
+++ /dev/null
@@ -1,86 +0,0 @@
1Upstream-Status: Inappropriate [distribution]
2
3--- client/scripts/bsdos
4+++ client/scripts/bsdos
5@@ -47,6 +47,11 @@
6 . /etc/dhcp/dhclient-exit-hooks
7 fi
8 # probably should do something with exit status of the local script
9+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
10+ dbus-send --system --dest=com.redhat.dhcp \
11+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
12+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
13+ fi
14 exit $exit_status
15 }
16
17--- client/scripts/freebsd
18+++ client/scripts/freebsd
19@@ -57,6 +57,11 @@
20 . /etc/dhcp/dhclient-exit-hooks
21 fi
22 # probably should do something with exit status of the local script
23+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
24+ dbus-send --system --dest=com.redhat.dhcp \
25+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
26+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
27+ fi
28 exit $exit_status
29 }
30
31--- client/scripts/linux
32+++ client/scripts/linux
33@@ -69,6 +69,11 @@
34 . /etc/dhcp/dhclient-exit-hooks
35 fi
36 # probably should do something with exit status of the local script
37+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
38+ dbus-send --system --dest=com.redhat.dhcp \
39+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
40+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
41+ fi
42 exit $exit_status
43 }
44
45--- client/scripts/netbsd
46+++ client/scripts/netbsd
47@@ -47,6 +47,11 @@
48 . /etc/dhcp/dhclient-exit-hooks
49 fi
50 # probably should do something with exit status of the local script
51+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
52+ dbus-send --system --dest=com.redhat.dhcp \
53+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
54+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
55+ fi
56 exit $exit_status
57 }
58
59--- client/scripts/openbsd
60+++ client/scripts/openbsd
61@@ -47,6 +47,11 @@
62 . /etc/dhcp/dhclient-exit-hooks
63 fi
64 # probably should do something with exit status of the local script
65+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
66+ dbus-send --system --dest=com.redhat.dhcp \
67+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
68+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
69+ fi
70 exit $exit_status
71 }
72
73--- client/scripts/solaris
74+++ client/scripts/solaris
75@@ -47,6 +47,11 @@
76 . /etc/dhcp/dhclient-exit-hooks
77 fi
78 # probably should do something with exit status of the local script
79+ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
80+ dbus-send --system --dest=com.redhat.dhcp \
81+ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
82+ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
83+ fi
84 exit $exit_status
85 }
86
diff --git a/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch b/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch
deleted file mode 100644
index 14356621c0..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/libxml2-configure-argument.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Add configure argument to make the libxml2 dependency explicit and
2determinisitic.
3
4Upstream-Status: Pending
5
6Signed-off-by: Christopher Larson <chris_larson@mentor.com>
7
8Rebase to 4.3.4
9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10---
11 configure.ac | 11 ++++++++++-
12 1 file changed, 10 insertions(+), 1 deletion(-)
13
14diff --git a/configure.ac b/configure.ac
15index 726c88e..1684df1 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -718,7 +718,16 @@ AC_SUBST(BINDSRCDIR)
19
20 # We need to find libxml2 if bind was built with support enabled
21 # otherwise we'll fail to build omapip/test.c
22-AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],)
23+AC_ARG_WITH(libxml2,
24+ AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]),
25+ with_libxml2="$withval", with_libxml2="no")
26+
27+if test x$with_libxml2 != xno; then
28+ AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],
29+ [if test x$with_libxml2 != xauto; then
30+ AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested])
31+ fi])
32+fi
33
34 # OpenLDAP support.
35 AC_ARG_WITH(ldap,
36--
372.8.1
38
diff --git a/meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch b/meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch
deleted file mode 100644
index 997b9f6ba9..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/remove-dhclient-script-bash-dependency.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 8aed2a9ff09cb0d584ad0a7340fe3a596879d9b1 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Thu, 21 Jul 2016 19:07:02 -0700
4Subject: [PATCH] remove dhclient-script bash dependency
5
6Take the dash compatible IPv6 link-local address test from the Debian
7version of dhclient-script.
8
9Note that although "echo -e" in the OE version of dhclient-script is
10technically bash specific too, it is supported by Busybox echo when
11Busybox is configured with CONFIG_FEATURE_FANCY_ECHO enabled (which
12is the default in the OE Busybox defconfig) therefore leave as-is.
13
14Upstream-Status: Inappropriate [OE specific]
15
16Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
17---
18 client/scripts/linux | 7 +++----
19 1 file changed, 3 insertions(+), 4 deletions(-)
20
21diff --git a/client/scripts/linux b/client/scripts/linux
22index 232a0aa..1383f46 100755
23--- a/client/scripts/linux
24+++ b/client/scripts/linux
25@@ -1,4 +1,4 @@
26-#!/bin/bash
27+#!/bin/sh
28 # dhclient-script for Linux. Dan Halbert, March, 1997.
29 # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
30 # No guarantees about this. I'm a novice at the details of Linux
31@@ -47,11 +47,11 @@ make_resolv_conf() {
32 if [ "x${new_dhcp6_domain_search}" != x ] ; then
33 resolv_conf="search ${new_dhcp6_domain_search}\n"
34 fi
35- shopt -s nocasematch
36 for nameserver in ${new_dhcp6_name_servers} ; do
37 # If the nameserver has a link-local address
38 # add a <zone_id> (interface name) to it.
39- if [[ "$nameserver" =~ ^fe80:: ]]
40+ if [ "${nameserver##fe80::}" != "$nameserver" ] ||
41+ [ "${nameserver##FE80::}" != "$nameserver" ]
42 then
43 zone_id="%$interface"
44 else
45@@ -59,7 +59,6 @@ make_resolv_conf() {
46 fi
47 resolv_conf="${resolv_conf}nameserver ${nameserver}$zone_id\n"
48 done
49- shopt -u nocasematch
50
51 echo -e "${resolv_conf}" > /etc/resolv.conf
52 fi
53--
541.9.1
55
diff --git a/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch b/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch
deleted file mode 100644
index d84df5cd34..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/replace-ifconfig-route.patch
+++ /dev/null
@@ -1,188 +0,0 @@
1Found this patch here:
2https://lists.isc.org/pipermail/dhcp-users/2011-January/012910.html
3
4and made some adjustments/updates to make it work with this version.
5Wasn't able to find that why this patch was not accepted by ISC DHCP developers.
6
7Upstream-Status: Pending
8
9Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
10
11Rebase to 4.3.4
12
13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14---
15 client/scripts/linux | 82 ++++++++++++++++++++++++++++------------------------
16 1 file changed, 45 insertions(+), 37 deletions(-)
17
18diff --git a/client/scripts/linux b/client/scripts/linux
19index a02cfd9..232a0aa 100755
20--- a/client/scripts/linux
21+++ b/client/scripts/linux
22@@ -101,17 +101,11 @@ fi
23 if [ x$old_broadcast_address != x ]; then
24 old_broadcast_arg="broadcast $old_broadcast_address"
25 fi
26-if [ x$new_subnet_mask != x ]; then
27- new_subnet_arg="netmask $new_subnet_mask"
28+if [ -n "$new_subnet_mask" ]; then
29+ new_mask="/$new_subnet_mask"
30 fi
31-if [ x$old_subnet_mask != x ]; then
32- old_subnet_arg="netmask $old_subnet_mask"
33-fi
34-if [ x$alias_subnet_mask != x ]; then
35- alias_subnet_arg="netmask $alias_subnet_mask"
36-fi
37-if [ x$new_interface_mtu != x ]; then
38- mtu_arg="mtu $new_interface_mtu"
39+if [ -n "$alias_subnet_mask" ]; then
40+ alias_mask="/$alias_subnet_mask"
41 fi
42 if [ x$IF_METRIC != x ]; then
43 metric_arg="metric $IF_METRIC"
44@@ -125,9 +119,9 @@ fi
45 if [ x$reason = xPREINIT ]; then
46 if [ x$alias_ip_address != x ]; then
47 # Bring down alias interface. Its routes will disappear too.
48- ifconfig $interface:0- inet 0
49+ ${ip} -4 addr flush dev ${interface} label ${interface}:0
50 fi
51- ifconfig $interface 0 up
52+ ${ip} link set dev ${interface} up
53
54 # We need to give the kernel some time to get the interface up.
55 sleep 1
56@@ -154,25 +148,30 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
57 if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
58 [ x$alias_ip_address != x$old_ip_address ]; then
59 # Possible new alias. Remove old alias.
60- ifconfig $interface:0- inet 0
61+ ${ip} -4 addr flush dev ${interface} label ${interface}:0
62 fi
63 if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
64 # IP address changed. Bringing down the interface will delete all routes,
65 # and clear the ARP cache.
66- ifconfig $interface inet 0 down
67+ ${ip} -4 addr flush dev ${interface} label ${interface}
68
69 fi
70 if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
71 [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
72
73- ifconfig $interface inet $new_ip_address $new_subnet_arg \
74- $new_broadcast_arg $mtu_arg
75+ ${ip} -4 addr add ${new_ip_address}${new_mask} ${new_broadcast_arg} \
76+ dev ${interface} label ${interface}
77+ if [ -n "$new_interface_mtu" ]; then
78+ # set MTU
79+ ${ip} link set dev ${interface} mtu ${new_interface_mtu}
80+ fi
81 # Add a network route to the computed network address.
82 for router in $new_routers; do
83 if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
84- route add -host $router dev $interface
85+ ${ip} -4 route add ${router} dev $interface >/dev/null 2>&1
86 fi
87- route add default gw $router $metric_arg dev $interface
88+ ${ip} -4 route add default via ${router} dev ${interface} \
89+ ${metric_arg} >/dev/null 2>&1
90 done
91 else
92 # we haven't changed the address, have we changed other options
93@@ -180,21 +179,23 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
94 if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
95 # if we've changed routers delete the old and add the new.
96 for router in $old_routers; do
97- route del default gw $router
98+ ${ip} -4 route delete default via ${router}
99 done
100 for router in $new_routers; do
101 if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
102- route add -host $router dev $interface
103- fi
104- route add default gw $router $metric_arg dev $interface
105+ ${ip} -4 route add ${router} dev $interface >/dev/null 2>&1
106+ fi
107+ ${ip} -4 route add default via ${router} dev ${interface} \
108+ ${metric_arg} >/dev/null 2>&1
109 done
110 fi
111 fi
112 if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
113 then
114- ifconfig $interface:0- inet 0
115- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
116- route add -host $alias_ip_address $interface:0
117+ ${ip} -4 addr flush dev ${interface} label ${interface}:0
118+ ${ip} -4 addr add ${alias_ip_address}${alias_mask} \
119+ dev ${interface} label ${interface}:0
120+ ${ip} -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
121 fi
122 make_resolv_conf
123 exit_with_hooks 0
124@@ -204,42 +205,49 @@ if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
125 || [ x$reason = xSTOP ]; then
126 if [ x$alias_ip_address != x ]; then
127 # Turn off alias interface.
128- ifconfig $interface:0- inet 0
129+ ${ip} -4 addr flush dev ${interface} label ${interface}:0
130 fi
131 if [ x$old_ip_address != x ]; then
132 # Shut down interface, which will delete routes and clear arp cache.
133- ifconfig $interface inet 0 down
134+ ${ip} -4 addr flush dev ${interface} label ${interface}
135 fi
136 if [ x$alias_ip_address != x ]; then
137- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
138- route add -host $alias_ip_address $interface:0
139+ ${ip} -4 addr add ${alias_ip_address}${alias_network_arg} \
140+ dev ${interface} label ${interface}:0
141+ ${ip} -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
142 fi
143 exit_with_hooks 0
144 fi
145
146 if [ x$reason = xTIMEOUT ]; then
147 if [ x$alias_ip_address != x ]; then
148- ifconfig $interface:0- inet 0
149+ ${ip} -4 addr flush dev ${interface} label ${interface}:0
150+ fi
151+ ${ip} -4 addr add ${new_ip_address}${new_mask} ${new_broadcast_arg} \
152+ dev ${interface} label ${interface}
153+ if [ -n "$new_interface_mtu" ]; then
154+ # set MTU
155+ ip link set dev ${interface} mtu ${new_interface_mtu}
156 fi
157- ifconfig $interface inet $new_ip_address $new_subnet_arg \
158- $new_broadcast_arg $mtu_arg
159 set $new_routers
160 if ping -q -c 1 $1; then
161 if [ x$new_ip_address != x$alias_ip_address ] && \
162 [ x$alias_ip_address != x ]; then
163- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
164- route add -host $alias_ip_address dev $interface:0
165+ ${ip} -4 addr add ${alias_ip_address}${alias_mask} \
166+ dev ${interface} label ${interface}:0
167+ ${ip} -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
168 fi
169 for router in $new_routers; do
170 if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
171- route add -host $router dev $interface
172+ ${ip} -4 route add ${router} dev $interface >/dev/null 2>&1
173 fi
174- route add default gw $router $metric_arg dev $interface
175+ ${ip} -4 route add default via ${router} dev ${interface} \
176+ ${metric_arg} >/dev/null 2>&1
177 done
178 make_resolv_conf
179 exit_with_hooks 0
180 fi
181- ifconfig $interface inet 0 down
182+ ${ip} -4 addr flush dev ${interface}
183 exit_with_hooks 1
184 fi
185
186--
1872.8.1
188
diff --git a/meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch b/meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch
deleted file mode 100644
index a08a5b725f..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp/search-for-libxml2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1libdns requires libxml2 if bind was built with libxml2 support
2enabled. Compilation will fail for omapip/test.c in case
3lxml2 isn't used during the build. So, we add losely coupled
4search path which will pick up the lib if it is present.
5
6Signed-off-by: Awais Belal <awais_belal@mentor.com>
7Upstream-Status: Pending
8
9diff --git a/configure.ac b/configure.ac
10index c9dc8b5..85f59be 100644
11--- a/configure.ac
12+++ b/configure.ac
13@@ -602,6 +602,10 @@ no)
14 esac
15 AC_SUBST([libbind])
16
17+# We need to find libxml2 if bind was built with support enabled
18+# otherwise we'll fail to build omapip/test.c
19+AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],)
20+
21 # OpenLDAP support.
22 AC_ARG_WITH(ldap,
23 AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd (default is no)]),
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb
deleted file mode 100644
index 964d05dde0..0000000000
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1require dhcp.inc
2
3SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
4 file://link-with-lcrypto.patch \
5 file://fixsepbuild.patch \
6 file://dhclient-script-drop-resolv.conf.dhclient.patch \
7 file://replace-ifconfig-route.patch \
8 file://0001-site.h-enable-gentle-shutdown.patch \
9 file://libxml2-configure-argument.patch \
10 file://tweak-to-support-external-bind.patch \
11 file://remove-dhclient-script-bash-dependency.patch \
12 file://build-shared-libs.patch \
13 file://Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch \
14 "
15
16SRC_URI[md5sum] = "2b5e5b2fa31c2e27e487039d86f83d3f"
17SRC_URI[sha256sum] = "eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954"
18
19PACKAGECONFIG ?= ""
20PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
new file mode 100644
index 0000000000..4634a01b04
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
@@ -0,0 +1,20 @@
1require dhcp.inc
2
3SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \
4 file://0002-dhclient-dbus.patch \
5 file://0003-link-with-lcrypto.patch \
6 file://0004-Fix-out-of-tree-builds.patch \
7 file://0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch \
8 file://0006-site.h-enable-gentle-shutdown.patch \
9 file://0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch \
10 file://0008-tweak-to-support-external-bind.patch \
11 file://0009-remove-dhclient-script-bash-dependency.patch \
12 file://0010-build-shared-libs.patch \
13 file://0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch \
14 "
15
16SRC_URI[md5sum] = "afa6e9b3eb7539ea048421a82c668adc"
17SRC_URI[sha256sum] = "a41eaf6364f1377fe065d35671d9cf82bbbc8f21207819b2b9f33f652aec6f1b"
18
19PACKAGECONFIG ?= ""
20PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 12:00:31 +0000