pool/avahi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 339880 from GNOME:Factory

Browse Source 
Does this look sane to y'all? (forwarded request 339789 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/339880
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=112
This commit is contained in:
Stephan Kulow 2015-10-25 18:12:10 +00:00 committed by Git OBS Bridge
commit e2c77b39eb
6 changed files with 66 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
avahi-0.6.31-invalid-packet.patch Normal file
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;
}

9
avahi-glib2.spec
View File

@ -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 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
@ -141,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
@ -330,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
@ -772,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

9
avahi-mono.spec
View File

@ -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 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
@ -141,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
@ -329,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
@ -772,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

9
avahi-qt4.spec
View File

@ -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 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
@ -141,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 +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
@ -774,6 +778,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

12
avahi.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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
- Add avahi-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

9
avahi.spec
View File

@ -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 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
@ -143,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
@ -332,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
@ -774,6 +778,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