CVS commit: pkgsrc/net/avahi

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Tue Sep 29 10:56:56 UTC 2020

Modified Files:
        pkgsrc/net/avahi: Makefile PLIST PLIST.python buildlink3.mk distinfo
Added Files:
        pkgsrc/net/avahi/patches: patch-configure

Log Message:
Update avahi to 0.8

avahi 0.8 release brings a number of new features and bug fix changes
including a backward-compatible addition to the D-Bus API and the avahi-core
API.

The existing API is still fully supported however clients using the new
API will not work with older Avahi releases. The avahi-client library is not
affected. See the "API Changes" section for further details.

New Features:
- New options for filtering reflected queries between networks (reflect-filter)
- New mainloop integration for Qt5 and libevent
- docs/THREADS: Information for multi-threaded avahi-client apps
- Listen on loopback interfaces by default, allowing local-only services to be
  consumed by the local machine
- New D-Bus V2 API and additions to the avahi-core API for splitting "New"
  calls into "Prepare" and "Start". See "API Changes" for more details.
 * Add support for binary values in TXT records in XML service files by
   specifying value-format="text|binary-hex|binary-base64".  If not specified,
   defaults to the normal value of "text" (thus backwards compatible)
 * avahi-gobject: Allow starting the client in a custom GMainContext by
   passing context to ga_client_start_in_context instead of ga_client_start
   (avahi-gobject minor version has been incremented)

Security Fixes:
- Drop legacy unicast queries from address not on local link which can lead to
  UDP traffic amplification attacks (CVE-2017-6519)

For full details, see:
https://github.com/lathiat/avahi/blob/v0.8/docs/NEWS


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/net/avahi/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/avahi/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/avahi/PLIST.python
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/avahi/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/avahi/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/avahi/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/avahi/Makefile
diff -u pkgsrc/net/avahi/Makefile:1.95 pkgsrc/net/avahi/Makefile:1.96
--- pkgsrc/net/avahi/Makefile:1.95      Mon Aug 17 20:17:38 2020
+++ pkgsrc/net/avahi/Makefile   Tue Sep 29 10:56:56 2020
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.95 2020/08/17 20:17:38 leot Exp $
+# $NetBSD: Makefile,v 1.96 2020/09/29 10:56:56 prlw1 Exp $
 
-DISTNAME=              avahi-0.6.32
-PKGREVISION=           25
+DISTNAME=              avahi-0.8
 CATEGORIES=            net
-MASTER_SITES=          https://github.com/lathiat/avahi/releases/download/v${PKGVERSION_NOREV}/
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=lathiat/avahi/releases/download/v${PKGVERSION_NOREV}/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://avahi.org/
@@ -16,8 +15,10 @@ GNU_CONFIGURE=               YES
 USE_LIBTOOL=           YES
 USE_PKGINSTALL=                YES
 USE_PKGLOCALEDIR=      YES
-USE_TOOLS+=            pkg-config gmake intltool msgfmt xgettext
-MAKE_JOBS_SAFE=                no
+USE_TOOLS+=            pkg-config gmake msgfmt xgettext
+
+# Requires --desktop in msgfmt.
+_TOOLS_USE_PKGSRC.msgfmt=      yes
 
 CONFIGURE_ARGS+=       --disable-gtk
 
@@ -27,8 +28,10 @@ PKGCONFIG_OVERRIDE+= avahi-compat-libdns
 PKGCONFIG_OVERRIDE+=   avahi-core.pc.in
 PKGCONFIG_OVERRIDE+=   avahi-glib.pc.in
 PKGCONFIG_OVERRIDE+=   avahi-gobject.pc.in
+PKGCONFIG_OVERRIDE+=   avahi-libevent.pc.in
 PKGCONFIG_OVERRIDE+=   avahi-qt3.pc.in
 PKGCONFIG_OVERRIDE+=   avahi-qt4.pc.in
+PKGCONFIG_OVERRIDE+=   avahi-qt5.pc.in
 PKGCONFIG_OVERRIDE+=   avahi-sharp.pc.in
 PKGCONFIG_OVERRIDE+=   avahi-ui-gtk3.pc.in
 PKGCONFIG_OVERRIDE+=   avahi-ui-sharp.pc.in
@@ -79,9 +82,11 @@ CONFIGURE_ARGS+=     --disable-doxygen-dot
 CONFIGURE_ARGS+=       --disable-doxygen-html --disable-doxygen-xml
 CONFIGURE_ARGS+=       --disable-xmltoman
 CONFIGURE_ARGS+=       --disable-autoipd
+CONFIGURE_ARGS+=       --disable-libevent
 CONFIGURE_ARGS+=       --disable-qt3
 CONFIGURE_ARGS+=       --disable-qt4
-CONFIGURE_ARGS+=       --disable-pygtk
+CONFIGURE_ARGS+=       --disable-qt5
+CONFIGURE_ARGS+=       --disable-pygobject
 CONFIGURE_ARGS+=       --with-distro=none
 
 INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples

Index: pkgsrc/net/avahi/PLIST
diff -u pkgsrc/net/avahi/PLIST:1.18 pkgsrc/net/avahi/PLIST:1.19
--- pkgsrc/net/avahi/PLIST:1.18 Mon Mar 23 15:56:55 2020
+++ pkgsrc/net/avahi/PLIST      Tue Sep 29 10:56:56 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2020/03/23 15:56:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2020/09/29 10:56:56 prlw1 Exp $
 bin/avahi-browse
 bin/avahi-browse-domains
 ${PLIST.ui}bin/avahi-discover-standalone
@@ -88,7 +88,7 @@ sbin/avahi-dnsconfd
 ${PLIST.ui}share/applications/bssh.desktop
 ${PLIST.ui}share/applications/bvnc.desktop
 share/avahi/avahi-service.dtd
-share/avahi/service-types
+${PLIST.ui}share/avahi/interfaces/avahi-discover.ui
 share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
 share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
 share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
@@ -140,6 +140,7 @@ 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/oc/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

Index: pkgsrc/net/avahi/PLIST.python
diff -u pkgsrc/net/avahi/PLIST.python:1.6 pkgsrc/net/avahi/PLIST.python:1.7
--- pkgsrc/net/avahi/PLIST.python:1.6   Mon Mar 23 13:23:47 2020
+++ pkgsrc/net/avahi/PLIST.python       Tue Sep 29 10:56:56 2020
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST.python,v 1.6 2020/03/23 13:23:47 nia Exp $
+@comment $NetBSD: PLIST.python,v 1.7 2020/09/29 10:56:56 prlw1 Exp $
 ${PYSITELIB}/avahi/__init__.py
 ${PYSITELIB}/avahi/__init__.pyc
 ${PYSITELIB}/avahi/__init__.pyo
 bin/avahi-bookmarks
 man/man1/avahi-bookmarks.1
-${PLIST.ui}share/avahi/interfaces/avahi-discover.ui

Index: pkgsrc/net/avahi/buildlink3.mk
diff -u pkgsrc/net/avahi/buildlink3.mk:1.45 pkgsrc/net/avahi/buildlink3.mk:1.46
--- pkgsrc/net/avahi/buildlink3.mk:1.45 Mon Aug 17 20:17:38 2020
+++ pkgsrc/net/avahi/buildlink3.mk      Tue Sep 29 10:56:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.45 2020/08/17 20:17:38 leot Exp $
+# $NetBSD: buildlink3.mk,v 1.46 2020/09/29 10:56:56 prlw1 Exp $
 
 BUILDLINK_TREE+=       avahi
 
@@ -12,23 +12,23 @@ BUILDLINK_PKGSRCDIR.avahi?= ../../net/av
 pkgbase := avahi
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.avahi:Mgdbm)
+.if ${PKG_BUILD_OPTIONS.avahi:Mgdbm}
 .  include "../../databases/gdbm/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.avahi:Mgtk3)
+.if ${PKG_BUILD_OPTIONS.avahi:Mgtk3}
 .include "../../x11/gtk3/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.avahi:Mintrospection)
+.if ${PKG_BUILD_OPTIONS.avahi:Mintrospection}
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.avahi:Mmono)
+.if ${PKG_BUILD_OPTIONS.avahi:Mmono}
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.avahi:Mpython)
+.if ${PKG_BUILD_OPTIONS.avahi:Mpython}
 .include "../../lang/python/application.mk"
 .endif
 

Index: pkgsrc/net/avahi/distinfo
diff -u pkgsrc/net/avahi/distinfo:1.17 pkgsrc/net/avahi/distinfo:1.18
--- pkgsrc/net/avahi/distinfo:1.17      Tue May 10 18:52:17 2016
+++ pkgsrc/net/avahi/distinfo   Tue Sep 29 10:56:56 2020
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.17 2016/05/10 18:52:17 jperkin Exp $
+$NetBSD: distinfo,v 1.18 2020/09/29 10:56:56 prlw1 Exp $
 
-SHA1 (avahi-0.6.32.tar.gz) = 1c6d234058fd7883b3a4515e99216fdc8f71b223
-RMD160 (avahi-0.6.32.tar.gz) = d5ec03116938e0ce54e6ae9c2773e153d1a56523
-SHA512 (avahi-0.6.32.tar.gz) = 6f8d0a64292439cbb989c531a4ba2f25a53ee9cf7ad9df04dedf73149489a92612f3b5955e10aa4b1c76496c34b90ad75590e8aa49468249508267c1c8b899ee
-Size (avahi-0.6.32.tar.gz) = 1297169 bytes
+SHA1 (avahi-0.8.tar.gz) = 969a50ae18c8d8e2288435a75666dd076e69852a
+RMD160 (avahi-0.8.tar.gz) = f060e7afbc20accc6befbbe6776d3ca7956b4962
+SHA512 (avahi-0.8.tar.gz) = c6ba76feb6e92f70289f94b3bf12e5f5c66c11628ce0aeb3cadfb72c13a5d1a9bd56d71bdf3072627a76cd103b9b056d9131aa49ffe11fa334c24ab3b596c7de
+Size (avahi-0.8.tar.gz) = 1591458 bytes
 SHA1 (patch-aa) = 95b883bf14dd1852cdf0ea8a364c57717eebb03f
 SHA1 (patch-ab) = 1f482b2a2f9a9bc59c3b1e300bad2896e2cf7bd2
 SHA1 (patch-ah) = 4b3ffdb927daef8c939527fd5c5893f9f88b3ff3
 SHA1 (patch-ai) = 48c5fca5683323a30dc646e5eafb1834e7bedaeb
 SHA1 (patch-avahi-core_socket.c) = 503f05f77d95b6f73d933810371c53242d13058c
 SHA1 (patch-avahi-daemon_main.c) = 672be922ca7516a29d7eb1a409e78199b00ddfa2
+SHA1 (patch-configure) = 5d81097a4d089a8bd57122dc384a4ae795301b03

Added files:

Index: pkgsrc/net/avahi/patches/patch-configure
diff -u /dev/null pkgsrc/net/avahi/patches/patch-configure:1.1
--- /dev/null   Tue Sep 29 10:56:56 2020
+++ pkgsrc/net/avahi/patches/patch-configure    Tue Sep 29 10:56:56 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2020/09/29 10:56:56 prlw1 Exp $
+
+Strange hardcoded place to put a socket.
+
+--- configure.orig     2020-02-18 07:03:14.638650833 +0000
++++ configure
+@@ -24638,7 +24638,7 @@ _ACEOF
+ #
+ # Avahi runtime dir
+ #
+-avahi_runtime_dir="/run"
++avahi_runtime_dir="${localstatedir}/run"
+ avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
+ 
+