summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-05 15:01:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-07 12:15:59 +0100
commitaf24c40ca46eff0390408f7b4e442ec9bdcd0c1e (patch)
tree2a03c7a614fb687287c14cdcc807d9c0c591af14
parentcca4eebd030c3d568a28b33c7adc17681a1866bd (diff)
downloadpoky-af24c40ca46eff0390408f7b4e442ec9bdcd0c1e.tar.gz
avahi: update to 0.8
(From OE-Core rev: 520cb26ac248994a88f161b6ad92211ffcb93d9b) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.8.bb (renamed from meta/recipes-connectivity/avahi/avahi_0.7.bb)20
-rw-r--r--meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch48
2 files changed, 9 insertions, 59 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi_0.7.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb
index b25cffa3cd..f4924fa1cb 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.7.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
@@ -20,12 +20,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
20 file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" 20 file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
21 21
22SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \ 22SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \
23 file://fix-CVE-2017-6519.patch \ 23 file://00avahi-autoipd \
24 file://99avahi-autoipd \
25 file://initscript.patch \
26 file://0001-Fix-opening-etc-resolv.conf-error.patch \
24 " 27 "
25 28
26UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" 29UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
27SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6" 30SRC_URI[md5sum] = "229c6aa30674fc43c202b22c5f8c2be7"
28SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804" 31SRC_URI[sha256sum] = "060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda"
29 32
30DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native" 33DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native"
31 34
@@ -37,12 +40,15 @@ PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
37PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+" 40PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
38PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" 41PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
39PACKAGECONFIG[libdns_sd] = "--enable-compat-libdns_sd --enable-dbus,,dbus" 42PACKAGECONFIG[libdns_sd] = "--enable-compat-libdns_sd --enable-dbus,,dbus"
43PACKAGECONFIG[libevent] = "--enable-libevent,--disable-libevent,libevent"
44PACKAGECONFIG[qt5] = "--enable-qt5,--disable-qt5,qtbase"
40 45
41inherit autotools pkgconfig gettext gobject-introspection 46inherit autotools pkgconfig gettext gobject-introspection
42 47
43EXTRA_OECONF = "--with-avahi-priv-access-group=adm \ 48EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
44 --disable-stack-protector \ 49 --disable-stack-protector \
45 --disable-gdbm \ 50 --disable-gdbm \
51 --disable-dbm \
46 --disable-mono \ 52 --disable-mono \
47 --disable-monodoc \ 53 --disable-monodoc \
48 --disable-qt3 \ 54 --disable-qt3 \
@@ -59,8 +65,6 @@ EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--wi
59EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}" 65EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
60 66
61do_configure_prepend() { 67do_configure_prepend() {
62 sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac
63
64 # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes 68 # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes
65 rm "${S}/common/introspection.m4" || true 69 rm "${S}/common/introspection.m4" || true
66} 70}
@@ -85,12 +89,6 @@ FILES_libavahi-compat-libdnssd = "${libdir}/libdns_sd.so.*"
85 89
86RPROVIDES_libavahi-compat-libdnssd = "libdns-sd" 90RPROVIDES_libavahi-compat-libdnssd = "libdns-sd"
87 91
88SRC_URI += "file://00avahi-autoipd \
89 file://99avahi-autoipd \
90 file://initscript.patch \
91 file://0001-Fix-opening-etc-resolv.conf-error.patch \
92 "
93
94inherit update-rc.d systemd useradd 92inherit update-rc.d systemd useradd
95 93
96PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils avahi-discover avahi-ui" 94PACKAGES =+ "libavahi-gobject avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils avahi-discover avahi-ui"
diff --git a/meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch b/meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch
deleted file mode 100644
index 7461fe193d..0000000000
--- a/meta/recipes-connectivity/avahi/files/fix-CVE-2017-6519.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1Upstream-Status: Backport [https://github.com/lathiat/avahi/commit/e111def]
2
3CVE: CVE-2017-6519
4
5Signed-off-by: Kai Kang <kai.kang@windriver.com>
6
7From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001
8From: Trent Lloyd <trent@lloyd.id.au>
9Date: Sat, 22 Dec 2018 09:06:07 +0800
10Subject: [PATCH] Drop legacy unicast queries from address not on local link
11
12When handling legacy unicast queries, ensure that the source IP is
13inside a subnet on the local link, otherwise drop the packet.
14
15Fixes #145
16Fixes #203
17CVE-2017-6519
18CVE-2018-1000845
19---
20 avahi-core/server.c | 8 ++++++++
21 1 file changed, 8 insertions(+)
22
23diff --git a/avahi-core/server.c b/avahi-core/server.c
24index a2cb19a8..a2580e38 100644
25--- a/avahi-core/server.c
26+++ b/avahi-core/server.c
27@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
28
29 if (avahi_dns_packet_is_query(p)) {
30 int legacy_unicast = 0;
31+ char t[AVAHI_ADDRESS_STR_MAX];
32
33 /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the
34 * AR section completely here, so far. Until the day we add
35@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
36 legacy_unicast = 1;
37 }
38
39+ if (!is_mdns_mcast_address(dst_address) &&
40+ !avahi_interface_address_on_link(i, src_address)) {
41+
42+ avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol);
43+ return;
44+ }
45+
46 if (legacy_unicast)
47 reflect_legacy_unicast_query_packet(s, p, i, src_address, port);
48