Update to avahi-0.6.32.
This commit is contained in:
ajacoutot
parent
c8475f795d
commit
2c0eb91cf3
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.119 2016/11/11 07:40:02 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.120 2016/11/11 07:56:23 ajacoutot Exp $
|
||||
|
||||
ONLY_FOR_ARCHS-mono= ${MONO_ARCHS}
|
||||
|
||||
@ -10,7 +10,7 @@ COMMENT-mono= mono (.NET) bindings for avahi
|
||||
COMMENT-python= python bindings for avahi
|
||||
COMMENT-ui= common avahi-ui header for gtk+2 and gtk+3
|
||||
|
||||
V= 0.6.31
|
||||
V= 0.6.32
|
||||
DISTNAME= avahi-${V}
|
||||
CATEGORIES= net devel
|
||||
|
||||
@ -22,30 +22,24 @@ PKGNAME-mono= mono-avahi-${V}
|
||||
PKGNAME-python= py-avahi-${V}
|
||||
PKGNAME-ui= avahi-ui-${V}
|
||||
|
||||
REVISION-main= 27
|
||||
REVISION-gtk= 7
|
||||
REVISION-gtk3= 8
|
||||
REVISION-gui= 11
|
||||
REVISION-mono= 3
|
||||
REVISION-ui= 4
|
||||
REVISION-python= 1
|
||||
|
||||
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
|
||||
SHARED_LIBS += avahi-common 0.0 # .8.0
|
||||
SHARED_LIBS += avahi-core 0.0 # .5.5
|
||||
SHARED_LIBS += avahi-client 0.0 # .5.4
|
||||
SHARED_LIBS += avahi-glib 0.0 # .1.1
|
||||
SHARED_LIBS += avahi-gobject 0.0 # .0.1
|
||||
SHARED_LIBS += howl 0.0 # .0.0
|
||||
SHARED_LIBS += dns_sd 0.0 # .1.0
|
||||
SHARED_LIBS += avahi-common 0.0 # 8.3
|
||||
SHARED_LIBS += avahi-core 0.0 # 7.2
|
||||
SHARED_LIBS += avahi-client 0.0 # 5.9
|
||||
SHARED_LIBS += avahi-glib 0.0 # 1.2
|
||||
SHARED_LIBS += avahi-gobject 0.0 # 0.4
|
||||
SHARED_LIBS += dns_sd 0.0 # 1.0
|
||||
SHARED_LIBS += howl 0.0 # 0.0
|
||||
SHARED_LIBS += avahi-ui 0.0 # 1.4
|
||||
SHARED_LIBS += avahi-ui-gtk3 0.0 # 1.4
|
||||
|
||||
HOMEPAGE= http://www.avahi.org/
|
||||
|
||||
# LGPLv2.1
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
MASTER_SITES= http://www.avahi.org/download/
|
||||
MASTER_SITES= https://github.com/lathiat/avahi/releases/download/v${V}/
|
||||
|
||||
PSEUDO_FLAVORS= no_gui no_mono bootstrap
|
||||
FLAVOR?= no_gui no_mono bootstrap
|
||||
@ -99,7 +93,6 @@ BUILD_DEPENDS+= lang/python/${MODPY_VERSION},-gdbm \
|
||||
x11/dbus-python
|
||||
|
||||
### -gtk
|
||||
SHARED_LIBS += avahi-ui 0.0 # .1.0
|
||||
LIB_DEPENDS-gtk= x11/gtk+2 \
|
||||
${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-gtk= ${BUILD_PKGPATH},-ui
|
||||
@ -113,7 +106,6 @@ WANTLIB-gtk += xcb-render avahi-client avahi-common xcb-shm
|
||||
WANTLIB-gtk += avahi-glib ffi harfbuzz graphite2 iconv intl
|
||||
|
||||
### -gtk3
|
||||
SHARED_LIBS += avahi-ui-gtk3 0.0 # 1.4
|
||||
LIB_DEPENDS-gtk3= x11/gtk+3 \
|
||||
${BUILD_PKGPATH}
|
||||
RUN_DEPENDS-gtk3= ${BUILD_PKGPATH},-ui
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (avahi-0.6.31.tar.gz) = g3JxmyTi3XXeb1m7ExXmANtP0JKAW9EgHtDLZRotq0g=
|
||||
SIZE (avahi-0.6.31.tar.gz) = 1268686
|
||||
SHA256 (avahi-0.6.32.tar.gz) = 1UmRGF1RSgq6VOvrQI11dbYPWBincuKPoOGLmLwdtFQ=
|
||||
SIZE (avahi-0.6.32.tar.gz) = 1297169
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
$OpenBSD: patch-avahi-daemon_avahi-daemon_conf,v 1.6 2013/01/26 10:25:31 ajacoutot Exp $
|
||||
|
||||
From 938b5f883fbaa642e3acb7720e37f95f3d72be62 Mon Sep 17 00:00:00 2001
|
||||
From: Lennart Poettering <lennart@poettering.net>
|
||||
Date: Mon, 2 Apr 2012 21:17:19 +0200
|
||||
Subject: [PATCH] avahi-daemon: don't add 0pointer.de and zeroconf.org to default browse list
|
||||
|
||||
From 530fbb59abafb970ef1dd8f61571b13fb0918b23 Mon Sep 17 00:00:00 2001
|
||||
From: Lennart Poettering <lennart@poettering.net>
|
||||
Date: Mon, 2 Apr 2012 21:17:36 +0200
|
||||
Subject: [PATCH] avahi-daemon: don't leak host info by default
|
||||
|
||||
--- avahi-daemon/avahi-daemon.conf.orig Sat Jan 26 10:41:50 2013
|
||||
+++ avahi-daemon/avahi-daemon.conf Sat Jan 26 10:42:02 2013
|
||||
@@ -21,7 +21,7 @@
|
||||
[server]
|
||||
#host-name=foo
|
||||
#domain-name=local
|
||||
-browse-domains=0pointer.de, zeroconf.org
|
||||
+#browse-domains=0pointer.de, zeroconf.org
|
||||
use-ipv4=yes
|
||||
use-ipv6=no
|
||||
#allow-interfaces=eth0
|
||||
@@ -46,8 +46,8 @@ enable-wide-area=yes
|
||||
#disable-user-service-publishing=no
|
||||
#add-service-cookie=no
|
||||
#publish-addresses=yes
|
||||
-#publish-hinfo=yes
|
||||
-#publish-workstation=yes
|
||||
+publish-hinfo=no
|
||||
+publish-workstation=no
|
||||
#publish-domain=yes
|
||||
#publish-dns-servers=192.168.50.1, 192.168.50.2
|
||||
#publish-resolv-conf-dns-servers=yes
|
||||
@ -1,74 +0,0 @@
|
||||
$OpenBSD: patch-avahi-daemon_main_c,v 1.8 2014/02/07 07:48:03 ajacoutot Exp $
|
||||
|
||||
From 147cdce70b22ae7cee9fb4fe123db40952f31c9e Mon Sep 17 00:00:00 2001
|
||||
From: David Zeuthen <zeuthen@chromium.org>
|
||||
Date: Tue, 5 Mar 2013 11:52:38 -0800
|
||||
Subject: [PATCH] avahi-daemon: add option "host-name-from-machine-id="
|
||||
|
||||
--- avahi-daemon/main.c.orig Fri Feb 7 08:37:36 2014
|
||||
+++ avahi-daemon/main.c Fri Feb 7 08:37:45 2014
|
||||
@@ -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) {
|
||||
|
||||
@@ -1101,8 +1134,10 @@ static int run_server(DaemonConfig *c) {
|
||||
|
||||
ignore_signal(SIGPIPE);
|
||||
|
||||
+#ifndef __OpenBSD__ // no NSS in OpenBSD
|
||||
if (!(nss_support = avahi_nss_support()))
|
||||
avahi_log_warn("WARNING: No NSS support for mDNS detected, consider installing nss-mdns!");
|
||||
+#endif
|
||||
|
||||
if (!(simple_poll_api = avahi_simple_poll_new())) {
|
||||
avahi_log_error("Failed to create main loop object.");
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-avahi-ui_Makefile_in,v 1.1 2013/09/25 12:27:12 ajacoutot Exp $
|
||||
|
||||
Allow building with deprecated GTK+ symbols
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1001676
|
||||
|
||||
--- avahi-ui/Makefile.in.orig Wed Sep 25 09:13:06 2013
|
||||
+++ avahi-ui/Makefile.in Wed Sep 25 09:13:35 2013
|
||||
@@ -464,8 +464,7 @@ top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
|
||||
# This cool debug trap works on i386/gcc only
|
||||
-AM_CFLAGS = -I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 \
|
||||
- -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1 \
|
||||
+AM_CFLAGS = -I$(top_srcdir) \
|
||||
'-DDEBUG_TRAP=__asm__("int $$3")' $(am__append_1)
|
||||
pkglibdatadir = $(libdir)/avahi
|
||||
desktopdir = $(datadir)/applications
|
||||
18
net/avahi/patches/patch-configure
Normal file
18
net/avahi/patches/patch-configure
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2016/11/11 07:56:23 ajacoutot Exp $
|
||||
|
||||
From dede2a12d0bcc6ae9daf2a4671f0d618eeb44425 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
Date: Sun, 6 Mar 2016 13:56:55 +0100
|
||||
Subject: [PATCH] configure.ac: Fix libavahi-client test
|
||||
|
||||
--- configure.orig Fri Nov 11 08:46:40 2016
|
||||
+++ configure Fri Nov 11 08:46:51 2016
|
||||
@@ -28506,7 +28506,7 @@ fi
|
||||
|
||||
BUILD_CLIENT="no (You need avahi-daemon and D-Bus!)"
|
||||
|
||||
-if "x$HAVE_DBUS" = "xyes" ; then
|
||||
+if test "x$HAVE_DBUS" = "xyes" ; then
|
||||
BUILD_CLIENT=yes
|
||||
fi
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-man_avahi-daemon_conf_5_xml_in,v 1.1 2014/02/07 07:48:03 ajacoutot Exp $
|
||||
|
||||
From 147cdce70b22ae7cee9fb4fe123db40952f31c9e Mon Sep 17 00:00:00 2001
|
||||
From: David Zeuthen <zeuthen@chromium.org>
|
||||
Date: Tue, 5 Mar 2013 11:52:38 -0800
|
||||
Subject: [PATCH] avahi-daemon: add option "host-name-from-machine-id="
|
||||
|
||||
--- man/avahi-daemon.conf.5.xml.in.orig Fri Feb 18 19:36:33 2011
|
||||
+++ man/avahi-daemon.conf.5.xml.in Fri Feb 7 08:37:45 2014
|
||||
@@ -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>
|
||||
@ -1,9 +1,9 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.16 2016/11/11 07:40:02 ajacoutot Exp $
|
||||
@pkgpath net/avahi,-qt3
|
||||
@pkgpath net/avahi,-qt4
|
||||
@comment $OpenBSD: PLIST-main,v 1.17 2016/11/11 07:56:23 ajacoutot Exp $
|
||||
@conflict avahi-qt3-*
|
||||
@conflict avahi-qt4-*
|
||||
@conflict howl-*
|
||||
@pkgpath net/avahi,-qt3
|
||||
@pkgpath net/avahi,-qt4
|
||||
@newgroup _avahi:629
|
||||
@newuser _avahi:629:629:daemon:Avahi User:/var/empty:/sbin/nologin
|
||||
@bin bin/avahi-browse
|
||||
@ -161,6 +161,10 @@ share/examples/avahi/services/ssh.service
|
||||
share/gir-1.0/
|
||||
share/gir-1.0/Avahi-0.6.gir
|
||||
share/gir-1.0/AvahiCore-0.6.gir
|
||||
share/locale/ach/
|
||||
share/locale/ach/LC_MESSAGES/
|
||||
share/locale/ach/LC_MESSAGES/avahi.mo
|
||||
share/locale/ar/LC_MESSAGES/avahi.mo
|
||||
share/locale/bg/LC_MESSAGES/avahi.mo
|
||||
share/locale/ca/LC_MESSAGES/avahi.mo
|
||||
share/locale/cs/LC_MESSAGES/avahi.mo
|
||||
@ -175,7 +179,10 @@ share/locale/en_GB/LC_MESSAGES/avahi.mo
|
||||
share/locale/en_NZ/
|
||||
share/locale/en_NZ/LC_MESSAGES/
|
||||
share/locale/en_NZ/LC_MESSAGES/avahi.mo
|
||||
share/locale/eo/LC_MESSAGES/avahi.mo
|
||||
share/locale/es/LC_MESSAGES/avahi.mo
|
||||
share/locale/et/LC_MESSAGES/avahi.mo
|
||||
share/locale/fa/LC_MESSAGES/avahi.mo
|
||||
share/locale/fi/LC_MESSAGES/avahi.mo
|
||||
share/locale/fo/
|
||||
share/locale/fo/LC_MESSAGES/
|
||||
@ -187,16 +194,20 @@ share/locale/hu/LC_MESSAGES/avahi.mo
|
||||
share/locale/id/LC_MESSAGES/avahi.mo
|
||||
share/locale/it/LC_MESSAGES/avahi.mo
|
||||
share/locale/ja/LC_MESSAGES/avahi.mo
|
||||
share/locale/ko/LC_MESSAGES/avahi.mo
|
||||
share/locale/lv/LC_MESSAGES/avahi.mo
|
||||
share/locale/ms/LC_MESSAGES/avahi.mo
|
||||
share/locale/nl/LC_MESSAGES/avahi.mo
|
||||
share/locale/pl/LC_MESSAGES/avahi.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/avahi.mo
|
||||
share/locale/ro/LC_MESSAGES/avahi.mo
|
||||
share/locale/ru/LC_MESSAGES/avahi.mo
|
||||
share/locale/sk/LC_MESSAGES/avahi.mo
|
||||
share/locale/sl/LC_MESSAGES/avahi.mo
|
||||
share/locale/sr/LC_MESSAGES/avahi.mo
|
||||
share/locale/sr@latin/LC_MESSAGES/avahi.mo
|
||||
share/locale/sv/LC_MESSAGES/avahi.mo
|
||||
share/locale/tr/LC_MESSAGES/avahi.mo
|
||||
share/locale/uk/LC_MESSAGES/avahi.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/avahi.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/avahi.mo
|
||||
|
||||
Loading…
Reference in New Issue
Block a user