From 932fb9a40d0ddd4d6000b83e040fd68c3f2efd5c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 02 2019 22:11:07 +0000 Subject: import avahi-0.6.31-19.el7 --- diff --git a/.avahi.metadata b/.avahi.metadata new file mode 100644 index 0000000..d206029 --- /dev/null +++ b/.avahi.metadata @@ -0,0 +1 @@ +7e05bd78572c9088b03b1207a0ad5aba38490684 SOURCES/avahi-0.6.31.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8781274 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/avahi-0.6.31.tar.gz diff --git a/SOURCES/0001-man-correct-short-option-to-print-version-string.patch b/SOURCES/0001-man-correct-short-option-to-print-version-string.patch new file mode 100644 index 0000000..3de04f4 --- /dev/null +++ b/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 +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 + diff --git a/SOURCES/0002-man-add-description-for-t-option.patch b/SOURCES/0002-man-add-description-for-t-option.patch new file mode 100644 index 0000000..675079c --- /dev/null +++ b/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 +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 + diff --git a/SOURCES/0003-dbus-don-t-crash-if-we-can-t-determine-alternative-s.patch b/SOURCES/0003-dbus-don-t-crash-if-we-can-t-determine-alternative-s.patch new file mode 100644 index 0000000..ca14613 --- /dev/null +++ b/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 +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 + diff --git a/SOURCES/0004-avahi-core-reserve-space-for-record-data-when-size-e.patch b/SOURCES/0004-avahi-core-reserve-space-for-record-data-when-size-e.patch new file mode 100644 index 0000000..0247518 --- /dev/null +++ b/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" +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 + diff --git a/SOURCES/0005-Remove-prefix-home-lennart-tmp-avahi-from-references.patch b/SOURCES/0005-Remove-prefix-home-lennart-tmp-avahi-from-references.patch new file mode 100644 index 0000000..f6ac97b --- /dev/null +++ b/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 +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\f1 The document tag of avahi service files. Should contain one \fB\f1 and one or more \fB\f1 elements. +-- +2.3.4 + diff --git a/SOURCES/0006-Silently-ignore-invalid-DNS-packets.patch b/SOURCES/0006-Silently-ignore-invalid-DNS-packets.patch new file mode 100644 index 0000000..af92991 --- /dev/null +++ b/SOURCES/0006-Silently-ignore-invalid-DNS-packets.patch @@ -0,0 +1,31 @@ +From a372e0bfb25f9f8f0d5878d317be7b614f5a4571 Mon Sep 17 00:00:00 2001 +From: 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 + diff --git a/SOURCES/0007-avahi-daemon-don-t-add-0pointer.de-and-zeroconf.org-.patch b/SOURCES/0007-avahi-daemon-don-t-add-0pointer.de-and-zeroconf.org-.patch new file mode 100644 index 0000000..ea6f878 --- /dev/null +++ b/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 +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 + diff --git a/SOURCES/0008-avahi_server_set_browse_domains-check-the-provided-d.patch b/SOURCES/0008-avahi_server_set_browse_domains-check-the-provided-d.patch new file mode 100644 index 0000000..b1d7477 --- /dev/null +++ b/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 +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 + diff --git a/SOURCES/0009-Fix-not-publishing-entries-if-a-probing-interface-is.patch b/SOURCES/0009-Fix-not-publishing-entries-if-a-probing-interface-is.patch new file mode 100644 index 0000000..f2549f5 --- /dev/null +++ b/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 +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 + diff --git a/SOURCES/0010-avahi-ui-Replace-usage-of-deprecated-GTK-Stock-Items.patch b/SOURCES/0010-avahi-ui-Replace-usage-of-deprecated-GTK-Stock-Items.patch new file mode 100644 index 0000000..9fb2307 --- /dev/null +++ b/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 +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 + diff --git a/SOURCES/0011-avahi-ui-replace-gtk_vbox_new-with-gtk_box_new-for-G.patch b/SOURCES/0011-avahi-ui-replace-gtk_vbox_new-with-gtk_box_new-for-G.patch new file mode 100644 index 0000000..442efbc --- /dev/null +++ b/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 +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 + diff --git a/SOURCES/0012-avahi-ui-Cannot-use-g_object_unref-to-free-GdkCursor.patch b/SOURCES/0012-avahi-ui-Cannot-use-g_object_unref-to-free-GdkCursor.patch new file mode 100644 index 0000000..764899b --- /dev/null +++ b/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 +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 + diff --git a/SOURCES/0013-avahi-ui-Remove-deprecated-usage-of-gtk_widget_push_.patch b/SOURCES/0013-avahi-ui-Remove-deprecated-usage-of-gtk_widget_push_.patch new file mode 100644 index 0000000..0cf03af --- /dev/null +++ b/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 +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 + diff --git a/SOURCES/avahi-0.6.30-mono-libdir.patch b/SOURCES/avahi-0.6.30-mono-libdir.patch new file mode 100644 index 0000000..a8d2b86 --- /dev/null +++ b/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 diff --git a/SOURCES/avahi-0.6.31-no-deprecations.patch b/SOURCES/avahi-0.6.31-no-deprecations.patch new file mode 100644 index 0000000..9ca9d38 --- /dev/null +++ b/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 diff --git a/SPECS/avahi.spec b/SPECS/avahi.spec new file mode 100644 index 0000000..97c4c5e --- /dev/null +++ b/SPECS/avahi.spec @@ -0,0 +1,1136 @@ +%global _hardened_build 1 + +%{?!WITH_MONO: %global WITH_MONO 1} +%{?!WITH_COMPAT_DNSSD: %global WITH_COMPAT_DNSSD 1} +%{?!WITH_COMPAT_HOWL: %global WITH_COMPAT_HOWL 1} +%ifarch sparc64 s390 +%define WITH_MONO 0 +%endif +%if 0%{?rhel} +%define WITH_MONO 0 +%endif + +Name: avahi +Version: 0.6.31 +Release: 19%{?dist} +Summary: Local network service discovery +License: LGPLv2+ +URL: http://avahi.org +Requires: dbus +Requires: expat +Requires: libdaemon >= 0.11 +Requires(post): initscripts +Requires(post): ldconfig +Requires(pre): shadow-utils +Requires(pre): coreutils +Requires(pre): /usr/bin/getent +Requires(pre): /usr/sbin/groupadd +Requires: %{name}-libs = %{version}-%{release} +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool +BuildRequires: dbus-devel >= 0.90 +BuildRequires: dbus-glib-devel >= 0.70 +BuildRequires: dbus-python +BuildRequires: libxml2-python +BuildRequires: gtk2-devel +BuildRequires: gtk3-devel >= 2.99.0 +#BuildRequires: gobject-introspection-devel +BuildRequires: qt3-devel +BuildRequires: qt4-devel +BuildRequires: libglade2-devel +BuildRequires: libdaemon-devel >= 0.11 +BuildRequires: glib2-devel +BuildRequires: libcap-devel +BuildRequires: expat-devel +BuildRequires: python +BuildRequires: gdbm-devel +BuildRequires: pygtk2 +BuildRequires: intltool +BuildRequires: perl-XML-Parser +%if %{WITH_MONO} +BuildRequires: mono-devel >= 1.1.13 +BuildRequires: monodoc-devel +%endif +BuildRequires: systemd +Requires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +Requires(post): systemd-sysv + +Source0: http://avahi.org/download/%{name}-%{version}.tar.gz +Patch0000: avahi-0.6.30-mono-libdir.patch +Patch0001: 0001-man-correct-short-option-to-print-version-string.patch +Patch0002: 0002-man-add-description-for-t-option.patch +Patch0003: 0003-dbus-don-t-crash-if-we-can-t-determine-alternative-s.patch +Patch0004: 0004-avahi-core-reserve-space-for-record-data-when-size-e.patch +Patch0005: 0005-Remove-prefix-home-lennart-tmp-avahi-from-references.patch +Patch0006: 0006-Silently-ignore-invalid-DNS-packets.patch +Patch0007: 0007-avahi-daemon-don-t-add-0pointer.de-and-zeroconf.org-.patch +Patch0008: 0008-avahi_server_set_browse_domains-check-the-provided-d.patch +Patch0009: 0009-Fix-not-publishing-entries-if-a-probing-interface-is.patch +Patch0010: 0010-avahi-ui-Replace-usage-of-deprecated-GTK-Stock-Items.patch +Patch0011: 0011-avahi-ui-replace-gtk_vbox_new-with-gtk_box_new-for-G.patch +Patch0012: 0012-avahi-ui-Cannot-use-g_object_unref-to-free-GdkCursor.patch +Patch0013: 0013-avahi-ui-Remove-deprecated-usage-of-gtk_widget_push_.patch + +# due to FTBFS caused by Gtk changes introduced in RHEL-7.2 +Patch1000: avahi-0.6.31-no-deprecations.patch + +%description +Avahi is a system which facilitates service discovery on +a local network -- this means that you can plug your laptop or +computer into a network and instantly be able to view other people who +you can chat with, find printers to print to or find files being +shared. This kind of technology is already found in MacOS X (branded +'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very +convenient. + +%package tools +Summary: Command line tools for mDNS browsing and publishing +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} + +%description tools +Command line tools that use avahi to browse and publish mDNS services. + +%package ui-tools +Summary: UI tools for mDNS browsing +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-glib = %{version}-%{release} +Requires: %{name}-ui-gtk3 = %{version}-%{release} +Requires: vnc +Requires: openssh-clients +Requires: pygtk2 +Requires: pygtk2-libglade +Requires: gdbm +Requires: python +Requires: dbus-python + +%description ui-tools +Graphical user interface tools that use Avahi to browse for mDNS services. + +%package glib +Summary: Glib libraries for avahi +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name} > %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} + +%description glib +Libraries for easy use of avahi from glib applications. + +%package glib-devel +Summary: Libraries and header files for avahi glib development +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-glib = %{version}-%{release} +Requires: glib2-devel + +%description glib-devel +The avahi-devel package contains the header files and libraries +necessary for developing programs using avahi with glib. + +%package gobject +Summary: GObject wrapper library for Avahi +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name} > %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-glib = %{version}-%{release} + +%description gobject +This library contains a GObject wrapper for the Avahi API + +%package gobject-devel +Summary: Libraries and header files for Avahi GObject development +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-glib = %{version}-%{release} +Requires: %{name}-glib-devel = %{version}-%{release} +Requires: %{name}-gobject = %{version}-%{release} + +%description gobject-devel +The avahi-gobject-devel package contains the header files and libraries +necessary for developing programs using avahi-gobject. + +%package ui +Summary: Gtk user interface library for Avahi (Gtk+ 2 version) +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name} > %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-glib = %{version}-%{release} +Requires: gtk2 + +%description ui +This library contains a Gtk 2.x widget for browsing services. + +%package ui-gtk3 +Summary: Gtk user interface library for Avahi (Gtk+ 3 version) +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name} > %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-glib = %{version}-%{release} +Requires: gtk3 + +%description ui-gtk3 +This library contains a Gtk 3.x widget for browsing services. + +%package ui-devel +Summary: Libraries and header files for Avahi UI development +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-glib = %{version}-%{release} +Requires: %{name}-glib-devel = %{version}-%{release} +Requires: %{name}-ui = %{version}-%{release} +Requires: %{name}-ui-gtk3 = %{version}-%{release} + +%description ui-devel +The avahi-ui-devel package contains the header files and libraries +necessary for developing programs using avahi-ui. + +%package qt3 +Summary: Qt3 libraries for avahi +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name} > %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} + +%description qt3 +Libraries for easy use of avahi from Qt3 applications. + +%package qt3-devel +Summary: Libraries and header files for avahi Qt3 development +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-qt3 = %{version}-%{release} +Requires: qt3-devel + +%description qt3-devel +The avahi-qt3-devel package contains the header files and libraries +necessary for developing programs using avahi with Qt3. + +%package qt4 +Summary: Qt4 libraries for avahi +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name} > %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} + +%description qt4 +Libraries for easy use of avahi from Qt4 applications. + +%package qt4-devel +Summary: Libraries and header files for avahi Qt4 development +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-qt4 = %{version}-%{release} +Requires: qt4-devel + +%description qt4-devel +Th avahi-qt4-devel package contains the header files and libraries +necessary for developing programs using avahi with Qt4. + +%if %{WITH_MONO} +%package sharp +Summary: Mono language bindings for avahi mono development +Requires: mono-core >= 1.1.13 +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name} > %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} + +%description sharp +The avahi-sharp package contains the files needed to develop +mono programs that use avahi. + +%package ui-sharp +Summary: Mono language bindings for avahi-ui +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name} > %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-ui = %{version}-%{release} +Requires: %{name}-sharp = %{version}-%{release} +Requires: mono-core >= 1.1.13 +Requires: gtk-sharp2 +BuildRequires: gtk-sharp2-devel + +%description ui-sharp +The avahi-sharp package contains the files needed to run +Mono programs that use avahi-ui. + +%package ui-sharp-devel +Summary: Mono language bindings for developing with avahi-ui +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-ui-sharp = %{version}-%{release} + +%description ui-sharp-devel +The avahi-sharp-ui-devel package contains the files needed to develop +Mono programs that use avahi-ui. +%endif + +%package libs +Summary: Libraries for avahi run-time use + +%description libs +The avahi-libs package contains the libraries needed +to run programs that use avahi. + +%package devel +Summary: Libraries and header files for avahi development +Requires: %{name}-libs = %{version}-%{release} +Requires: pkgconfig + +%description devel +The avahi-devel package contains the header files and libraries +necessary for developing programs using avahi. + +%if %{WITH_COMPAT_HOWL} +%package compat-howl +Summary: Libraries for howl compatibility +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name} > %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Obsoletes: howl-libs +Provides: howl-libs + +%description compat-howl +Libraries that are compatible with those provided by the howl package. + +%package compat-howl-devel +Summary: Header files for development with the howl compatibility libraries +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-compat-howl = %{version}-%{release} +Obsoletes: howl-devel +Provides: howl-devel + +%description compat-howl-devel +Header files for development with the howl compatibility libraries. +%endif + +%if %{WITH_COMPAT_DNSSD} +%package compat-libdns_sd +Summary: Libraries for Apple Bonjour mDNSResponder compatibility +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name} > %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} + +%description compat-libdns_sd +Libraries for Apple Bonjour mDNSResponder compatibility. + +%package compat-libdns_sd-devel +Summary: Header files for the Apple Bonjour mDNSResponder compatibility libraries +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-compat-libdns_sd = %{version}-%{release} + +%description compat-libdns_sd-devel +Header files for development with the Apple Bonjour mDNSResponder compatibility +libraries. +%endif + +%package autoipd +Summary: Link-local IPv4 address automatic configuration daemon (IPv4LL) +Requires(pre): shadow-utils +Conflicts: %{name} < %{version}-%{release} +Conflicts: %{name} > %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} + +%description autoipd +avahi-autoipd implements IPv4LL, "Dynamic Configuration of IPv4 +Link-Local Addresses" (IETF RFC3927), a protocol for automatic IP address +configuration from the link-local 169.254.0.0/16 range without the need for a +central server. It is primarily intended to be used in ad-hoc networks which +lack a DHCP server. + +%package dnsconfd +Summary: Configure local unicast DNS settings based on information published in mDNS +Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} + +%description dnsconfd +avahi-dnsconfd connects to a running avahi-daemon and runs the script +/etc/avahi/dnsconfd.action 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. + +%prep +%autosetup -S git + +%build +autoreconf -fi +%configure \ + --with-distro=fedora \ + --disable-monodoc \ + --with-avahi-user=avahi \ + --with-avahi-group=avahi \ + --with-avahi-priv-access-group=avahi \ + --with-autoipd-user=avahi-autoipd \ + --with-autoipd-group=avahi-autoipd \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --enable-introspection=no \ +%if %{WITH_COMPAT_DNSSD} + --enable-compat-libdns_sd \ +%endif +%if %{WITH_COMPAT_HOWL} + --enable-compat-howl \ +%endif +%if ! %{WITH_MONO} + --disable-mono \ +%endif +; +/usr/bin/make %{?_smp_mflags} + +%install +%make_install +/usr/bin/find %{buildroot} \( -name '*.a' -o -name '*.la' \) -exec rm {} \; + +# remove example +/usr/bin/rm -f %{buildroot}%{_sysconfdir}/avahi/services/ssh.service +/usr/bin/rm -f %{buildroot}%{_sysconfdir}/avahi/services/sftp-ssh.service + +# remove avahi-discover-standalone +rm -f $RPM_BUILD_ROOT%{_bindir}/avahi-discover-standalone + +# create /var/run/avahi-daemon to ensure correct selinux policy for it: +/usr/bin/mkdir -p %{buildroot}%{_localstatedir}/run/avahi-daemon +/usr/bin/mkdir -p %{buildroot}%{_localstatedir}/lib/avahi-autoipd + +# remove the documentation directory - let % doc handle it: +/usr/bin/rm -rf %{buildroot}%{_datadir}/%{name}-%{version} + +# Make /etc/avahi/etc/localtime owned by avahi: +/usr/bin/mkdir -p %{buildroot}/etc/avahi/etc +/usr/bin/touch %{buildroot}/etc/avahi/etc/localtime + +# fix bug 197414 - add missing symlinks for avahi-compat-howl and avahi-compat-dns-sd +%if %{WITH_COMPAT_HOWL} +/usr/bin/ln -s avahi-compat-howl.pc %{buildroot}/%{_libdir}/pkgconfig/howl.pc +%endif +%if %{WITH_COMPAT_DNSSD} +/usr/bin/ln -s avahi-compat-libdns_sd.pc %{buildroot}/%{_libdir}/pkgconfig/libdns_sd.pc +/usr/bin/ln -s avahi-compat-libdns_sd/dns_sd.h %{buildroot}/%{_includedir}/ +%endif + +/usr/bin/rm -f %{buildroot}%{_sysconfdir}/rc.d/init.d/avahi-daemon +/usr/bin/rm -f %{buildroot}%{_sysconfdir}/rc.d/init.d/avahi-dnsconfd + +%find_lang %{name} + +%pre +/usr/bin/getent group avahi >/dev/null 2>&1 || /usr/sbin/groupadd \ + -r \ + -g 70 \ + avahi >/dev/null 2>&1 || : +/usr/bin/getent passwd avahi >/dev/null 2>&1 || /usr/sbin/useradd \ + -r -l \ + -u 70 \ + -g avahi \ + -d %{_localstatedir}/run/avahi-daemon \ + -s /sbin/nologin \ + -c "Avahi mDNS/DNS-SD Stack" \ + avahi >/dev/null 2>&1 || : + +%post +/sbin/ldconfig >/dev/null 2>&1 || : +/usr/bin/dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig >/dev/null 2>&1 || : +if [ "$1" -eq 1 -a -s /etc/localtime ]; then + /usr/bin/cp -cfp /etc/localtime /etc/avahi/etc/localtime >/dev/null 2>&1 || : +fi +%systemd_post avahi-daemon.socket avahi-daemon.service + +%preun +%systemd_preun avahi-daemon.socket avahi-daemon.service + +%postun +/sbin/ldconfig >/dev/null 2>&1 || : +%systemd_postun_with_restart avahi-daemon.socket avahi-daemon.service + +%triggerun -- avahi < 0.6.28-1 +/usr/bin/systemd-sysv-convert --save avahi-daemon >/dev/null 2>&1 || : +/usr/bin/systemctl --no-reload enable avahi-daemon.service >/dev/null 2>&1 || : +/usr/bin/systemctl try-restart avahi-daemon.service >/dev/null 2>&1 || : + +%pre autoipd +/usr/bin/getent group avahi-autoipd >/dev/null 2>&1 || /usr/sbin/groupadd \ + -r \ + -g 170 \ + avahi-autoipd >/dev/null 2>&1 || : +/usr/bin/getent passwd avahi-autoipd >/dev/null 2>&1 || /usr/sbin/useradd \ + -r -l \ + -u 170 \ + -g avahi-autoipd \ + -d %{_localstatedir}/lib/avahi-autoipd \ + -s /sbin/nologin \ + -c "Avahi IPv4LL Stack" \ + avahi-autoipd >/dev/null 2>&1 || : +:; + +%post dnsconfd +%systemd_post avahi-dnsconfd.service + +%preun dnsconfd +%systemd_preun avahi-dnsconfd.service + +%postun dnsconfd +%systemd_postun_with_restart avahi-dnsconfd.service + +%triggerun dnsconfd -- avahi-dnsconfd < 0.6.28-1 +/usr/bin/systemd-sysv-convert --save avahi-dnsconfd >/dev/null 2>&1 || : +/usr/bin/systemctl --no-reload enable avahi-dnsconfd.service >/dev/null 2>&1 || : +/usr/bin/systemctl try-restart avahi-dnsconfd.service >/dev/null 2>&1 || : + +%post glib -p /sbin/ldconfig +%postun glib -p /sbin/ldconfig + +%post compat-howl -p /sbin/ldconfig +%postun compat-howl -p /sbin/ldconfig + +%post compat-libdns_sd -p /sbin/ldconfig +%postun compat-libdns_sd -p /sbin/ldconfig + +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + +%post qt3 -p /sbin/ldconfig +%postun qt3 -p /sbin/ldconfig + +%post qt4 -p /sbin/ldconfig +%postun qt4 -p /sbin/ldconfig + +%post ui -p /sbin/ldconfig +%postun ui -p /sbin/ldconfig + +%post ui-gtk3 -p /sbin/ldconfig +%postun ui-gtk3 -p /sbin/ldconfig + +%post gobject -p /sbin/ldconfig +%postun gobject -p /sbin/ldconfig + +%files -f %{name}.lang +%doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service avahi-daemon/ssh.service +%dir %{_sysconfdir}/avahi +%dir %{_sysconfdir}/avahi/etc +%ghost %{_sysconfdir}/avahi/etc/localtime +%config(noreplace) %{_sysconfdir}/avahi/hosts +%dir %{_sysconfdir}/avahi/services +%ghost %dir %{_localstatedir}/run/avahi-daemon +%config(noreplace) %{_sysconfdir}/avahi/avahi-daemon.conf +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf +%{_sbindir}/avahi-daemon +%dir %{_datadir}/avahi +%{_datadir}/avahi/*.dtd +%{_datadir}/avahi/service-types +%dir %{_libdir}/avahi +%{_libdir}/avahi/service-types.db +%{_datadir}/dbus-1/interfaces/*.xml +%{_mandir}/man5/* +%{_mandir}/man8/avahi-daemon.* +%{_unitdir}/avahi-daemon.service +%{_unitdir}/avahi-daemon.socket +%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service +%{_libdir}/libavahi-core.so.* + +%files autoipd +%{_sbindir}/avahi-autoipd +%config(noreplace) %{_sysconfdir}/avahi/avahi-autoipd.action +%attr(1770,avahi-autoipd,avahi-autoipd) %dir %{_localstatedir}/lib/avahi-autoipd/ +%{_mandir}/man8/avahi-autoipd.* + +%files dnsconfd +%config(noreplace) %{_sysconfdir}/avahi/avahi-dnsconfd.action +%{_sbindir}/avahi-dnsconfd +%{_mandir}/man8/avahi-dnsconfd.* +%{_unitdir}/avahi-dnsconfd.service + +%files tools +%{_bindir}/* +%{_mandir}/man1/* +%exclude %{_bindir}/b* +%exclude %{_bindir}/avahi-discover* +%exclude %{_bindir}/avahi-bookmarks +%exclude %{_mandir}/man1/b* +%exclude %{_mandir}/man1/avahi-discover* +%exclude %{_mandir}/man1/avahi-bookmarks* + +%files ui-tools +%{_bindir}/b* +%{_bindir}/avahi-discover +# avahi-bookmarks is not really a UI tool, but I won't create a seperate package for it... +%{_bindir}/avahi-bookmarks +%{_mandir}/man1/b* +%{_mandir}/man1/avahi-discover* +%{_mandir}/man1/avahi-bookmarks* +%{_datadir}/applications/b*.desktop +%{_datadir}/applications/avahi-discover.desktop +# These are .py files only, so they don't go in lib64 +%{_prefix}/lib/python?.?/site-packages/* +%{_datadir}/avahi/interfaces/ + +%files devel +%{_libdir}/libavahi-common.so +%{_libdir}/libavahi-core.so +%{_libdir}/libavahi-client.so +%{_includedir}/avahi-client +%{_includedir}/avahi-common +%{_includedir}/avahi-core +%{_libdir}/pkgconfig/avahi-core.pc +%{_libdir}/pkgconfig/avahi-client.pc + +%files libs +%{_libdir}/libavahi-common.so.* +%{_libdir}/libavahi-client.so.* + +%files glib +%{_libdir}/libavahi-glib.so.* + +%files glib-devel +%{_libdir}/libavahi-glib.so +%{_includedir}/avahi-glib +%{_libdir}/pkgconfig/avahi-glib.pc + +%files gobject +%{_libdir}/libavahi-gobject.so.* +#%{_libdir}/girepository-1.0/Avahi-0.6.typelib +#%{_libdir}/girepository-1.0/AvahiCore-0.6.typelib + +%files gobject-devel +%{_libdir}/libavahi-gobject.so +%{_includedir}/avahi-gobject +%{_libdir}/pkgconfig/avahi-gobject.pc +#%{_datadir}/gir-1.0/Avahi-0.6.gir +#%{_datadir}/gir-1.0/AvahiCore-0.6.gir + +%files ui +%{_libdir}/libavahi-ui.so.* + +%files ui-gtk3 +%{_libdir}/libavahi-ui-gtk3.so.* + +%files ui-devel +%{_libdir}/libavahi-ui.so +%{_libdir}/libavahi-ui-gtk3.so +%{_includedir}/avahi-ui +%{_libdir}/pkgconfig/avahi-ui.pc +%{_libdir}/pkgconfig/avahi-ui-gtk3.pc + +%files qt3 +%{_libdir}/libavahi-qt3.so.* + +%files qt3-devel +%{_libdir}/libavahi-qt3.so +%{_includedir}/avahi-qt3/ +%{_libdir}/pkgconfig/avahi-qt3.pc + +%files qt4 +%{_libdir}/libavahi-qt4.so.* + +%files qt4-devel +%{_libdir}/libavahi-qt4.so +%{_includedir}/avahi-qt4/ +%{_libdir}/pkgconfig/avahi-qt4.pc + +%if %{WITH_MONO} +%files sharp +%{_prefix}/lib/mono/avahi-sharp +%{_prefix}/lib/mono/gac/avahi-sharp +%{_libdir}/pkgconfig/avahi-sharp.pc + +%files ui-sharp +%{_prefix}/lib/mono/avahi-ui-sharp +%{_prefix}/lib/mono/gac/avahi-ui-sharp + +%files ui-sharp-devel +%{_libdir}/pkgconfig/avahi-ui-sharp.pc +%endif + +%if %{WITH_COMPAT_HOWL} +%files compat-howl +%{_libdir}/libhowl.so.* + +%files compat-howl-devel +%{_libdir}/libhowl.so +%{_includedir}/avahi-compat-howl +%{_libdir}/pkgconfig/avahi-compat-howl.pc +%{_libdir}/pkgconfig/howl.pc +%endif + +%if %{WITH_COMPAT_DNSSD} +%files compat-libdns_sd +%{_libdir}/libdns_sd.so.* + +%files compat-libdns_sd-devel +%{_libdir}/libdns_sd.so +%{_includedir}/avahi-compat-libdns_sd +%{_includedir}/dns_sd.h +%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc +%{_libdir}/pkgconfig/libdns_sd.pc +%endif + +%changelog +* Thu Nov 09 2017 Michal Sekletar - 0.6.31-19 +- exclude avahi-discover from avahi-tools package (#1421229) + +* Tue Nov 07 2017 Michal Sekletar - 0.6.31-18 +- create home directory for avahi-autoipd user (#1416287) +- get rid of the dangling symlink to avahi-discover in debuginfo package (#1421229) + +* Mon Jul 04 2016 Michal Sekletar - 0.6.31-17 +- fix crash due to use of deprecated Gtk3 API (#1263720) +- don't add 0pointer.de and zeroconf.org to default browse list (#1340837) +- fix not publishing entries if a probing interface is removed (#1222646) + +* Thu Dec 17 2015 Michal Sekletar - 0.6.31-16 +- silently ignore non-valid DNS response packets (#1290890) + +* Tue Apr 21 2015 Michal Sekletar - 0.6.31-15 +- enable hardened build (#1092506) +- fix short option for --version, document -t option of avahi-autoipd (#948583) +- fix crashes in D-Bus methods GetAlternativeHostName and GetAlternativeServiceName (#1003688) +- fix bug when avahi-daemon ended up in a tight loop (#1081801) +- remove prefix /home/lennart/tmp/avahi from references in man pages (#1120233) + +* Mon Dec 8 2014 Michal Sekletar - 0.6.31-14 +- remove dependency on the main package from avahi-libs (#1170681) + +* Fri Jan 24 2014 Daniel Mach - 0.6.31-13 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 0.6.31-12 +- Mass rebuild 2013-12-27 + +* Sat Feb 02 2013 Kalev Lember - 0.6.31-11 +- Correct a typo in inter-subpackage deps + +* Fri Feb 1 2013 Matthias Clasen - 0.6.31-10 +- Tighten inter-subpackage deps + +* Fri Jan 18 2013 Adam Tkac - 0.6.31-9 +- rebuild due to "jpeg8-ABI" feature drop + +* Fri Dec 21 2012 Adam Tkac - 0.6.31-8 +- fix path to ldconfig + +* Fri Dec 21 2012 Adam Tkac - 0.6.31-7 +- rebuild against new libjpeg + +* Tue Aug 7 2012 Lennart Poettering - 0.6.31-6 +- Use new systemd macros +- Other modernizations + +* Mon Aug 6 2012 Stef Walter - 0.6.31-5 +- Don't ship ssh service by default file since openssh-server isn't + running by default, and shouldn't be advertised without user + confirmation. + +* Wed Jul 18 2012 Fedora Release Engineering - 0.6.31-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon May 21 2012 Peter Robinson - 0.6.31-3 +- Merge F-17 into master +- ARM has mono + +* Tue Feb 14 2012 Lennart Poettering - 0.6.31-2 +- Fix tarball + +* Tue Feb 14 2012 Lennart Poettering - 0.6.31-1 +- New upstream release + +* Thu Jan 12 2012 Fedora Release Engineering - 0.6.30-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 29 2011 Christian Krause - 0.6.30-6 +- Change paths for mono assemblies according to updated packaging + guidelines (http://fedoraproject.org/wiki/Packaging:Mono) + +* Mon Nov 14 2011 Adam Jackson 0.6.30-5 +- Rebuild to break bogus libpng dep + +* Mon Aug 22 2011 Lennart Poettering - 0.6.30-4 +- Remove sysv init script (#714649) + +* Thu May 5 2011 Bill Nottingham - 0.6.30-3 +- fix versioning on triggers + +* Tue May 3 2011 Lennart Poettering - 0.6.30-2 +- Enable Avahi by default +- https://bugzilla.redhat.com/show_bug.cgi?id=647831 + +* Mon Apr 4 2011 Lennart Poettering - 0.6.30-1 +- New upstream release + +* Wed Mar 9 2011 Lennart Poettering - 0.6.29-1 +- New upstream release +- Fixes CVE-2011-1002 among other things + +* Thu Feb 10 2011 Matthias Clasen - 0.6.28-9 +- Rebuild against new gtk + +* Mon Feb 07 2011 Fedora Release Engineering - 0.6.28-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Feb 2 2011 Matthias Clasen - 0.6.28-7 +- Rebuild against new gtk + +* Fri Jan 7 2011 Matthias Clasen - 0.6.28-6 +- Rebuild against new gtk + +* Fri Dec 3 2010 Matthias Clasen - 0.6.28-5 +- Rebuild against new gtk + +* Wed Nov 24 2010 Dan Horák - 0.6.28-4 +- Updated the archs without mono + +* Tue Nov 2 2010 Matthias Clasen - 0.6.28-3 +- Rebuild against newer gtk3 + +* Wed Oct 27 2010 paul - 0.6.28-2 +- rebuilt + +* Tue Oct 5 2010 Lennart Poettering - 0.6.28-1 +- New upstream release + +* Wed Aug 4 2010 Lennart Poettering - 0.6.27-3 +- convert from systemd-install to systemctl enable + +* Wed Jul 21 2010 David Malcolm - 0.6.27-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Tue Jul 13 2010 Lennart Poettering 0.6.27-1 +- New upstream release + +* Tue Jun 29 2010 Lennart Poettering 0.6.26-4 +- On request of Colin Walters, disable introspection again for now. + +* Tue Jun 29 2010 Lennart Poettering 0.6.26-3 +- Fix systemd unit installation + +* Tue Jun 29 2010 Lennart Poettering 0.6.26-2 +- Add missing dependencies + +* Tue Jun 29 2010 Lennart Poettering 0.6.26-1 +- New upstream release + +* Mon Apr 19 2010 Bastien Nocera 0.6.25-7 +- Split avahi libraries in -libs + +* Mon Jan 25 2010 Lennart Poettering - 0.6.25-6 +- Move avahi-discover from avahi-tools to avahi-ui-tools +- https://bugzilla.redhat.com/show_bug.cgi?id=513768 + +* Fri Jul 24 2009 Fedora Release Engineering - 0.6.25-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jun 17 2009 Karsten Hopp 0.6.25-4 +- Build *-sharp & *-ui-sharp for s390x + +* Thu Jun 11 2009 Matthias Clasen - 0.6.25-4 +- Use %%find_lang + +* Tue May 26 2009 Michael Schwendt - 0.6.25-3 +- Create avahi-ui-sharp-devel package for pkgconfig dep-chain (#477308). + +* Mon May 25 2009 Xavier Lamien - 0.6.25-2 +- Build arch ppc64 for *-sharp & *-ui-sharp. + +* Mon Apr 13 2009 Lennart Poettering - 0.6.25-1 +- New upstream release + +* Mon Feb 23 2009 Fedora Release Engineering - 0.6.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Dec 12 2008 Lennart Poettering - 0.6.24-1 +- New upstream release + +* Wed Dec 3 2008 Ignacio Vazquez-Abrams - 0.6.22-13 +- Fix libtool errors + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.6.22-12 +- Rebuild for Python 2.6 + +* Wed Jun 04 2008 Rex Dieter - 0.6.22-11 +- qt4 bindings (#446904) +- devel: BR: pkgconfig +- nuke rpaths + +* Thu Mar 27 2008 Lennart Poettering - 0.6.22-10 +- Add release part to package dependencies (Closed #311601) + +* Mon Mar 10 2008 Christopher Aillon - 0.6.22-9 +- The qt3 subpackage should (Build)Require: qt3 + +* Mon Mar 03 2008 Kevin Kofler - 0.6.22-8 +- updated (completed) German translation by Fabian Affolter (#427090) + +* Thu Feb 21 2008 Adam Tkac - 0.6.22-7 +- really rebuild against new libcap + +* Sun Feb 17 2008 Adam Tkac - 0.6.22-6 +- rebuild against new libcap + +* Sat Feb 09 2008 Dennis Gilmore - 0.6.22-5 +- sparc64 does not have mono + +* Tue Dec 18 2007 Lubomir Kundrak - 0.6.22-4 +- Make bvnc call vncviewer instead of xvncviewer +- Let ui-tools depend on necessary packages + +* Mon Dec 17 2007 Lennart Poettering - 0.6.22-3 +- Add missing intltool dependency + +* Mon Dec 17 2007 Lennart Poettering - 0.6.22-2 +- Fix mistag + +* Mon Dec 17 2007 Lennart Poettering - 0.6.22-1 +- resolves #274731, #425491: New upstream version + +* Tue Sep 25 2007 Lennart Poettering - 0.6.21-6 +- resolves #279301: fix segfault when no domains are configured in resolv.conf (pulled from upstream SVN r1525) + +* Thu Sep 6 2007 Lennart Poettering - 0.6.21-5 +- resolves #249044: Update init script to use runlevel 96 +- resolves #251700: Fix assertion in libdns_sd-compat + +* Thu Sep 6 2007 Lennart Poettering - 0.6.21-4 +- Ship ssh static service file by default, don't ship ssh-sftp by default +- resolves: #269741: split off avahi-ui-tools package +- resolves: #253734: add missing dependency on avahi-glib-devel to avahi-ui-devel + +* Tue Aug 28 2007 Martin Bacovsky - 0.6.21-3 +- resolves: #246875: Initscript Review + +* Sun Aug 12 2007 Lennart Poettering - 0.6.21-2 +- Fix avahi-browse --help output + +* Sun Aug 12 2007 Lennart Poettering - 0.6.21-1 +- New upstream release + +* Thu Aug 9 2007 Lennart Poettering - 0.6.20-7 +- Fix tagging borkage + +* Thu Aug 9 2007 Lennart Poettering - 0.6.20-6 +- fix avahi-autoipd corrupt packet bug +- drop dependency on python for the main package + +* Wed Jul 11 2007 Lennart Poettering - 0.6.20-5 +- add two patches which are important to get RR updating work properly. + Will be part of upstream 0.6.21 + +* Thu Jul 5 2007 Dan Williams - 0.6.20-4 +- Add Requires(pre): shadow-utils for avahi-autoipd package + +* Mon Jun 25 2007 Bill Nottingham - 0.6.20-3 +- fix %%endif typo + +* Mon Jun 25 2007 Lennart Poettering - 0.6.20-2 +- add gtk-sharp2-devel to build deps + +* Fri Jun 22 2007 Lennart Poettering - 0.6.20-1 +- upgrade to new upstream 0.6.20 +- fix a few rpmlint warnings +- create avahi-autoipd user +- no longer create avahi user with a static uid, move to dynamic uids +- drop a couple of patches merged upstream +- Provide "howl" and "howl-devel" +- Split off avahi-autoipd and avahi-dnsconfd +- Introduce avahi-ui packages for the first time +- Reload D-Bus config after installation using dbus-send +- add a couple of missing ldconfig invocations + +* Mon Mar 12 2007 Martin Bacovsky - 0.6.17-1 +- upgrade to new upstream 0.6.17 +- redundant patches removal +- removed auto* stuff from specfile since that was no longer needed +- Resolves: #232205: 'service {avahi-dnsconfd,avahi-daemon} status' + returns 0 when the service is stopped + +* Fri Feb 2 2007 Christopher Aillon - 0.6.16-3 +- Remove bogus mono-libdir patches + +* Tue Jan 23 2007 Jeremy Katz - 0.6.16-2 +- nuke bogus avahi-sharp -> avahi-devel dep + +* Mon Jan 22 2007 Martin Bacovsky - 0.6.16-1.fc7 +- Resolves: #221763: CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon +- upgrade to new upstream +- patch revision +- Resolves: #218140: avahi configuration file wants a non-existent group + +* Wed Dec 6 2006 Jeremy Katz - 0.6.15-4 +- rebuild against python 2.5 + +* Mon Nov 27 2006 Martin Bacovsky - 0.6.15-3 +- automake-1.10 required for building + +* Mon Nov 27 2006 Martin Bacovsky - 0.6.15-2 +- automake-1.9 required for building + +* Thu Nov 24 2006 Martin Bacovsky - 0.6.15-1 +- Upgrade to 0.6.15 +- patches revision + +* Mon Sep 18 2006 Martin Stransky - 0.6.11-6 +- added patch from #206445 - ia64: unaligned access errors seen + during startup of avahi-daemon +- removed unused patches + +* Thu Sep 7 2006 Dan Walsh - 0.6.11-5 +- Maintain the security context on the localtime file + +* Wed Aug 23 2006 Martin Stransky - 0.6.11-4 +- fix for #204710 - /etc/init.d/avahi-dnsconfd missing line + continuation slash (\) in description + +* Wed Aug 23 2006 Martin Stransky - 0.6.11-3 +- added fix for #200767 - avahi-dnsconfd Segmentation fault + with invalid command line argument +- added dist tag + +* Tue Jul 18 2006 John (J5) Palmieri - 0.6.11-2.fc6 +- add BR for dbus-glib-devel +- fix deprecated functions + +* Mon Jul 17 2006 Jason Vas Dias - 0.6.11-1.fc6 +- Upgrade to upstream version 0.6.11 +- fix bug 195674: set 'use-ipv6=yes' in avahi-daemon.conf +- fix bug 197414: avahi-compat-howl and avahi-compat-dns-sd symlinks +- fix bug 198282: avahi-compat-{howl-devel,dns-sd-devel} Requires: + +* Wed Jul 12 2006 Jesse Keating +- rebuild + +* Tue Jun 13 2006 Jason Vas Dias - 0.6.10-3.FC6 +- rebuild for broken mono deps + +* Tue Jun 06 2006 Jason Vas Dias - 0.6.10-2.FC6 +- fix bug 194203: fix permissions on /var/run/avahi-daemon + +* Tue May 30 2006 Jason Vas Dias - 0.6.10-1.FC6 +- Upgrade to upstream version 0.6.10 +- fix bug 192080: split avahi-compat-libdns_sd into separate package + (same goes for avahi-compat-howl) + +* Tue May 02 2006 Jason Vas Dias - 0.6.9-9.FC6 +- fix avahi-sharp issues for banshee - patches from caillon@redhat.com + +* Thu Apr 20 2006 Jason Vas Dias - 0.6.9-9.FC6 +- fix bug 189427: correct avahi-resolve --help typo + +* Mon Mar 20 2006 Jason Vas Dias - 0.6.9-8.FC6 +- fix bug 185972: remove ellipses in initscript +- fix bug 185965: make chkconfigs unconditional + +* Thu Mar 16 2006 Jason Vas Dias - 0.6.9-6 +- Fix bug 185692: install avahi-sharp into %{_prefix}/lib, not %{_libdir} + +* Thu Mar 09 2006 Jason Vas Dias - 0.6.9-4 +- fix scriptlet error introduced by last fix: + if user has disabled avahi-daemon, do not enable it during post + +* Wed Mar 08 2006 Bill Nottingham - 0.6.9-2 +- fix scriplet error during installer +- move service-types* to the tools package (avoids multilib conflicts) + +* Tue Mar 07 2006 Jason Vas Dias - 0.6.9-1 +- Upgrade to upstream version 0.6.9 + +* Thu Feb 23 2006 Jason Vas Dias - 0.6.8-1 +- Upgrade to upstream version 0.6.8 +- fix bug 182462: +Requires(post): initscripts, chkconfig, ldconfig + +* Fri Feb 17 2006 Jason Vas Dias - 0.6.7-1 +- Upgrade to upstream version 0.6.7 + +* Fri Feb 17 2006 Karsten Hopp - 0.6.6-4 +- BuildRequires pygtk2 + +* Fri Feb 10 2006 Jesse Keating - 0.6.6-3.1 +- bump again for double-long bug on ppc(64) + +* Fri Feb 10 2006 Jason Vas Dias - 0.6.6-3 +- rebuild for new gcc (again) +- further fix for bug 178746: fix avahi-dnsconfd initscript + +* Tue Feb 07 2006 Jason Vas Dias - 0.6.6-2 +- rebuild for new gcc, glibc, glibc-kernheaders + +* Wed Feb 01 2006 Jason Vas Dias - 0.6.6-1 +- fix bug 179448: mis-alignment of input cmsghdr msg->msg_control buffer on ia64 +- Upgrade to 0.6.6 + +* Thu Jan 26 2006 Jason Vas Dias - 0.6.5-1 +- Upgrade to upstream version 0.6.5 +- Make /etc/avahi/etc and /etc/avahi/etc/localtime owned by avahi + package; copy system localtime into chroot in post + +* Mon Jan 23 2006 Jason Vas Dias - 0.6.4-4 +- fix bug 178689: copy localtime to chroot +- fix bug 178784: fix avahi-dnsconfd initscript + +* Fri Jan 20 2006 Peter Jones - 0.6.4-3 +- fix subsystem locking in the initscript + +* Thu Jan 19 2006 Jason Vas Dias - 0.6.4-2 +- fix bug 178127: fully localize the initscript + +* Mon Jan 16 2006 Jason Vas Dias - 0.6.4-1 +- Upgrade to upstream version 0.6.4 + +* Thu Jan 12 2006 Jason Vas Dias - 0.6.3-2 +- fix bug 177610: Enable mono support with new avahi-sharp package +- fix bug 177609: add gdbm / gdbm-devel Requires for avahi-browse + +* Mon Jan 09 2006 Jason Vas Dias - 0.6.3-1 +- Upgrade to upstream version 0.6.3 +- fix bug 177148: initscript start should not fail if avahi-daemon running + +* Thu Dec 22 2005 Jason Vas Dias - 0.6.1-3 +- move initscripts from /etc/init.d to /etc/rc.d/init.d + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Dec 09 2005 Jason Vas Dias - 0.6.1-2 +- fix bug 175352: Do not chkconfig --add avahi-daemon + if user has already configured it + +* Wed Dec 07 2005 Jason Vas Dias - 0.6.1-1 +- Upgrade to 0.6.1 + +* Mon Dec 05 2005 Jason Vas Dias - 0.6-6 +- fix bug 174799 - fix .spec file files permissions + +* Fri Dec 02 2005 Jason Vas Dias - 0.6-5 +- python-twisted has been removed from the FC-5 distribution - disable its use + +* Thu Dec 01 2005 Jason Vas Dias - 0.6-4 +- Rebuild for dbus-0.6 - remove use of DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT + +* Wed Nov 30 2005 Jason Vas Dias - 0.6-3 +- fix bug 172047 - tools should require python-twisted +- fix bug 173985 - docs directory permissions + +* Mon Nov 21 2005 Jason Vas Dias - 0.6-1 +- Upgrade to upstream version 0.6 - now provides 'avahi-howl-compat' + libraries / includes. + +* Mon Nov 14 2005 Jason Vas Dias - 0.5.2-7 +- fix bug 172034: fix ownership of /var/run/avahi-daemon/ +- fix bug 172772: .spec file improvements from matthias@rpmforge.net + +* Mon Oct 31 2005 Jason Vas Dias - 0.5.2-6 +- put back avahi-devel Obsoletes: howl-devel + +* Mon Oct 31 2005 Alexander Larsson - 0.5.2-5 +- Obsoletes howl, howl-libs, as we want to get rid of them on updates +- No provides yet, as the howl compat library is in Avahi 0.6.0. + +* Sun Oct 30 2005 Florian La Roche +- disable the Obsoletes: howl until the transition is complete + +* Fri Oct 28 2005 Jason Vas Dias - 0.5.2-3 +- change initscript to start avahi-daemon AFTER messagebus + +* Wed Oct 26 2005 Karsten Hopp 0.5.2-2 +- add buildrequires dbus-python + +* Fri Oct 21 2005 Alexander Larsson - 0.5.2-1 +- Initial package