diff --git a/apache-0.6.31-invalid-packet.patch b/apache-0.6.31-invalid-packet.patch new file mode 100644 index 0000000..10a5019 --- /dev/null +++ b/apache-0.6.31-invalid-packet.patch @@ -0,0 +1,26 @@ +From: Mike Gorse +Date: Wed Oct 7 15:14:31 CDT 2015 +Subject: don't spam logs with invalid packets + +We should silently ignore any questions in the Question Section of +a received Multicast DNS Response. +Also, use avahi_log_debug to log invalid packets. +Taken from Fedora / http://www.avahi.org/ticket/352 + +diff -up avahi-0.6.31/avahi-core/server.c.invalid_packet avahi-0.6.31/avahi-core/server.c +--- avahi-0.6.31/avahi-core/server.c.invalid_packet 2015-09-22 08:12:58.544588701 -0500 ++++ avahi-0.6.31/avahi-core/server.c 2015-09-22 08:13:39.743862403 -0500 +@@ -972,11 +972,9 @@ static void dispatch_packet(AvahiServer + return; + } + +- if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT) != 0 || +- avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0 || +- avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT) != 0) { ++ if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0) { + +- avahi_log_warn("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address)); ++ avahi_log_debug("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address)); + return; + } + diff --git a/avahi-glib2.spec b/avahi-glib2.spec index f8aafb3..53ca36a 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-glib2 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -94,6 +94,8 @@ Patch15: avahi-move-everything-to-run.patch Patch16: avahi-reserve-space-for-record-data-when-size-e.patch # PATCH-FIX-UPSTREAM avahi-outdated-URL.patch boo#914298 dimstar@opensuse.org -- Replace reference to no longer existing address with a more generic explanation URL Patch17: avahi-outdated-URL.patch +# PATCH-FIX-UPSTREAM apache-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- don't spam logs for Windows 10 multicast packets +Patch18: apache-0.6.31-invalid-packet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -772,6 +774,7 @@ translation-update-upstream %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions diff --git a/avahi-mono.spec b/avahi-mono.spec index 29d90a7..4c56388 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-mono # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -94,6 +94,8 @@ Patch15: avahi-move-everything-to-run.patch Patch16: avahi-reserve-space-for-record-data-when-size-e.patch # PATCH-FIX-UPSTREAM avahi-outdated-URL.patch boo#914298 dimstar@opensuse.org -- Replace reference to no longer existing address with a more generic explanation URL Patch17: avahi-outdated-URL.patch +# PATCH-FIX-UPSTREAM apache-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- don't spam logs for Windows 10 multicast packets +Patch18: apache-0.6.31-invalid-packet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -772,6 +774,7 @@ translation-update-upstream %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions diff --git a/avahi-qt4.spec b/avahi-qt4.spec index 5ce4978..c8c1c6e 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-qt4 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -94,6 +94,8 @@ Patch15: avahi-move-everything-to-run.patch Patch16: avahi-reserve-space-for-record-data-when-size-e.patch # PATCH-FIX-UPSTREAM avahi-outdated-URL.patch boo#914298 dimstar@opensuse.org -- Replace reference to no longer existing address with a more generic explanation URL Patch17: avahi-outdated-URL.patch +# PATCH-FIX-UPSTREAM apache-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- don't spam logs for Windows 10 multicast packets +Patch18: apache-0.6.31-invalid-packet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -774,6 +776,7 @@ translation-update-upstream %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions diff --git a/avahi.changes b/avahi.changes index 91df03f..97e6848 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 7 20:34:24 UTC 2015 - mgorse@suse.com + +- Add apache-0.6.31-invalid-packet.patch: do not spam logs for + invalid packets (boo#947140 bsc#948277). + ------------------------------------------------------------------- Wed Aug 19 13:59:10 UTC 2015 - dimstar@opensuse.org diff --git a/avahi.spec b/avahi.spec index b818b25..8e17112 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,7 +1,7 @@ # # spec file for package avahi # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -96,6 +96,8 @@ Patch15: avahi-move-everything-to-run.patch Patch16: avahi-reserve-space-for-record-data-when-size-e.patch # PATCH-FIX-UPSTREAM avahi-outdated-URL.patch boo#914298 dimstar@opensuse.org -- Replace reference to no longer existing address with a more generic explanation URL Patch17: avahi-outdated-URL.patch +# PATCH-FIX-UPSTREAM apache-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- don't spam logs for Windows 10 multicast packets +Patch18: apache-0.6.31-invalid-packet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes @@ -774,6 +776,7 @@ translation-update-upstream %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions