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.

Package-Manager: portage-2.1.3.9

7 files changed, 106 insertions, 26 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/Manifest b/net-dns/avahi/Manifest
index 0c2f0e634ece..9236b9e04c62 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -45,25 +45,33 @@ AUX avahi-0.6.21-dbus-compat.patch 762 RMD160 d11f99a0e8dff26bfc1a16399401f68d16
 MD5 c5d1fc486c87375b6f4428259fad8372 files/avahi-0.6.21-dbus-compat.patch 762
 RMD160 d11f99a0e8dff26bfc1a16399401f68d161c634d files/avahi-0.6.21-dbus-compat.patch 762
 SHA256 7d9525d8b6d9b2e357be10ef0d6c291e9895a24ea4249f27cee9a619971a5068 files/avahi-0.6.21-dbus-compat.patch 762
+AUX avahi-0.6.21-service_name_chosen.patch 709 RMD160 bad502a0fa0ee86277b8d822622d79df2f232adf SHA1 79c00d322cfdbc81ceefb39b6e09ccaee50c3d24 SHA256 2399844bac43a7a020da7e075457b0b76fcaaef035e6d6282ae98167ff5c797c
+MD5 a3314891844a6af2bc92a25b04c53580 files/avahi-0.6.21-service_name_chosen.patch 709
+RMD160 bad502a0fa0ee86277b8d822622d79df2f232adf files/avahi-0.6.21-service_name_chosen.patch 709
+SHA256 2399844bac43a7a020da7e075457b0b76fcaaef035e6d6282ae98167ff5c797c files/avahi-0.6.21-service_name_chosen.patch 709
+AUX avahi-start-after-netmount.patch 998 RMD160 865a837ad85f6569405ab8d69bd08aebafbb9342 SHA1 a5b084504f70ceaf99bcfd75ddad846bda294166 SHA256 03ec271640c86405297cdd2292bcb3745fac517ed050e777a3dfc4188f06b5fb
+MD5 3d9147891d07cf4418d27fff7edab1b7 files/avahi-start-after-netmount.patch 998
+RMD160 865a837ad85f6569405ab8d69bd08aebafbb9342 files/avahi-start-after-netmount.patch 998
+SHA256 03ec271640c86405297cdd2292bcb3745fac517ed050e777a3dfc4188f06b5fb files/avahi-start-after-netmount.patch 998
 DIST avahi-0.6.19.tar.gz 973381 RMD160 15ae4baaa55f0020422552994a8d1ef33935b065 SHA1 367322064a5dd66a0e69c75df9407ab3518aebdc SHA256 a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a
 DIST avahi-0.6.20.tar.gz 974209 RMD160 da413b25675184d1514953bfd308d544ca5f0556 SHA1 451a095440fba9bec2effa0730bb4ec29593d1b1 SHA256 89ae5fd08018679b80cee201e1c1350d86db73bdcf6718aabb4bd3ea86f93ec9
 DIST avahi-0.6.21.tar.gz 976841 RMD160 0f33afed44112a57c5353bf373a307c9c551abdb SHA1 3675f83b294b87a5cfa947d2f68518f0da8ed7b9 SHA256 d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561
-EBUILD avahi-0.6.19-r2.ebuild 4500 RMD160 f42b614d2c722e1633525465277fb8f65e58bf23 SHA1 741f5ab650b1bbc0a7c9c7773d234add633056b4 SHA256 04d0469dbaf3570f4ae96a0744df6d17c5de47e3f5eb2625880a7d89393771e6
-MD5 bb05599b7ffa6eb6b6dd848263e54252 avahi-0.6.19-r2.ebuild 4500
-RMD160 f42b614d2c722e1633525465277fb8f65e58bf23 avahi-0.6.19-r2.ebuild 4500
-SHA256 04d0469dbaf3570f4ae96a0744df6d17c5de47e3f5eb2625880a7d89393771e6 avahi-0.6.19-r2.ebuild 4500
-EBUILD avahi-0.6.20-r2.ebuild 4613 RMD160 ea3dc6653c636420f9768f2283296bbec89a8ab9 SHA1 b0158e5e6dd84460cbfcce0cfd6b260c4359d063 SHA256 e260241b0379113a8fa86d46fc817701d1ee7709a4915050441f1386ac8908a9
-MD5 e469c409fede1f996f3b7c057c952434 avahi-0.6.20-r2.ebuild 4613
-RMD160 ea3dc6653c636420f9768f2283296bbec89a8ab9 avahi-0.6.20-r2.ebuild 4613
-SHA256 e260241b0379113a8fa86d46fc817701d1ee7709a4915050441f1386ac8908a9 avahi-0.6.20-r2.ebuild 4613
-EBUILD avahi-0.6.21.ebuild 4450 RMD160 f04a0290c2ca7e2471e3990e0e6e043c228e0912 SHA1 1019e8a6fca6970e172b23f7a45524b165cc679a SHA256 84b7fc8c1908cc4f3a59b3b6a18da10af5f7ff9e556d0d11228bfe7ac57e5371
-MD5 5f2aef94c81543f7ec72712a3a68d16f avahi-0.6.21.ebuild 4450
-RMD160 f04a0290c2ca7e2471e3990e0e6e043c228e0912 avahi-0.6.21.ebuild 4450
-SHA256 84b7fc8c1908cc4f3a59b3b6a18da10af5f7ff9e556d0d11228bfe7ac57e5371 avahi-0.6.21.ebuild 4450
-MISC ChangeLog 17911 RMD160 29cde2ad7254a9c04871d5376b365a70456efc5d SHA1 804b32feaa78df2be1dc4417b6e557390bd0a80a SHA256 203c00d129cf7ac1741d0f0e23b39f66dcbe8282961ca285b7020fca6856f247
-MD5 bfec239110210ce97b3ebd65271704f8 ChangeLog 17911
-RMD160 29cde2ad7254a9c04871d5376b365a70456efc5d ChangeLog 17911
-SHA256 203c00d129cf7ac1741d0f0e23b39f66dcbe8282961ca285b7020fca6856f247 ChangeLog 17911
+EBUILD avahi-0.6.19-r2.ebuild 4557 RMD160 65d9902244b69e5056a8c98f3f4076ba54e0aa76 SHA1 490b3d86a693df3f34601267acc75ee61982f377 SHA256 f779f219258999024e738c08f4083236efbc4e90037b305f5615a18c63323780
+MD5 8ef8564c03301ec20446a7683990146a avahi-0.6.19-r2.ebuild 4557
+RMD160 65d9902244b69e5056a8c98f3f4076ba54e0aa76 avahi-0.6.19-r2.ebuild 4557
+SHA256 f779f219258999024e738c08f4083236efbc4e90037b305f5615a18c63323780 avahi-0.6.19-r2.ebuild 4557
+EBUILD avahi-0.6.20-r2.ebuild 4668 RMD160 441ef0fa4dff73d289c5e193c7b9022b8e192efa SHA1 697e7d6f8809fe13a2783a8390e8b5473a4a7dbd SHA256 bbe0db4d59bc524fd6f2acbf72fb326773b5c1eaf4fa551f3c1d556f5a2bca76
+MD5 4dcb71c61467a8cc8a53e61fe6f7c671 avahi-0.6.20-r2.ebuild 4668
+RMD160 441ef0fa4dff73d289c5e193c7b9022b8e192efa avahi-0.6.20-r2.ebuild 4668
+SHA256 bbe0db4d59bc524fd6f2acbf72fb326773b5c1eaf4fa551f3c1d556f5a2bca76 avahi-0.6.20-r2.ebuild 4668
+EBUILD avahi-0.6.21.ebuild 4698 RMD160 edc054be21413f819dfd00d8ca5be2f897041a38 SHA1 cb575a46736d3223a8074f458a81c626f024d2e6 SHA256 42d20558c44df73144f76df922325b9c3a8e9bc4c1745d6902fee77bb56e870d
+MD5 77d6a572c18b3dc9504b7b5a1f0da341 avahi-0.6.21.ebuild 4698
+RMD160 edc054be21413f819dfd00d8ca5be2f897041a38 avahi-0.6.21.ebuild 4698
+SHA256 42d20558c44df73144f76df922325b9c3a8e9bc4c1745d6902fee77bb56e870d avahi-0.6.21.ebuild 4698
+MISC ChangeLog 18307 RMD160 4a97cd39d9e8ea648e38178ff168aaf68c8e35a3 SHA1 cd1bf9ba8a0f2c684796e78b32bdf00dfb3e7176 SHA256 f9ef4ec5d8355b1508c1f1915cdb456dc0fa7b79a3ced6df924babb395d4c2db
+MD5 7e4cb46b413f608950ecac793c5817a3 ChangeLog 18307
+RMD160 4a97cd39d9e8ea648e38178ff168aaf68c8e35a3 ChangeLog 18307
+SHA256 f9ef4ec5d8355b1508c1f1915cdb456dc0fa7b79a3ced6df924babb395d4c2db ChangeLog 18307
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -80,7 +88,7 @@ SHA256 959d8a48b6cc82ee56ba4c373c11569935ae21adb9ee13d0fe6bcbfb18669d35 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG4/lXI1lqEGTUzyQRAhsTAKDeocfibInRHyGEk//oSyGvNZ3fBwCgjkmL
-ydgS2/YPw8g4F7p2zu0R/pw=
-=rbry
+iD8DBQFG5FmTI1lqEGTUzyQRAkTbAKDGbxHprzzKvj1eHUq2wlcJMEoOywCaApNT
+7KeTk5UyH6obI00jhryAdcc=
+=lveY
 -----END PGP SIGNATURE-----
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
+ }