From 86f5101218db60108b5112fc772c5788643be6a8 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Wed, 8 Aug 2007 20:28:52 +0000 Subject: Revision bump, including a fix from upstream for autoipd. (Portage version: 2.1.3.3) --- net-dns/avahi/ChangeLog | 10 +- net-dns/avahi/avahi-0.6.19-r2.ebuild | 182 ++++++++++++++++++++++++ net-dns/avahi/avahi-0.6.20-r2.ebuild | 184 +++++++++++++++++++++++++ net-dns/avahi/files/avahi-0.6.20-autoipd.patch | 13 ++ net-dns/avahi/files/digest-avahi-0.6.19-r2 | 3 + net-dns/avahi/files/digest-avahi-0.6.20-r2 | 3 + 6 files changed, 394 insertions(+), 1 deletion(-) create mode 100644 net-dns/avahi/avahi-0.6.19-r2.ebuild create mode 100644 net-dns/avahi/avahi-0.6.20-r2.ebuild create mode 100644 net-dns/avahi/files/avahi-0.6.20-autoipd.patch create mode 100644 net-dns/avahi/files/digest-avahi-0.6.19-r2 create mode 100644 net-dns/avahi/files/digest-avahi-0.6.20-r2 (limited to 'net-dns/avahi') diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog index f8a4f1619938..476034b6b113 100644 --- a/net-dns/avahi/ChangeLog +++ b/net-dns/avahi/ChangeLog @@ -1,6 +1,14 @@ # 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.119 2007/07/21 21:17:59 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.120 2007/08/08 20:28:52 swegener Exp $ + +*avahi-0.6.20-r2 (08 Aug 2007) +*avahi-0.6.19-r2 (08 Aug 2007) + + 08 Aug 2007; Sven Wegener + +files/avahi-0.6.20-autoipd.patch, +avahi-0.6.19-r2.ebuild, + +avahi-0.6.20-r2.ebuild: + Revision bump, including a fix from upstream for autoipd. 21 Jul 2007; Sven Wegener -files/avahi-0.6.18-inotify-ifdef-fix.patch, -avahi-0.6.17.ebuild, diff --git a/net-dns/avahi/avahi-0.6.19-r2.ebuild b/net-dns/avahi/avahi-0.6.19-r2.ebuild new file mode 100644 index 000000000000..2402cff17d33 --- /dev/null +++ b/net-dns/avahi/avahi-0.6.19-r2.ebuild @@ -0,0 +1,182 @@ +# 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-r2.ebuild,v 1.1 2007/08/08 20:28:52 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 ~s390 ~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.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}-ui-sharp-gtk.patch + epatch "${FILESDIR}"/${P}-assert-security.patch + epatch "${FILESDIR}"/${PN}-0.6.20-autoipd.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_=( autoipd ) in /etc/conf.d/net!" + elog + fi +} diff --git a/net-dns/avahi/avahi-0.6.20-r2.ebuild b/net-dns/avahi/avahi-0.6.20-r2.ebuild new file mode 100644 index 000000000000..cf5ccc7f1464 --- /dev/null +++ b/net-dns/avahi/avahi-0.6.20-r2.ebuild @@ -0,0 +1,184 @@ +# 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.20-r2.ebuild,v 1.1 2007/08/08 20:28:52 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 ~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? ( $(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.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-gtk.patch + epatch "${FILESDIR}"/${P}-make-known-answers-not-conflict.patch + epatch "${FILESDIR}"/${P}-cleanup-dns-compression-table.patch + epatch "${FILESDIR}"/${P}-autoipd.patch + + use ipv6 && sed -i -e s/use-ipv6=no/use-ipv6=yes/ avahi-daemon/avahi-daemon.conf + + 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_=( autoipd ) in /etc/conf.d/net!" + elog + fi +} diff --git a/net-dns/avahi/files/avahi-0.6.20-autoipd.patch b/net-dns/avahi/files/avahi-0.6.20-autoipd.patch new file mode 100644 index 000000000000..9e517575223b --- /dev/null +++ b/net-dns/avahi/files/avahi-0.6.20-autoipd.patch @@ -0,0 +1,13 @@ +Index: trunk/avahi-autoipd/main.c +=================================================================== +--- trunk/avahi-autoipd/main.c (revision 1502) ++++ trunk/avahi-autoipd/main.c (revision 1503) +@@ -510,7 +510,7 @@ + sa.sll_halen = ETHER_ADDRLEN; + memset(sa.sll_addr, 0xFF, ETHER_ADDRLEN); + +- if (sendto(fd, packet, packet_len, 0, (struct sockaddr*) &sa, sizeof(sa)) < 0) { ++ if (sendto(fd, packet->ether_payload, packet_len, 0, (struct sockaddr*) &sa, sizeof(sa)) < 0) { + daemon_log(LOG_ERR, "sendto() failed: %s", strerror(errno)); + return -1; + } diff --git a/net-dns/avahi/files/digest-avahi-0.6.19-r2 b/net-dns/avahi/files/digest-avahi-0.6.19-r2 new file mode 100644 index 000000000000..166fb945297b --- /dev/null +++ b/net-dns/avahi/files/digest-avahi-0.6.19-r2 @@ -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 diff --git a/net-dns/avahi/files/digest-avahi-0.6.20-r2 b/net-dns/avahi/files/digest-avahi-0.6.20-r2 new file mode 100644 index 000000000000..b44d491d525d --- /dev/null +++ b/net-dns/avahi/files/digest-avahi-0.6.20-r2 @@ -0,0 +1,3 @@ +MD5 6acdff79afa2631f765f3bbbc3e25a74 avahi-0.6.20.tar.gz 974209 +RMD160 da413b25675184d1514953bfd308d544ca5f0556 avahi-0.6.20.tar.gz 974209 +SHA256 89ae5fd08018679b80cee201e1c1350d86db73bdcf6718aabb4bd3ea86f93ec9 avahi-0.6.20.tar.gz 974209 -- cgit v1.2.3-65-gdbad