Backporting the security fix to 0.6.19 because of unresolved issues with 0.6.20.

Package-Manager: portage-2.1.3_rc5

5 files changed, 232 insertions, 8 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 8eb2bf247196..a9eb345aedf1 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,13 @@
 # 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.106 2007/06/22 17:58:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.107 2007/06/23 23:35:41 swegener Exp $
+
+*avahi-0.6.19-r1 (23 Jun 2007)
+
+  23 Jun 2007; Sven Wegener <swegener@gentoo.org>
+  +files/avahi-0.6.19-assert-security.patch, +avahi-0.6.19-r1.ebuild:
+  Backporting the security fix to 0.6.19 because of unresolved issues with
+  0.6.20.
 
 *avahi-0.6.20 (22 Jun 2007)
 
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 72526a5eee05..f293ebf25c13 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -49,6 +49,10 @@ AUX avahi-0.6.18-inotify-ifdef-fix.patch 455 RMD160 abc10c1cd74192f545e43fd6a0cf
 MD5 5e626d1ed9e0f9ec6d1fe4b586cf0eca files/avahi-0.6.18-inotify-ifdef-fix.patch 455
 RMD160 abc10c1cd74192f545e43fd6a0cfcc8002515a0d files/avahi-0.6.18-inotify-ifdef-fix.patch 455
 SHA256 165a156b28e0c7b4784138ebdc0ebffd7c47a675320f74323345545633e04710 files/avahi-0.6.18-inotify-ifdef-fix.patch 455
+AUX avahi-0.6.19-assert-security.patch 794 RMD160 7c9218345b9ce84291b679748ccd24ed9cc1c81d SHA1 9a3d9a8a726cecb45b07cd4411b4521acc1b7fd8 SHA256 b52d7ffda641a58f446112fb6413cdfee670e666c943751389dc6ef2b3b3c4e4
+MD5 556e77f8b9ecb88caed982f6ae2d36c4 files/avahi-0.6.19-assert-security.patch 794
+RMD160 7c9218345b9ce84291b679748ccd24ed9cc1c81d files/avahi-0.6.19-assert-security.patch 794
+SHA256 b52d7ffda641a58f446112fb6413cdfee670e666c943751389dc6ef2b3b3c4e4 files/avahi-0.6.19-assert-security.patch 794
 AUX avahi-0.6.19-ui-sharp-automake.patch 654 RMD160 a55092fc273e7d01a92609219a3ba30dcd2770e9 SHA1 9c0a7a1fc7691181d73375e4380d0aa19830ca72 SHA256 4c1ef7b47639072151af0d745eedd34a6396ad2cb904ad4ad4f4cde482457b92
 MD5 5c378a5f054a7933f920735348ea0c1e files/avahi-0.6.19-ui-sharp-automake.patch 654
 RMD160 a55092fc273e7d01a92609219a3ba30dcd2770e9 files/avahi-0.6.19-ui-sharp-automake.patch 654
@@ -70,6 +74,10 @@ EBUILD avahi-0.6.18.ebuild 4376 RMD160 cb47da925834f82a65a2a5a14e3776eea97c5dc2
 MD5 2f2eb87526ed492535d69492fa3117f1 avahi-0.6.18.ebuild 4376
 RMD160 cb47da925834f82a65a2a5a14e3776eea97c5dc2 avahi-0.6.18.ebuild 4376
 SHA256 93e8d9212b811da2b529ee58f0082589f8ed70c2b5de1efbfecdaabfe704a0c5 avahi-0.6.18.ebuild 4376
+EBUILD avahi-0.6.19-r1.ebuild 4411 RMD160 153bc620ca5da4b8c49294e84437401b04f87af4 SHA1 e5237c7365f5eeada4232df43ad3a90923121f4a SHA256 4a179a1e76db9e9ae2ef7f1024365c001a3f4dc4e838cafb821bef8ac7f5d49c
+MD5 efc1e4880c99fbed6bf9659281433efc avahi-0.6.19-r1.ebuild 4411
+RMD160 153bc620ca5da4b8c49294e84437401b04f87af4 avahi-0.6.19-r1.ebuild 4411
+SHA256 4a179a1e76db9e9ae2ef7f1024365c001a3f4dc4e838cafb821bef8ac7f5d49c avahi-0.6.19-r1.ebuild 4411
 EBUILD avahi-0.6.19.ebuild 4360 RMD160 96f4efb166b67df09bdd8c21d90be2e268ab70a5 SHA1 496746d1183153f6dc4b4bac44d42fb31170bf8f SHA256 e195d3ae9bfabcb567288b43001d5e1c3974c14ffbcf1d01e8501c41094a3cd1
 MD5 e8ceff339e7a3c161a0e7b94516f9d1a avahi-0.6.19.ebuild 4360
 RMD160 96f4efb166b67df09bdd8c21d90be2e268ab70a5 avahi-0.6.19.ebuild 4360
@@ -78,10 +86,10 @@ EBUILD avahi-0.6.20.ebuild 4266 RMD160 e8de065ba73bc4c6d0dc7795731499283815b74c
 MD5 daa2d2ad5fd675fb8a04b4f5bb340f11 avahi-0.6.20.ebuild 4266
 RMD160 e8de065ba73bc4c6d0dc7795731499283815b74c avahi-0.6.20.ebuild 4266
 SHA256 5f8d79f4397543112a24688fefed9cfe0183a4d1462b40009fd309cb2e4c064d avahi-0.6.20.ebuild 4266
-MISC ChangeLog 14587 RMD160 89a131e6b0c735870fd1295adcdab8fe58199a55 SHA1 536d4900b101af5f0a9629cc7146453a855d19d3 SHA256 425b61250f771961a40d595ec138a827e8ae0777b2287f438128c2d87fa3a85c
-MD5 b9b1ce525357a77ddf0939df9d9ee654 ChangeLog 14587
-RMD160 89a131e6b0c735870fd1295adcdab8fe58199a55 ChangeLog 14587
-SHA256 425b61250f771961a40d595ec138a827e8ae0777b2287f438128c2d87fa3a85c ChangeLog 14587
+MISC ChangeLog 14825 RMD160 e70c89912a71cab799efb14ee5631c0ec09800cf SHA1 686480369022bf5fcf59c12698ef3e2c7d18ae4a SHA256 c095a30b9f7c058543d33af00765d26dbe6d670583121a2293e4a20f0c773ef7
+MD5 dba58a7e35423e9debf808ac80024ed1 ChangeLog 14825
+RMD160 e70c89912a71cab799efb14ee5631c0ec09800cf ChangeLog 14825
+SHA256 c095a30b9f7c058543d33af00765d26dbe6d670583121a2293e4a20f0c773ef7 ChangeLog 14825
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -98,13 +106,16 @@ SHA256 11372c91a1b12a5b2930aa3fc3ff38c756c108f7a4a42bbef1e02636ef434e7a files/di
 MD5 8426d4046873ff10e6d7facf145b3b89 files/digest-avahi-0.6.19 238
 RMD160 a5c23988afd3e8cdf90e4647155bd86e9d2dee92 files/digest-avahi-0.6.19 238
 SHA256 ea8928681ddbe0fe704197076ec00c506b7a138c1510c373671297fcdbaef20d files/digest-avahi-0.6.19 238
+MD5 8426d4046873ff10e6d7facf145b3b89 files/digest-avahi-0.6.19-r1 238
+RMD160 a5c23988afd3e8cdf90e4647155bd86e9d2dee92 files/digest-avahi-0.6.19-r1 238
+SHA256 ea8928681ddbe0fe704197076ec00c506b7a138c1510c373671297fcdbaef20d files/digest-avahi-0.6.19-r1 238
 MD5 abad0d13524e320d577cc47c71fbc9da files/digest-avahi-0.6.20 238
 RMD160 189115dd402bfa26b8bf8aa16ffd0879d8d147a5 files/digest-avahi-0.6.20 238
 SHA256 9dd3a566162032a532c8a8ce934135a8c99fd7abc07dfe010bfe606fa687785c files/digest-avahi-0.6.20 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGfA3CI1lqEGTUzyQRAgMKAJoC2zFSHp0KJdReNN8/2g8IPzkAGQCdGaPE
-Q2SOOa5QzHRh7c5dIUuU/n8=
-=VcQE
+iD8DBQFGfa5ZI1lqEGTUzyQRAqj7AJ9Z6zfBk1Stnhavn58vcY9ySxr1xACfd0v2
+PbSNpaYSsaZYRdhdhqSdmA0=
+=fDFl
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.19-r1.ebuild b/net-dns/avahi/avahi-0.6.19-r1.ebuild
new file mode 100644
index 000000000000..20d8cd43a047
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.19-r1.ebuild
@@ -0,0 +1,180 @@
+# 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.19-r1.ebuild,v 1.1 2007/06/23 23:35:41 swegener Exp $
+
+WANT_AUTOMAKE="1.9"
+
+inherit eutils mono python qt3 qt4 autotools
+
+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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bookmarks howl-compat mdnsresponder-compat gdbm dbus doc mono gtk python qt3 qt4 autoipd kernel_linux test"
+
+RDEPEND=">=dev-libs/libdaemon-0.5
+	dev-libs/expat
+	>=dev-libs/glib-2
+	gdbm? ( sys-libs/gdbm )
+	qt3? ( $(qt_min_version 3.3.6-r2) )
+	qt4? ( $(qt4_min_version 4) )
+	gtk? (
+		>=x11-libs/gtk+-2
+		>=gnome-base/libglade-2
+	)
+	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 )
+	)
+	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 )
+	!net-misc/mDNSResponder"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	doc? (
+		app-doc/doxygen
+		mono? ( >=dev-util/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
+}
+
+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}"
+
+	epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
+	epatch "${FILESDIR}"/${P}-ui-sharp-automake.patch
+	epatch "${FILESDIR}"/${P}-assert-security.patch
+
+	eautomake
+}
+
+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"
+}
+
+src_install() {
+	make 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 /lib/rcscripts/net
+		doins "${FILESDIR}"/autoipd.sh
+	fi
+
+	dodoc docs/{AUTHORS,README,TODO}
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/avahi
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/avahi
+
+	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
+}
diff --git a/net-dns/avahi/files/avahi-0.6.19-assert-security.patch b/net-dns/avahi/files/avahi-0.6.19-assert-security.patch
new file mode 100644
index 000000000000..596245ecbe31
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.19-assert-security.patch
@@ -0,0 +1,23 @@
+Index: trunk/avahi-daemon/dbus-util.c
+===================================================================
+--- trunk/avahi-daemon/dbus-util.c (revision 1357)
++++ trunk/avahi-daemon/dbus-util.c (revision 1482)
+@@ -345,4 +345,7 @@
+         n = 0;
+         dbus_message_iter_get_fixed_array(&sub2, &k, &n);
++
++        if (!k)
++            k = (const uint8_t*) "";
+             
+         strlst = avahi_string_list_add_arbitrary(strlst, k, n);
+Index: trunk/avahi-common/strlst.c
+===================================================================
+--- trunk/avahi-common/strlst.c (revision 1050)
++++ trunk/avahi-common/strlst.c (revision 1482)
+@@ -52,5 +52,5 @@
+     AvahiStringList *n;
+ 
+-    assert(text);
++    assert(size == 0 || text);
+ 
+     if (!(n = avahi_string_list_add_anonymous(l, size)))
diff --git a/net-dns/avahi/files/digest-avahi-0.6.19-r1 b/net-dns/avahi/files/digest-avahi-0.6.19-r1
new file mode 100644
index 000000000000..166fb945297b
--- /dev/null
+++ b/net-dns/avahi/files/digest-avahi-0.6.19-r1
@@ -0,0 +1,3 @@
+MD5 a06782435d1c994ecd00a66e95a5d9d4 avahi-0.6.19.tar.gz 973381
+RMD160 15ae4baaa55f0020422552994a8d1ef33935b065 avahi-0.6.19.tar.gz 973381
+SHA256 a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a avahi-0.6.19.tar.gz 973381