Accepting request 404321 from GNOME:Next
Subbing this we forgot... - The patch applied in GF from mgorse is added here via rebase. OBS-URL: https://build.opensuse.org/request/show/404321 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=129
This commit is contained in:
Bjørn Lie
committed by
Git OBS Bridge
Git OBS Bridge
parent
a4701e6157
commit
05a63233a9
@@ -7,10 +7,11 @@ 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
|
||||
Index: avahi-0.6.32/avahi-core/server.c
|
||||
===================================================================
|
||||
--- avahi-0.6.32.orig/avahi-core/server.c
|
||||
+++ avahi-0.6.32/avahi-core/server.c
|
||||
@@ -972,9 +972,7 @@ static void dispatch_packet(AvahiServer
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -19,8 +20,5 @@ diff -up avahi-0.6.31/avahi-core/server.c.invalid_packet avahi-0.6.31/avahi-core
|
||||
- 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));
|
||||
avahi_log_debug("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48
|
||||
size 1268686
|
||||
3
avahi-0.6.32.tar.gz
Normal file
3
avahi-0.6.32.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454
|
||||
size 1297169
|
||||
@@ -1,13 +0,0 @@
|
||||
Index: avahi-0.6.31/avahi-daemon/avahi-daemon.conf
|
||||
===================================================================
|
||||
--- avahi-0.6.31.orig/avahi-daemon/avahi-daemon.conf
|
||||
+++ avahi-0.6.31/avahi-daemon/avahi-daemon.conf
|
||||
@@ -23,7 +23,7 @@
|
||||
#domain-name=local
|
||||
#browse-domains=0pointer.de, zeroconf.org
|
||||
use-ipv4=yes
|
||||
-use-ipv6=no
|
||||
+use-ipv6=yes
|
||||
#allow-interfaces=eth0
|
||||
#deny-interfaces=eth1
|
||||
#check-response-ttl=no
|
||||
@@ -1,26 +0,0 @@
|
||||
Index: avahi-0.6.31/avahi-autoipd/Makefile.am
|
||||
===================================================================
|
||||
--- avahi-0.6.31.orig/avahi-autoipd/Makefile.am 2010-08-26 02:51:38.000000000 +0200
|
||||
+++ avahi-0.6.31/avahi-autoipd/Makefile.am 2012-07-01 22:34:57.922855526 +0200
|
||||
@@ -76,7 +76,7 @@ dhcliententerdir = $(sysconfdir)/dhcp/dh
|
||||
dhclientexitdir = $(sysconfdir)/dhcp/dhclient-exit-hooks.d
|
||||
|
||||
install-exec-hook: dhclient-exit-hook dhclient-enter-hook
|
||||
- $(mkdir_p) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
|
||||
+ $(MKDIR_P) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
|
||||
$(INSTALL) dhclient-enter-hook $(DESTDIR)$(dhcliententerdir)/avahi-autoipd
|
||||
$(INSTALL) dhclient-exit-hook $(DESTDIR)$(dhclientexitdir)/avahi-autoipd
|
||||
|
||||
Index: avahi-0.6.31/avahi-daemon/Makefile.am
|
||||
===================================================================
|
||||
--- avahi-0.6.31.orig/avahi-daemon/Makefile.am 2010-08-26 02:51:38.000000000 +0200
|
||||
+++ avahi-0.6.31/avahi-daemon/Makefile.am 2012-07-01 22:34:44.570481086 +0200
|
||||
@@ -169,7 +169,7 @@ xmllint:
|
||||
done
|
||||
|
||||
install-data-local:
|
||||
- test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"
|
||||
+ test -z "$(localstatedir)/run" || $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run"
|
||||
|
||||
update-systemd:
|
||||
curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
|
||||
@@ -28,7 +28,7 @@ Name: avahi-glib2
|
||||
%define build_mono 0
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.31
|
||||
Version: 0.6.32
|
||||
Release: 0
|
||||
# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
|
||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||
@@ -52,7 +52,7 @@ Url: http://www.avahi.org/
|
||||
Summary: D-BUS Service for Zeroconf and Bonjour
|
||||
License: LGPL-2.1+
|
||||
Group: System/Daemons
|
||||
Source: http://avahi.org/download/%{_name}-%{version}.tar.gz
|
||||
Source: https://github.com/lathiat/avahi/releases/download/v%{version}/%{_name}-%{version}.tar.gz
|
||||
# From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz
|
||||
Source1: avahi-daemon-check-dns.sh
|
||||
Source3: avahi.firewall
|
||||
@@ -77,20 +77,10 @@ Patch1: avahi-desktop.patch
|
||||
Patch3: avahi-empty-share-dir.patch
|
||||
# PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal
|
||||
Patch4: avahi-daemon-check-dns-suse.patch
|
||||
# PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
|
||||
Patch10: avahi-unicastdomains.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342
|
||||
Patch11: avahi-gtk_box_new.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency
|
||||
Patch12: avahi-gir-fixup.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros
|
||||
Patch13: avahi-fix-mkdir.diff
|
||||
# PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default
|
||||
Patch14: avahi-enable-ipv6.patch
|
||||
# PATCH-FIX-OPENSUSE avahi-move-everything-to-run.patch rmilasan@suse.com -- Move everything to /run directory (socket and pid files)
|
||||
Patch15: avahi-move-everything-to-run.patch
|
||||
# PATCH-FIX-OPENSUSE avahi-reserve-space-for-record-data-when-size-e.patch bnc#835984 jlee@suse.com -- avahi-core: reserve space for record data when size estimate
|
||||
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
|
||||
@@ -769,13 +759,8 @@ translation-update-upstream
|
||||
%patch1 -p1
|
||||
%patch3
|
||||
%patch4
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
Index: avahi-0.6.30/avahi-ui/avahi-ui.c
|
||||
===================================================================
|
||||
--- avahi-0.6.30.orig/avahi-ui/avahi-ui.c
|
||||
+++ avahi-0.6.30/avahi-ui/avahi-ui.c
|
||||
@@ -991,7 +991,11 @@ static void domain_button_clicked(GtkBut
|
||||
gtk_dialog_set_has_separator(GTK_DIALOG(p->domain_dialog), FALSE);
|
||||
#endif
|
||||
|
||||
+#if GTK_CHECK_VERSION(3,0,0)
|
||||
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
||||
+#else
|
||||
vbox = gtk_vbox_new(FALSE, 8);
|
||||
+#endif
|
||||
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
|
||||
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(p->domain_dialog))), vbox, TRUE, TRUE, 0);
|
||||
|
||||
@@ -1002,7 +1006,11 @@ static void domain_button_clicked(GtkBut
|
||||
g_signal_connect(p->domain_entry, "changed", G_CALLBACK(domain_entry_changed_callback), d);
|
||||
gtk_box_pack_start(GTK_BOX(vbox), p->domain_entry, FALSE, FALSE, 0);
|
||||
|
||||
+#if GTK_CHECK_VERSION(3,0,0)
|
||||
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
||||
+#else
|
||||
vbox2 = gtk_vbox_new(FALSE, 8);
|
||||
+#endif
|
||||
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
|
||||
|
||||
scrolled_window = gtk_scrolled_window_new(NULL, NULL);
|
||||
@@ -1113,7 +1121,11 @@ static void aui_service_dialog_init(AuiS
|
||||
|
||||
gtk_container_set_border_width(GTK_CONTAINER(d), 5);
|
||||
|
||||
+#if GTK_CHECK_VERSION(3,0,0)
|
||||
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
||||
+#else
|
||||
vbox = gtk_vbox_new(FALSE, 8);
|
||||
+#endif
|
||||
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
|
||||
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(d))), vbox, TRUE, TRUE, 0);
|
||||
|
||||
@@ -1123,7 +1135,11 @@ static void aui_service_dialog_init(AuiS
|
||||
gtk_box_pack_start(GTK_BOX(vbox), p->domain_label, FALSE, FALSE, 0);
|
||||
|
||||
|
||||
+#if GTK_CHECK_VERSION(3,0,0)
|
||||
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
||||
+#else
|
||||
vbox2 = gtk_vbox_new(FALSE, 8);
|
||||
+#endif
|
||||
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
|
||||
|
||||
scrolled_window = gtk_scrolled_window_new(NULL, NULL);
|
||||
@@ -28,7 +28,7 @@ Name: avahi-mono
|
||||
%define build_mono 1
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.31
|
||||
Version: 0.6.32
|
||||
Release: 0
|
||||
# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
|
||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||
@@ -52,7 +52,7 @@ Url: http://www.avahi.org/
|
||||
Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
|
||||
License: LGPL-2.1+
|
||||
Group: Development/Languages/Mono
|
||||
Source: http://avahi.org/download/%{_name}-%{version}.tar.gz
|
||||
Source: https://github.com/lathiat/avahi/releases/download/v%{version}/%{_name}-%{version}.tar.gz
|
||||
# From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz
|
||||
Source1: avahi-daemon-check-dns.sh
|
||||
Source3: avahi.firewall
|
||||
@@ -77,20 +77,10 @@ Patch1: avahi-desktop.patch
|
||||
Patch3: avahi-empty-share-dir.patch
|
||||
# PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal
|
||||
Patch4: avahi-daemon-check-dns-suse.patch
|
||||
# PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
|
||||
Patch10: avahi-unicastdomains.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342
|
||||
Patch11: avahi-gtk_box_new.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency
|
||||
Patch12: avahi-gir-fixup.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros
|
||||
Patch13: avahi-fix-mkdir.diff
|
||||
# PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default
|
||||
Patch14: avahi-enable-ipv6.patch
|
||||
# PATCH-FIX-OPENSUSE avahi-move-everything-to-run.patch rmilasan@suse.com -- Move everything to /run directory (socket and pid files)
|
||||
Patch15: avahi-move-everything-to-run.patch
|
||||
# PATCH-FIX-OPENSUSE avahi-reserve-space-for-record-data-when-size-e.patch bnc#835984 jlee@suse.com -- avahi-core: reserve space for record data when size estimate
|
||||
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
|
||||
@@ -769,13 +759,8 @@ translation-update-upstream
|
||||
%patch1 -p1
|
||||
%patch3
|
||||
%patch4
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
|
||||
@@ -28,7 +28,7 @@ Name: avahi-qt4
|
||||
%define build_mono 0
|
||||
%define build_qt3 0
|
||||
%define build_qt4 1
|
||||
Version: 0.6.31
|
||||
Version: 0.6.32
|
||||
Release: 0
|
||||
# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
|
||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||
@@ -52,7 +52,7 @@ Url: http://www.avahi.org/
|
||||
Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
|
||||
License: LGPL-2.1+
|
||||
Group: System/GUI/KDE
|
||||
Source: http://avahi.org/download/%{_name}-%{version}.tar.gz
|
||||
Source: https://github.com/lathiat/avahi/releases/download/v%{version}/%{_name}-%{version}.tar.gz
|
||||
# From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz
|
||||
Source1: avahi-daemon-check-dns.sh
|
||||
Source3: avahi.firewall
|
||||
@@ -77,20 +77,10 @@ Patch1: avahi-desktop.patch
|
||||
Patch3: avahi-empty-share-dir.patch
|
||||
# PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal
|
||||
Patch4: avahi-daemon-check-dns-suse.patch
|
||||
# PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
|
||||
Patch10: avahi-unicastdomains.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342
|
||||
Patch11: avahi-gtk_box_new.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency
|
||||
Patch12: avahi-gir-fixup.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros
|
||||
Patch13: avahi-fix-mkdir.diff
|
||||
# PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default
|
||||
Patch14: avahi-enable-ipv6.patch
|
||||
# PATCH-FIX-OPENSUSE avahi-move-everything-to-run.patch rmilasan@suse.com -- Move everything to /run directory (socket and pid files)
|
||||
Patch15: avahi-move-everything-to-run.patch
|
||||
# PATCH-FIX-OPENSUSE avahi-reserve-space-for-record-data-when-size-e.patch bnc#835984 jlee@suse.com -- avahi-core: reserve space for record data when size estimate
|
||||
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
|
||||
@@ -771,13 +761,8 @@ translation-update-upstream
|
||||
%patch1 -p1
|
||||
%patch3
|
||||
%patch4
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
From 5cf2d9e32dffc902ca5a6f0220904f8dca8ec055 Mon Sep 17 00:00:00 2001
|
||||
From: "Lee, Chun-Yi" <jlee@suse.com>
|
||||
Date: Fri, 7 Sep 2012 04:37:33 +0800
|
||||
Subject: [PATCH] avahi-core: reserve space for record data when size estimate
|
||||
|
||||
When we tested put a lot of airprint service files(have 45 to 60 flies), found there have cpu loadinghigh problem when start avahi-daemon with those service files.
|
||||
|
||||
After traced source code, there have problem in probe-sched.c::elapse_callback causes doesn't have any probe job set to DONE so the daemon unlimited send out DNS package.
|
||||
The root cause is when compare with the free package space in packet_add_probe_query before attach job key, the free package space doesn't include any record data that will attached after all keys attached. This defect causes whole DNS package is filled by job key, but doesn't remain enough space for any rdata. Then, that means have no job set to DONE.
|
||||
|
||||
This patch add a new res_size member to AvahiDnsPacket, it used to sum the reserve size for record data the will attached after all keys attached. It can avoid keys consume whole size until p->size larger then p->max_size.
|
||||
|
||||
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
|
||||
---
|
||||
avahi-core/dns.c | 20 ++++++++++++++++++++
|
||||
avahi-core/dns.h | 4 +++-
|
||||
avahi-core/probe-sched.c | 10 ++++++++--
|
||||
3 files changed, 31 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/avahi-core/dns.c b/avahi-core/dns.c
|
||||
index 2fcd91f..523afdc 100644
|
||||
--- a/avahi-core/dns.c
|
||||
+++ b/avahi-core/dns.c
|
||||
@@ -55,6 +55,7 @@ AvahiDnsPacket* avahi_dns_packet_new(unsigned mtu) {
|
||||
|
||||
p->size = p->rindex = AVAHI_DNS_PACKET_HEADER_SIZE;
|
||||
p->max_size = max_size;
|
||||
+ p->res_size = 0;
|
||||
p->name_table = NULL;
|
||||
p->data = NULL;
|
||||
|
||||
@@ -833,6 +834,25 @@ size_t avahi_dns_packet_space(AvahiDnsPacket *p) {
|
||||
return p->max_size - p->size;
|
||||
}
|
||||
|
||||
+size_t avahi_dns_packet_reserve_size(AvahiDnsPacket *p, size_t res_size) {
|
||||
+ assert(p);
|
||||
+
|
||||
+ assert(p->size + p->res_size <= p->max_size);
|
||||
+
|
||||
+ if ((p->size + p->res_size + res_size) <= p->max_size)
|
||||
+ p->res_size += res_size;
|
||||
+
|
||||
+ return p->res_size;
|
||||
+}
|
||||
+
|
||||
+size_t avahi_dns_packet_reserved_space(AvahiDnsPacket *p) {
|
||||
+ assert(p);
|
||||
+
|
||||
+ assert(p->size + p->res_size <= p->max_size);
|
||||
+
|
||||
+ return p->max_size - p->size - p->res_size;
|
||||
+}
|
||||
+
|
||||
int avahi_rdata_parse(AvahiRecord *record, const void* rdata, size_t size) {
|
||||
int ret;
|
||||
AvahiDnsPacket p;
|
||||
diff --git a/avahi-core/dns.h b/avahi-core/dns.h
|
||||
index 52e8d88..13b1ac2 100644
|
||||
--- a/avahi-core/dns.h
|
||||
+++ b/avahi-core/dns.h
|
||||
@@ -30,7 +30,7 @@
|
||||
#define AVAHI_DNS_PACKET_SIZE_MAX (AVAHI_DNS_PACKET_HEADER_SIZE + 256 + 2 + 2 + 4 + 2 + AVAHI_DNS_RDATA_MAX)
|
||||
|
||||
typedef struct AvahiDnsPacket {
|
||||
- size_t size, rindex, max_size;
|
||||
+ size_t size, rindex, max_size, res_size;
|
||||
AvahiHashmap *name_table; /* for name compression */
|
||||
uint8_t *data;
|
||||
} AvahiDnsPacket;
|
||||
@@ -78,6 +78,8 @@ int avahi_dns_packet_skip(AvahiDnsPacket *p, size_t length);
|
||||
|
||||
int avahi_dns_packet_is_empty(AvahiDnsPacket *p);
|
||||
size_t avahi_dns_packet_space(AvahiDnsPacket *p);
|
||||
+size_t avahi_dns_packet_reserve_size(AvahiDnsPacket *p, size_t res_size);
|
||||
+size_t avahi_dns_packet_reserved_space(AvahiDnsPacket *p);
|
||||
|
||||
#define AVAHI_DNS_FIELD_ID 0
|
||||
#define AVAHI_DNS_FIELD_FLAGS 1
|
||||
diff --git a/avahi-core/probe-sched.c b/avahi-core/probe-sched.c
|
||||
index 1e63411..63cb817 100644
|
||||
--- a/avahi-core/probe-sched.c
|
||||
+++ b/avahi-core/probe-sched.c
|
||||
@@ -179,7 +179,7 @@ static int packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p, Ava
|
||||
avahi_record_get_estimate_size(pj->record);
|
||||
|
||||
/* Too large */
|
||||
- if (size > avahi_dns_packet_space(p))
|
||||
+ if (size > avahi_dns_packet_reserved_space(p))
|
||||
return 0;
|
||||
|
||||
/* Create the probe query */
|
||||
@@ -189,6 +189,9 @@ static int packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p, Ava
|
||||
b = !!avahi_dns_packet_append_key(p, k, 0);
|
||||
assert(b);
|
||||
|
||||
+ /* reserve size for record data */
|
||||
+ avahi_dns_packet_reserve_size(p, avahi_record_get_estimate_size(pj->record));
|
||||
+
|
||||
/* Mark this job for addition to the packet */
|
||||
pj->chosen = 1;
|
||||
|
||||
@@ -202,9 +205,12 @@ static int packet_add_probe_query(AvahiProbeScheduler *s, AvahiDnsPacket *p, Ava
|
||||
continue;
|
||||
|
||||
/* This job wouldn't fit in */
|
||||
- if (avahi_record_get_estimate_size(pj->record) > avahi_dns_packet_space(p))
|
||||
+ if (avahi_record_get_estimate_size(pj->record) > avahi_dns_packet_reserved_space(p))
|
||||
break;
|
||||
|
||||
+ /* reserve size for record data */
|
||||
+ avahi_dns_packet_reserve_size(p, avahi_record_get_estimate_size(pj->record));
|
||||
+
|
||||
/* Mark this job for addition to the packet */
|
||||
pj->chosen = 1;
|
||||
}
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
Index: avahi-0.6.25/avahi-daemon/avahi-daemon.conf
|
||||
===================================================================
|
||||
--- avahi-0.6.25.orig/avahi-daemon/avahi-daemon.conf
|
||||
+++ avahi-0.6.25/avahi-daemon/avahi-daemon.conf
|
||||
@@ -23,7 +23,7 @@
|
||||
[server]
|
||||
#host-name=foo
|
||||
#domain-name=local
|
||||
-browse-domains=0pointer.de, zeroconf.org
|
||||
+#browse-domains=0pointer.de, zeroconf.org
|
||||
use-ipv4=yes
|
||||
use-ipv6=no
|
||||
#allow-interfaces=eth0
|
||||
@@ -1,3 +1,35 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 23 18:45:13 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 0.6.32:
|
||||
+ Don't log warnings about invalid packets, commonly triggered by
|
||||
Windows 10 systems.
|
||||
+ Fix issue with bad packet size estimation, causing probes to
|
||||
continuously be sent when hosting large numbers of services.
|
||||
+ Fix build on Solaris/SmartOS (filio.h issue).
|
||||
+ Fix build on FreeBSD (PCAP_D_IN issue).
|
||||
+ Fix debug output with libdaemon >= 0.14.
|
||||
+ avahi_server_set_browse_domains now correctly uses the provided
|
||||
list, instead of re-using the list from the configuration file.
|
||||
+ Set nl_pid to 0, this will automatically assign the value and
|
||||
prevent conflicts per netlink(7). (Bug #334).
|
||||
+ Check for netlink pid=0 (kernel) instead of uid=0, which works
|
||||
correctly with network & user namespaces.
|
||||
+ Fix reversed IFA_LOCAL and IFA_ADDRESS checks (Avahi#355).
|
||||
+ Don't fail the build on deprecated GTK/GLIB usage.
|
||||
+ Gracefully fail if SO_REUSEPORT is not available.
|
||||
+ Minor Python 3 update for the python ServiceTypeDatabase test
|
||||
usage of print, should be backwards compatible.
|
||||
+ avahi-autoipd: Fix incorrect usage of IFLA_RTA instead of
|
||||
IFA_RTA which could crash on ARM (Closes: gh#lathiat/avahi#42).
|
||||
- Drop upstream fixed patches:
|
||||
+ avahi-unicastdomains.patch
|
||||
+ avahi-gtk_box_new.patch
|
||||
+ avahi-fix-mkdir.diff
|
||||
+ avahi-enable-ipv6.patch
|
||||
+ avahi-reserve-space-for-record-data-when-size-e.patch
|
||||
- Rebase avahi-0.6.31-invalid-packet.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 23 18:45:12 UTC 2016 - mgorse@suse.com
|
||||
|
||||
|
||||
19
avahi.spec
19
avahi.spec
@@ -30,7 +30,7 @@ Name: avahi
|
||||
%define build_mono 0
|
||||
%define build_qt3 0
|
||||
%define build_qt4 0
|
||||
Version: 0.6.31
|
||||
Version: 0.6.32
|
||||
Release: 0
|
||||
# FIXME: on upgrade, ensure to verify if -DGTK_DISABLE_DEPRECATED=1 can remain in avahi=ui/Makefile.am (GtkStock deprecated with GTK+ 3.9.10).
|
||||
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
|
||||
@@ -54,7 +54,7 @@ Url: http://www.avahi.org/
|
||||
Summary: D-BUS Service for Zeroconf and Bonjour
|
||||
License: LGPL-2.1+
|
||||
Group: System/Daemons
|
||||
Source: http://avahi.org/download/%{_name}-%{version}.tar.gz
|
||||
Source: https://github.com/lathiat/avahi/releases/download/v%{version}/%{_name}-%{version}.tar.gz
|
||||
# From http://packages.debian.org/sid/avahi-daemon http://ftp.debian.org/debian/pool/main/a/avahi/avahi_0.6.31-1.debian.tar.gz
|
||||
Source1: avahi-daemon-check-dns.sh
|
||||
Source3: avahi.firewall
|
||||
@@ -79,20 +79,10 @@ Patch1: avahi-desktop.patch
|
||||
Patch3: avahi-empty-share-dir.patch
|
||||
# PATCH-FEATURE-OPENSUSE avahi-daemon-check-dns-suse.patch bnc431704 sbrabec@suse.cz -- Port Debian avahi-daemon-check-dns.sh to SUSE, see also http://avahi.org/wiki/AvahiAndUnicastDotLocal
|
||||
Patch4: avahi-daemon-check-dns-suse.patch
|
||||
# PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
|
||||
Patch10: avahi-unicastdomains.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-gtk_box_new.patch dimstar@opensuse.org -- Do not use deprecated gtk_[hv]box_new, http://www.avahi.org/ticket/342
|
||||
Patch11: avahi-gtk_box_new.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-gir-fixup.patch dimstar@opensnse.org -- Use complete shared library name in gir file for dependency
|
||||
Patch12: avahi-gir-fixup.patch
|
||||
# PATCH-FIX-UPSTREAM avahi-fix-mkdir.diff coolo@suse.de -- Avoid obsolete automake macros
|
||||
Patch13: avahi-fix-mkdir.diff
|
||||
# PATCH-FIX-OPENSUSE avahi-enable-ipv6.patch bnc#710230 vuntz@opensuse.org -- Enable ipv6 by default
|
||||
Patch14: avahi-enable-ipv6.patch
|
||||
# PATCH-FIX-OPENSUSE avahi-move-everything-to-run.patch rmilasan@suse.com -- Move everything to /run directory (socket and pid files)
|
||||
Patch15: avahi-move-everything-to-run.patch
|
||||
# PATCH-FIX-OPENSUSE avahi-reserve-space-for-record-data-when-size-e.patch bnc#835984 jlee@suse.com -- avahi-core: reserve space for record data when size estimate
|
||||
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
|
||||
@@ -771,13 +761,8 @@ translation-update-upstream
|
||||
%patch1 -p1
|
||||
%patch3
|
||||
%patch4
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
|
||||
Reference in New Issue
Block a user