net-dns/avahi: brought current stable from gentoo repo, re-adding qt3 flag

Signed-off-by: Ian Stakenvicius <axs@gentoo.org>

5 files changed, 330 insertions, 0 deletions

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 8563dab6..fc62e655 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -2,9 +2,12 @@ AUX autoipd-openrc.sh 700 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e27
 AUX autoipd.sh 1271 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3 WHIRLPOOL b33889de73f571b18da092342be6a47e71d608466aa0d94fa3f0d8d7e373265767a62bdfb82df31059549e4ec0d05aacef89f1778ea561152fd5e1970072584c
 AUX avahi-0.6.28-CVE-2011-1002.patch 2076 SHA256 bf8422b278c0c66eca063672c4836346a4d85cb16014882ca3003b0a79ba9f97 SHA512 f5331d750a4cb20ecc814699edf252ec0894a2b3294a42300e8f2ab305245444b59376ff7dc535ad2e614f2b56fa5492fe4c103fbca1e6ece885204c8218d149 WHIRLPOOL 8c4bb40764639376510355f6822dd02f6f7d0d2923e9ef657f7c3c591f8866993b7bdae57cceb089ad6704a6f505f1b0a38b2dd28a8966d9bb37a1cc5b6bfa5b
 AUX avahi-0.6.30-optional-gtk-utils.patch 2422 SHA256 1233ba93af567117091094921e5ba76f205b1d984fd5a97153c2004f8f0509e3 SHA512 3ea7f7cd0074286bbe474f783ea9638abef7f68d9466d4f5d4d3a0bc6624a43e48bb293f02f2dd08413d5dcf3f99161e0f45537c5f922b1a326375d40b574596 WHIRLPOOL 82a61a4bce9547e15d6370cd856ac020bcdf9ad220f20929d5c64909c0505406e09fa8503aa79c835477811be48e9c72fbcbfc12061c49722431db196c0cbb8c
+AUX avahi-0.6.31-build-client-without-daemon.patch 738 SHA256 d3d1d451886f7bcd7c20cb2c29ec9b5f59ead4ee9567f40d9820ec2275a01a85 SHA512 0d7ab88560eed40bb04360442b4daba6aa58d9f7f7d60b64c0e47b86ff0e6f2fcc8ccc7fbeab9ed87f77eedfde3814d37f82da9ae010223ef0e81e5b64d34b04 WHIRLPOOL caee48616992cfaf71bd5b7b7b90bd0a179a17ab7b2eb60a04026bc099ad2a611f107cf21a634b2cdaf0f15bcbb44523a7eef84cd692e653f537a1bc1501aacc
 AUX avahi-0.6.31-fix-install-avahi-discover.patch 715 SHA256 79da591066f1ddb454f4d7b7ed7163a0d13c332462ac0c2db3e8a6cd130f8441 SHA512 0cdcf41bbd25caea84a62054c4081dfdba1d421cef56babebe33f480a8ba9af1362c7b698803c17132ee78716439ec70cd5d71f7c85b5d49ba9bda471466cb79 WHIRLPOOL 3b5aa85769688a070707e2a03cccbb4861465bad7b03f5d6e34819dbe2dda5934b332934102616d0a0910cddf80150497f15df19d53726850e1a64d0c48e34d9
+AUX avahi-0.6.31-fix-locale-build.patch 866 SHA256 a55f964f9f834e2d864e05bdda00b514650ecca05d8d35dc570c50c51fa616ed SHA512 c970cd5d199024699e3345d59fb03d0966b62c859e9dd2107a1adef4cb7433a2ebcf2cd6331f4726d84a3ec973b45d7e93824fb80a8c8dcf3fcf6a610a67b337 WHIRLPOOL e1878ae2254b1efcf72e4deff94788a389c5e301e70e699007089f06b60163ce8f34790a5b774b42e255e800a2474f8b3a28e1cd0232f9feb16233cdcd7fff64
 AUX avahi-0.6.31-host-name-from-machine-id.patch 3001 SHA256 257685dde4c7dc78b9fbfeab5f213a94121c8bff6ae8fff99a9aae7eeaa34442 SHA512 659d36b06bf721664105bf51a1610186700004dea2af5dc43e29a8d688e903fb0c69416b1b98957de902901fc5ed04fdd252d30e23f680608608e6f633b94b17 WHIRLPOOL e258af6f138ab7b838a8886d74b73f8d44aefea981bd3e876cca41a144081ad4d199f9ba4031fda71c5d78578869fadd1b226a11b101df406fa2d85911d06e81
 AUX avahi-0.6.31-install-exec-hook.patch 507 SHA256 5411262dd719e647ab7781d2e10ff05d051ff1d7218d58e5bf3a3fbe8628a439 SHA512 c25802f78b5c2f6cc15705c6e426b6590dbcdf30d33e239bd919e9592c5e72c7fb244726e74addfeff4b81fa41cc62afb3ddb880232fea66f3cc9470bb5940b1 WHIRLPOOL 864804ca378b2ef83766ba10e08998f0524ed8c2f6c5fe491eefe88dac2184a3b20848258cd7d19af10a50bbbe8567928c3762b00896bb32b18fda6a4d117c19
+AUX avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch 1265 SHA256 24954a76f0dfdffc9a079072f8f4d50e292f8ae2a2b8e5a49f488519057c51b0 SHA512 f575e3ba1c704ec3bf92ffd8344a104f35026e6738720955caa23549f602f491c5e209188c5c00189b269e79e6120021d02cc07fbdea22a7c99ce7682f017fe7 WHIRLPOOL f0859f44face57b0eefb6858203bbfa73d6c4be2aa684911d3a152eeca93f972eb81650c4c307b96cd5764c1b12ade6624574331c944db259159bc9321092edb
 AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 SHA256 0bd4f2b2f720684b754698d86b6b1f106576473cead815e7b60b1c62171e4cdc SHA512 c2d11b243acdc058cde03b872dccbbbd44a7a584adf168f16016f29c7a5d9d8668095b781f53102feba8b9c80b2cbbd788c9b327d9d1e2e552fbdcf3c2960517 WHIRLPOOL faae601dca07f267ebe6f8254ff2e00d7ff3de3aa4aa92186e9dead9ac49b43c670b3310d0d7671eae8858ef2f046a4c6b27cb1bb23c20413fddb791ad793a67
 AUX netlink-request-all-matches-when-requesting-interface.patch 1634 SHA256 163db2141b278a07433e7d1b51227493555ca7ba1faf2d19c97e20aa51b947cd SHA512 d02e4359152644622c2e52866f150b1cf70d699885f4fad02696113eab9dba5c1954efeb2975de71cc3f8077675ede92409c67e6acfee5d2e86a72281007d545 WHIRLPOOL 3b79b4482663d44d7cd04c64b3b29341f1f00164d227d639630e53616a13b9b17692aecc940157cb984114bb3ed02e5ad14bfe2fe8177898976c240e1773314a
 DIST avahi-0.6.28.tar.gz 1238660 SHA256 a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91
@@ -13,5 +16,6 @@ DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092
 EBUILD avahi-0.6.28-r1.ebuild 4966 SHA256 c2c7ffd115821b50bb6d8d35452d9167530ce676a794a8d3378767d53d702672 SHA512 e914adf62b20200042a3280937962dcadd9e53fbf9c8372de962d8614aa06bd5fc970544891e13653e188c36e953acbfb58c93cbd903226173ed9baf253be70d WHIRLPOOL 8df4af44593d409e67715b8b2e2c4dd3262297fff549a64924d54ae989c71d558e6e539ed8c69857dd5464767afe11f23d7e1279fde42b3333bffcda3abf634a
 EBUILD avahi-0.6.30-r1.ebuild 5358 SHA256 b299f8e843e7e69b9ef8f0dbae7ef53583f6716ab6fdff6f3ccaa275c7ce4b7b SHA512 dd68dd4d66e36098c4cc0078e3bab5fc991220a2d30e096a70ecd5e20c99dd387ff29fecf87603eb19b8ffb2b83281035710ae497bbef6167106c4540d4dbf9a WHIRLPOOL c2d30cbaacf8cfc1e1758ea53aee39111835f48f1063ceab8c491e1f18e48045c6b69b60ec0a87664e813eb028e5c001e225208dc8224c136f5eeeab4bc7e3e2
 EBUILD avahi-0.6.31-r2.ebuild 5138 SHA256 2814b1c3d27db864555df67235f9fd8a912ef10ecde988bcd6cb9a670f34e3d8 SHA512 296a65ddec09762e2e5055653fa1159d8a93fbeaa18fe63a29d38a01fd5eafdca8f6882c7eba5b94c56552d63965569f93ecc1806a109d5231159c6c46abf7d3 WHIRLPOOL 833c22b6d7b6bade470be3245907411eadcc342db2d2f960faa0c2a90645b7e1155675d6c36b8f4036bac6060140f7886616119f790795afaa042f5097fbda6f
+EBUILD avahi-0.6.31-r6.ebuild 6385 SHA256 2f3491392440f2e5d3e7a3a69eb187a13383ce600884f3d036ef2545d22d218f SHA512 03d520a99699dfc7ad0a0ebc4e54f3be0cd6efc0f553449b3a2c189991e3c1231660aa16a8fa01dc4fe2546f81b3b5310a7a2c93ce53a440a64a23393b0269f7 WHIRLPOOL 366580db8a08e794669caf5177d2a9fdfc7206d8705a2e7ca6ea63ada35f6319b2cb3e88c43e1ac3899ad7ffa687813b14e7f6aac8a0360924c985a0dea9b585
 MISC ChangeLog 30875 SHA256 fb9a0aab47238749181692d918e55b7bd82316ee744341fc0004826316e556f0 SHA512 228b4e528c476c81c9312434f2ce79213d9505d62b7fbeb03b134d46f39ffdc1fc039de3d9c182499a58d6a965eb7faf81a02e3f87928cd252458bb957a58f13 WHIRLPOOL 74c1adb950db409e1274849d861b18cbf3f4a321e719c83ac8b3c4e09012814c6f6fc505a50448d8081aae98ed0a4c7a4719320ff086f49e5c3d16ffbee82d19
 MISC metadata.xml 913 SHA256 1a95241251d48972e68bfc61d6ed70722991e837d3b01c11bf14860f7231d68e SHA512 0d15283f054a418c508c9cf663ec9fd66fe0d93ac7dfbdb3e3247e2366b7a5247fe08cbb8866aea1b71f9a8da6247369672089d83cbf87653bb461e93088e67b WHIRLPOOL 9dbc29b77342b58cb65787412ea28395cbabd781a0dcd1ca179a0a1e54d039641265d2da78b9dac184339141b48d6b0dc65f01c8d5cfed78bdb9cf60d4215142
diff --git a/net-dns/avahi/avahi-0.6.31-r6.ebuild b/net-dns/avahi/avahi-0.6.31-r6.ebuild
new file mode 100644
index 00000000..0d03a584
--- /dev/null
+++ b/net-dns/avahi/avahi-0.6.31-r6.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r6.ebuild,v 1.11 2015/04/08 18:16:54 mgorny Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="gdbm"
+
+WANT_AUTOMAKE=1.11
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env \
+	python-r1 systemd user
+
+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 arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt3 qt4 selinux test utils"
+
+REQUIRED_USE="
+	utils? ( || ( gtk gtk3 ) )
+	python? ( dbus gdbm )
+	mono? ( dbus )
+	howl-compat? ( dbus )
+	mdnsresponder-compat? ( dbus )
+"
+
+COMMON_DEPEND="
+	dev-libs/libdaemon
+	dev-libs/expat
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
+	qt3? ( dev-qt/qt-meta:3 )
+	qt4? ( dev-qt/qtcore:4 )
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	kernel_linux? ( sys-libs/libcap )
+	introspection? ( dev-libs/gobject-introspection )
+	mono? (
+		dev-lang/mono
+		gtk? ( dev-dotnet/gtk-sharp )
+	)
+	python? (
+		${PYTHON_DEPS}
+		gtk? ( dev-python/pygtk )
+		dbus? ( dev-python/dbus-python )
+	)
+	bookmarks? (
+		dev-python/twisted-core
+		dev-python/twisted-web
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? (
+		app-doc/doxygen
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	howl-compat? ( !net-misc/howl )
+	mdnsresponder-compat? ( !net-misc/mDNSResponder )
+	selinux? ( sec-policy/selinux-avahi )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# necessary until the UI libraries are ported
+	/usr/include/avahi-qt4/qt-watch.h
+	/usr/include/avahi-ui/avahi-ui.h
+)
+
+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
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+}
+
+src_prepare() {
+	if use ipv6; then
+		sed -i \
+			-e s/use-ipv6=no/use-ipv6=yes/ \
+			avahi-daemon/avahi-daemon.conf || die
+	fi
+
+	sed -i\
+		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
+		doxygen_to_devhelp.xsl || die
+
+	# Make gtk utils optional
+	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
+
+	# Fix init scripts for >=openrc-0.9.0, bug #383641
+	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
+
+	# install-exec-local -> install-exec-hook
+	epatch "${FILESDIR}"/${P}-install-exec-hook.patch
+
+	# Backport host-name-from-machine-id patch, bug #466134
+	epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch
+
+	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
+	epatch "${FILESDIR}"/${P}-fix-install-avahi-discover.patch
+
+	epatch "${FILESDIR}"/${P}-so_reuseport-may-not-exist-in-running-kernel.patch
+
+	# allow building client without the daemon
+	epatch "${FILESDIR}"/${P}-build-client-without-daemon.patch
+
+	# Fix build under various locales, bug #501664
+	epatch "${FILESDIR}"/${P}-fix-locale-build.patch
+
+	# Drop DEPRECATED flags, bug #384743
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
+
+	# Fix references to Lennart's home directory, bug #466210
+	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
+
+	# Prevent .pyc files in DESTDIR
+	>py-compile
+
+	eautoreconf
+
+	# bundled manpages
+	multilib_copy_sources
+}
+
+src_configure() {
+	# those steps should be done once-per-ebuild rather than per-ABI
+	use sh && replace-flags -O? -O0
+	use python && python_export_best
+
+	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
+	unset DISPLAY
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=( --disable-static )
+
+	if use python; then
+		myconf+=(
+			$(multilib_native_use_enable dbus python-dbus)
+			$(multilib_native_use_enable gtk pygtk)
+		)
+	fi
+
+	if use mono; then
+		myconf+=( $(multilib_native_use_enable doc monodoc) )
+	fi
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# used by daemons only
+			--disable-libdaemon
+			--with-xml=none
+		)
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--with-distro=gentoo \
+		--disable-python-dbus \
+		--disable-pygtk \
+		--disable-xmltoman \
+		--disable-monodoc \
+		--enable-glib \
+		--enable-gobject \
+		$(multilib_native_use_enable test tests) \
+		$(multilib_native_use_enable autoipd) \
+		$(use_enable mdnsresponder-compat compat-libdns_sd) \
+		$(use_enable howl-compat compat-howl) \
+		$(multilib_native_use_enable doc doxygen-doc) \
+		$(multilib_native_use_enable mono) \
+		$(use_enable dbus) \
+		$(multilib_native_use_enable python) \
+		$(multilib_native_use_enable gtk) \
+		$(multilib_native_use_enable gtk3) \
+		$(use_enable nls) \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_enable utils gtk-utils) \
+		$(multilib_native_use_enable qt3) \
+		$(multilib_native_use_enable qt4) \
+		$(use_enable gdbm) \
+		$(systemd_with_unitdir) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	multilib_is_native_abi && use doc && emake avahi.devhelp
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+	use bookmarks && use python && use dbus && use gtk || \
+		rm -f "${ED}"/usr/bin/avahi-bookmarks
+
+	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
+	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
+
+	if multilib_is_native_abi && use doc; then
+		dohtml -r doxygen/html/. || die
+		insinto /usr/share/devhelp/books/avahi
+		doins avahi.devhelp || die
+	fi
+}
+
+multilib_src_install_all() {
+	if use autoipd; then
+		insinto /$(get_libdir)/rcscripts/net
+		doins "${FILESDIR}"/autoipd.sh
+
+		insinto /$(get_libdir)/netifrc/net
+		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
+	fi
+
+	dodoc docs/{AUTHORS,NEWS,README,TODO}
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	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.31-build-client-without-daemon.patch b/net-dns/avahi/files/avahi-0.6.31-build-client-without-daemon.patch
new file mode 100644
index 00000000..df0c420f
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.31-build-client-without-daemon.patch
@@ -0,0 +1,27 @@
+From ce3b83de6aa689c0cefe0b1e85c03a627b537099 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 12 May 2014 19:46:22 +0200
+Subject: [PATCH] Allow building client without the daemon.
+
+There's no good reason to disallow that, and that's what we specifically
+want to do for multilib.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0e190ba..c56cf01 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1185,7 +1185,7 @@ fi
+ 
+ BUILD_CLIENT="no   (You need avahi-daemon and D-Bus!)"
+ 
+-if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" ; then
++if "x$HAVE_DBUS" = "xyes" ; then
+     BUILD_CLIENT=yes
+ fi
+ 
+-- 
+1.9.3
+
diff --git a/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch b/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch
new file mode 100644
index 00000000..b0e47e90
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.31-fix-locale-build.patch
@@ -0,0 +1,20 @@
+avahi-gobject fails to build under et_EE and possibly other locales.
+
+The regex for a sed in avahi-gobject/Makefile fails under various locales.
+Forcing LC_ALL=C fixes the issue.
+
+X-Gentoo-Bug: 501664
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/501664
+
+diff -Naur avahi-0.6.31.orig/avahi-gobject/Makefile.am avahi-0.6.31/avahi-gobject/Makefile.am
+--- avahi-0.6.31.orig/avahi-gobject/Makefile.am	2010-08-25 20:51:39.007153001 -0400
++++ avahi-0.6.31/avahi-gobject/Makefile.am	2014-09-07 19:00:05.485657990 -0400
+@@ -76,7 +76,7 @@
+ 
+ signals-marshal.list: $(CORE_SOURCES) Makefile.am
+ 	$(AM_V_GEN)( cd $(srcdir) && \
+-	sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
++	LC_ALL=C sed -n -e 's/.*_ga_signals_marshal_\([A-Z]*__[A-Z_]*\).*/\1/p' \
+ 		$(CORE_SOURCES) ) \
+ 		| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp && \
+ 	if cmp -s $@.tmp $@; then \
diff --git a/net-dns/avahi/files/avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch b/net-dns/avahi/files/avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch
new file mode 100644
index 00000000..9c23ca5e
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/484212
+
+Description: SO_REUSEPORT may not exist in running kernel
+ When userspace defines SO_REUSEPORT we will attempt to enable socket
+ port number reuse.  However if the running kernel does not support
+ this call it will fail preventing daemon startup.  If this call is
+ present but fails ENOPROTOOPT then we know that actually the kernel
+ does not support it and we should continue as if we did not have the
+ call at all.  (LP: #1228204)
+ .
+ This patch could be removed from the debian package after jessie release.
+Author: Andy Whitcroft <apw@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1228204
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732009
+Last-Update: 2013-09-20
+
+Index: avahi-0.6.31/avahi-core/socket.c
+===================================================================
+--- avahi-0.6.31.orig/avahi-core/socket.c	2013-09-20 16:36:50.000000000 +0100
++++ avahi-0.6.31/avahi-core/socket.c	2013-09-20 16:38:23.781863644 +0100
+@@ -177,7 +177,8 @@
+     yes = 1;
+     if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes)) < 0) {
+         avahi_log_warn("SO_REUSEPORT failed: %s", strerror(errno));
+-        return -1;
++        if (errno != ENOPROTOOPT)
++            return -1;
+     }
+ #endif
+