| 1 |
swegener 07/09/09 20:37:34 |
| 2 |
|
| 3 |
Added: avahi-0.6.21-service_name_chosen.patch |
| 4 |
avahi-start-after-netmount.patch |
| 5 |
Log: |
| 6 |
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. |
| 7 |
(Portage version: 2.1.3.9) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/files/avahi-0.6.21-service_name_chosen.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: avahi-0.6.21-service_name_chosen.patch |
| 16 |
=================================================================== |
| 17 |
Index: trunk/avahi-compat-libdns_sd/compat.c |
| 18 |
=================================================================== |
| 19 |
--- trunk/avahi-compat-libdns_sd/compat.c (revision 1535) |
| 20 |
+++ trunk/avahi-compat-libdns_sd/compat.c (revision 1536) |
| 21 |
@@ -990,6 +990,16 @@ |
| 22 |
return; |
| 23 |
} |
| 24 |
} |
| 25 |
+ |
| 26 |
+ if (!sdref->service_name_chosen) { |
| 27 |
+ |
| 28 |
+ assert(sdref->service_name); |
| 29 |
+ |
| 30 |
+ if (!(sdref->service_name_chosen = avahi_strdup(sdref->service_name))) { |
| 31 |
+ reg_report_error(sdref, kDNSServiceErr_NoMemory); |
| 32 |
+ return; |
| 33 |
+ } |
| 34 |
+ } |
| 35 |
|
| 36 |
/* Register the service */ |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 net-dns/avahi/files/avahi-start-after-netmount.patch |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/files/avahi-start-after-netmount.patch?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dns/avahi/files/avahi-start-after-netmount.patch?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: avahi-start-after-netmount.patch |
| 47 |
=================================================================== |
| 48 |
Index: trunk/initscript/gentoo/avahi-dnsconfd.in |
| 49 |
=================================================================== |
| 50 |
--- trunk/initscript/gentoo/avahi-dnsconfd.in (revision 1538) |
| 51 |
+++ trunk/initscript/gentoo/avahi-dnsconfd.in (working copy) |
| 52 |
@@ -3,7 +3,7 @@ |
| 53 |
# Copyright 1999-2005 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
|
| 56 |
-opts="${opts} reload" |
| 57 |
+opts="reload" |
| 58 |
|
| 59 |
depend() { |
| 60 |
need avahi-daemon |
| 61 |
Index: trunk/initscript/gentoo/avahi-daemon.in |
| 62 |
=================================================================== |
| 63 |
--- trunk/initscript/gentoo/avahi-daemon.in (revision 1538) |
| 64 |
+++ trunk/initscript/gentoo/avahi-daemon.in (working copy) |
| 65 |
@@ -1,11 +1,12 @@ |
| 66 |
#!/sbin/runscript |
| 67 |
# $Id: avahi-start-after-netmount.patch,v 1.1 2007/09/09 20:37:33 swegener Exp $ |
| 68 |
# Copyright 1999-2005 Gentoo Foundation |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
-opts="${opts} reload" |
| 72 |
+opts="reload" |
| 73 |
|
| 74 |
depend() { |
| 75 |
+ before netmount |
| 76 |
use net |
| 77 |
need dbus |
| 78 |
} |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
-- |
| 83 |
gentoo-commits@g.o mailing list |
Archives