Accepting request 337076 from home:mgorse:branches:GNOME:Factory

- Add apache-0.6.31-invalid-packet.patch: do not spam logs for
  invalid packets (boo#947140 bsc#948277).

OBS-URL: https://build.opensuse.org/request/show/337076
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=118
This commit is contained in:
Bjørn Lie 2015-10-07 20:55:16 +00:00 committed by Git OBS Bridge
parent 00bce2a791
commit 3cfdbdf2f6
6 changed files with 48 additions and 4 deletions

View File

@ -0,0 +1,26 @@
From: Mike Gorse <mgorse@suse.com>
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;
}

View File

@ -1,7 +1,7 @@
# #
# spec file for package avahi-glib2 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 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 # 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 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python BuildRequires: dbus-1-python
BuildRequires: fdupes BuildRequires: fdupes
@ -772,6 +774,7 @@ translation-update-upstream
%patch15 -p1 %patch15 -p1
%patch16 -p1 %patch16 -p1
%patch17 -p1 %patch17 -p1
%patch18 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions

View File

@ -1,7 +1,7 @@
# #
# spec file for package avahi-mono # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 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 # 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 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python BuildRequires: dbus-1-python
BuildRequires: fdupes BuildRequires: fdupes
@ -772,6 +774,7 @@ translation-update-upstream
%patch15 -p1 %patch15 -p1
%patch16 -p1 %patch16 -p1
%patch17 -p1 %patch17 -p1
%patch18 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions

View File

@ -1,7 +1,7 @@
# #
# spec file for package avahi-qt4 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 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 # 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 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python BuildRequires: dbus-1-python
BuildRequires: fdupes BuildRequires: fdupes
@ -774,6 +776,7 @@ translation-update-upstream
%patch15 -p1 %patch15 -p1
%patch16 -p1 %patch16 -p1
%patch17 -p1 %patch17 -p1
%patch18 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions

View File

@ -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 Wed Aug 19 13:59:10 UTC 2015 - dimstar@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package avahi # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 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 # 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 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python BuildRequires: dbus-1-python
BuildRequires: fdupes BuildRequires: fdupes
@ -774,6 +776,7 @@ translation-update-upstream
%patch15 -p1 %patch15 -p1
%patch16 -p1 %patch16 -p1
%patch17 -p1 %patch17 -p1
%patch18 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions