Include a patch from upstream that fixes a segfault.

Package-Manager: portage-2.1.3.9

4 files changed, 41 insertions, 14 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 064f7b8d789d..85c3cd51a2ec 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.126 2007/09/09 20:37:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.127 2007/09/25 19:14:53 swegener Exp $
+
+  25 Sep 2007; Sven Wegener <swegener@gentoo.org>
+  +files/avahi-0.6.21-no-browse-domains-segfault.patch, avahi-0.6.21.ebuild:
+  Include a patch from upstream that fixes a segfault.
 
   09 Sep 2007; Sven Wegener <swegener@gentoo.org>
   +files/avahi-0.6.21-service_name_chosen.patch,
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 9236b9e04c62..4a7d3386dfa2 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -45,6 +45,10 @@ 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-no-browse-domains-segfault.patch 627 RMD160 fd1d23a23a992d0a6754795135c750033a2cadee SHA1 f1b74c53f60dac90bd3b7ef3b3681f1bb719ed78 SHA256 6a54f155d8e51ddf790bd10ab365cf7ef301fceb5d030491365cb317831e1fcb
+MD5 28f2adbe855a7b41ae25b083060eaf55 files/avahi-0.6.21-no-browse-domains-segfault.patch 627
+RMD160 fd1d23a23a992d0a6754795135c750033a2cadee files/avahi-0.6.21-no-browse-domains-segfault.patch 627
+SHA256 6a54f155d8e51ddf790bd10ab365cf7ef301fceb5d030491365cb317831e1fcb files/avahi-0.6.21-no-browse-domains-segfault.patch 627
 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
@@ -64,14 +68,14 @@ EBUILD avahi-0.6.20-r2.ebuild 4668 RMD160 441ef0fa4dff73d289c5e193c7b9022b8e192e
 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
+EBUILD avahi-0.6.21.ebuild 4758 RMD160 69ac55368ba744bfb7eb581c1b3ff7abb7ceb42f SHA1 b59a9eaab286b948974cc36184686d70690acdb2 SHA256 8bc73a9f4ca2b62bbefe49f12e8b0fb58f6b3d75bda3e4554f0858669c03096f
+MD5 e47421c1214cd393221884572d54229f avahi-0.6.21.ebuild 4758
+RMD160 69ac55368ba744bfb7eb581c1b3ff7abb7ceb42f avahi-0.6.21.ebuild 4758
+SHA256 8bc73a9f4ca2b62bbefe49f12e8b0fb58f6b3d75bda3e4554f0858669c03096f avahi-0.6.21.ebuild 4758
+MISC ChangeLog 18490 RMD160 b3656fcdca40f3fd0ccb0865d60bec9efdcfba86 SHA1 f53b72674eedaa105320c37e7ca6436825e955e8 SHA256 150c09d840b8dddc65b2bfec1f1514144a82dadefca36181cf261fa0890c21e0
+MD5 3f6cba578b1d893c2ff9c1b0b9aefd56 ChangeLog 18490
+RMD160 b3656fcdca40f3fd0ccb0865d60bec9efdcfba86 ChangeLog 18490
+SHA256 150c09d840b8dddc65b2bfec1f1514144a82dadefca36181cf261fa0890c21e0 ChangeLog 18490
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -86,9 +90,9 @@ MD5 87d3e0560a399c32aeabd184957fc10d files/digest-avahi-0.6.21 238
 RMD160 55763a7d1642a46b05622141a93b327a5cca4e77 files/digest-avahi-0.6.21 238
 SHA256 959d8a48b6cc82ee56ba4c373c11569935ae21adb9ee13d0fe6bcbfb18669d35 files/digest-avahi-0.6.21 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG5FmTI1lqEGTUzyQRAkTbAKDGbxHprzzKvj1eHUq2wlcJMEoOywCaApNT
-7KeTk5UyH6obI00jhryAdcc=
-=lveY
+iD8DBQFG+V42I1lqEGTUzyQRAmYoAKCz1xbawDjOeM0PVOWGX/rBrt5RrwCgrI90
+gNOHXIF8yDXoEodQb9zKR3s=
+=JYV2
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.21.ebuild b/net-dns/avahi/avahi-0.6.21.ebuild
index b295b46c6e17..84f214768ddc 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.5 2007/09/09 20:37:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.21.ebuild,v 1.6 2007/09/25 19:14:53 swegener Exp $
 
 inherit eutils mono python qt3 qt4
 
@@ -100,6 +100,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-dbus-compat.patch
 	epatch "${FILESDIR}"/${P}-browse-help.patch
 	epatch "${FILESDIR}"/${P}-service_name_chosen.patch
+	epatch "${FILESDIR}"/${P}-no-browse-domains-segfault.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/files/avahi-0.6.21-no-browse-domains-segfault.patch b/net-dns/avahi/files/avahi-0.6.21-no-browse-domains-segfault.patch
new file mode 100644
index 000000000000..0eca3329672f
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.21-no-browse-domains-segfault.patch
@@ -0,0 +1,18 @@
+Don't segfault when no browse domains are configured in resolv.conf. Original patch from zml. Closes #162
+
+Index: avahi-daemon/main.c
+===================================================================
+--- avahi-daemon/main.c	(revision 1524)
++++ avahi-daemon/main.c	(revision 1525)
+@@ -317,6 +317,11 @@
+     int n;
+     char **p;
+ 
++    if (!resolv_conf_search_domains) {
++        avahi_server_set_browse_domains(avahi_server, NULL);
++        return;
++    }
++
+     l = avahi_string_list_copy(config.server_config.browse_domains);
+     
+     for (p = resolv_conf_search_domains, n = 0; *p && n < BROWSE_DOMAINS_MAX; p++, n++) {