diff options
author | 2010-08-31 19:05:26 +0200 | |
---|---|---|
committer | 2010-08-31 19:05:26 +0200 | |
commit | a19d9bf9c82c2db7fc00001aad74cfcf06b020c4 (patch) | |
tree | e62007a200b612df9282f1a490ecb19464f7a96a /net-dns | |
parent | [kde-misc/knetworkmanager] removed knetworkmanager-0.7_pre1075348.ebuild (diff) | |
download | kde-sunset-a19d9bf9c82c2db7fc00001aad74cfcf06b020c4.tar.gz kde-sunset-a19d9bf9c82c2db7fc00001aad74cfcf06b020c4.tar.bz2 kde-sunset-a19d9bf9c82c2db7fc00001aad74cfcf06b020c4.zip |
[net-dns/avahi] Update from main portage tree
Diffstat (limited to 'net-dns')
-rw-r--r-- | net-dns/avahi/ChangeLog | 20 | ||||
-rw-r--r-- | net-dns/avahi/Manifest | 6 | ||||
-rw-r--r-- | net-dns/avahi/avahi-0.6.25-r1.ebuild | 4 | ||||
-rw-r--r-- | net-dns/avahi/avahi-0.6.27-r1.ebuild | 206 | ||||
-rw-r--r-- | net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch | 37 |
5 files changed, 268 insertions, 5 deletions
diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog index 8d05efb0..0743a918 100644 --- a/net-dns/avahi/ChangeLog +++ b/net-dns/avahi/ChangeLog @@ -1,6 +1,24 @@ # ChangeLog for net-dns/avahi # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.181 2010/08/03 20:09:38 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.185 2010/08/29 17:48:19 armin76 Exp $ + + 29 Aug 2010; Raúl Porcel <armin76@gentoo.org> avahi-0.6.25-r1.ebuild: + ia64/s390/sh/sparc stable wrt #278177 + + 11 Aug 2010; Joseph Jezak <josejx@gentoo.org> avahi-0.6.25-r1.ebuild: + Marked ppc/ppc64 stable for bug #278177. + + 11 Aug 2010; Arun Raghavan <ford_prefect@gentoo.org> + avahi-0.6.27-r1.ebuild: + Disable introspection for now. Upstream ships a .gir file which is broken + with >=gobject-introspection-0.9. (http://avahi.org/ticket/318) + +*avahi-0.6.27-r1 (10 Aug 2010) + + 10 Aug 2010; Sven Wegener <swegener@gentoo.org> +avahi-0.6.27-r1.ebuild, + +files/avahi-0.6.27-no-auto-activated.patch: + Revert one commit that introduced compability for auto-activated services. + This fixes bug #331275. *avahi-0.6.27 (03 Aug 2010) diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest index 1ef5e5c1..9bee9672 100644 --- a/net-dns/avahi/Manifest +++ b/net-dns/avahi/Manifest @@ -3,12 +3,14 @@ AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145 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-0.6.27-no-auto-activated.patch 1677 RMD160 c5abd8cab9872c22b57de2158c3cb3117722b206 SHA1 2158ca2c25aa8f81dbb6d376ff00a3ed26932e4b SHA256 907ccacfaf118e88a750ff3699e53b4efed7661bb3d09722f04fc389fe46f12b DIST avahi-0.6.24.tar.gz 1115626 RMD160 94f59ccbd14d99e91e259b27dd7f03404c6691e6 SHA1 a187af361fefc8bda026936bb07ccdeb41dc74bc SHA256 260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950 DIST avahi-0.6.25.tar.gz 1103653 RMD160 3025f774360a8ea3b9de87e2df0b00387569aaf2 SHA1 7ce8ed5a494d72401dd81f64594fda59d2ec91fd SHA256 9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59 DIST avahi-0.6.27.tar.gz 1217974 RMD160 36e6a242f0c926351e31871d8a4f8a52a501fdc3 SHA1 e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b SHA256 c22df5e0b0d695bfe3cc52545bf0affc1c52060818a5a65d70055e320bc45e84 EBUILD avahi-0.6.24-r2.ebuild 5400 RMD160 f955a49312b3d0b269e08358c1dce3a6ad00f037 SHA1 12f531483b56407b83be6ed2639d79f671c23226 SHA256 8ea2e741aea77123d87ba83f71cdebde92886e8716554916b87a9a79bd67d018 -EBUILD avahi-0.6.25-r1.ebuild 5002 RMD160 371538bfc5e7697224a0dd7acb234e3c1be5eda8 SHA1 4960afb8c6350c6efb93273331cbad4ead4111c4 SHA256 42854614fbbea0d6c8fd6f60fe62da084f32c663630adbd0692df50eed9edc91 +EBUILD avahi-0.6.25-r1.ebuild 5001 RMD160 a3630d681a75bbb9bb12c2ef86d213750eec6a4a SHA1 3553b0e5b285db42dd303da6459924d2974206e2 SHA256 58cfcd047f3afb58134f851215ebe7e789c2e164874396b65173d9970b7f960a EBUILD avahi-0.6.25.ebuild 5352 RMD160 0fb9fe844fba482fbfc95caf8744b71539c55324 SHA1 353f53cbbf73ed27c5b85629fd2e09374f08a251 SHA256 854cb5b236f3109a227970a9aa99904c1f947680a8bef1345c3e98bdc89d0efa +EBUILD avahi-0.6.27-r1.ebuild 4936 RMD160 3003c3df83b4454863f0cb15259fd4e38c2a79d7 SHA1 7d17c3bf220c9c8a9f445fb17d73e4a9afdb8864 SHA256 a5260698cfca38d54d53f1bd93be28316bc189cf6f18c38e9a6798cee762b966 EBUILD avahi-0.6.27.ebuild 4679 RMD160 8ea7c8f93c28455161164f508b6ee46532fb1e23 SHA1 b74b902c640695c5cb73e2f75a23b6c07bef08bb SHA256 75995b26ecbcbb4d6d4a42882034acebd44f932bd8d0d9db3e149989aac07d21 -MISC ChangeLog 26921 RMD160 9ffda3d09b4ce12b7a3a9d001c6385e1466bb468 SHA1 aac52a0fde4f6da1014dc4f50aafea3b7e9ca5a4 SHA256 f97da840a81ace55b4a3e52625646d4dc69c7931a871777aa2ad1b4ca5226013 +MISC ChangeLog 27632 RMD160 c32a4a1f2cfa0266125a2c457f91f94d4e033047 SHA1 3fcca49e591186d6c42e4ff2c81b815eac5dac8f SHA256 0d85c3f9e2747c304d1284e7fd2278d2001445d0ac3055afce184a94581242fd MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa diff --git a/net-dns/avahi/avahi-0.6.25-r1.ebuild b/net-dns/avahi/avahi-0.6.25-r1.ebuild index 3a6089a0..5e3151da 100644 --- a/net-dns/avahi/avahi-0.6.25-r1.ebuild +++ b/net-dns/avahi/avahi-0.6.25-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25-r1.ebuild,v 1.8 2010/08/03 01:56:46 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.25-r1.ebuild,v 1.10 2010/08/29 17:48:19 armin76 Exp $ EAPI="3" @@ -16,7 +16,7 @@ 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 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips 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 ipv6" RDEPEND=">=dev-libs/libdaemon-0.11-r1 diff --git a/net-dns/avahi/avahi-0.6.27-r1.ebuild b/net-dns/avahi/avahi-0.6.27-r1.ebuild new file mode 100644 index 00000000..e303ae77 --- /dev/null +++ b/net-dns/avahi/avahi-0.6.27-r1.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.27-r1.ebuild,v 1.2 2010/08/11 14:18:15 ford_prefect Exp $ + +EAPI="3" + +PYTHON_DEPEND="python? 2" +PYTHON_USE_WITH="gdbm" +PYTHON_USE_WITH_OPT="python" + +inherit eutils mono python multilib flag-o-matic + +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 ~x86-fbsd" +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 ) + gtk? ( + >=x11-libs/gtk+-2.4.0:2 + >=gnome-base/libglade-2.4.0 + ) + dbus? ( + >=sys-apps/dbus-0.30 + python? ( dev-python/dbus-python ) + ) + mono? ( + >=dev-lang/mono-1.1.10 + gtk? ( >=dev-dotnet/gtk-sharp-2 ) + ) + howl-compat? ( !net-misc/howl ) + mdnsresponder-compat? ( !net-misc/mDNSResponder ) + python? ( + gtk? ( >=dev-python/pygtk-2 ) + ) + bookmarks? ( + dev-python/twisted + dev-python/twisted-web + ) + kernel_linux? ( sys-libs/libcap )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40.5 + >=dev-util/pkgconfig-0.9.0 + doc? ( + app-doc/doxygen + mono? ( >=virtual/monodoc-1.1.8 ) + )" + +pkg_setup() { + if use python + then + python_set_active_version 2 + python_pkg_setup + 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_prepare() { + 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}-no-auto-activated.patch +} + +src_configure() { + use sh && replace-flags -O? -O0 + + 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 + + # Upstream ships a gir file (AvahiCore.gir) which does not work with + # >=gobject-introspection-0.9, so we disable introspection for now. + # http://avahi.org/ticket/318 + econf \ + --localstatedir=/var \ + --with-distro=gentoo \ + --disable-python-dbus \ + --disable-pygtk \ + --disable-xmltoman \ + --disable-monodoc \ + --disable-introspection \ + --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) \ + --disable-gtk3 \ + $(use_enable gtk) \ + $(use_enable qt3) \ + $(use_enable qt4) \ + $(use_enable gdbm) \ + ${myconf} +} + +src_compile() { + 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,NEWS,README,TODO} + + if use doc + then + dohtml -r doxygen/html/. + insinto /usr/share/devhelp/books/avahi + doins avahi.devhelp + fi +} + +pkg_postrm() { + if use python; then + python_mod_cleanup avahi avahi_discover + fi +} + +pkg_postinst() { + if use python; then + python_mod_optimize avahi avahi_discover + 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/files/avahi-0.6.27-no-auto-activated.patch b/net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch new file mode 100644 index 00000000..8a37cd7f --- /dev/null +++ b/net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch @@ -0,0 +1,37 @@ +diff --git b/avahi-client/client.c a/avahi-client/client.c +index 2b29480..6435723 100644 +--- b/avahi-client/client.c ++++ a/avahi-client/client.c +@@ -141,10 +141,9 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message, + + if (strcmp(name, AVAHI_DBUS_NAME) == 0) { + +- if (old[0] && +- avahi_client_is_connected(client)) { ++ if (avahi_client_is_connected(client)) { + +- /* Regardless if the server lost its name or ++ /* Regardless if the server lost or acquired its name or + * if the name was transfered: our services are no longer + * available, so we disconnect ourselves */ + avahi_client_set_errno(client, AVAHI_ERR_DISCONNECTED); +@@ -523,7 +522,7 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags, + goto fail; + } + +- if (!dbus_connection_add_filter(client->bus, filter_func, client, NULL)) { ++ if (!dbus_connection_add_filter (client->bus, filter_func, client, NULL)) { + if (ret_error) + *ret_error = AVAHI_ERR_NO_MEMORY; + goto fail; +@@ -560,7 +559,9 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientFlags flags, + if (dbus_error_is_set(&error)) + goto fail; + +- if (!dbus_bus_start_service_by_name(client->bus, AVAHI_DBUS_NAME, 0, NULL, &error)) { ++ ++ if (!(dbus_bus_name_has_owner(client->bus, AVAHI_DBUS_NAME, &error)) || ++ dbus_error_is_set(&error)) { + + /* We free the error so its not set, that way the fail target + * will return the NO_DAEMON error rather than a DBUS error */ |