avahi package update

Signed-off-by: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>

SOURCES/0001-man-correct-short-option-to-print-version-string.patch

@@ -0,0 +1,40 @@
+From 7e7d6d6724742cc936177bf8dd6737b8b6f9d160 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 21 Apr 2015 13:48:45 +0200
+Subject: [PATCH 1/2] man: correct short option to print version string
+
+Related: #948583
+---
+ man/avahi-autoipd.8 | 2 +-
+ man/avahi-daemon.8  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/man/avahi-autoipd.8 b/man/avahi-autoipd.8
+index 034804c..e44c953 100644
+--- a/man/avahi-autoipd.8
++++ b/man/avahi-autoipd.8
+@@ -65,7 +65,7 @@ Don't change the process name while running. Unless this option is specified ava
+ \fB-h | --help\f1
+ Show help.
+ .TP
+-\fB-v | --version\f1
++\fB-V | --version\f1
+ Show version information.
+ .SH FILES
+ \fI/home/lennart/tmp/avahi/etc/avahi/avahi-autoipd.action\f1: the script to run when an IP address as been acquired or is lost.
+diff --git a/man/avahi-daemon.8 b/man/avahi-daemon.8
+index bbf2b43..3b35799 100644
+--- a/man/avahi-daemon.8
++++ b/man/avahi-daemon.8
+@@ -52,7 +52,7 @@ Return 0 as return code when avahi-daemon is already running.
+ \fB-h | --help\f1
+ Show help
+ .TP
+-\fB-v | --version\f1
++\fB-V | --version\f1
+ Show version information 
+ .SH FILES
+ \fI/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf\f1: the default configuration file for avahi-daemon, \fBavahi-daemon.conf(5)\f1 for more information.
+-- 
+2.3.4
+

SOURCES/0002-man-add-description-for-t-option.patch

@@ -0,0 +1,27 @@
+From 0eddf3f8a2e7321ed4ab33680c0559740021eb1e Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 21 Apr 2015 13:50:41 +0200
+Subject: [PATCH 2/2] man: add description for -t option
+
+Related: #948583
+---
+ man/avahi-autoipd.8 | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/man/avahi-autoipd.8 b/man/avahi-autoipd.8
+index e44c953..0c2b814 100644
+--- a/man/avahi-autoipd.8
++++ b/man/avahi-autoipd.8
+@@ -59,6 +59,9 @@ Wait until a IP address has been successfully acquired before detaching. Only va
+ \fB--force-bind\f1
+ Acquire an IPv4LL address, even if a routable address has been configured on the interface.
+ .TP
++\fB-t | --script\f1
++Action script to run (defaults to /home/lennart/tmp/avahi/etc/avahi/avahi-autoipd.action). See \fBautoipd.action(8)\f1 for more details. 
++.TP
+ \fB--no-proc-title\f1
+ Don't change the process name while running. Unless this option is specified avahi-autoipd will reflect its current state and the IP address in the process title.
+ .TP
+-- 
+2.3.4
+

SOURCES/0003-dbus-don-t-crash-if-we-can-t-determine-alternative-s.patch

@@ -0,0 +1,42 @@
+From c17ad43fc445ee649f1020378d8464b96ce57102 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Mon, 13 Apr 2015 10:06:41 +0200
+Subject: [PATCH 3/4] dbus: don't crash if we can't determine alternative
+ {service,host} name
+
+Resolves: #1003688
+---
+ avahi-daemon/dbus-protocol.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
+index eb8a662..d7738bd 100644
+--- a/avahi-daemon/dbus-protocol.c
++++ b/avahi-daemon/dbus-protocol.c
+@@ -391,6 +391,11 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, AVAH
+         }
+ 
+         t = avahi_alternative_host_name(n);
++        if (!t) {
++            avahi_log_warn("Failed to determine alternative host name");
++            goto fail;
++        }
++
+         avahi_dbus_respond_string(c, m, t);
+         avahi_free(t);
+ 
+@@ -405,6 +410,11 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, AVAH
+         }
+ 
+         t = avahi_alternative_service_name(n);
++        if (!t) {
++            avahi_log_warn("Failed to determine alternative service name");
++            goto fail;
++        }
++
+         avahi_dbus_respond_string(c, m, t);
+         avahi_free(t);
+ 
+-- 
+2.3.4
+

SOURCES/0004-avahi-core-reserve-space-for-record-data-when-size-e.patch

@@ -0,0 +1,131 @@
+From 86e213fbd0d24b5b2e58d474d27d47b222011936 Mon Sep 17 00:00:00 2001
+From: "Lee, Chun-Yi" <jlee at suse.com>
+Date: Mon, 10 Sep 2012 10:27:56 +0800
+Subject: [PATCH 4/4] 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.
+
+Resolves: #1081801
+---
+ 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;
+     }
+-- 
+2.3.4
+

SOURCES/0005-Remove-prefix-home-lennart-tmp-avahi-from-references.patch

@@ -0,0 +1,185 @@
+From bc5677a679ae4ade6c1d033c3bdc54dda0f15cc0 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 21 Apr 2015 14:27:34 +0200
+Subject: [PATCH 5/5] Remove prefix /home/lennart/tmp/avahi from references in
+ manpages
+
+Resolves: #1120233
+---
+ man/avahi-autoipd.8         |  4 ++--
+ man/avahi-autoipd.action.8  |  2 +-
+ man/avahi-daemon.8          | 14 +++++++-------
+ man/avahi-daemon.conf.5     |  2 +-
+ man/avahi-dnsconfd.8        |  4 ++--
+ man/avahi-dnsconfd.action.8 |  2 +-
+ man/avahi.hosts.5           |  4 ++--
+ man/avahi.service.5         |  4 ++--
+ 8 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/man/avahi-autoipd.8 b/man/avahi-autoipd.8
+index 0c2b814..aca4a21 100644
+--- a/man/avahi-autoipd.8
++++ b/man/avahi-autoipd.8
+@@ -60,7 +60,7 @@ Wait until a IP address has been successfully acquired before detaching. Only va
+ Acquire an IPv4LL address, even if a routable address has been configured on the interface.
+ .TP
+ \fB-t | --script\f1
+-Action script to run (defaults to /home/lennart/tmp/avahi/etc/avahi/avahi-autoipd.action). See \fBautoipd.action(8)\f1 for more details. 
++Action script to run (defaults to /etc/avahi/avahi-autoipd.action). See \fBautoipd.action(8)\f1 for more details.
+ .TP
+ \fB--no-proc-title\f1
+ Don't change the process name while running. Unless this option is specified avahi-autoipd will reflect its current state and the IP address in the process title.
+@@ -71,7 +71,7 @@ Show help.
+ \fB-V | --version\f1
+ Show version information.
+ .SH FILES
+-\fI/home/lennart/tmp/avahi/etc/avahi/avahi-autoipd.action\f1: the script to run when an IP address as been acquired or is lost.
++\fI/etc/avahi/avahi-autoipd.action\f1: the script to run when an IP address as been acquired or is lost.
+ .SH SIGNALS
+ \fISIGINT, SIGTERM\f1: avahi-autoipd will shutdown. (Same as \fB--kill\f1)
+ 
+diff --git a/man/avahi-autoipd.action.8 b/man/avahi-autoipd.action.8
+index 837a762..62b14a4 100644
+--- a/man/avahi-autoipd.action.8
++++ b/man/avahi-autoipd.action.8
+@@ -2,7 +2,7 @@
+ .SH NAME
+ avahi-autoipd.action \- avahi-autoipd action script
+ .SH SYNOPSIS
+-\fB/home/lennart/tmp/avahi/etc/avahi/avahi-autoipd.action
++\fB/etc/avahi/avahi-autoipd.action
+ \f1
+ .SH DESCRIPTION
+ \fIavahi-autoipd.action\f1 is the action script that is called whenever an IP address has been acquired by avahi-autoipd or when it detected an IP address conflict. The script should add or remove the specified address from the specified network interface.
+diff --git a/man/avahi-daemon.8 b/man/avahi-daemon.8
+index 3b35799..4141271 100644
+--- a/man/avahi-daemon.8
++++ b/man/avahi-daemon.8
+@@ -13,11 +13,11 @@ avahi-daemon --check\fB
+ .SH DESCRIPTION
+ The Avahi mDNS/DNS-SD daemon implements Apple's Zeroconf architecture (also known as "Rendezvous" or "Bonjour"). The daemon registers local IP addresses and static services using mDNS/DNS-SD and provides two IPC APIs for local programs to make use of the mDNS record cache the avahi-daemon maintains. First there is the so called "simple protocol" which is used exclusively by avahi-dnsconfd (a daemon which configures unicast DNS servers using server info published via mDNS) and nss-mdns (a libc NSS plugin, providing name resolution via mDNS). Finally there is the D-Bus interface which provides a rich object oriented interface to D-Bus enabled applications.
+ 
+-Upon startup avahi-daemon interprets its configuration file \fI/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf\f1 and reads XML fragments from \fI/home/lennart/tmp/avahi/etc/avahi/services/*.service\f1 which may define static DNS-SD services. If you enable \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1 the file \fI/etc/resolv.conf\f1 will be read, too.
++Upon startup avahi-daemon interprets its configuration file \fI/etc/avahi/avahi-daemon.conf\f1 and reads XML fragments from \fI/etc/avahi/services/*.service\f1 which may define static DNS-SD services. If you enable \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1 the file \fI/etc/resolv.conf\f1 will be read, too.
+ .SH OPTIONS
+ .TP
+ \fB-f | --file=\f1 \fIFILE\f1
+-Specify the configuration file to read. (default: /home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf)
++Specify the configuration file to read. (default: /etc/avahi/avahi-daemon.conf)
+ .TP
+ \fB-D | --daemonize\f1
+ Daemonize after startup. Implies \fB--syslog\f1.
+@@ -44,7 +44,7 @@ Don't change the process name while running. Unless this option is specified ava
+ Kill an already running avahi-daemon. (equivalent to sending a SIGTERM)
+ .TP
+ \fB-r | --reload\f1
+-Tell an already running avahi-daemon to reread \fI/etc/resolv.conf\f1 (in case you enabled \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1) the files from \fI/home/lennart/tmp/avahi/etc/avahi/services/\f1. Please note that this will not reload the \fI/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf\f1. (equivalent to sending a SIGHUP)
++Tell an already running avahi-daemon to reread \fI/etc/resolv.conf\f1 (in case you enabled \fBpublish-resolv-conf-dns-servers\f1 in \fIavahi-daemon.conf\f1) the files from \fI/etc/avahi/services/\f1. Please note that this will not reload the \fI/etc/avahi/avahi-daemon.conf\f1. (equivalent to sending a SIGHUP)
+ .TP
+ \fB-c | --check\f1
+ Return 0 as return code when avahi-daemon is already running.
+@@ -55,15 +55,15 @@ Show help
+ \fB-V | --version\f1
+ Show version information 
+ .SH FILES
+-\fI/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf\f1: the default configuration file for avahi-daemon, \fBavahi-daemon.conf(5)\f1 for more information.
++\fI/etc/avahi/avahi-daemon.conf\f1: the default configuration file for avahi-daemon, \fBavahi-daemon.conf(5)\f1 for more information.
+ 
+-\fI/home/lennart/tmp/avahi/etc/avahi/hosts\f1: additional static hostname mappings to publish in mDNS, see \fBavahi.hosts(5)\f1 for more information.
++\fI/etc/avahi/hosts\f1: additional static hostname mappings to publish in mDNS, see \fBavahi.hosts(5)\f1 for more information.
+ 
+-\fI/home/lennart/tmp/avahi/etc/avahi/services/*.service\f1: static service definitions, see \fBavahi.service(5)\f1 for more information.
++\fI/etc/avahi/services/*.service\f1: static service definitions, see \fBavahi.service(5)\f1 for more information.
+ .SH SIGNALS
+ \fISIGINT, SIGTERM\f1: avahi-daemon will shutdown. (Same as \fB--kill\f1).
+ 
+-\fISIGHUP\f1: avahi-daemon will reload unicast DNS server data from \fI/etc/resolv.conf\f1 and static service definitions from \fI/home/lennart/tmp/avahi/etc/avahi/services/\f1. (Same as \fB--reload\f1)
++\fISIGHUP\f1: avahi-daemon will reload unicast DNS server data from \fI/etc/resolv.conf\f1 and static service definitions from \fI/etc/avahi/services/\f1. (Same as \fB--reload\f1)
+ 
+ \fISIGUSR1\f1: avahi-daemon will dump local and remote cached resource record data to syslog.
+ .SH AUTHORS
+diff --git a/man/avahi-daemon.conf.5 b/man/avahi-daemon.conf.5
+index 0ebc9d4..edddc1e 100644
+--- a/man/avahi-daemon.conf.5
++++ b/man/avahi-daemon.conf.5
+@@ -2,7 +2,7 @@
+ .SH NAME
+ avahi-daemon.conf \- avahi-daemon configuration file
+ .SH SYNOPSIS
+-\fB/home/lennart/tmp/avahi/etc/avahi/avahi-daemon.conf
++\fB/etc/avahi/avahi-daemon.conf
+ \f1
+ .SH DESCRIPTION
+ \fIavahi-daemon.conf\f1 is the configuration file for avahi-daemon.
+diff --git a/man/avahi-dnsconfd.8 b/man/avahi-dnsconfd.8
+index 4ddee58..418ae36 100644
+--- a/man/avahi-dnsconfd.8
++++ b/man/avahi-dnsconfd.8
+@@ -11,7 +11,7 @@ avahi-dnsconfd --refresh\fB
+ avahi-dnsconfd --check\fB
+ \f1
+ .SH DESCRIPTION
+-avahi-dnsconfd connects to a running avahi-daemon and runs the script \fI/home/lennart/tmp/avahi/etc/avahi/dnsconfd.action\f1 for each unicast DNS server that is announced on the local LAN. This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS.
++avahi-dnsconfd connects to a running avahi-daemon and runs the script \fI/etc/avahi/dnsconfd.action\f1 for each unicast DNS server that is announced on the local LAN. This is useful for configuring unicast DNS servers in a DHCP-like fashion with mDNS.
+ .SH OPTIONS
+ .TP
+ \fB-D | --daemonize\f1
+@@ -35,7 +35,7 @@ Show help
+ \fB-v | --version\f1
+ Show version information 
+ .SH FILES
+-\fI/home/lennart/tmp/avahi/etc/avahi/avahi-dnsconfd.action\f1: the script to run when a DNS server is found or removed.
++\fI/etc/avahi/avahi-dnsconfd.action\f1: the script to run when a DNS server is found or removed.
+ .SH SIGNALS
+ \fISIGINT, SIGTERM\f1: avahi-dnsconfd will shutdown. This is issued by passing --kill to avahi-daemon.
+ 
+diff --git a/man/avahi-dnsconfd.action.8 b/man/avahi-dnsconfd.action.8
+index 0ad2676..3f2f16a 100644
+--- a/man/avahi-dnsconfd.action.8
++++ b/man/avahi-dnsconfd.action.8
+@@ -2,7 +2,7 @@
+ .SH NAME
+ avahi-dnsconfd.action \- avahi-dnsconfd action script
+ .SH SYNOPSIS
+-\fB/home/lennart/tmp/avahi/etc/avahi/avahi-dnsconfd.action
++\fB/etc/avahi/avahi-dnsconfd.action
+ \f1
+ .SH DESCRIPTION
+ \fIavahi-dnsconfd.action\f1 is the action script that is called whenever a new unicast DNS server is found or removed by avahi-dnsconfd. The default script as shipped with avahi patches \fI/etc/resolv.conf\f1 to reflect the changed unicast DNS server configuration.
+diff --git a/man/avahi.hosts.5 b/man/avahi.hosts.5
+index fe27077..dc4f73f 100644
+--- a/man/avahi.hosts.5
++++ b/man/avahi.hosts.5
+@@ -2,10 +2,10 @@
+ .SH NAME
+ avahi.hosts \- avahi-daemon static host name file
+ .SH SYNOPSIS
+-\fB/home/lennart/tmp/avahi/etc/avahi/hosts
++\fB/etc/avahi/hosts
+ \f1
+ .SH DESCRIPTION
+-\fI/home/lennart/tmp/avahi/etc/avahi/hosts\f1 is a file which may be used to define static host name to IP address mappings for multicast DNS. This is especially useful when publishing DNS-SD services on behalf of other hosts. See \fBavahi.service(5)\f1 for more information.
++\fI/etc/avahi/hosts\f1 is a file which may be used to define static host name to IP address mappings for multicast DNS. This is especially useful when publishing DNS-SD services on behalf of other hosts. See \fBavahi.service(5)\f1 for more information.
+ 
+ The file format is similar to the one of \fI/etc/hosts\f1: on each line an IP address and the corresponding host name. The host names should be in FQDN form, i.e. with appended .local suffix.
+ .SH AUTHORS
+diff --git a/man/avahi.service.5 b/man/avahi.service.5
+index 2ef8333..1775add 100644
+--- a/man/avahi.service.5
++++ b/man/avahi.service.5
+@@ -2,10 +2,10 @@
+ .SH NAME
+ avahi.service \- avahi-daemon static service file
+ .SH SYNOPSIS
+-\fB/home/lennart/tmp/avahi/etc/avahi/services/*.service
++\fB/etc/avahi/services/*.service
+ \f1
+ .SH DESCRIPTION
+-\fI/home/lennart/tmp/avahi/etc/avahi/services/*.service\f1 are XML fragments containing static DNS-SD service data. Every service file can contain multiple service definitions which share the same name. This is useful for publishing service data for services which implement multiple protocols. (i.e. a printer implementing _ipp._tcp and _printer._tcp)
++\fI/etc/avahi/services/*.service\f1 are XML fragments containing static DNS-SD service data. Every service file can contain multiple service definitions which share the same name. This is useful for publishing service data for services which implement multiple protocols. (i.e. a printer implementing _ipp._tcp and _printer._tcp)
+ .SH XML TAGS
+ .TP
+ \fB<service-group>\f1 The document tag of avahi service files. Should contain one \fB<name>\f1 and one or more \fB<service>\f1 elements.
+-- 
+2.3.4
+

SOURCES/0006-Silently-ignore-invalid-DNS-packets.patch

@@ -0,0 +1,31 @@
+From a372e0bfb25f9f8f0d5878d317be7b614f5a4571 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 17 Dec 2015 17:12:07 +0100
+Subject: [PATCH] Silently ignore invalid DNS packets
+
+Resolves: #1290890
+---
+ avahi-core/server.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/avahi-core/server.c b/avahi-core/server.c
+index 86fd4a5..4acf5fc 100644
+--- a/avahi-core/server.c
++++ b/avahi-core/server.c
+@@ -972,11 +972,9 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
+             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;
+         }
+ 
+-- 
+2.5.0
+

SOURCES/0007-avahi-daemon-don-t-add-0pointer.de-and-zeroconf.org-.patch

@@ -0,0 +1,29 @@
+From 80bed702662a1cbad0f6b54345ab5b21734dc861 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Mon, 2 Apr 2012 21:17:19 +0200
+Subject: [PATCH] avahi-daemon: don't add 0pointer.de and zeroconf.org to
+ default browselist
+
+(cherry-picked from commit 938b5f883fbaa642e3acb7720e37f95f3d72be62)
+
+Resolves: #1340837
+---
+ avahi-daemon/avahi-daemon.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
+index c992842..1906590 100644
+--- a/avahi-daemon/avahi-daemon.conf
++++ b/avahi-daemon/avahi-daemon.conf
+@@ -21,7 +21,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
+-- 
+2.7.4
+

SOURCES/0008-avahi_server_set_browse_domains-check-the-provided-d.patch

@@ -0,0 +1,29 @@
+From d81e470bc3d7647d85d2456885ebc86a5e19bc1f Mon Sep 17 00:00:00 2001
+From: Trent Lloyd <trent@lloyd.id.au>
+Date: Tue, 31 Mar 2015 09:00:09 +0800
+Subject: [PATCH] avahi_server_set_browse_domains: check the provided domain
+ list, instead of the list from the configuration file
+
+(cherry-picked from commit 1616785d583939aa4c1b859fcf626759214769dd)
+
+Related: #1340837
+---
+ avahi-core/server.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avahi-core/server.c b/avahi-core/server.c
+index 4acf5fc..dd9da99 100644
+--- a/avahi-core/server.c
++++ b/avahi-core/server.c
+@@ -1792,7 +1792,7 @@ int avahi_server_set_browse_domains(AvahiServer *s, AvahiStringList *domains) {
+ 
+     assert(s);
+ 
+-    for (l = s->config.browse_domains; l; l = l->next)
++    for (l = domains; l; l = l->next)
+         if (!avahi_is_valid_domain_name((char*) l->text))
+             return avahi_server_set_errno(s, AVAHI_ERR_INVALID_DOMAIN_NAME);
+ 
+-- 
+2.7.4
+

SOURCES/0009-Fix-not-publishing-entries-if-a-probing-interface-is.patch

@@ -0,0 +1,44 @@
+From 8d7edcaf79ce5a439f40ca50c020a097cbe8d8eb Mon Sep 17 00:00:00 2001
+From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
+Date: Wed, 25 Nov 2015 16:31:39 +0100
+Subject: [PATCH] Fix not publishing entries if a probing interface is removed.
+
+If an interface is no longer relevant for mDNS while an announcer was
+probing on this interface, the announcer is removed but the n_probing
+counter of the entry group is not updated.   So n_probing would never
+reach zero and the entry group would stay  forever in the REGISTERING
+state.  If the entry group is for a host resource record,  the daemon
+could stay in the registering phase forever and would not publish any
+service.
+
+Fix that by decrementing group->n_probing when removing an announcer
+in the PROBING state. Also handle the case where the entry group was
+waiting for the deleted announcer to become registered.
+
+(cherry-picked from PR https://github.com/lathiat/avahi/pull/39)
+
+Resolves: #1222646
+---
+ avahi-core/announce.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/avahi-core/announce.c b/avahi-core/announce.c
+index ccdbf15..05053cf 100644
+--- a/avahi-core/announce.c
++++ b/avahi-core/announce.c
+@@ -44,6 +44,12 @@ static void remove_announcer(AvahiServer *s, AvahiAnnouncer *a) {
+     AVAHI_LLIST_REMOVE(AvahiAnnouncer, by_interface, a->interface->announcers, a);
+     AVAHI_LLIST_REMOVE(AvahiAnnouncer, by_entry, a->entry->announcers, a);
+ 
++    if (a->state == AVAHI_PROBING && a->entry->group) {
++	assert(a->entry->group->n_probing);
++	a->entry->group->n_probing--;
++	avahi_s_entry_group_check_probed(a->entry->group, 1);
++    }
++
+     avahi_free(a);
+ }
+ 
+-- 
+2.7.4
+

SOURCES/0010-avahi-ui-Replace-usage-of-deprecated-GTK-Stock-Items.patch

@@ -0,0 +1,66 @@
+From 6e109a641be45bc75b6d73f6a318bfdf294c2fbf Mon Sep 17 00:00:00 2001
+From: Trent Lloyd <trent@lloyd.id.au>
+Date: Thu, 16 Jan 2014 11:14:10 +0800
+Subject: [PATCH] avahi-ui: Replace usage of deprecated GTK Stock Items API
+
+Converted to recommended label text or icon name from
+https://docs.google.com/spreadsheet/pub?key=0AsPAM3pPwxagdGF4THNMMUpjUW5xMXZfdUNzMXhEa2c
+---
+ avahi-ui/avahi-ui.c | 6 +++---
+ avahi-ui/bssh.c     | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c
+index 92d765a..3845066 100644
+--- a/avahi-ui/avahi-ui.c
++++ b/avahi-ui/avahi-ui.c
+@@ -1032,8 +1032,8 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user
+     gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(p->domain_progress_bar), 0.1);
+     gtk_box_pack_end(GTK_BOX(vbox2), p->domain_progress_bar, FALSE, FALSE, 0);
+ 
+-    gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+-    p->domain_ok_button = GTK_WIDGET(gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT));
++    gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), _("_Cancel"), GTK_RESPONSE_CANCEL);
++    p->domain_ok_button = GTK_WIDGET(gtk_dialog_add_button(GTK_DIALOG(p->domain_dialog), _("_OK"), GTK_RESPONSE_ACCEPT));
+     gtk_dialog_set_default_response(GTK_DIALOG(p->domain_dialog), GTK_RESPONSE_ACCEPT);
+     gtk_widget_set_sensitive(p->domain_ok_button, is_valid_domain_suffix(gtk_entry_get_text(GTK_ENTRY(p->domain_entry))));
+ 
+@@ -1164,7 +1164,7 @@ static void aui_service_dialog_init(AuiServiceDialog *d) {
+     gtk_box_pack_end(GTK_BOX(vbox2), p->service_progress_bar, FALSE, FALSE, 0);
+ 
+     p->domain_button = gtk_button_new_with_mnemonic(_("_Domain..."));
+-    gtk_button_set_image(GTK_BUTTON(p->domain_button), gtk_image_new_from_stock(GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON));
++    gtk_button_set_image(GTK_BUTTON(p->domain_button), gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON));
+     g_signal_connect(p->domain_button, "clicked", G_CALLBACK(domain_button_clicked), d);
+     gtk_box_pack_start(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(d))), p->domain_button, FALSE, TRUE, 0);
+     gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(d))), p->domain_button, TRUE);
+diff --git a/avahi-ui/bssh.c b/avahi-ui/bssh.c
+index 491380f..ebe8b82 100644
+--- a/avahi-ui/bssh.c
++++ b/avahi-ui/bssh.c
+@@ -146,19 +146,19 @@ int main(int argc, char*argv[]) {
+             break;
+ 
+         case COMMAND_SHELL:
+-            d = aui_service_dialog_new(_("Choose Shell Server"), NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
++            d = aui_service_dialog_new(_("Choose Shell Server"), NULL, _("_Cancel"), GTK_RESPONSE_CANCEL, _("C_onnect"), GTK_RESPONSE_ACCEPT, NULL);
+             aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_rfb._tcp", "_ssh._tcp", NULL);
+             aui_service_dialog_set_service_type_name(AUI_SERVICE_DIALOG(d), "_rfb._tcp", _("Desktop"));
+             aui_service_dialog_set_service_type_name(AUI_SERVICE_DIALOG(d), "_ssh._tcp", _("Terminal"));
+             break;
+ 
+         case COMMAND_VNC:
+-            d = aui_service_dialog_new(_("Choose VNC server"), NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
++            d = aui_service_dialog_new(_("Choose VNC server"), NULL, _("_Cancel"), GTK_RESPONSE_CANCEL, _("C_onnect"), GTK_RESPONSE_ACCEPT, NULL);
+             aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_rfb._tcp", NULL);
+             break;
+ 
+         case COMMAND_SSH:
+-            d = aui_service_dialog_new(_("Choose SSH server"), NULL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
++            d = aui_service_dialog_new(_("Choose SSH server"), NULL, _("_Cancel"), GTK_RESPONSE_CANCEL, _("C_onnect"), GTK_RESPONSE_ACCEPT, NULL);
+             aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_ssh._tcp", NULL);
+             break;
+     }
+-- 
+2.7.4
+

SOURCES/0011-avahi-ui-replace-gtk_vbox_new-with-gtk_box_new-for-G.patch

@@ -0,0 +1,65 @@
+From d2e1b40ee0bb05a5e7f6b8b208bd2e93a50dd01f Mon Sep 17 00:00:00 2001
+From: Trent Lloyd <trent@lloyd.id.au>
+Date: Thu, 16 Jan 2014 12:05:51 +0800
+Subject: [PATCH] avahi-ui: replace gtk_vbox_new with gtk_box_new for GTK3 due
+ to deprecation
+
+---
+ avahi-ui/avahi-ui.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c
+index 3845066..ff33a89 100644
+--- a/avahi-ui/avahi-ui.c
++++ b/avahi-ui/avahi-ui.c
+@@ -991,7 +991,11 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user
+     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(GtkButton *button G_GNUC_UNUSED, gpointer user
+     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(AuiServiceDialog *d) {
+ 
+     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(AuiServiceDialog *d) {
+     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);
+-- 
+2.7.4
+

SOURCES/0012-avahi-ui-Cannot-use-g_object_unref-to-free-GdkCursor.patch

@@ -0,0 +1,30 @@
+From 3a88b01e459d38bbeed05d3ba8f4a1f07f34e0b8 Mon Sep 17 00:00:00 2001
+From: Trent Lloyd <trent@lloyd.id.au>
+Date: Thu, 16 Jan 2014 12:58:24 +0800
+Subject: [PATCH] avahi-ui: Cannot use g_object_unref to free GdkCursor in GTK2
+
+GdkCursor does not use GObject in GTK2
+---
+ avahi-ui/avahi-ui.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c
+index ff33a89..8f90b27 100644
+--- a/avahi-ui/avahi-ui.c
++++ b/avahi-ui/avahi-ui.c
+@@ -890,7 +890,11 @@ static void response_callback(GtkDialog *dialog, gint response, gpointer user_da
+         gtk_widget_set_sensitive(GTK_WIDGET(dialog), FALSE);
+         cursor = gdk_cursor_new(GDK_WATCH);
+         gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(dialog)), cursor);
+-        g_object_unref(G_OBJECT(cursor));
++#if GTK_CHECK_VERSION(3,0,0)
++        g_object_unref(cursor);
++#else
++        gdk_cursor_unref(cursor);
++#endif
+ 
+         if (!(d->priv->resolver = avahi_service_resolver_new(
+                       d->priv->client, interface, protocol, name, type, d->priv->domain,
+-- 
+2.7.4
+

SOURCES/0013-avahi-ui-Remove-deprecated-usage-of-gtk_widget_push_.patch

@@ -0,0 +1,41 @@
+From 305e5c6faab36e01f2ac7a26a9b1690a60e54275 Mon Sep 17 00:00:00 2001
+From: Trent Lloyd <trent@lloyd.id.au>
+Date: Thu, 16 Jan 2014 13:16:22 +0800
+Subject: [PATCH] avahi-ui: Remove deprecated usage of
+ gtk_widget_push_composite_child/gtk_widget_pop_composite_child
+
+The composite API is deprecated in GTK3, it doesn't really do anything other than
+hide the container objects from gtk_container_foreach which no one is really doing
+with avahi-ui that I can find anyway, so we remove it entirely rather than make it
+conditional.
+
+Ideally avahi-ui should be converted to GtkBuilder where there is a new composite API
+---
+ avahi-ui/avahi-ui.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c
+index 8f90b27..e3d38f5 100644
+--- a/avahi-ui/avahi-ui.c
++++ b/avahi-ui/avahi-ui.c
+@@ -1121,8 +1121,6 @@ static void aui_service_dialog_init(AuiServiceDialog *d) {
+     p->service_list_store = p->domain_list_store = NULL;
+     p->service_type_names = NULL;
+ 
+-    gtk_widget_push_composite_child();
+-
+     gtk_container_set_border_width(GTK_CONTAINER(d), 5);
+ 
+ #if GTK_CHECK_VERSION(3,0,0)
+@@ -1198,8 +1196,6 @@ static void aui_service_dialog_init(AuiServiceDialog *d) {
+ 
+     gtk_widget_show_all(vbox);
+ 
+-    gtk_widget_pop_composite_child();
+-
+     p->glib_poll = avahi_glib_poll_new(NULL, G_PRIORITY_DEFAULT);
+ 
+     p->service_pulse_timeout = g_timeout_add(100, service_pulse_callback, d);
+-- 
+2.7.4
+

SOURCES/avahi-0.6.30-mono-libdir.patch

@@ -0,0 +1,82 @@
+diff -uNr avahi-0.6.30.old/avahi-sharp/Makefile.am avahi-0.6.30/avahi-sharp/Makefile.am
+--- avahi-0.6.30.old/avahi-sharp/Makefile.am	2010-06-29 05:30:35.000000000 +0200
++++ avahi-0.6.30/avahi-sharp/Makefile.am	2011-11-27 17:03:04.933192204 +0100
+@@ -73,10 +73,10 @@
+ endif
+ 
+ install-data-hook: $(ASSEMBLY)
+-	$(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++	$(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+ 
+ uninstall-hook: $(ASSEMBLY)
+-	$(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++	$(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+ 
+ endif
+ endif
+diff -uNr avahi-0.6.30.old/avahi-sharp/Makefile.in avahi-0.6.30/avahi-sharp/Makefile.in
+--- avahi-0.6.30.old/avahi-sharp/Makefile.in	2011-04-04 00:10:46.000000000 +0200
++++ avahi-0.6.30/avahi-sharp/Makefile.in	2011-11-27 17:06:13.316193244 +0100
+@@ -615,10 +615,10 @@
+ @HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@	$(AM_V_GEN)$(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en
+ 
+ @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
+-@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@	$(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@	$(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+ 
+ @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY)
+-@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@	$(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@	$(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -uNr avahi-0.6.30.old/avahi-sharp.pc.in avahi-0.6.30/avahi-sharp.pc.in
+--- avahi-0.6.30.old/avahi-sharp.pc.in	2010-06-25 02:54:22.000000000 +0200
++++ avahi-0.6.30/avahi-sharp.pc.in	2011-11-27 17:00:05.482192846 +0100
+@@ -5,4 +5,4 @@
+ Name: avahi-sharp
+ Description: Mono bindings for the Avahi mDNS/DNS-SD stack
+ Version: @PACKAGE_VERSION@
+-Libs: -r:${libdir}/mono/avahi-sharp/avahi-sharp.dll
++Libs: -r:${prefix}/lib/mono/avahi-sharp/avahi-sharp.dll
+diff -uNr avahi-0.6.30.old/avahi-ui-sharp/Makefile.am avahi-0.6.30/avahi-ui-sharp/Makefile.am
+--- avahi-0.6.30.old/avahi-ui-sharp/Makefile.am	2010-06-29 05:30:35.000000000 +0200
++++ avahi-0.6.30/avahi-ui-sharp/Makefile.am	2011-11-27 17:04:59.812193067 +0100
+@@ -60,10 +60,10 @@
+ endif
+ 
+ install-data-hook: $(ASSEMBLY)
+-	$(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++	$(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+ 
+ uninstall-hook: $(ASSEMBLY)
+-	$(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++	$(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+ 
+ endif
+ endif
+diff -uNr avahi-0.6.30.old/avahi-ui-sharp/Makefile.in avahi-0.6.30/avahi-ui-sharp/Makefile.in
+--- avahi-0.6.30.old/avahi-ui-sharp/Makefile.in	2011-04-04 00:10:46.000000000 +0200
++++ avahi-0.6.30/avahi-ui-sharp/Makefile.in	2011-11-27 17:05:54.197220114 +0100
+@@ -604,10 +604,10 @@
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@	$(AM_V_GEN)$(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en
+ 
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@	$(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@	$(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+ 
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY)
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@	$(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@	$(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -uNr avahi-0.6.30.old/avahi-ui-sharp.pc.in avahi-0.6.30/avahi-ui-sharp.pc.in
+--- avahi-0.6.30.old/avahi-ui-sharp.pc.in	2010-06-25 02:54:22.000000000 +0200
++++ avahi-0.6.30/avahi-ui-sharp.pc.in	2011-11-27 17:04:05.077192737 +0100
+@@ -6,4 +6,4 @@
+ Description: Mono bindings for the Avahi mDNS/DNS-SD stack
+ Version: @PACKAGE_VERSION@
+ Requires: gtk-sharp-2.0
+-Libs: -r:${libdir}/mono/avahi-ui-sharp/avahi-ui-sharp.dll
++Libs: -r:${prefix}/lib/mono/avahi-ui-sharp/avahi-ui-sharp.dll

SOURCES/avahi-0.6.31-no-deprecations.patch

@@ -0,0 +1,22 @@
+--- avahi-0.6.31/avahi-ui/Makefile.am.orig	2013-09-21 16:47:28.677659361 +0200
++++ avahi-0.6.31/avahi-ui/Makefile.am	2013-09-21 16:47:34.852520537 +0200
+@@ -15,7 +15,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+ 
+-AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1
++AM_CFLAGS=-I$(top_srcdir)
+ 
+ # This cool debug trap works on i386/gcc only
+ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+--- avahi-0.6.31/configure.ac.orig	2013-09-21 16:46:43.750669413 +0200
++++ avahi-0.6.31/configure.ac	2013-09-21 16:47:02.566246400 +0200
+@@ -92,7 +92,7 @@
+     AC_MSG_CHECKING([whether stack-smashing protection is available])
+     ssp_old_cflags="$CFLAGS"
+     ssp_old_ldflags="$LDFLAGS"
+-    CFLAGS="$CFLAGS -Werror -fstack-protector-all -fPIC"
++    CFLAGS="$CFLAGS -fstack-protector-all -fPIC"
+     LDFLAGS="$LDFLAGS -Wl,-z,defs"
+     cat confdefs.h > conftest.c
+     cat >>conftest.c <<_ACEOF