diff options
| -rw-r--r-- | Documentation/package.unmask/kde-3.5 | 5 | ||||
| -rw-r--r-- | net-dns/avahi/ChangeLog | 23 | ||||
| -rw-r--r-- | net-dns/avahi/Manifest | 17 | ||||
| -rw-r--r-- | net-dns/avahi/avahi-0.6.25-r1.ebuild | 209 | ||||
| -rw-r--r-- | net-dns/avahi/avahi-0.6.27-r1.ebuild | 205 | ||||
| -rw-r--r-- | net-dns/avahi/avahi-0.6.27.ebuild | 199 | ||||
| -rw-r--r-- | net-dns/avahi/avahi-0.6.28-r1.ebuild | 4 | ||||
| -rw-r--r-- | net-dns/avahi/avahi-0.6.29.ebuild (renamed from net-dns/avahi/avahi-0.6.28.ebuild) | 8 | ||||
| -rw-r--r-- | net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch | 11 | ||||
| -rw-r--r-- | net-dns/avahi/files/avahi-0.6.24-libintl.patch | 11 | ||||
| -rw-r--r-- | net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch | 37 | ||||
| -rw-r--r-- | net-dns/avahi/files/netlink-request-all-matches-when-requesting-interface.patch | 53 |
12 files changed, 59 insertions, 723 deletions
diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package.unmask/kde-3.5 index 288981ff..8f2cce01 100644 --- a/Documentation/package.unmask/kde-3.5 +++ b/Documentation/package.unmask/kde-3.5 @@ -611,11 +611,8 @@ =media-video/subtitlecomposer-0.4.3-r1 =net-analyzer/knetscan-1.0-r1 =net-analyzer/ksniffer-0.3.2 -=net-dns/avahi-0.6.25-r1 -=net-dns/avahi-0.6.27 -=net-dns/avahi-0.6.27-r1 -=net-dns/avahi-0.6.28 =net-dns/avahi-0.6.28-r1 +=net-dns/avahi-0.6.29 =net-firewall/knetfilter-3.5.0 =net-im/kmess-1.5.1 =net-im/kmess-1.5.2 diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog index b27e1237..0060d1ee 100644 --- a/net-dns/avahi/ChangeLog +++ b/net-dns/avahi/ChangeLog @@ -1,6 +1,27 @@ # ChangeLog for net-dns/avahi # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.197 2011/03/02 08:46:47 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.202 2011/03/17 07:14:41 swegener Exp $ + + 17 Mar 2011; Sven Wegener <swegener@gentoo.org> + files/netlink-request-all-matches-when-requesting-interface.patch: + Update netlink patch from git. + +*avahi-0.6.29 (17 Mar 2011) + + 17 Mar 2011; Sven Wegener <swegener@gentoo.org> +avahi-0.6.29.ebuild: + Version bump, bug #358971. + + 12 Mar 2011; Sven Wegener <swegener@gentoo.org> + -files/avahi-0.6.24-cmsg_space.patch, -files/avahi-0.6.24-libintl.patch, + -avahi-0.6.25-r1.ebuild, -avahi-0.6.27.ebuild, -avahi-0.6.27-r1.ebuild, + -files/avahi-0.6.27-no-auto-activated.patch, -avahi-0.6.28.ebuild: + Cleanup. + + 05 Mar 2011; Raúl Porcel <armin76@gentoo.org> avahi-0.6.28-r1.ebuild: + alpha/arm/ia64/s390/sh/sparc stable wrt #355583 + + 03 Mar 2011; Jeroen Roovers <jer@gentoo.org> avahi-0.6.28-r1.ebuild: + Stable for HPPA (bug #355583). 02 Mar 2011; Thomas Kahle <tomka@gentoo.org> avahi-0.6.28-r1.ebuild: x86 stable per bug 355583 diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest index b2986cdf..0397df4d 100644 --- a/net-dns/avahi/Manifest +++ b/net-dns/avahi/Manifest @@ -1,17 +1,10 @@ AUX autoipd-openrc.sh 700 RMD160 00e259967279dc52ee99476dfb4d6c9672b77ee3 SHA1 1d9858b99f23688f6a0f4a6726400bbbe41df976 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9 -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 AUX avahi-0.6.28-CVE-2011-1002.patch 2076 RMD160 0b561a78e75099a14e7a3da5290cd1ffa6a75533 SHA1 6d298861d7c7b432cd350f3df277e43ed59b378b SHA256 bf8422b278c0c66eca063672c4836346a4d85cb16014882ca3003b0a79ba9f97 -AUX netlink-request-all-matches-when-requesting-interface.patch 1642 RMD160 b8c1987c35e2d7fde63ee3971bb6e5cafe37ae43 SHA1 44fe78fda6a2cdfbb92654164fa421450aaec68a SHA256 9b91094b8316d8125a2dc2b118c406e2ae8e5f7760089a041bbf539ff44dc12f -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 +AUX netlink-request-all-matches-when-requesting-interface.patch 1634 RMD160 3995e26dca6ec1cb4801159c479c0b591eff5da3 SHA1 e234d6bd96b7adaf543ef7583b6dd90538238608 SHA256 163db2141b278a07433e7d1b51227493555ca7ba1faf2d19c97e20aa51b947cd DIST avahi-0.6.28.tar.gz 1238660 RMD160 d61b370baa3f25d57efba43f2c34b54cab7e7e9e SHA1 5da3f7da2cff8ddf74f8746e4dcb2524e5047f67 SHA256 a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91 -EBUILD avahi-0.6.25-r1.ebuild 5001 RMD160 a3630d681a75bbb9bb12c2ef86d213750eec6a4a SHA1 3553b0e5b285db42dd303da6459924d2974206e2 SHA256 58cfcd047f3afb58134f851215ebe7e789c2e164874396b65173d9970b7f960a -EBUILD avahi-0.6.27-r1.ebuild 4903 RMD160 00dafea3f3a4ae4281e573a23f7f4ec9bb130eef SHA1 dd637d5b1207bdf455064009647697775752bba7 SHA256 64e24c62269015042226b6bc801852c4576eda04cde4c2b7e59421291d0358ba -EBUILD avahi-0.6.27.ebuild 4650 RMD160 93703638ec59e9da63b6ba2bd058b94964ac69e4 SHA1 40c43baf69299bad27812f2ab6859da444d8e7d7 SHA256 cc53a733743c9274e846aa6c255bd085c5b612405ae4f73dea147df7380279b7 -EBUILD avahi-0.6.28-r1.ebuild 4971 RMD160 a991e269c764baa22eddba22a6242496d00c4691 SHA1 1b2050fbf2a7918187292bea3a8ee529c6815ab2 SHA256 fa282f31a3b863543a32687f0dd32486c0d252459c8e7bc1f5e6a444de246540 -EBUILD avahi-0.6.28.ebuild 4866 RMD160 d448c65be1b093d24a5124983dc6cfafd8a83013 SHA1 25199f847c683619d32c989b9b51f985c187928e SHA256 55280d5880a8938f7080c4e2363aedb9f217eb10387719d6c17b35d605652ec8 -MISC ChangeLog 29365 RMD160 b720dbe81ba1452e358f87a56f41a2d1be575a2a SHA1 8dbe487e14c8e2842b2cff8e7a486e8edc058abf SHA256 9f00b4860a063a270d1fcff62eebfd933f2810858ad107e5ce6aab044de1b11d +DIST avahi-0.6.29.tar.gz 1244081 RMD160 a0a4e1019cafb53a683ceceaa44605873957b6cd SHA1 af13ae6fdb3cd61b2eafa25a108773156d88b362 SHA256 4eb1a6bdc93f1b245fc1b26ff6a79f5f958c1135c04bff60d36d374d98cc14d8 +EBUILD avahi-0.6.28-r1.ebuild 4966 RMD160 47ba572f4480b3bea49236fdd827fc06d17c7e3c SHA1 700c711bb955724c97d069eb666bfd371291a4da SHA256 56685b8e760f0326fc3e3c7522650053d5115494e2f836eed411b99a688ee5c2 +EBUILD avahi-0.6.29.ebuild 4845 RMD160 b7eeae605f34a536c6dfd0d0a4ea766752b8e158 SHA1 d568b8ab8037216b9a3bd9e2d031a409347267ff SHA256 34c5691642d73bc50f3ccb4a9026e880b890573df3f9be8f86b3bbab9cdabf47 +MISC ChangeLog 30161 RMD160 e9b632ee6bc0041d87356bee452609199c0e9a59 SHA1 cc9883e834fe699307534bcdf0095b005dcfa1e5 SHA256 fc0d4d9dea48441e01aee1c97d3a52684aa5acacc0ebe35aa6e8a793d79e4fd6 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 deleted file mode 100644 index 5e3151da..00000000 --- a/net-dns/avahi/avahi-0.6.25-r1.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# 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.10 2010/08/29 17:48:19 armin76 Exp $ - -EAPI="3" - -PYTHON_DEPEND="python? 2" -PYTHON_USE_WITH="gdbm" -PYTHON_USE_WITH_OPT="python" - -inherit eutils mono python multilib autotools 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 - >=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 - - # Fix intltoolize broken file, see GNOME upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed" - - rm -f common/libtool.m4 common/lt*.m4 || die "Removing libtool macros failed" - - epatch "${FILESDIR}"/avahi-0.6.24-cmsg_space.patch - epatch "${FILESDIR}"/avahi-0.6.24-libintl.patch - - eautoreconf -} - -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 - - 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} -} - -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/avahi-0.6.27-r1.ebuild b/net-dns/avahi/avahi-0.6.27-r1.ebuild deleted file mode 100644 index 8c259c4d..00000000 --- a/net-dns/avahi/avahi-0.6.27-r1.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# 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.3 2010/12/14 00:27:52 swegener 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.14.0:2 - ) - 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/avahi-0.6.27.ebuild b/net-dns/avahi/avahi-0.6.27.ebuild deleted file mode 100644 index 28b960bd..00000000 --- a/net-dns/avahi/avahi-0.6.27.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# 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.ebuild,v 1.2 2010/12/14 00:27:52 swegener 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.14.0:2 - ) - 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 -} - -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 - - 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) \ - --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/avahi-0.6.28-r1.ebuild b/net-dns/avahi/avahi-0.6.28-r1.ebuild index a6feb6c4..8da410ea 100644 --- a/net-dns/avahi/avahi-0.6.28-r1.ebuild +++ b/net-dns/avahi/avahi-0.6.28-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28-r1.ebuild,v 1.5 2011/03/02 08:46:47 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28-r1.ebuild,v 1.7 2011/03/05 13:42:05 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="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux mdnsresponder-compat mono python qt3 qt4 test " DBUS_DEPEND=">=sys-apps/dbus-0.30" diff --git a/net-dns/avahi/avahi-0.6.28.ebuild b/net-dns/avahi/avahi-0.6.29.ebuild index f8084f2d..ee2f0662 100644 --- a/net-dns/avahi/avahi-0.6.28.ebuild +++ b/net-dns/avahi/avahi-0.6.29.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28.ebuild,v 1.6 2011/01/23 20:24:45 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.29.ebuild,v 1.1 2011/03/17 07:11:30 swegener Exp $ EAPI="3" @@ -93,8 +93,6 @@ src_prepare() { sed -i\ -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ doxygen_to_devhelp.xsl || die - - epatch "${FILESDIR}"/netlink-request-all-matches-when-requesting-interface.patch } src_configure() { @@ -181,11 +179,11 @@ src_install() { } pkg_postrm() { - use python && python_mod_cleanup avahi avahi_discover + use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover) } pkg_postinst() { - use python && python_mod_optimize avahi avahi_discover + use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover) if use autoipd; then echo 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 deleted file mode 100644 index 220e63fa..00000000 --- a/net-dns/avahi/files/avahi-0.6.24-cmsg_space.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 3ad943ac..00000000 --- a/net-dns/avahi/files/avahi-0.6.24-libintl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 = \ 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 deleted file mode 100644 index 8a37cd7f..00000000 --- a/net-dns/avahi/files/avahi-0.6.27-no-auto-activated.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 */ diff --git a/net-dns/avahi/files/netlink-request-all-matches-when-requesting-interface.patch b/net-dns/avahi/files/netlink-request-all-matches-when-requesting-interface.patch index 2cd1afd1..877d97c7 100644 --- a/net-dns/avahi/files/netlink-request-all-matches-when-requesting-interface.patch +++ b/net-dns/avahi/files/netlink-request-all-matches-when-requesting-interface.patch @@ -1,32 +1,34 @@ -From 882da7d7385e51024bc64a08a21cfd86cc55f3d1 Mon Sep 17 00:00:00 2001 -From: Andy Whitcroft <apw@canonical.com> -Date: Tue, 18 Jan 2011 10:30:58 +0000 -Subject: [PATCH] netlink: request all matches when requesting interface and address lists +From: Pablo Neira Ayuso <pablo@netfilter.org> +Date: Fri, 18 Feb 2011 17:58:21 +0000 (+0100) +Subject: netlink: fix wrong use of netlink flags for dump operations +X-Git-Tag: v0.6.29~17 +X-Git-Url: http://git.0pointer.de/?p=avahi.git;a=commitdiff_plain;h=65cb5c100eb1e5891f145be0b89aaa3c2d2e4317 -When requesting the a full list of interfaces and addresses for the machine -avahi uses a wild card netlink search. This is done via a NLM_F_ROOT -request. However we do not correctly request NLM_F_MATCH indicating -we want all matches. This leads to the requests returning EINVAL on -v2.6.38-rc1 and later kernels and to the daemon hanging during startup. +netlink: fix wrong use of netlink flags for dump operations -Prior to v2.6.38-rc1 bugs in the kernel caused NLM_F_ROOT to incorrectly -imply NLM_F_MATCH, see the commit below for details: +The avahi-daemon uses a wrong flag combination to operate with +rtnetlink. This patch fixes the problems. - commit 0ab03c2b1478f2438d2c80204f7fef65b1bca9cf - Author: Jan Engelhardt <jengelh@medozas.de> - Date: Fri Jan 7 03:15:05 2011 +0000 - - netlink: test for all flags of the NLM_F_DUMP composite - -Add the missing NLM_F_MATCH. - -Signed-off-by: Andy Whitcroft <apw@canonical.com> +No need to set NLM_F_ACK since the dump operation already includes +the trailing NLMSG_DONE message that informs about the end of the +dump operation. --- - avahi-core/iface-linux.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) +diff --git a/avahi-autoipd/iface-linux.c b/avahi-autoipd/iface-linux.c +index fc27829..83e9e41 100644 +--- a/avahi-autoipd/iface-linux.c ++++ b/avahi-autoipd/iface-linux.c +@@ -262,7 +262,7 @@ int iface_get_initial_state(State *state) { + n->nlmsg_len = NLMSG_LENGTH(sizeof(*ifi)); + n->nlmsg_type = RTM_GETLINK; + n->nlmsg_seq = seq; +- n->nlmsg_flags = NLM_F_MATCH|NLM_F_REQUEST|NLM_F_ACK; ++ n->nlmsg_flags = NLM_F_REQUEST|NLM_F_DUMP; + n->nlmsg_pid = 0; + + ifi = NLMSG_DATA(n); diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c -index a1b7f73..9a0bbb6 100644 +index a1b7f73..4d12f73 100644 --- a/avahi-core/iface-linux.c +++ b/avahi-core/iface-linux.c @@ -53,7 +53,7 @@ static int netlink_list_items(AvahiNetlink *nl, uint16_t type, unsigned *ret_seq @@ -34,10 +36,7 @@ index a1b7f73..9a0bbb6 100644 n->nlmsg_len = NLMSG_LENGTH(sizeof(struct rtgenmsg)); n->nlmsg_type = type; - n->nlmsg_flags = NLM_F_ROOT|NLM_F_REQUEST; -+ n->nlmsg_flags = NLM_F_MATCH|NLM_F_ROOT|NLM_F_REQUEST; ++ n->nlmsg_flags = NLM_F_REQUEST|NLM_F_DUMP; n->nlmsg_pid = 0; gen = NLMSG_DATA(n); --- -1.7.1 - |