[packages/avahi] - up to 0.6.32; glade patch dropped (old and never merged upstream; why it wasn't needed in first pl
arekm
arekm at pld-linux.org
Fri May 27 02:03:34 CEST 2016
commit c84146bce9ec1bddcedfafaea856dcd068f7f548
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri May 27 02:03:22 2016 +0200
- up to 0.6.32; glade patch dropped (old and never merged upstream; why it wasn't needed in first place?); rest of patches merged
01_avahi-daemon.conf.patch | 16 ---
...-space-for-record-data-when-size-estimate.patch | 91 ----------------
avahi-glade.patch | 117 ---------------------
avahi-gtk3.patch | 95 -----------------
avahi.spec | 20 ++--
nss-mdns-package.patch | 61 ++++-------
6 files changed, 28 insertions(+), 372 deletions(-)
---
diff --git a/avahi.spec b/avahi.spec
index 93df260..2475810 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -32,25 +32,22 @@
Summary: Free mDNS/DNS-SD/Zeroconf implementation
Summary(pl.UTF-8): Wolna implementacja mDNS/DNS-SD/Zeroconf
Name: avahi
-Version: 0.6.31
-Release: 11
+Version: 0.6.32
+Release: 1
License: LGPL v2.1+
Group: Applications
-Source0: http://avahi.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: 2f22745b8f7368ad5a0a3fddac343f2d
+Source0: https://github.com/lathiat/avahi/archive/v%{version}.tar.gz
+# Source0-md5: 0c408c4baa330e751d8731038ca43db0
Source1: %{name}-daemon
Source2: %{name}-dnsconfd
Source3: %{name}.png
Patch0: %{name}-desktop.patch
-Patch1: %{name}-glade.patch
+
Patch2: %{name}-destdir.patch
Patch3: %{name}-mono-dir.patch
Patch4: nss-mdns-package.patch
Patch5: %{name}-dhclient_hooks.patch
Patch6: %{name}-autoipd-sbin_ip.patch
-Patch7: 01_%{name}-daemon.conf.patch
-Patch8: %{name}-core-reserve-space-for-record-data-when-size-estimate.patch
-Patch9: %{name}-gtk3.patch
URL: http://avahi.org/
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
@@ -94,6 +91,7 @@ BuildRequires: qt4-build
%endif
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.626
+BuildRequires: xmltoman
Requires(post,preun): /sbin/chkconfig
Requires(post,preun,postun): systemd-units >= 38
Requires: %{name}-libs = %{version}-%{release}
@@ -633,15 +631,12 @@ Narzędzia linii poleceń korzystające z avahi-client.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
%build
%{__intltoolize}
@@ -1058,7 +1053,6 @@ fi
%files discover-standalone
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/avahi-discover-standalone
-%{_datadir}/%{name}/interfaces/avahi-discover-standalone.glade
%endif
%files utils
diff --git a/01_avahi-daemon.conf.patch b/01_avahi-daemon.conf.patch
deleted file mode 100644
index d8cf45e..0000000
--- a/01_avahi-daemon.conf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: b/avahi-daemon/avahi-daemon.conf
-===================================================================
---- a/avahi-daemon/avahi-daemon.conf 2010-06-29 02:19:57.000000000 +0200
-+++ b/avahi-daemon/avahi-daemon.conf 2010-07-07 20:03:01.987655481 +0200
-@@ -21,9 +21,9 @@
- [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
-+use-ipv6=yes
- #allow-interfaces=eth0
- #deny-interfaces=eth1
- #check-response-ttl=no
diff --git a/avahi-core-reserve-space-for-record-data-when-size-estimate.patch b/avahi-core-reserve-space-for-record-data-when-size-estimate.patch
deleted file mode 100644
index 5145b8c..0000000
--- a/avahi-core-reserve-space-for-record-data-when-size-estimate.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- a/avahi-core/dns.c
-+++ b/avahi-core/dns.c
-@@ -55,6 +55,7 @@
-
- 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 @@
- 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;
---- 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_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
---- a/avahi-core/probe-sched.c
-+++ b/avahi-core/probe-sched.c
-@@ -179,7 +179,7 @@
- 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 @@
- 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 @@
- 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;
- }
diff --git a/avahi-glade.patch b/avahi-glade.patch
deleted file mode 100644
index 02b2aae..0000000
--- a/avahi-glade.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- avahi-0.6.26/avahi-discover-standalone/Makefile.am~ 2010-06-25 05:25:11.000000000 +0200
-+++ avahi-0.6.26/avahi-discover-standalone/Makefile.am 2010-07-07 11:03:44.306813189 +0200
-@@ -18,7 +18,8 @@
- AM_CFLAGS=-I$(top_srcdir)
-
- interfaces = \
-- avahi-discover.ui
-+ avahi-discover.ui \
-+ avahi-discover-standalone.glade
-
- # This cool debug trap works on i386/gcc only
- AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
-diff -aurN avahi-0.6.5.orig/avahi-discover-standalone/avahi-discover-standalone.glade avahi-0.6.5/avahi-discover-standalone/avahi-discover-standalone.glade
---- avahi-0.6.5.orig/avahi-discover-standalone/avahi-discover-standalone.glade 1970-01-01 01:00:00.000000000 +0100
-+++ avahi-0.6.5/avahi-discover-standalone/avahi-discover-standalone.glade 2005-09-25 22:34:48.000000000 +0200
-@@ -0,0 +1,91 @@
-+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-+
-+<glade-interface>
-+
-+<widget class="GtkWindow" id="main_window">
-+ <property name="visible">True</property>
-+ <property name="title" translatable="yes">Avahi Discovery</property>
-+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
-+ <property name="window_position">GTK_WIN_POS_NONE</property>
-+ <property name="modal">False</property>
-+ <property name="default_width">500</property>
-+ <property name="default_height">400</property>
-+ <property name="resizable">True</property>
-+ <property name="destroy_with_parent">False</property>
-+ <property name="decorated">True</property>
-+ <property name="skip_taskbar_hint">False</property>
-+ <property name="skip_pager_hint">False</property>
-+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-+ <property name="focus_on_map">True</property>
-+ <signal handler="gtk_main_quit" name="destroy" after="False"/>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox1">
-+ <property name="border_width">12</property>
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">12</property>
-+
-+ <child>
-+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-+ <property name="shadow_type">GTK_SHADOW_IN</property>
-+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-+
-+ <child>
-+ <widget class="GtkTreeView" id="tree_view">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="headers_visible">True</property>
-+ <property name="rules_hint">False</property>
-+ <property name="reorderable">False</property>
-+ <property name="enable_search">True</property>
-+ <property name="fixed_height_mode">False</property>
-+ <property name="hover_selection">False</property>
-+ <property name="hover_expand">False</property>
-+ <signal name="cursor_changed" handler="on_tree_view_cursor_changed" last_modification_time="Sat, 30 Jul 2005 21:39:13 GMT"/>
-+ </widget>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkLabel" id="info_label">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label" translatable="yes"><i>No service currently selected.</i></property>
-+ <property name="use_underline">False</property>
-+ <property name="use_markup">True</property>
-+ <property name="justify">GTK_JUSTIFY_LEFT</property>
-+ <property name="wrap">False</property>
-+ <property name="selectable">True</property>
-+ <property name="xalign">0</property>
-+ <property name="yalign">0.5</property>
-+ <property name="xpad">0</property>
-+ <property name="ypad">0</property>
-+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+ <property name="width_chars">-1</property>
-+ <property name="single_line_mode">False</property>
-+ <property name="angle">0</property>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ </child>
-+</widget>
-+
-+</glade-interface>
---- avahi-0.6.26/avahi-discover-standalone/main.c~ 2010-06-25 02:41:25.000000000 +0200
-+++ avahi-0.6.26/avahi-discover-standalone/main.c 2010-07-07 11:06:22.006805326 +0200
-@@ -330,7 +330,7 @@
- poll_api = avahi_glib_poll_new(NULL, G_PRIORITY_DEFAULT);
-
- ui = gtk_builder_new();
-- gtk_builder_add_from_file(ui, AVAHI_INTERFACES_DIR"avahi-discover.ui", NULL);
-+ gtk_builder_add_from_file(ui, AVAHI_INTERFACES_DIR"avahi-discover-standalone.glade", NULL);
- main_window = GTK_WIDGET(gtk_builder_get_object(ui, "main_window"));
- g_signal_connect(main_window, "delete-event", (GCallback) main_window_on_delete_event, NULL);
diff --git a/avahi-gtk3.patch b/avahi-gtk3.patch
deleted file mode 100644
index ede84d2..0000000
--- a/avahi-gtk3.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- avahi-0.6.31/avahi-ui/avahi-ui.c.orig 2011-02-18 19:04:10.251546734 +0100
-+++ avahi-0.6.31/avahi-ui/avahi-ui.c 2013-11-22 23:15:26.702181607 +0100
-@@ -991,7 +991,11 @@
- 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 @@
- 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);
-@@ -1032,8 +1040,8 @@
- 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))));
-
-@@ -1113,7 +1121,11 @@
-
- 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 @@
- 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);
-@@ -1164,7 +1180,7 @@
- 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);
---- avahi-0.6.31/avahi-ui/bssh.c.orig 2010-08-26 02:51:39.023153001 +0200
-+++ avahi-0.6.31/avahi-ui/bssh.c 2013-11-22 23:17:41.635509278 +0100
-@@ -146,19 +146,19 @@
- 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, gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON), 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, gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON), 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, gtk_image_new_from_icon_name("network-workgroup", GTK_ICON_SIZE_BUTTON), GTK_RESPONSE_ACCEPT, NULL);
- aui_service_dialog_set_browse_service_types(AUI_SERVICE_DIALOG(d), "_ssh._tcp", NULL);
- break;
- }
diff --git a/nss-mdns-package.patch b/nss-mdns-package.patch
index 9a975b1..0c2587b 100644
--- a/nss-mdns-package.patch
+++ b/nss-mdns-package.patch
@@ -1,7 +1,8 @@
---- avahi-0.6.25/avahi-daemon/main.c~ 2008-12-12 23:36:15.000000000 +0200
-+++ avahi-0.6.25/avahi-daemon/main.c 2010-02-28 00:58:01.846880027 +0200
-@@ -986,7 +986,7 @@
- assert(c);
+diff -urN avahi-0.6.32.org/avahi-daemon/main.c avahi-0.6.32/avahi-daemon/main.c
+--- avahi-0.6.32.org/avahi-daemon/main.c 2016-02-16 03:13:45.000000000 +0100
++++ avahi-0.6.32/avahi-daemon/main.c 2016-05-27 01:47:37.741433179 +0200
+@@ -1141,7 +1141,7 @@
+ ignore_signal(SIGPIPE);
if (!(nss_support = avahi_nss_support()))
- avahi_log_warn("WARNING: No NSS support for mDNS detected, consider installing nss-mdns!");
@@ -9,31 +10,10 @@
if (!(simple_poll_api = avahi_simple_poll_new())) {
avahi_log_error("Failed to create main loop object.");
---- avahi-0.6.25/man/avahi-daemon.8.xml.in~ 2008-06-18 02:13:44.000000000 +0300
-+++ avahi-0.6.25/man/avahi-daemon.8.xml.in 2010-02-28 00:58:25.183544394 +0200
-@@ -40,7 +40,7 @@
- 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
-+ 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.</p>
---- avahi-0.6.25/man/avahi-daemon.8~ 2009-04-14 04:57:47.000000000 +0300
-+++ avahi-0.6.25/man/avahi-daemon.8 2010-02-28 00:58:37.027084926 +0200
-@@ -11,7 +11,7 @@
- avahi-daemon --check\fB
- \f1
- .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.
-+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/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
---- avahi-0.6.25/man/avahi-bookmarks.1.xml.in~ 2008-06-18 02:13:44.000000000 +0300
-+++ avahi-0.6.25/man/avahi-bookmarks.1.xml.in 2010-02-28 00:58:45.089793513 +0200
-@@ -55,7 +55,7 @@
+diff -urN avahi-0.6.32.org/man/avahi-bookmarks.1.xml.in avahi-0.6.32/man/avahi-bookmarks.1.xml.in
+--- avahi-0.6.32.org/man/avahi-bookmarks.1.xml.in 2016-02-16 03:13:45.000000000 +0100
++++ avahi-0.6.32/man/avahi-bookmarks.1.xml.in 2016-05-27 01:47:37.738099757 +0200
+@@ -53,7 +53,7 @@
<optdesc><p>Create links pointing to mDNS host names instead
of resolved IP addreses. This is only compatible with your
browser if you run some kind of local NSS module to resolve
@@ -42,14 +22,15 @@
avahi-bookmarks detects whether NSS support is available
locally. This option conflicts with -A.</p></optdesc>
</option>
---- avahi-0.6.25/man/avahi-bookmarks.1~ 2009-04-14 04:57:48.000000000 +0300
-+++ avahi-0.6.25/man/avahi-bookmarks.1 2010-02-28 00:58:54.383125793 +0200
-@@ -15,7 +15,7 @@
- Specify an IP address to listen on. If omitted defaults to 127.0.0.1. Specify 0.0.0.0 if you want to allow remote access.
- .TP
- \fB-H | --host-names\f1
--Create links pointing to mDNS host names instead of resolved IP addreses. This is only compatible with your browser if you run some kind of local NSS module to resolve mDNS host names (e.g. nss-mdns). If both -A and -H are ommited avahi-bookmarks detects whether NSS support is available locally. This option conflicts with -A.
-+Create links pointing to mDNS host names instead of resolved IP addreses. This is only compatible with your browser if you run some kind of local NSS module to resolve mDNS host names (e.g. nss_mdns). If both -A and -H are ommited avahi-bookmarks detects whether NSS support is available locally. This option conflicts with -A.
- .TP
- \fB-A | --addresses\f1
- Create links pointing to numeric IP addresses instead of mDNS host names. This will break access to hosts running virtual servers. If both -A and -H are ommited avahi-bookmarks detects whether NSS support is available locally. This option conflicts with -H.
+diff -urN avahi-0.6.32.org/man/avahi-daemon.8.xml.in avahi-0.6.32/man/avahi-daemon.8.xml.in
+--- avahi-0.6.32.org/man/avahi-daemon.8.xml.in 2016-02-16 03:13:45.000000000 +0100
++++ avahi-0.6.32/man/avahi-daemon.8.xml.in 2016-05-27 01:47:37.738099757 +0200
+@@ -38,7 +38,7 @@
+ 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
++ 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.</p>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/avahi.git/commitdiff/c84146bce9ec1bddcedfafaea856dcd068f7f548
More information about the pld-cvs-commit
mailing list