* [meta-networking][PATCH 1/4] dhcp-relay: update bundled bind to 9.11.32
@ 2021-06-08 6:02 Yi Zhao
2021-06-08 6:02 ` [meta-networking][PATCH 2/4] dhcp-relay: disable backtrace in bundled bind Yi Zhao
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Yi Zhao @ 2021-06-08 6:02 UTC (permalink / raw)
To: openembedded-devel
Update the bundled bind from 9.11.14 to 9.11.32.
Fixes build error on qemuarmv5:
stats.c: In function 'setcounter':
stats.c:300:36: error: 'val' undeclared (first use in this function); did you mean 'value'?
300 | stats->counters[counter] = val;
| ^~~
| value
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../dhcp/dhcp-relay_4.4.2.bb | 19 ++++++++----
...ind-version-update-to-latest-version.patch | 30 +++++++++++++++++++
2 files changed, 43 insertions(+), 6 deletions(-)
create mode 100644 meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch
diff --git a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb
index b178180ec..671fbf054 100644
--- a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb
+++ b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb
@@ -11,14 +11,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747
DEPENDS = "openssl libcap zlib"
SRC_URI = "https://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
+ https://ftp.isc.org/isc/bind9/9.11.32/bind-9.11.32.tar.gz;name=bind;downloadfilename=bind.tar.gz;unpack=0 \
file://default-relay \
file://init-relay \
file://dhcrelay.service \
file://0001-Makefile.am-only-build-dhcrelay.patch \
+ file://0002-bind-version-update-to-latest-version.patch \
"
SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1"
SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521"
+SRC_URI[bind.md5sum] = "0d029dd06ca60c6739c3189c999ef757"
+SRC_URI[bind.sha256sum] = "cbf8cb4b74dd1452d97c3a2a8c625ea346df8516b4b3508ef07443121a591342"
UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
@@ -43,15 +47,18 @@ EXTRA_OEMAKE += "LIBTOOL='${S}/${HOST_SYS}-libtool'"
# Enable shared libs per dhcp README
do_configure_prepend () {
cp configure.ac+lt configure.ac
+ rm ${S}/bind/bind.tar.gz
+ mv ${WORKDIR}/bind.tar.gz ${S}/bind/
}
+
do_compile_prepend() {
- rm -rf ${S}/bind/bind-9.11.14/
+ rm -rf ${S}/bind/bind-9.11.32/
tar xf ${S}/bind/bind.tar.gz -C ${S}/bind
- install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/bind/bind-9.11.14/
- install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/bind/bind-9.11.14/
- cp -fpR ${S}/m4/*.m4 ${S}/bind/bind-9.11.14/libtool.m4/
- rm -rf ${S}/bind/bind-9.11.14/libtool
- install -m 0755 ${S}/${HOST_SYS}-libtool ${S}/bind/bind-9.11.14/
+ install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/bind/bind-9.11.32/
+ install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/bind/bind-9.11.32/
+ cp -fpR ${S}/m4/*.m4 ${S}/bind/bind-9.11.32/libtool.m4/
+ rm -rf ${S}/bind/bind-9.11.32/libtool
+ install -m 0755 ${S}/${HOST_SYS}-libtool ${S}/bind/bind-9.11.32/
}
do_install_append () {
diff --git a/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch b/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch
new file mode 100644
index 000000000..5c7a5f058
--- /dev/null
+++ b/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch
@@ -0,0 +1,30 @@
+From edb68972f8dc636e6208e78f02dec6f9805e4c0b Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Wed, 26 May 2021 11:39:00 +0800
+Subject: [PATCH] bind/version: update to latest version
+
+Update the bundled bind from 9.11.14 to 9.11.32.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ bind/version.tmp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bind/version.tmp b/bind/version.tmp
+index cf52f1b..4cc538e 100644
+--- a/bind/version.tmp
++++ b/bind/version.tmp
+@@ -5,7 +5,7 @@ PRODUCT=BIND
+ DESCRIPTION="(Extended Support Version)"
+ MAJORVER=9
+ MINORVER=11
+-PATCHVER=14
++PATCHVER=32
+ RELEASETYPE=
+ RELEASEVER=
+ EXTENSIONS=
+--
+2.17.1
+
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-networking][PATCH 2/4] dhcp-relay: disable backtrace in bundled bind
2021-06-08 6:02 [meta-networking][PATCH 1/4] dhcp-relay: update bundled bind to 9.11.32 Yi Zhao
@ 2021-06-08 6:02 ` Yi Zhao
2021-06-08 6:02 ` [meta-networking][PATCH 3/4] dhcp-relay: update 4.4.2 -> 4.4.2-P1 Yi Zhao
2021-06-08 6:02 ` [meta-networking][PATCH 4/4] packagegroup-meta-networking: add dhcp-relay Yi Zhao
2 siblings, 0 replies; 4+ messages in thread
From: Yi Zhao @ 2021-06-08 6:02 UTC (permalink / raw)
To: openembedded-devel
Disable backtrace in bundled bind to fix build error for qemuarm on
musl.
Fixes:
bind/bind-9.11.32/lib/isc/.libs/libisc.so: undefined reference to `_Unwind_GetIP'
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../dhcp/dhcp-relay_4.4.2.bb | 1 +
...3-bind-Makefile.in-disable-backtrace.patch | 31 +++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch
diff --git a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb
index 671fbf054..563a6180c 100644
--- a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb
+++ b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb
@@ -17,6 +17,7 @@ SRC_URI = "https://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
file://dhcrelay.service \
file://0001-Makefile.am-only-build-dhcrelay.patch \
file://0002-bind-version-update-to-latest-version.patch \
+ file://0003-bind-Makefile.in-disable-backtrace.patch \
"
SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1"
diff --git a/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch b/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch
new file mode 100644
index 000000000..51520bc62
--- /dev/null
+++ b/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch
@@ -0,0 +1,31 @@
+From bc9c5d64ad4829c7830ef70fcaff94470974247c Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Tue, 8 Jun 2021 10:13:57 +0800
+Subject: [PATCH] bind/Makefile.in: disable backtrace
+
+Fixes build error for qemuarm on musl:
+libisc.so: undefined reference to `_Unwind_GetIP'
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ bind/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bind/Makefile.in b/bind/Makefile.in
+index 8fe8883..1058160 100644
+--- a/bind/Makefile.in
++++ b/bind/Makefile.in
+@@ -22,7 +22,7 @@ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+
+ bindconfig = --without-openssl --without-libxml2 --without-libjson \
+- --without-gssapi --disable-threads --without-lmdb \
++ --without-gssapi --disable-threads --without-lmdb --disable-backtrace \
+ --includedir=@includedir@ --libdir=@libdir@ --without-python\
+ @BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report
+
+--
+2.17.1
+
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-networking][PATCH 3/4] dhcp-relay: update 4.4.2 -> 4.4.2-P1
2021-06-08 6:02 [meta-networking][PATCH 1/4] dhcp-relay: update bundled bind to 9.11.32 Yi Zhao
2021-06-08 6:02 ` [meta-networking][PATCH 2/4] dhcp-relay: disable backtrace in bundled bind Yi Zhao
@ 2021-06-08 6:02 ` Yi Zhao
2021-06-08 6:02 ` [meta-networking][PATCH 4/4] packagegroup-meta-networking: add dhcp-relay Yi Zhao
2 siblings, 0 replies; 4+ messages in thread
From: Yi Zhao @ 2021-06-08 6:02 UTC (permalink / raw)
To: openembedded-devel
Changes since 4.4.2 (Bug Fixes)
Corrected a buffer overwrite possible when parsing hexadecimal
literals with more than 1024 octets. Reported by Jon Franklin from Dell,
and also by Pawel Wieczorkiewicz from Amazon Web Services.
[Gitlab #182]
CVE: CVE-2021-25217
See: https://downloads.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1-RELNOTES
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../dhcp/{dhcp-relay_4.4.2.bb => dhcp-relay_4.4.2p1.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta-networking/recipes-connectivity/dhcp/{dhcp-relay_4.4.2.bb => dhcp-relay_4.4.2p1.bb} (92%)
diff --git a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb
similarity index 92%
rename from meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb
rename to meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb
index 563a6180c..6ea5b4b27 100644
--- a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb
+++ b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747
DEPENDS = "openssl libcap zlib"
-SRC_URI = "https://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
+SRC_URI = "https://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz \
https://ftp.isc.org/isc/bind9/9.11.32/bind-9.11.32.tar.gz;name=bind;downloadfilename=bind.tar.gz;unpack=0 \
file://default-relay \
file://init-relay \
@@ -20,15 +20,15 @@ SRC_URI = "https://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
file://0003-bind-Makefile.in-disable-backtrace.patch \
"
-SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1"
-SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521"
+SRC_URI[md5sum] = "3089a1ebd20a802ec0870ae337d43907"
+SRC_URI[sha256sum] = "b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a"
SRC_URI[bind.md5sum] = "0d029dd06ca60c6739c3189c999ef757"
SRC_URI[bind.sha256sum] = "cbf8cb4b74dd1452d97c3a2a8c625ea346df8516b4b3508ef07443121a591342"
UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/"
-S = "${WORKDIR}/dhcp-${PV}"
+S = "${WORKDIR}/dhcp-4.4.2-P1"
inherit autotools-brokensep systemd
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-networking][PATCH 4/4] packagegroup-meta-networking: add dhcp-relay
2021-06-08 6:02 [meta-networking][PATCH 1/4] dhcp-relay: update bundled bind to 9.11.32 Yi Zhao
2021-06-08 6:02 ` [meta-networking][PATCH 2/4] dhcp-relay: disable backtrace in bundled bind Yi Zhao
2021-06-08 6:02 ` [meta-networking][PATCH 3/4] dhcp-relay: update 4.4.2 -> 4.4.2-P1 Yi Zhao
@ 2021-06-08 6:02 ` Yi Zhao
2 siblings, 0 replies; 4+ messages in thread
From: Yi Zhao @ 2021-06-08 6:02 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../recipes-core/packagegroups/packagegroup-meta-networking.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
index 24b9a1b49..31f9aef48 100644
--- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
+++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
@@ -67,6 +67,7 @@ RDEPENDS_packagegroup-meta-networking-connectivity = "\
wolfssl \
autossh \
bearssl \
+ dhcp-relay \
"
RDEPENDS_packagegroup-meta-networking-connectivity_remove_libc-musl = "rdist"
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-08 6:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-08 6:02 [meta-networking][PATCH 1/4] dhcp-relay: update bundled bind to 9.11.32 Yi Zhao
2021-06-08 6:02 ` [meta-networking][PATCH 2/4] dhcp-relay: disable backtrace in bundled bind Yi Zhao
2021-06-08 6:02 ` [meta-networking][PATCH 3/4] dhcp-relay: update 4.4.2 -> 4.4.2-P1 Yi Zhao
2021-06-08 6:02 ` [meta-networking][PATCH 4/4] packagegroup-meta-networking: add dhcp-relay Yi Zhao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.