diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2007-09-25 19:14:53 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2007-09-25 19:14:53 +0000 |
| commit | 601ecadbab96dd05b87443389d6927cf91cc224d (patch) | |
| tree | a7ea0adae4dc43c5d0125d01c2a0a0d428d55c58 | |
| parent | sparc stable wrt security #192096 (diff) | |
| download | gentoo-2-601ecadbab96dd05b87443389d6927cf91cc224d.tar.gz gentoo-2-601ecadbab96dd05b87443389d6927cf91cc224d.tar.bz2 gentoo-2-601ecadbab96dd05b87443389d6927cf91cc224d.zip | |
Include a patch from upstream that fixes a segfault.
(Portage version: 2.1.3.9)
| -rw-r--r-- | net-dns/avahi/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dns/avahi/avahi-0.6.21.ebuild | 3 | ||||
| -rw-r--r-- | net-dns/avahi/files/avahi-0.6.21-no-browse-domains-segfault.patch | 18 |
3 files changed, 25 insertions, 2 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/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++) { |