diff options
13 files changed, 601 insertions, 2 deletions
diff --git a/net-dns/avahi-base/avahi-base-0.6.31-r6.ebuild b/net-dns/avahi-base/avahi-base-0.6.31-r6.ebuild index 1ab595fb..afb9721d 100644 --- a/net-dns/avahi-base/avahi-base-0.6.31-r6.ebuild +++ b/net-dns/avahi-base/avahi-base-0.6.31-r6.ebuild @@ -197,8 +197,6 @@ multilib_src_install() { dohtml -r doxygen/html/. || die insinto /usr/share/devhelp/books/avahi doins avahi.devhelp || die - insinto /usr/include - doins avahi-ui/avahi-ui.h fi } diff --git a/net-dns/avahi-libs/Manifest b/net-dns/avahi-libs/Manifest new file mode 100644 index 00000000..0206eaaa --- /dev/null +++ b/net-dns/avahi-libs/Manifest @@ -0,0 +1 @@ +DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f diff --git a/net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild b/net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild new file mode 100644 index 00000000..8e166d15 --- /dev/null +++ b/net-dns/avahi-libs/avahi-libs-0.6.31-r6.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2014 Sabayon +# Copyright 2015 Rogentos Group +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" + +AVAHI_MODULE="${AVAHI_MODULE:-${PN/avahi-}}" +MY_P=${P/-${AVAHI_MODULE}} +MY_PN=${PN/-${AVAHI_MODULE}} + +WANT_AUTOMAKE=1.11 + +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE="gdbm" + +inherit autotools eutils flag-o-matic multilib multilib-minimal \ + python-r1 systemd user + +DESCRIPTION="System which facilitates service discovery on a local network (gtk3 pkg)" +HOMEPAGE="http://avahi.org/" +SRC_URI="http://avahi.org/download/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 x86 ~x86-linux" +IUSE="bookmarks dbus gdbm introspection nls python utils" + +S="${WORKDIR}/${MY_P}" + +COMMON_DEPEND="" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +MULTILIB_WRAPPED_HEADERS=( + # necessary until the UI libraries are ported + /usr/include/avahi-ui/avahi-ui.h +) + +src_prepare() { + # Make gtk utils optional + epatch "${FILESDIR}"/${MY_PN}-0.6.30-optional-gtk-utils.patch + + # Fix init scripts for >=openrc-0.9.0, bug #383641 + epatch "${FILESDIR}"/${MY_PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch + + # install-exec-local -> install-exec-hook + epatch "${FILESDIR}"/${MY_P}-install-exec-hook.patch + + # Backport host-name-from-machine-id patch, bug #466134 + epatch "${FILESDIR}"/${MY_P}-host-name-from-machine-id.patch + + # Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575 + epatch "${FILESDIR}"/${MY_P}-fix-install-avahi-discover.patch + + epatch "${FILESDIR}"/${MY_P}-so_reuseport-may-not-exist-in-running-kernel.patch + + # allow building client without the daemon + epatch "${FILESDIR}"/${MY_P}-build-client-without-daemon.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 + + # 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 ! multilib_is_native_abi; then + myconf+=( + # used by daemons only + --disable-libdaemon + --with-xml=none + ) + fi + + if use python; then + myconf+=( + $(multilib_native_use_enable dbus python-dbus) + ) + fi + + econf \ + --localstatedir="${EPREFIX}/var" \ + --with-distro=gentoo \ + --disable-python-dbus \ + --disable-xmltoman \ + --disable-mono \ + --disable-monodoc \ + --disable-pygtk \ + --enable-glib \ + --enable-gobject \ + $(use_enable dbus) \ + $(multilib_native_use_enable python) \ + $(use_enable nls) \ + $(multilib_native_use_enable introspection) \ + --disable-qt3 \ + --disable-qt4 \ + --disable-gtk \ + $(multilib_is_native_abi && echo -n --enable-gtk3 --enable-utils || echo -n --disable-gtk3 --disable-utils) \ + $(use_enable gdbm) \ + $(systemd_with_unitdir) \ + "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + for target in avahi-common avahi-client avahi-glib avahi-ui; do + cd "${BUILD_DIR}"/${target} || die + emake || die + done + cd "${BUILD_DIR}" || die + emake avahi-ui-gtk3.pc || die + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + mkdir -p "${D}/usr/bin" || die + cd "${BUILD_DIR}"/avahi-ui || die + emake DESTDIR="${D}" install || die + cd "${BUILD_DIR}" || die + dodir /usr/$(get_libdir)/pkgconfig + insinto /usr/$(get_libdir)/pkgconfig + doins avahi-ui-gtk3.pc + fi +} + +multilib_src_install_all() { + prune_libtool_files --all + use bookmarks && use python && use dbus || \ + rm -f "${D}"/usr/bin/avahi-bookmarks +} + +src_install() { + if use abi_x86_32 ; then + insinto /usr/include/ + doins avahi-ui/avahi-ui.h + insinto /usr/include/${CHOST}/avahi-ui/ + doins "${WORKDIR}"/avahi-0.6.31-abi_x86_32.x86/avahi-ui/avahi-ui.h + elif use abi_x86_64 ; then + insinto /usr/include/ + doins avahi-ui/avahi-ui.h + insinto /usr/include/${CHOST}/avahi-ui/ + doins "${WORKDIR}"/avahi-0.6.31-abi_x86_64.amd64/avahi-ui/avahi-ui.h + fi +} diff --git a/net-dns/avahi-libs/files/avahi-0.6.30-automake-1.11.2.patch b/net-dns/avahi-libs/files/avahi-0.6.30-automake-1.11.2.patch new file mode 100644 index 00000000..be385f6c --- /dev/null +++ b/net-dns/avahi-libs/files/avahi-0.6.30-automake-1.11.2.patch @@ -0,0 +1,102 @@ +http://bugs.gentoo.org/397477 + +--- avahi-python/avahi/Makefile.am ++++ avahi-python/avahi/Makefile.am +@@ -31,7 +31,7 @@ + -e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \ + -e 's,@CHECK_KEY\@,while key is not None:,g' \ + -e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \ +- -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \ ++ -e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@ && \ + chmod +x $@ + endif + +@@ -44,7 +44,7 @@ + -e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \ + -e 's,@CHECK_KEY\@,for key in keys:,g' \ + -e 's,@NEXT_KEY\@,,g' \ +- -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \ ++ -e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@ && \ + chmod +x $@ + endif + +--- avahi-python/avahi/ServiceTypeDatabase.py.in ++++ avahi-python/avahi/ServiceTypeDatabase.py.in +@@ -26,7 +26,7 @@ + class ServiceTypeDatabase: + """ServiceTypeDatabase maps service types to descriptions""" + +- def __init__(self, filename = "@pkglibdir@/service-types.db"): ++ def __init__(self, filename = "@pkgdatadir@/service-types.db"): + + self.db = @DBM@.open(filename, "r") + +--- avahi-ui/Makefile.am ++++ avahi-ui/Makefile.am +@@ -62,18 +62,18 @@ + + if HAVE_GDBM + libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c +-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" ++libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" + libavahi_ui_la_LIBADD += -lgdbm + +-libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" ++libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" + libavahi_ui_gtk3_la_LIBADD += -lgdbm + endif + + if HAVE_DBM + libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c +-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" ++libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" + +-libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" ++libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" + endif + + bin_PROGRAMS = bssh +--- avahi-utils/Makefile.am ++++ avahi-utils/Makefile.am +@@ -30,13 +30,13 @@ + + if HAVE_GDBM + avahi_browse_SOURCES += stdb.h stdb.c +-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" ++avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" + avahi_browse_LDADD += -lgdbm + endif + + if HAVE_DBM + avahi_browse_SOURCES += stdb.h stdb.c +-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" ++avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\" + endif + + avahi_resolve_SOURCES = avahi-resolve.c sigint.c sigint.h +--- service-type-database/Makefile.am ++++ service-type-database/Makefile.am +@@ -18,13 +18,12 @@ + EXTRA_DIST=build-db.in service-types + + pkgdata_DATA=service-types +-pkglib_DATA= + + if HAVE_PYTHON + if HAVE_GDBM + + noinst_SCRIPTS=build-db +-pkglib_DATA+=service-types.db ++pkgdata_DATA+=service-types.db + + build-db: build-db.in + $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ +@@ -41,7 +40,7 @@ + if HAVE_DBM + + noinst_SCRIPTS=build-db +-pkglib_DATA+=service-types.db.pag service-types.db.dir ++pkgdata_DATA+=service-types.db.pag service-types.db.dir + + build-db: build-db.in + $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ diff --git a/net-dns/avahi-libs/files/avahi-0.6.30-optional-gtk-utils.patch b/net-dns/avahi-libs/files/avahi-0.6.30-optional-gtk-utils.patch new file mode 100644 index 00000000..2c615a2b --- /dev/null +++ b/net-dns/avahi-libs/files/avahi-0.6.30-optional-gtk-utils.patch @@ -0,0 +1,83 @@ +--- avahi-discover-standalone/Makefile.am ++++ avahi-discover-standalone/Makefile.am +@@ -23,7 +23,7 @@ + # This cool debug trap works on i386/gcc only + AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' + +-if HAVE_GTK2OR3 ++if ENABLE_GTK_UTILS + if HAVE_GLIB + bin_PROGRAMS = \ + avahi-discover-standalone +--- avahi-ui/Makefile.am ++++ avahi-ui/Makefile.am +@@ -76,6 +76,7 @@ + libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\" + endif + ++if ENABLE_GTK_UTILS + bin_PROGRAMS = bssh + desktop_DATA += bssh.desktop bvnc.desktop + @INTLTOOL_DESKTOP_RULE@ +@@ -102,6 +103,7 @@ + bvnc.desktop.in: bvnc.desktop.in.in + $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@ + ++endif # ENABLE_GTK_UTILS + endif # HAVE_GLIB + endif + endif +--- configure.ac ++++ configure.ac +@@ -564,7 +564,29 @@ + fi + AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes") + +-AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK" = "xyes" ) ++# ++# Check for GTK+ Utils ++# ++AC_ARG_ENABLE(gtk-utils, ++ AS_HELP_STRING([--disable-gtk-utils],[Disable GTK+ utilities]), ++ [case "${enableval}" in ++ yes) WANT_GTK_UTILS=yes ;; ++ no) WANT_GTK_UTILS=no ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk-utils) ;; ++ esac], ++ [WANT_GTK_UTILS=yes]) ++ ++ENABLE_GTK_UTILS=no ++HAVE_GTK2OR3=no ++if test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK" = "xyes"; then ++ HAVE_GTK2OR3=yes ++ if test "x$WANT_GTK_UTILS" = "xyes"; then ++ ENABLE_GTK_UTILS=yes ++ fi ++fi ++ ++AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK2OR3" = "xyes") ++AM_CONDITIONAL(ENABLE_GTK_UTILS, test "x$ENABLE_GTK_UTILS" = "xyes") + + # + # D-Bus +@@ -1199,11 +1221,6 @@ + ENABLE_AUTOIPD="no (You need libdaemon!)" + fi + +-HAVE_GTK2OR3=no +-if test "x$HAVE_GTK" = "xyes" -o "x$HAVE_GTK3" = "xyes" ; then +- HAVE_GTK2OR3=yes +-fi +- + BUILD_UI="no" + if test "x$HAVE_GTK2OR3" = "xyes" -a "x$BUILD_CLIENT" = "xyes" ; then + BUILD_UI="yes" +@@ -1223,7 +1240,7 @@ + Building avahi-python: ${BUILD_PYTHON} + Building libavahi-glib: ${HAVE_GLIB} + Building libavahi-gobject: ${BUILD_GOBJECT} +- Building avahi-discover-standalone: ${HAVE_GTK2OR3} ++ Building avahi-discover-standalone: ${ENABLE_GTK_UTILS} + Building libavahi-qt3: ${HAVE_QT3} + Building libavahi-qt4: ${HAVE_QT4} + Building avahi-sharp: ${HAVE_MONO} diff --git a/net-dns/avahi-libs/files/avahi-0.6.30-parallel.patch b/net-dns/avahi-libs/files/avahi-0.6.30-parallel.patch new file mode 100644 index 00000000..a75f9910 --- /dev/null +++ b/net-dns/avahi-libs/files/avahi-0.6.30-parallel.patch @@ -0,0 +1,34 @@ +From cb10a844f9e91322aca91340b7adc0db19c96b36 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu> +Date: Mon, 30 Apr 2012 17:07:41 -0700 +Subject: [PATCH] build-sys: fix parallel install in avahi-utils +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The moment install-exec-local is called, we might still not have +created ${DESTDIR}/${bindir} so we should make sure to create it +first, and then try to chdir into it. + +Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> +--- + avahi-utils/Makefile.am | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am +index a644b4a..1abc79a 100644 +--- a/avahi-utils/Makefile.am ++++ b/avahi-utils/Makefile.am +@@ -54,7 +54,8 @@ avahi_set_host_name_CFLAGS = $(AM_CFLAGS) + avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la + + install-exec-local: +- cd $(DESTDIR)/$(bindir) && \ ++ $(mkdir_p) $(DESTDIR)/$(bindir) && \ ++ cd $(DESTDIR)/$(bindir) && \ + rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \ + $(LN_S) avahi-resolve avahi-resolve-host-name && \ + $(LN_S) avahi-resolve avahi-resolve-address && \ +-- +1.7.8.6 + diff --git a/net-dns/avahi-libs/files/avahi-0.6.31-build-client-without-daemon.patch b/net-dns/avahi-libs/files/avahi-0.6.31-build-client-without-daemon.patch new file mode 100644 index 00000000..df0c420f --- /dev/null +++ b/net-dns/avahi-libs/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-libs/files/avahi-0.6.31-fix-install-avahi-discover.patch b/net-dns/avahi-libs/files/avahi-0.6.31-fix-install-avahi-discover.patch new file mode 100644 index 00000000..62ba967c --- /dev/null +++ b/net-dns/avahi-libs/files/avahi-0.6.31-fix-install-avahi-discover.patch @@ -0,0 +1,31 @@ +--- avahi-0.6.30.old/avahi-python/avahi-discover/Makefile.am 2010-06-28 23:30:34.000000000 -0400 ++++ avahi-0.6.30/avahi-python/avahi-discover/Makefile.am 2012-04-21 18:02:01.642934527 -0400 +@@ -22,6 +22,7 @@ + avahi-discover.py \ + avahi-discover.desktop.in.in + ++if ENABLE_GTK_UTILS + if HAVE_PYTHON + if HAVE_PYTHON_DBUS + if HAVE_PYGTK +@@ -67,3 +68,4 @@ + endif + endif + endif ++endif +--- avahi-0.6.30.old/man/Makefile.am 2012-04-21 18:10:45.690900742 -0400 ++++ avahi-0.6.30/man/Makefile.am 2012-04-21 18:09:15.146906578 -0400 +@@ -65,11 +65,13 @@ + man_MANS += \ + avahi-bookmarks.1 + if HAVE_GTK ++if ENABLE_GTK_UTILS + man_MANS += \ + avahi-discover.1 + endif + endif + endif ++endif + + if ENABLE_AUTOIPD + if HAVE_LIBDAEMON diff --git a/net-dns/avahi-libs/files/avahi-0.6.31-host-name-from-machine-id.patch b/net-dns/avahi-libs/files/avahi-0.6.31-host-name-from-machine-id.patch new file mode 100644 index 00000000..17ecba52 --- /dev/null +++ b/net-dns/avahi-libs/files/avahi-0.6.31-host-name-from-machine-id.patch @@ -0,0 +1,85 @@ +From: David Zeuthen <zeuthen@chromium.org> +Date: Tue, 5 Mar 2013 19:52:38 +0000 (-0800) +Subject: avahi-daemon: add option "host-name-from-machine-id=" +X-Git-Url: http://git.0pointer.de/?p=avahi.git;a=commitdiff_plain;h=147cdce70b22ae7cee9fb4fe123db40952f31c9e + +avahi-daemon: add option "host-name-from-machine-id=" + +Signed-off-by: David Zeuthen <zeuthen@chromium.org> +--- + +diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c +index d46f40a..8c28fd6 100644 +--- a/avahi-daemon/main.c ++++ b/avahi-daemon/main.c +@@ -65,6 +65,7 @@ + #include <avahi-core/publish.h> + #include <avahi-core/dns-srv-rr.h> + #include <avahi-core/log.h> ++#include <avahi-core/util.h> + + #ifdef ENABLE_CHROOT + #include "chroot.h" +@@ -576,6 +577,29 @@ static int parse_usec(const char *s, AvahiUsec *u) { + return 0; + } + ++static char *get_machine_id(void) { ++ int fd; ++ char buf[32]; ++ ++ fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY); ++ if (fd == -1 && errno == ENOENT) ++ fd = open("/var/lib/dbus/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY); ++ if (fd == -1) ++ return NULL; ++ ++ /* File is on a filesystem so we never get EINTR or partial reads */ ++ if (read(fd, buf, sizeof buf) != sizeof buf) { ++ close(fd); ++ return NULL; ++ } ++ close(fd); ++ ++ /* Contents can be lower, upper and even mixed case so normalize */ ++ avahi_strdown(buf); ++ ++ return avahi_strndup(buf, sizeof buf); ++} ++ + static int load_config_file(DaemonConfig *c) { + int r = -1; + AvahiIniFile *f; +@@ -631,6 +655,15 @@ static int load_config_file(DaemonConfig *c) { + c->server_config.use_iff_running = is_yes(p->value); + else if (strcasecmp(p->key, "disallow-other-stacks") == 0) + c->server_config.disallow_other_stacks = is_yes(p->value); ++ else if (strcasecmp(p->key, "host-name-from-machine-id") == 0) { ++ if (*(p->value) == 'y' || *(p->value) == 'Y') { ++ char *machine_id = get_machine_id(); ++ if (machine_id != NULL) { ++ avahi_free(c->server_config.host_name); ++ c->server_config.host_name = machine_id; ++ } ++ } ++ } + #ifdef HAVE_DBUS + else if (strcasecmp(p->key, "enable-dbus") == 0) { + +diff --git a/man/avahi-daemon.conf.5.xml.in b/man/avahi-daemon.conf.5.xml.in +index bea7ed5..2d15017 100644 +--- a/man/avahi-daemon.conf.5.xml.in ++++ b/man/avahi-daemon.conf.5.xml.in +@@ -40,6 +40,12 @@ + </option> + + <option> ++ <p><opt>host-name-from-machine-id=</opt> Takes a boolean ++ value ("yes" or "no"). If set to "yes" avahi-daemon ++ will use the machine-id as name on the LAN.</p> ++ </option> ++ ++ <option> + <p><opt>domain-name=</opt> Set the default domain name avahi-daemon + tries to register its host name and services on the LAN in. If + omitted defaults to ".local".</p> diff --git a/net-dns/avahi-libs/files/avahi-0.6.31-install-exec-hook.patch b/net-dns/avahi-libs/files/avahi-0.6.31-install-exec-hook.patch new file mode 100644 index 00000000..d9a7bc34 --- /dev/null +++ b/net-dns/avahi-libs/files/avahi-0.6.31-install-exec-hook.patch @@ -0,0 +1,11 @@ +--- avahi-0.6.31/avahi-utils/Makefile.am ++++ avahi-0.6.31/avahi-utils/Makefile.am +@@ -53,7 +53,7 @@ + avahi_set_host_name_CFLAGS = $(AM_CFLAGS) + avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la + +-install-exec-local: ++install-exec-hook: + cd $(DESTDIR)/$(bindir) && \ + rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \ + $(LN_S) avahi-resolve avahi-resolve-host-name && \ diff --git a/net-dns/avahi-libs/files/avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch b/net-dns/avahi-libs/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-libs/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 + diff --git a/net-dns/avahi-libs/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch b/net-dns/avahi-libs/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch new file mode 100644 index 00000000..394f6d34 --- /dev/null +++ b/net-dns/avahi-libs/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch @@ -0,0 +1,22 @@ +--- avahi-0.6.30/initscript/gentoo/avahi-daemon.in ++++ avahi-0.6.30/initscript/gentoo/avahi-daemon.in +@@ -2,7 +2,7 @@ + # Copyright 1999-2007 Gentoo Foundation + # Distributed under the terms of the GNU General Public License v2 + +-opts="reload" ++extra_started_commands="reload" + + depend() { + before netmount nfsmount +--- avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in ++++ avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in +@@ -2,7 +2,7 @@ + # Copyright 1999-2007 Gentoo Foundation + # Distributed under the terms of the GNU General Public License v2 + +-opts="reload" ++extra_started_commands="reload" + + depend() { + need avahi-daemon diff --git a/net-dns/avahi-libs/metadata.xml b/net-dns/avahi-libs/metadata.xml new file mode 100644 index 00000000..2c673780 --- /dev/null +++ b/net-dns/avahi-libs/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>no-herd</herd> +<maintainer> + <email>lxnay@gentoo.org</email> +</maintainer> +</pkgmetadata> |