<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Fri, Jun 29, 2018 at 1:40 PM akuster808 <<a href="mailto:akuster808@gmail.com">akuster808@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div text="#000000" bgcolor="#FFFFFF" class="">
<p><br>
</p>
<br>
<div class="m_1440340043775474453moz-cite-prefix">On 06/29/2018 08:13 AM, Christopher
Larson wrote:<br>
</div>
<blockquote type="cite">
<div dir="ltr"><br>
<br>
<div class="gmail_quote">
<div dir="ltr">On Sun, Jun 24, 2018 at 11:43 AM Armin Kuster
<<a href="mailto:akuster808@gmail.com" target="_blank">akuster808@gmail.com</a>> wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">include
several CVE fixes.<br>
CVE: CVE-2018-5733<br>
CVE: CVE-2018-5732<br>
<br>
LIC_CHKSUM_FILE updated to SPFX format<br>
<br>
<a href="https://kb.isc.org/article/AA-01571" rel="noreferrer" target="_blank">https://kb.isc.org/article/AA-01571</a><br>
<br>
remove several patches now included in update.<br>
Shared libarary support is now enabled in configure+lt, use
it<br>
and revert to autotools-brokensep<br>
Refresh patches<br>
<br>
alings support with bind 9.11.x<br>
<br>
add libxml2 support to <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a>+lt<br>
<br>
Signed-off-by: Armin Kuster <<a href="mailto:akuster808@gmail.com" target="_blank">akuster808@gmail.com</a>><br>
---<br>
meta/recipes-connectivity/dhcp/dhcp.inc | 19 +-<br>
...o-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch | 13 +-<br>
.../dhcp/dhcp/0003-link-with-lcrypto.patch | 13 +-<br>
.../dhcp/dhcp/0004-Fix-out-of-tree-builds.patch | 109
+++++------<br>
.../dhcp/0006-site.h-enable-gentle-shutdown.patch | 13 +-<br>
...re-argument-to-make-the-libxml2-dependenc.patch | 40
+++-<br>
.../dhcp/dhcp/0010-build-shared-libs.patch | 208
---------------------<br>
...all-to-isc_app_ctxstart-to-not-get-signal.patch | 81
--------<br>
...correct-the-intention-for-xml2-lib-search.patch | 13 +-<br>
.../dhcp/dhcp/CVE-2017-3144.patch | 74
--------<br>
.../dhcp/{<a href="http://dhcp_4.3.6.bb" rel="noreferrer" target="_blank">dhcp_4.3.6.bb</a>
=> <a href="http://dhcp_4.4.1.bb" rel="noreferrer" target="_blank">dhcp_4.4.1.bb</a>}
| 12 +-<br>
11 files changed, 120 insertions(+), 475 deletions(-)<br>
delete mode 100644
meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch<br>
delete mode 100644
meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch<br>
delete mode 100644
meta/recipes-connectivity/dhcp/dhcp/CVE-2017-3144.patch<br>
rename meta/recipes-connectivity/dhcp/{<a href="http://dhcp_4.3.6.bb" rel="noreferrer" target="_blank">dhcp_4.3.6.bb</a>
=> <a href="http://dhcp_4.4.1.bb" rel="noreferrer" target="_blank">dhcp_4.4.1.bb</a>}
(65%)<br>
<br>
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc
b/meta/recipes-connectivity/dhcp/dhcp.inc<br>
index e943707..2eb3513 100644<br>
--- a/meta/recipes-connectivity/dhcp/dhcp.inc<br>
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc<br>
@@ -8,7 +8,7 @@ easier to administer devices."<br>
HOMEPAGE = "<a href="http://www.isc.org/" rel="noreferrer" target="_blank">http://www.isc.org/</a>"<br>
<br>
LICENSE = "ISC"<br>
-LIC_FILES_CHKSUM =
<a class="m_1440340043775474453moz-txt-link-rfc2396E">"file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1753"</a><br>
+LIC_FILES_CHKSUM =
<a class="m_1440340043775474453moz-txt-link-rfc2396E">"file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01"</a><br>
<br>
DEPENDS = "openssl bind"<br>
<br>
@@ -24,7 +24,7 @@ SRC_URI = "<a href="http://ftp.isc.org/isc/dhcp/$%7BPV%7D/dhcp-$%7BPV%7D.tar.gz" rel="noreferrer" target="_blank">http://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz</a>
\<br>
UPSTREAM_CHECK_URI = "<a href="ftp://ftp.isc.org/isc/dhcp/" rel="noreferrer" target="_blank">ftp://ftp.isc.org/isc/dhcp/</a>"<br>
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"<br>
<br>
-inherit autotools systemd useradd update-rc.d<br>
+inherit autotools-brokensep systemd useradd update-rc.d<br>
<br>
USERADD_PACKAGES = "${PN}-server"<br>
USERADD_PARAM_${PN}-server = "--system --no-create-home
--home-dir /var/run/${BPN} --shell /bin/false --user-group
${BPN}"<br>
@@ -48,11 +48,21 @@ EXTRA_OECONF =
"--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases
\<br>
--with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases
\<br>
--with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases
\<br>
--with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases
\<br>
- --with-libbind=${STAGING_LIBDIR}/ \<br>
--enable-paranoia --disable-static \<br>
--with-randomdev=/dev/random \<br>
+ --with-libbind=${STAGING_DIR_HOST}/usr \<br>
+ --enable-libtool \<br>
"<br>
<br>
+#Enable shared libs per dhcp README<br>
+do_configure () {<br>
+ cd ${S}<br>
+ cp <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a>+lt
<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
+ autoreconf -i<br>
+ ./configure ${CONFIGUREOPTS} ${EXTRA_OECONF} <br>
+ automake<br>
</blockquote>
<div><br>
</div>
<div>1. Why run automake when autoreconf already runs
automake?</div>
</div>
</div>
</blockquote>
it caused errors when I did not included. <br>
<br>
<blockquote type="cite">
<div dir="ltr">
<div class="gmail_quote">
<div>2. Why override do_configure and reproduce what's already
in autotools-brokensep rather than doing the cp in a
do_configure_prepend?<br clear="all">
</div>
</div>
</div>
</blockquote>
I did that first and it did not work. The README regarding *+lt says
it needs "autoreconf -i". I am only doing this as the current
version of dhcp has a patch to create shared libs. The isc dhcp
solution to this is their <a href="http://configure.ac" target="_blank">configure.ac</a>+lt. I would rather no do
this but someone needed shared libs.<br></div></blockquote><div><br></div><div>We already run autoreconf -i in the default do_configure, I see no reason to be duplicating half of its logic when all you need to do is replace the default <a href="http://configure.ac">configure.ac</a> with the +lt version before that.<br></div></div>-- <br><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr">Christopher Larson<br>kergoth at gmail dot com<br>Founder - BitBake, OpenEmbedded, OpenZaurus<br>Senior Software Engineer, Mentor Graphics</div></div></div></div></div>