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)

6 files changed, 79 insertions, 7 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index fd0a8c1b0d81..064f7b8d789d 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.125 2007/09/09 13:46:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.126 2007/09/09 20:37:32 swegener Exp $
+
+  09 Sep 2007; Sven Wegener <swegener@gentoo.org>
+  +files/avahi-0.6.21-service_name_chosen.patch,
+  +files/avahi-start-after-netmount.patch, avahi-0.6.19-r2.ebuild,
+  avahi-0.6.20-r2.ebuild, avahi-0.6.21.ebuild:
+  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.
 
   09 Sep 2007; Sven Wegener <swegener@gentoo.org>
   -files/avahi-0.6.16-svn-1353.patch, -files/avahi-0.6.16-svn-1361.patch,
diff --git a/net-dns/avahi/avahi-0.6.19-r2.ebuild b/net-dns/avahi/avahi-0.6.19-r2.ebuild
index b6ced5dbe556..01f3e85093fd 100644
--- a/net-dns/avahi/avahi-0.6.19-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild,v 1.2 2007/08/25 14:32:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.19-r2.ebuild,v 1.3 2007/09/09 20:37:32 swegener Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -103,6 +103,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-ui-sharp-gtk.patch
 	epatch "${FILESDIR}"/${P}-assert-security.patch
 	epatch "${FILESDIR}"/${PN}-0.6.20-autoipd.patch
+	epatch "${FILESDIR}"/avahi-start-after-netmount.patch
 
 	eautomake
 }
diff --git a/net-dns/avahi/avahi-0.6.20-r2.ebuild b/net-dns/avahi/avahi-0.6.20-r2.ebuild
index cf5ccc7f1464..8a40d9351162 100644
--- a/net-dns/avahi/avahi-0.6.20-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.20-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v 1.1 2007/08/08 20:28:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.20-r2.ebuild,v 1.2 2007/09/09 20:37:32 swegener Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -103,6 +103,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-make-known-answers-not-conflict.patch
 	epatch "${FILESDIR}"/${P}-cleanup-dns-compression-table.patch
 	epatch "${FILESDIR}"/${P}-autoipd.patch
+	epatch "${FILESDIR}"/avahi-start-after-netmount.patch
 
 	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
 
diff --git a/net-dns/avahi/avahi-0.6.21.ebuild b/net-dns/avahi/avahi-0.6.21.ebuild
index 9d4266b62931..b295b46c6e17 100644
--- a/net-dns/avahi/avahi-0.6.21.ebuild
+++ b/net-dns/avahi/avahi-0.6.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v 1.4 2007/08/22 03:00:48 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v 1.5 2007/09/09 20:37:32 swegener Exp $
 
 inherit eutils mono python qt3 qt4
 
@@ -99,6 +99,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
 	epatch "${FILESDIR}"/${P}-dbus-compat.patch
 	epatch "${FILESDIR}"/${P}-browse-help.patch
+	epatch "${FILESDIR}"/${P}-service_name_chosen.patch
+	epatch "${FILESDIR}"/avahi-start-after-netmount.patch
 
 	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
 }
@@ -146,7 +148,7 @@ src_compile() {
 }
 
 src_install() {
-	make install py_compile=true DESTDIR="${D}" || die "make install failed"
+	emake install py_compile=true DESTDIR="${D}" || die "make install failed"
 	use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks
 
 	use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc
@@ -162,11 +164,11 @@ src_install() {
 }
 
 pkg_postrm() {
-	use python && python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
+	use python && python_mod_cleanup
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
+	use python && python_mod_optimize "${ROOT}"/usr/lib*/python*/site-packages/avahi
 
 	if use autoipd
 	then
@@ -175,4 +177,12 @@ pkg_postinst() {
 		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
 		elog
 	fi
+
+	if use dbus
+	then
+		elog
+		elog "If this is your first install of avahi please reload your dbus config"
+		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
+		elog
+	fi
 }
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
+ }