summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/dhcp/dhcp.inc
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-07-01 15:53:20 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-04 00:02:17 +0100
commitc026c365eb66dc85e6eee3fa477222c4da3a0ca8 (patch)
tree0e1d9f423482c2d9e11616f107582fe4ad3a6b8e /meta/recipes-connectivity/dhcp/dhcp.inc
parent396e269c5c0e285be9d5ab40b521dda21bd72e19 (diff)
downloadpoky-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.inc')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc15
1 files changed, 10 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index e94370786a..3e65e5cf29 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -8,7 +8,7 @@ easier to administer devices."
8HOMEPAGE = "http://www.isc.org/" 8HOMEPAGE = "http://www.isc.org/"
9 9
10LICENSE = "ISC" 10LICENSE = "ISC"
11LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1753" 11LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01"
12 12
13DEPENDS = "openssl bind" 13DEPENDS = "openssl bind"
14 14
@@ -24,7 +24,7 @@ SRC_URI = "http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
24UPSTREAM_CHECK_URI = "ftp://ftp.isc.org/isc/dhcp/" 24UPSTREAM_CHECK_URI = "ftp://ftp.isc.org/isc/dhcp/"
25UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/" 25UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
26 26
27inherit autotools systemd useradd update-rc.d 27inherit autotools-brokensep systemd useradd update-rc.d
28 28
29USERADD_PACKAGES = "${PN}-server" 29USERADD_PACKAGES = "${PN}-server"
30USERADD_PARAM_${PN}-server = "--system --no-create-home --home-dir /var/run/${BPN} --shell /bin/false --user-group ${BPN}" 30USERADD_PARAM_${PN}-server = "--system --no-create-home --home-dir /var/run/${BPN} --shell /bin/false --user-group ${BPN}"
@@ -48,11 +48,17 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
48 --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \ 48 --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
49 --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \ 49 --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
50 --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \ 50 --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
51 --with-libbind=${STAGING_LIBDIR}/ \
52 --enable-paranoia --disable-static \ 51 --enable-paranoia --disable-static \
53 --with-randomdev=/dev/random \ 52 --with-randomdev=/dev/random \
53 --with-libbind=${STAGING_DIR_HOST} \
54 --enable-libtool \
54 " 55 "
55 56
57#Enable shared libs per dhcp README
58do_configure_prepend () {
59 cp configure.ac+lt configure.ac
60}
61
56do_install_append () { 62do_install_append () {
57 install -d ${D}${sysconfdir}/init.d 63 install -d ${D}${sysconfdir}/init.d
58 install -d ${D}${sysconfdir}/default 64 install -d ${D}${sysconfdir}/default
@@ -96,8 +102,7 @@ PACKAGES += "dhcp-libs dhcp-server dhcp-server-config dhcp-client dhcp-relay dhc
96PACKAGES_remove = "${PN}" 102PACKAGES_remove = "${PN}"
97RDEPENDS_${PN}-dev = "" 103RDEPENDS_${PN}-dev = ""
98RDEPENDS_${PN}-staticdev = "" 104RDEPENDS_${PN}-staticdev = ""
99 105FILES_${PN}-libs = "${libdir}/libdhcpctl.so.0* ${libdir}/libomapi.so.0* ${libdir}/libdhcp.so.0*"
100FILES_${PN}-libs = "${libdir}/libdhcpctl.so.0* ${libdir}/libomapi.so.0*"
101 106
102FILES_${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server" 107FILES_${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
103RRECOMMENDS_${PN}-server = "dhcp-server-config" 108RRECOMMENDS_${PN}-server = "dhcp-server-config"