From patchwork Tue Feb 18 09:45:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 1239894 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embedded.rocks Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" header.d=embedded.rocks header.i=@embedded.rocks header.a=rsa-sha256 header.s=default header.b=sF3H1P1e; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48MGFq4nkqz9sRk for ; Tue, 18 Feb 2020 20:46:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8922A85A0E; Tue, 18 Feb 2020 09:46:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bY5-Hw1uvcqR; Tue, 18 Feb 2020 09:46:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1CE1985521; Tue, 18 Feb 2020 09:46:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 255301BF5E9 for ; Tue, 18 Feb 2020 09:46:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1FCDF853C5 for ; Tue, 18 Feb 2020 09:46:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LDZ88piWowqW for ; Tue, 18 Feb 2020 09:46:16 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7272D8466D for ; Tue, 18 Feb 2020 09:46:16 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 7944D2400E6 for ; Tue, 18 Feb 2020 10:46:13 +0100 (CET) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48MGFc4cybz9rxH for ; Tue, 18 Feb 2020 10:46:12 +0100 (CET) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1582019171; x=1582623972; bh=T/FrbiQW+Wij4UIW4ONSSXDFkUMcPQiCzSIGBEfwHQ4=; b=sF3H1P1eW16b v6rrb1ZlRr1M0gh80webPgU62+DNERHq7iO402FhqjyxS28sWDlfe45qs3UEQJh9 T+TfRkm+7JZ/+vRLY1aIygHE3Hi3KBnzor4ad6USXOW++aUvOGsmLg3Qsbdb4Hev vd265jYMmGEe2UQKPhJemKw+xqixF14Bbea5RHXZptZoNYqW+9DKlWgBcXVtR4v1 6ErZz4yCOKaR5rGJq8RATM429ZAkYjy/ZBLNewKDs4o6FdW5siHIT4k0IuMXOElr YK80UHv6op9lEIav/49JIauALMizcbTEiAdPhfBkxg35wdPruRxsjn8tU5nVM225 /r5mswcSsA== Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id xSt7KeR_bGvJ; Tue, 18 Feb 2020 10:46:11 +0100 (CET) Received: from hp.lintech.bln (business-90-187-64-85.pool2.vodafone-ip.de [90.187.64.85]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Tue, 18 Feb 2020 10:46:10 +0100 (CET) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Tue, 18 Feb 2020 10:45:59 +0100 Message-Id: <20200218094600.31221-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/avahi: bump to version 0.8 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This bump also includes: * Drop upstream security patch which is included in the new version * Unconditionally disable support for Qt5 [1] (same as Qt3 and Qt4) * Switch from host-inttool to host-gettext [2] * Conditionally enable support for libevent [3] [1] https://github.com/lathiat/avahi/commit/5dbb32767ae3f5a371cfbd04b4e3a9a634b8efc4 [2] https://github.com/lathiat/avahi/commit/3d5a0c68057e2ed76187a0bb565baaa10d566003 [3] https://github.com/lathiat/avahi/commit/998e20cd76927ce978fb5676820a38308e21f45d Signed-off-by: Jörg Krause --- ...ast-queries-from-address-not-on-loca.patch | 48 ------------------- package/avahi/avahi.hash | 2 +- package/avahi/avahi.mk | 11 ++++- 3 files changed, 10 insertions(+), 51 deletions(-) delete mode 100644 package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch diff --git a/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch b/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch deleted file mode 100644 index 0e8408c830..0000000000 --- a/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001 -From: Trent Lloyd -Date: Sat, 22 Dec 2018 09:06:07 +0800 -Subject: [PATCH] Drop legacy unicast queries from address not on local link - -When handling legacy unicast queries, ensure that the source IP is -inside a subnet on the local link, otherwise drop the packet. - -Fixes #145 -Fixes #203 -CVE-2017-6519 -CVE-2018-100084 - -Backported from: e111def44a7df4624a4aa3f85fe98054bffb6b4f -Signed-off-by: Artem Panfilov ---- - avahi-core/server.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/avahi-core/server.c b/avahi-core/server.c -index a2cb19a8..a2580e38 100644 ---- a/avahi-core/server.c -+++ b/avahi-core/server.c -@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres - - if (avahi_dns_packet_is_query(p)) { - int legacy_unicast = 0; -+ char t[AVAHI_ADDRESS_STR_MAX]; - - /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the - * AR section completely here, so far. Until the day we add -@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres - legacy_unicast = 1; - } - -+ if (!is_mdns_mcast_address(dst_address) && -+ !avahi_interface_address_on_link(i, src_address)) { -+ -+ 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); -+ return; -+ } -+ - if (legacy_unicast) - reflect_legacy_unicast_query_packet(s, p, i, src_address, port); - --- -2.19.1 - diff --git a/package/avahi/avahi.hash b/package/avahi/avahi.hash index b4d36ffe50..cfc7ba020d 100644 --- a/package/avahi/avahi.hash +++ b/package/avahi/avahi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804 avahi-0.7.tar.gz +sha256 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda avahi-0.8.tar.gz sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 53021f6b6d..115ed2226d 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -4,7 +4,7 @@ # ################################################################################ -AVAHI_VERSION = 0.7 +AVAHI_VERSION = 0.8 AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION) AVAHI_LICENSE = LGPL-2.1+ AVAHI_LICENSE_FILES = LICENSE @@ -74,6 +74,7 @@ AVAHI_CONF_ENV = \ AVAHI_CONF_OPTS = \ --disable-qt3 \ --disable-qt4 \ + --disable-qt5 \ --disable-gtk \ --disable-gtk3 \ --disable-gdbm \ @@ -90,7 +91,7 @@ AVAHI_CONF_OPTS = \ --with-autoipd-group=avahi AVAHI_DEPENDENCIES = \ - host-intltool host-pkgconf \ + host-gettext host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) AVAHI_CFLAGS = $(TARGET_CFLAGS) @@ -130,6 +131,12 @@ else AVAHI_CONF_OPTS += --disable-dbus endif +ifeq ($(BR2_PACKAGE_LIBEVENT),y) +AVAHI_DEPENDENCIES += libevent +else +AVAHI_CONF_OPTS += --disable-libevent +endif + ifeq ($(BR2_PACKAGE_LIBGLIB2),y) AVAHI_DEPENDENCIES += libglib2 else