summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2007-09-09 20:37:33 +0000
committerSven Wegener <swegener@gentoo.org>2007-09-09 20:37:33 +0000
commit81ae98082e60c812055f0d6c1b587da12fd684e0 (patch)
tree7bb81bb23c2b94bc268709ca3f9a780d4ae07378 /net-dns/avahi/files
parentDon't vacuum the postgres database in purge sql script because it will be vac... (diff)
downloadgentoo-2-81ae98082e60c812055f0d6c1b587da12fd684e0.tar.gz
gentoo-2-81ae98082e60c812055f0d6c1b587da12fd684e0.tar.bz2
gentoo-2-81ae98082e60c812055f0d6c1b587da12fd684e0.zip
Start avahi-daemon before netmount, bug #188719. Print a message that the dbus configuration needs to be reloaded before starting avahi-daemon for the first time, bug #191307.
(Portage version: 2.1.3.9)
Diffstat (limited to 'net-dns/avahi/files')
-rw-r--r--net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch21
-rw-r--r--net-dns/avahi/files/avahi-start-after-netmount.patch31
2 files changed, 52 insertions, 0 deletions
diff --git a/net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch b/net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch
new file mode 100644
index 000000000000..84b8b1dae1e0
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch
@@ -0,0 +1,21 @@
+Index: trunk/avahi-compat-libdns_sd/compat.c
+===================================================================
+--- trunk/avahi-compat-libdns_sd/compat.c (revision 1535)
++++ trunk/avahi-compat-libdns_sd/compat.c (revision 1536)
+@@ -990,6 +990,16 @@
+ return;
+ }
+ }
++
++ if (!sdref->service_name_chosen) {
++
++ assert(sdref->service_name);
++
++ if (!(sdref->service_name_chosen = avahi_strdup(sdref->service_name))) {
++ reg_report_error(sdref, kDNSServiceErr_NoMemory);
++ return;
++ }
++ }
+
+ /* Register the service */
+
diff --git a/net-dns/avahi/files/avahi-start-after-netmount.patch b/net-dns/avahi/files/avahi-start-after-netmount.patch
new file mode 100644
index 000000000000..74de8e64756f
--- /dev/null
+++ b/net-dns/avahi/files/avahi-start-after-netmount.patch
@@ -0,0 +1,31 @@
+Index: trunk/initscript/gentoo/avahi-dnsconfd.in
+===================================================================
+--- trunk/initscript/gentoo/avahi-dnsconfd.in (revision 1538)
++++ trunk/initscript/gentoo/avahi-dnsconfd.in (working copy)
+@@ -3,7 +3,7 @@
+ # Copyright 1999-2005 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+
+-opts="${opts} reload"
++opts="reload"
+
+ depend() {
+ need avahi-daemon
+Index: trunk/initscript/gentoo/avahi-daemon.in
+===================================================================
+--- trunk/initscript/gentoo/avahi-daemon.in (revision 1538)
++++ trunk/initscript/gentoo/avahi-daemon.in (working copy)
+@@ -1,11 +1,12 @@
+ #!/sbin/runscript
+ # $Id: avahi-start-after-netmount.patch,v 1.1 2007/09/09 20:37:33 swegener Exp $
+ # Copyright 1999-2005 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+
+-opts="${opts} reload"
++opts="reload"
+
+ depend() {
++ before netmount
+ use net
+ need dbus
+ }