From 3cfdbdf2f6e64336e756c444e3158c81acb42bcd20543c74684974f53d2f2fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 7 Oct 2015 20:55:16 +0000 Subject: [PATCH 1/3] 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 --- apache-0.6.31-invalid-packet.patch | 26 ++++++++++++++++++++++++++ avahi-glib2.spec | 5 ++++- avahi-mono.spec | 5 ++++- avahi-qt4.spec | 5 ++++- avahi.changes | 6 ++++++ avahi.spec | 5 ++++- 6 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 apache-0.6.31-invalid-packet.patch 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 From 9d8e5b15e77918386cc62f7a3b2bd43232404ac6d1797b0fedd403d08192a04c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 8 Oct 2015 08:34:10 +0000 Subject: [PATCH 2/3] Rename patch OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=119 --- ...nvalid-packet.patch => avahi-0.6.31-invalid-packet.patch | 0 avahi-glib2.spec | 6 +++--- avahi-mono.spec | 6 +++--- avahi-qt4.spec | 6 +++--- avahi.changes | 2 +- avahi.spec | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) rename apache-0.6.31-invalid-packet.patch => avahi-0.6.31-invalid-packet.patch (100%) diff --git a/apache-0.6.31-invalid-packet.patch b/avahi-0.6.31-invalid-packet.patch similarity index 100% rename from apache-0.6.31-invalid-packet.patch rename to avahi-0.6.31-invalid-packet.patch diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 53ca36a..9a1ba53 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-glib2 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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,8 +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 +# PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- don't spam logs for Windows 10 multicast packets +Patch18: avahi-0.6.31-invalid-packet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes diff --git a/avahi-mono.spec b/avahi-mono.spec index 4c56388..f23fbb4 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-mono # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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,8 +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 +# PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- don't spam logs for Windows 10 multicast packets +Patch18: avahi-0.6.31-invalid-packet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes diff --git a/avahi-qt4.spec b/avahi-qt4.spec index c8c1c6e..d7b4cd0 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -1,7 +1,7 @@ # # spec file for package avahi-qt4 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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,8 +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 +# PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- don't spam logs for Windows 10 multicast packets +Patch18: avahi-0.6.31-invalid-packet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes diff --git a/avahi.changes b/avahi.changes index 97e6848..5ca04fc 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Oct 7 20:34:24 UTC 2015 - mgorse@suse.com -- Add apache-0.6.31-invalid-packet.patch: do not spam logs for +- Add avahi-0.6.31-invalid-packet.patch: do not spam logs for invalid packets (boo#947140 bsc#948277). ------------------------------------------------------------------- diff --git a/avahi.spec b/avahi.spec index 8e17112..c503dfa 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,7 +1,7 @@ # # spec file for package avahi # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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,8 +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 +# PATCH-FIX-UPSTREAM avahi-0.6.31-invalid-packet.patch boo#947140 mgorse@suse.com -- don't spam logs for Windows 10 multicast packets +Patch18: avahi-0.6.31-invalid-packet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python BuildRequires: fdupes From abde4125bbe50791254baeaed0bd50261718b29219788c26889464361b4dd8cc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 19 Oct 2015 10:12:06 +0000 Subject: [PATCH 3/3] Accepting request 339789 from home:Zaitor:branches:GNOME:Factory Does this look sane to y'all? OBS-URL: https://build.opensuse.org/request/show/339789 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=120 --- avahi-glib2.spec | 6 ++++-- avahi-mono.spec | 6 ++++-- avahi-qt4.spec | 6 ++++-- avahi.changes | 6 ++++++ avahi.spec | 6 ++++-- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/avahi-glib2.spec b/avahi-glib2.spec index 9a1ba53..3beb6e7 100644 --- a/avahi-glib2.spec +++ b/avahi-glib2.spec @@ -143,8 +143,9 @@ Obsoletes: mDNSResponder-64bit # mDNSResponder was used for <= 10.2: Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder < 107.5 +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for service-types.db openSUSE <= 12.3 SLE <= 11SP2 -Conflicts: avahi-utils <= 0.6.31-9.2 +#Conflicts: avahi-utils <= 0.6.31-9.2 %endif %if %build_glib2 BuildRequires: gobject-introspection-devel @@ -332,8 +333,9 @@ Summary: IPv4LL Service for Zeroconf and Bonjour Group: Productivity/Networking/Other # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. Provides: avahi:%{_sbindir}/avahi-autoipd +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 -Conflicts: avahi <= 0.6.31-9.2 +#Conflicts: avahi <= 0.6.31-9.2 # coreutils contains /usr/bin/chown Requires(post): coreutils # shadow contains useradd and groupadd diff --git a/avahi-mono.spec b/avahi-mono.spec index f23fbb4..55d74a2 100644 --- a/avahi-mono.spec +++ b/avahi-mono.spec @@ -143,8 +143,9 @@ Obsoletes: mDNSResponder-64bit # mDNSResponder was used for <= 10.2: Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder < 107.5 +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for service-types.db openSUSE <= 12.3 SLE <= 11SP2 -Conflicts: avahi-utils <= 0.6.31-9.2 +#Conflicts: avahi-utils <= 0.6.31-9.2 %endif %if %build_glib2 BuildRequires: gobject-introspection-devel @@ -331,8 +332,9 @@ Summary: IPv4LL Service for Zeroconf and Bonjour Group: Productivity/Networking/Other # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. Provides: avahi:%{_sbindir}/avahi-autoipd +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 -Conflicts: avahi <= 0.6.31-9.2 +#Conflicts: avahi <= 0.6.31-9.2 # coreutils contains /usr/bin/chown Requires(post): coreutils # shadow contains useradd and groupadd diff --git a/avahi-qt4.spec b/avahi-qt4.spec index d7b4cd0..14741d4 100644 --- a/avahi-qt4.spec +++ b/avahi-qt4.spec @@ -143,8 +143,9 @@ Obsoletes: mDNSResponder-64bit # mDNSResponder was used for <= 10.2: Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder < 107.5 +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for service-types.db openSUSE <= 12.3 SLE <= 11SP2 -Conflicts: avahi-utils <= 0.6.31-9.2 +#Conflicts: avahi-utils <= 0.6.31-9.2 %endif %if %build_glib2 BuildRequires: gobject-introspection-devel @@ -334,8 +335,9 @@ Summary: IPv4LL Service for Zeroconf and Bonjour Group: Productivity/Networking/Other # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. Provides: avahi:%{_sbindir}/avahi-autoipd +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 -Conflicts: avahi <= 0.6.31-9.2 +#Conflicts: avahi <= 0.6.31-9.2 # coreutils contains /usr/bin/chown Requires(post): coreutils # shadow contains useradd and groupadd diff --git a/avahi.changes b/avahi.changes index 5ca04fc..0de920d 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 19 09:24:58 UTC 2015 - zaitor@opensuse.org + +- Temp disable 2 old Conflicts that are breaking staging. These can + back in once there is a new release of avahi. + ------------------------------------------------------------------- Wed Oct 7 20:34:24 UTC 2015 - mgorse@suse.com diff --git a/avahi.spec b/avahi.spec index c503dfa..e94fc75 100644 --- a/avahi.spec +++ b/avahi.spec @@ -145,8 +145,9 @@ Obsoletes: mDNSResponder-64bit # mDNSResponder was used for <= 10.2: Provides: mDNSResponder = 107.5 Obsoletes: mDNSResponder < 107.5 +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for service-types.db openSUSE <= 12.3 SLE <= 11SP2 -Conflicts: avahi-utils <= 0.6.31-9.2 +#Conflicts: avahi-utils <= 0.6.31-9.2 %endif %if %build_glib2 BuildRequires: gobject-introspection-devel @@ -334,8 +335,9 @@ Summary: IPv4LL Service for Zeroconf and Bonjour Group: Productivity/Networking/Other # Split provides for upgrade from openSUSE <= 12.3 and SLE <= 11. Provides: avahi:%{_sbindir}/avahi-autoipd +# Disable this conflict for now, it breaks staging, and it's pretty much obsolete, but can go back in if needed once a new version of avahi is released. # File conflict for avahi-autoipd openSUSE <= 12.3 SLE <= 11 -Conflicts: avahi <= 0.6.31-9.2 +#Conflicts: avahi <= 0.6.31-9.2 # coreutils contains /usr/bin/chown Requires(post): coreutils # shadow contains useradd and groupadd