diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-07-01 15:53:20 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-04 00:02:17 +0100 |
commit | c026c365eb66dc85e6eee3fa477222c4da3a0ca8 (patch) | |
tree | 0e1d9f423482c2d9e11616f107582fe4ad3a6b8e /meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch | |
parent | 396e269c5c0e285be9d5ab40b521dda21bd72e19 (diff) | |
download | poky-c026c365eb66dc85e6eee3fa477222c4da3a0ca8.tar.gz |
dhcp: update 4.4.1
include several CVE fixes.
CVE: CVE-2018-5733
CVE: CVE-2018-5732
LIC_CHKSUM_FILE updated to SPFX format
https://kb.isc.org/article/AA-01571
remove several patches now included in update.
Shared libarary support is now enabled in configure+lt, use it
and revert to autotools-brokensep
Refresh patches
Aligns support with bind 9.11.x
Add libxml2 support to configure.ac+lt
(From OE-Core rev: 7cb42ae87ef929bf7e08c559f09dc224c6e3d314)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch | 40 |
1 files changed, 30 insertions, 10 deletions
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 index 43c26ea21c..feb0754fff 100644 --- 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 | |||
@@ -15,13 +15,13 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
15 | configure.ac | 11 +++++++++++ | 15 | configure.ac | 11 +++++++++++ |
16 | 1 file changed, 11 insertions(+) | 16 | 1 file changed, 11 insertions(+) |
17 | 17 | ||
18 | diff --git a/configure.ac b/configure.ac | 18 | Index: dhcp-4.4.1/configure.ac |
19 | index 44fb57e..8e9f509 100644 | 19 | =================================================================== |
20 | --- a/configure.ac | 20 | --- dhcp-4.4.1.orig/configure.ac |
21 | +++ b/configure.ac | 21 | +++ dhcp-4.4.1/configure.ac |
22 | @@ -611,6 +611,17 @@ AC_CHECK_FUNCS(strlcat) | 22 | @@ -642,6 +642,17 @@ if test "$have_nanosleep" = "rt"; then |
23 | # For HP/UX we need -lipv6 for if_nametoindex, perhaps others. | 23 | LIBS="-lrt $LIBS" |
24 | AC_SEARCH_LIBS(if_nametoindex, [ipv6]) | 24 | fi |
25 | 25 | ||
26 | +AC_ARG_WITH(libxml2, | 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]), | 27 | + AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]), |
@@ -37,6 +37,26 @@ index 44fb57e..8e9f509 100644 | |||
37 | # check for /dev/random (declares HAVE_DEV_RANDOM) | 37 | # check for /dev/random (declares HAVE_DEV_RANDOM) |
38 | AC_MSG_CHECKING(for random device) | 38 | AC_MSG_CHECKING(for random device) |
39 | AC_ARG_WITH(randomdev, | 39 | AC_ARG_WITH(randomdev, |
40 | -- | 40 | Index: dhcp-4.4.1/configure.ac+lt |
41 | 1.8.3.1 | 41 | =================================================================== |
42 | 42 | --- dhcp-4.4.1.orig/configure.ac+lt | |
43 | +++ dhcp-4.4.1/configure.ac+lt | ||
44 | @@ -909,6 +909,18 @@ elif test "$want_libtool" = "yes" -a "$u | ||
45 | fi | ||
46 | AM_CONDITIONAL(INSTALL_BIND, test "$want_install_bind" = "yes") | ||
47 | |||
48 | +AC_ARG_WITH(libxml2, | ||
49 | + AS_HELP_STRING([--with-libxml2], [link against libxml2. this is needed if bind was built with xml2 support enabled]), | ||
50 | + with_libxml2="$withval", with_libxml2="no") | ||
51 | + | ||
52 | +if test x$with_libxml2 != xno; then | ||
53 | + AC_SEARCH_LIBS(xmlTextWriterStartElement, [xml2],, | ||
54 | + [if test x$with_libxml2 != xauto; then | ||
55 | + AC_MSG_FAILURE([*** Cannot find xmlTextWriterStartElement with -lxml2 and libxml2 was requested]) | ||
56 | + fi]) | ||
57 | +fi | ||
58 | + | ||
59 | + | ||
60 | # OpenLDAP support. | ||
61 | AC_ARG_WITH(ldap, | ||
62 | AS_HELP_STRING([--with-ldap],[enable OpenLDAP support in dhcpd (default is no)]), | ||