Add gfbsd patches, bug #184008. Security bump, bug #260971.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

7 files changed, 286 insertions, 6 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index a9f5b70a03a0..ac1af3f13bc4 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/avahi
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.155 2008/12/22 18:51:28 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.156 2009/03/05 21:13:28 swegener Exp $
+
+*avahi-0.6.24-r1 (05 Mar 2009)
+
+  05 Mar 2009; Sven Wegener <swegener@gentoo.org>
+  +files/avahi-0.6.24-CVE-2009-0758.patch,
+  +files/avahi-0.6.24-cmsg_space.patch, +files/avahi-0.6.24-libintl.patch,
+  +avahi-0.6.24-r1.ebuild:
+  Add gfbsd patches, bug #184008. Security bump, bug #260971.
 
   22 Dec 2008; Raúl Porcel <armin76@gentoo.org> avahi-0.6.24.ebuild:
   ia64/sparc stable wrt #250913
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index c17167bed14f..012fa3b9adb0 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX autoipd-openrc.sh 690 RMD160 d229d9909b40d7620798471ad99ff7392656eed1 SHA1 f3bf533d7267477b4d23446c98e3b1b15dafc569 SHA256 dd440a708fdaa286662b23e477ccb9544fbbff4dd1d2fb401d2fd9dd801000f4
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
 AUX avahi-0.6.1-no-ipv6.patch 362 RMD160 7c90e7b3fadbd880d18db23dbe54ab6824be53d1 SHA1 97126f8035616821e9dc937c9b741316e7222fe2 SHA256 e00bd75a9770acf68c0f92cb8594b62acb0d60577e7dbeb1b7680e250b4d39b4
@@ -7,6 +10,9 @@ AUX avahi-0.6.19-ui-sharp-gtk.patch 427 RMD160 967c446b0204baa4ddf5a0568164352ca
 AUX avahi-0.6.20-autoipd.patch 584 RMD160 5117179edd7af3237edad97c5c141b271470f58a SHA1 aa15b45e31cf97721d597fc030d56f66365d2f88 SHA256 7a8fa3ce860730d5a63641fe4e7e9f85d0fc45b7d4a0aa4d84a2b58e2c4112cd
 AUX avahi-0.6.22-gobject.patch 1113 RMD160 d4551aecefa470a6fe1f0998cc382192942ef647 SHA1 7e005c7d773aece3171f24061769c02b55693c35 SHA256 440df6f17e9e619622a326547313a9cb9df696ef1cfa0339385a225b69c8001a
 AUX avahi-0.6.22-vncviewer.patch 462 RMD160 a79540e16aecb781f0701ceb57db456f33296666 SHA1 de77191d8f2fe499be77c9f54adaefeea9919fc3 SHA256 daf1eaf78883b07669536b46b081c0b66f5a4a375a833a071ab91b6e12656da5
+AUX avahi-0.6.24-CVE-2009-0758.patch 953 RMD160 7c1a2a2082c61d6feb05d985068122133b434b02 SHA1 429347d8b9f9022c5316ce1e5163a68fa7393b4f SHA256 e8a93a705ec07ca6a4c4c7634a97b9b2c5ee0712c9e80767c6bf7e3f4a5d6853
+AUX avahi-0.6.24-cmsg_space.patch 449 RMD160 9593ee893daf908e35f36a7396ae5d52a7618022 SHA1 49fd79c1d0e0302747e84bdf611cfb0bf310b4c3 SHA256 f3b6bf6f522aea93627df8afda317782ed760493ffad9108697b50a310bc92d7
+AUX avahi-0.6.24-libintl.patch 542 RMD160 918aa11cdbce6f38d9a9446c798db2bc43a957b5 SHA1 c9f8ef5d0047b591e6e88153731ae380d64a2431 SHA256 fb8e37d6071a990184a7ad3c20a7709554103fb2c4f02450c338b9fbcf358215
 AUX avahi-start-after-netmount.patch 998 RMD160 865a837ad85f6569405ab8d69bd08aebafbb9342 SHA1 a5b084504f70ceaf99bcfd75ddad846bda294166 SHA256 03ec271640c86405297cdd2292bcb3745fac517ed050e777a3dfc4188f06b5fb
 AUX avahi-vncviewer.patch 474 RMD160 ca19092b5a410cefb67480f0de7f4baf8ceff1fc SHA1 1838114e7c0ed4ff15c4adaf791fb6cbfab1bb48 SHA256 3175b1febd682681a38536e1a8f65891b8d8467495b73ce40c4dcac0b2003d3b
 DIST avahi-0.6.19.tar.gz 973381 RMD160 15ae4baaa55f0020422552994a8d1ef33935b065 SHA1 367322064a5dd66a0e69c75df9407ab3518aebdc SHA256 a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a
@@ -16,6 +22,14 @@ DIST avahi-0.6.24.tar.gz 1115626 RMD160 94f59ccbd14d99e91e259b27dd7f03404c6691e6
 EBUILD avahi-0.6.19-r2.ebuild 4705 RMD160 d20e47b099f86bd5ea8460f6f171584e97b0e0ba SHA1 7bb0755783efdd7c7d660d79843c699545d122d5 SHA256 6959550cb0b610351b1a5a48f755cbc4188c8b4180f13db8961ec5b7440573f6
 EBUILD avahi-0.6.22-r1.ebuild 5173 RMD160 a531c08c4030f26fd749de4516e307e5f1feb863 SHA1 1c4f7a9d1d30e43d62f4bce8509f4551ca81ee40 SHA256 77643eccb71093861ba269c240b368fcd0bd1f8659f19f229684a2ae87679c5c
 EBUILD avahi-0.6.23.ebuild 5029 RMD160 15901194bf318afb17021dac725e7003761d788e SHA1 263ff6bd0f8f5cea748198bee77f5348e47e87f9 SHA256 e8d4c3c0a6b912c4d6b38490e35fa7bfca118c3a53629ff24edf03a0cd8312b2
-EBUILD avahi-0.6.24.ebuild 4995 RMD160 40be6230b8b3de58b196d523d8076489ca23bcc4 SHA1 765790fc0a364046e3d6520d8ac96af36e6f2fc8 SHA256 09044ac2c68289714cf939286448f6d97552198167c5c4d761662bc76670584d
-MISC ChangeLog 22934 RMD160 cc4d1c0351e3822a1e544c517d1aa0576ba5c029 SHA1 73f89c2da64d0cfff55d5ce607d5171bc9bc3249 SHA256 f460fb2a2dc0789d5d07f4c000d894fcf7da88f2b418f32bf88fa9b4494806b2
+EBUILD avahi-0.6.24-r1.ebuild 5066 RMD160 d738835616516b57d0c17e6da502467856ed85d9 SHA1 6d9fb5525502c15c0e60c8dbe80b09e4c2a64ff4 SHA256 7b40d8e5635f1d4d5efcb6314a9cb629f334e1551e86f80f21526856a5bcfb85
+EBUILD avahi-0.6.24.ebuild 4996 RMD160 91f0823545dd431d8c516a12f42a4e323df85745 SHA1 23182664c2343a4e6971a70d35e1a243535a75c6 SHA256 2f718ddefc7a56f1292f16e7b8b384a75ec8a662b0fa00b0ffbc5e5d25ed8a65
+MISC ChangeLog 23225 RMD160 523618bb1992491176f8cd141bf412d34e7ef3a5 SHA1 21fac8c396da3dfd8520e451333490323d8f9947 SHA256 8a12bf36950bce1fef7aab415ccbe6e99dfb386a75b2ea5e4a081be33eca62d4
 MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmwQH4ACgkQI1lqEGTUzySdvACgpS59TB55AdKggUSIt9u4MLUT
+HC0An20yEDhV5Ndz+Ewlnw2N/v7Atjq4
+=8mUE
+-----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.24-r1.ebuild b/net-dns/avahi/avahi-0.6.24-r1.ebuild
new file mode 100644
index 000000000000..95b9b20b7479
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.24-r1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.24-r1.ebuild,v 1.1 2009/03/05 21:13:27 swegener Exp $
+
+EAPI="1"
+
+inherit autotools eutils mono python multilib
+
+DESCRIPTION="System which facilitates service discovery on a local network"
+HOMEPAGE="http://avahi.org/"
+SRC_URI="http://avahi.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test ipv6"
+
+RDEPEND=">=dev-libs/libdaemon-0.11-r1
+	dev-libs/expat
+	>=dev-libs/glib-2
+	gdbm? ( sys-libs/gdbm )
+	qt3? ( x11-libs/qt:3 )
+	qt4? (
+		|| (
+			x11-libs/qt-core:4
+			x11-libs/qt:4
+		)
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.4.0
+		>=gnome-base/libglade-2.4.0
+	)
+	dbus? (
+		>=sys-apps/dbus-0.30
+		python? (
+			|| (
+				dev-python/dbus-python
+				(
+					<sys-apps/dbus-0.90
+					>=sys-apps/dbus-0.30
+				)
+			)
+		)
+	)
+	mono? (
+		>=dev-lang/mono-1.1.10
+		gtk? ( >=dev-dotnet/gtk-sharp-2 )
+	)
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+	python? (
+		>=virtual/python-2.4
+		gtk? ( >=dev-python/pygtk-2 )
+	)
+	bookmarks? (
+		dev-python/twisted
+		dev-python/twisted-web
+	)
+	kernel_linux? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9.0
+	doc? (
+		app-doc/doxygen
+		mono? ( >=virtual/monodoc-1.1.8 )
+	)"
+
+pkg_setup() {
+	if use python && ! built_with_use dev-lang/python gdbm
+	then
+		die "For python support you need dev-lang/python compiled with gdbm support!"
+	fi
+
+	if use python && use dbus && ! has_version dev-python/dbus-python && ! built_with_use sys-apps/dbus python
+	then
+		die "For python and dbus support you need sys-apps/dbus compiled with python support or dev-python/dbus-python!"
+	fi
+
+	if ( use mdnsresponder-compat || use howl-compat || use mono ) && ! use dbus
+	then
+		die "For *-compat or mono support you also need to enable the dbus USE flag!"
+	fi
+
+	if use bookmarks && ! ( use python && use dbus && use gtk )
+	then
+		die "For bookmarks support you also need to enable the python, dbus and gtk USE flags!"
+	fi
+
+	if use python && ! use dbus && ! use gtk
+	then
+		die "For proper python support you also need the dbus and gtk USE flags!"
+	fi
+}
+
+pkg_preinst() {
+	enewgroup netdev
+	enewgroup avahi
+	enewuser avahi -1 -1 -1 avahi
+
+	if use autoipd
+	then
+		enewgroup avahi-autoipd
+		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf
+
+	sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl
+
+	epatch "${FILESDIR}"/${P}-*.patch
+	eautoreconf
+}
+
+src_compile() {
+	local myconf=""
+
+	if use python
+	then
+		use dbus && myconf="${myconf} --enable-python-dbus"
+		use gtk && myconf="${myconf} --enable-pygtk"
+	fi
+
+	if use mono && use doc
+	then
+		myconf="${myconf} --enable-monodoc"
+	fi
+
+	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
+	unset DISPLAY
+
+	econf \
+		--localstatedir=/var \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-pygtk \
+		--disable-xmltoman \
+		--disable-monodoc \
+		--enable-glib \
+		$(use_enable test tests) \
+		$(use_enable autoipd) \
+		$(use_enable mdnsresponder-compat compat-libdns_sd) \
+		$(use_enable howl-compat compat-howl) \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable mono) \
+		$(use_enable dbus) \
+		$(use_enable python) \
+		$(use_enable gtk) \
+		$(use_enable qt3) \
+		$(use_enable qt4) \
+		$(use_enable gdbm) \
+		${myconf} \
+		|| die "econf failed"
+	emake || die "emake failed"
+
+	use doc && emake avahi.devhelp
+}
+
+src_install() {
+	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
+	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h
+
+	if use autoipd
+	then
+		insinto /$(get_libdir)/rcscripts/net
+		doins "${FILESDIR}"/autoipd.sh
+
+		insinto /$(get_libdir)/rc/net
+		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
+	fi
+
+	dodoc docs/{AUTHORS,README,TODO}
+
+	if use doc
+	then
+		dohtml -r doxygen/html/.
+		insinto /usr/share/devhelp/books/avahi
+		doins avahi.devhelp
+	fi
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup
+}
+
+pkg_postinst() {
+	if use python; then
+		python_version
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/avahi
+	fi
+
+	if use autoipd
+	then
+		elog
+		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
+		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/avahi-0.6.24.ebuild b/net-dns/avahi/avahi-0.6.24.ebuild
index 3cc3ea783fe2..ebcc7cac642a 100644
--- a/net-dns/avahi/avahi-0.6.24.ebuild
+++ b/net-dns/avahi/avahi-0.6.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2000-2008 Gentoo Foundation
+# Copyright 2000-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.24.ebuild,v 1.7 2008/12/22 18:51:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.24.ebuild,v 1.8 2009/03/05 21:13:27 swegener Exp $
 
 EAPI="1"
 
diff --git a/net-dns/avahi/files/avahi-0.6.24-CVE-2009-0758.patch b/net-dns/avahi/files/avahi-0.6.24-CVE-2009-0758.patch
new file mode 100644
index 000000000000..578839364c62
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.24-CVE-2009-0758.patch
@@ -0,0 +1,22 @@
+diff --git a/avahi-core/server.c b/avahi-core/server.c
+index 453db09..8187690 100644
+--- a/avahi-core/server.c
++++ b/avahi-core/server.c
+@@ -844,7 +844,7 @@ static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const Ava
+         if (getsockname(s->fd_legacy_unicast_ipv4, (struct sockaddr*) &lsa, &l) != 0)
+             avahi_log_warn("getsockname(): %s", strerror(errno));
+         else
+-            return lsa.sin_port == port;
++            return avahi_port_from_sockaddr((struct sockaddr*) &lsa) == port;
+ 
+     }
+ 
+@@ -855,7 +855,7 @@ static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const Ava
+         if (getsockname(s->fd_legacy_unicast_ipv6, (struct sockaddr*) &lsa, &l) != 0)
+             avahi_log_warn("getsockname(): %s", strerror(errno));
+         else
+-            return lsa.sin6_port == port;
++            return avahi_port_from_sockaddr((struct sockaddr*) &lsa) == port;
+     }
+ 
+     return 0;
diff --git a/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch b/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch
new file mode 100644
index 000000000000..220e63fa24f3
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2009-02-25 11:51:29 +0100
++++ configure.ac	2009-02-25 11:55:47 +0100
+@@ -348,7 +348,7 @@
+  # Solaris stuff
+  AC_SEARCH_LIBS([inet_ntop],[nsl])
+  AC_SEARCH_LIBS([recv],[socket])
+- AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__")
++ AC_CHECK_DECL([CMSG_SPACE],,CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500 -D__EXTENSIONS__", [[#include <sys/socket.h>]])
+ 
+ # Checks for library functions.
+ AC_FUNC_MEMCMP
diff --git a/net-dns/avahi/files/avahi-0.6.24-libintl.patch b/net-dns/avahi/files/avahi-0.6.24-libintl.patch
new file mode 100644
index 000000000000..3ad943ac130c
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.24-libintl.patch
@@ -0,0 +1,11 @@
+--- avahi-common/Makefile.am.orig	2008-12-12 21:33:35 +0100
++++ avahi-common/Makefile.am	2009-02-25 12:21:14 +0100
+@@ -71,7 +71,7 @@
+ 	i18n.c i18n.h
+ 
+ libavahi_common_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -DAVAHI_LOCALEDIR=\"$(avahilocaledir)\"
+-libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBINTL)
++libavahi_common_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS)
+ libavahi_common_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_COMMON_VERSION_INFO)
+ 
+ strlst_test_SOURCES = \