Split out gfbsd patches to separate revision to allow early security stable marking.

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

4 files changed, 234 insertions, 10 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index ac1af3f13bc4..74b11795ae3b 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/avahi
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.157 2009/03/06 23:04:33 swegener Exp $
+
+*avahi-0.6.24-r2 (06 Mar 2009)
+
+  06 Mar 2009; Sven Wegener <swegener@gentoo.org> avahi-0.6.24-r1.ebuild,
+  +avahi-0.6.24-r2.ebuild:
+  Split out gfbsd patches to separate revision to allow early security
+  stable marking.
 
 *avahi-0.6.24-r1 (05 Mar 2009)
 
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 012fa3b9adb0..318f38146579 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -22,14 +22,15 @@ 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-r1.ebuild 5066 RMD160 d738835616516b57d0c17e6da502467856ed85d9 SHA1 6d9fb5525502c15c0e60c8dbe80b09e4c2a64ff4 SHA256 7b40d8e5635f1d4d5efcb6314a9cb629f334e1551e86f80f21526856a5bcfb85
+EBUILD avahi-0.6.24-r1.ebuild 5063 RMD160 945bc5148e0b0196cd0bba2cc951f02fe50f7aad SHA1 934d1ab60568a1c76b9c4a4a185fede1dc0f0a01 SHA256 adc233d7d92455a5f6cc047ff7b7caf049fc47caab40b0ac34a63348500411d6
+EBUILD avahi-0.6.24-r2.ebuild 5212 RMD160 04ca1886b331718d7fa830bad74a73b5c1d311b2 SHA1 e490d3b4a50998bddc8c21a9482801a0c77e49bb SHA256 c00e165b602ea162be79ed97625ae4d60f68e302b615e1a78a600f834f06cfe5
 EBUILD avahi-0.6.24.ebuild 4996 RMD160 91f0823545dd431d8c516a12f42a4e323df85745 SHA1 23182664c2343a4e6971a70d35e1a243535a75c6 SHA256 2f718ddefc7a56f1292f16e7b8b384a75ec8a662b0fa00b0ffbc5e5d25ed8a65
-MISC ChangeLog 23225 RMD160 523618bb1992491176f8cd141bf412d34e7ef3a5 SHA1 21fac8c396da3dfd8520e451333490323d8f9947 SHA256 8a12bf36950bce1fef7aab415ccbe6e99dfb386a75b2ea5e4a081be33eca62d4
+MISC ChangeLog 23448 RMD160 44b50613b265ae15c0d1bd96bd2d7871672cdb94 SHA1 419eee9e613a88eb3873b326e7008e9556e6a94b SHA256 811b286634bf9132749fd4e1eaab3d51d5495f61bc6759707a6e69ed65711fcd
 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
+iEYEARECAAYFAkmxrAkACgkQI1lqEGTUzyRBHgCbB3seWkWvLxpYU4dqWc49sLJR
+x6oAn0T/zb4oxP7JWSqb5qv/c/6kx+ad
+=OHQ7
 -----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
index 95b9b20b7479..630c1cb8a0b1 100644
--- a/net-dns/avahi/avahi-0.6.24-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.24-r1.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.24-r1.ebuild,v 1.2 2009/03/06 23:04:33 swegener Exp $
 
 EAPI="1"
 
-inherit autotools eutils mono python multilib
+inherit eutils mono python multilib
 
 DESCRIPTION="System which facilitates service discovery on a local network"
 HOMEPAGE="http://avahi.org/"
@@ -112,8 +112,7 @@ src_unpack() {
 
 	sed -i -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" doxygen_to_devhelp.xsl
 
-	epatch "${FILESDIR}"/${P}-*.patch
-	eautoreconf
+	epatch "${FILESDIR}"/avahi-0.6.24-CVE-2009-0758.patch
 }
 
 src_compile() {
diff --git a/net-dns/avahi/avahi-0.6.24-r2.ebuild b/net-dns/avahi/avahi-0.6.24-r2.ebuild
new file mode 100644
index 000000000000..054efad111a3
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.24-r2.ebuild
@@ -0,0 +1,217 @@
+# 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-r2.ebuild,v 1.1 2009/03/06 23:04:33 swegener Exp $
+
+EAPI="1"
+
+inherit eutils mono python multilib 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 ~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}
+	>=sys-devel/libtool-2.2
+	>=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}"/avahi-0.6.24-CVE-2009-0758.patch
+	epatch "${FILESDIR}"/avahi-0.6.24-cmsg_space.patch
+	epatch "${FILESDIR}"/avahi-0.6.24-libintl.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
+}