uppkg

3 files changed, 42 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a20eb709381a..0c31474b5a20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = avahi-gtk2
 	pkgdesc = Multicast/unicast DNS-SD framework (with Gtk2 client apps)
-	pkgver = 0.8+20+gd1e71b3
+	pkgver = 0.8+22+gfd482a7
 	pkgrel = 1
 	url = https://github.com/lathiat/avahi
 	arch = x86_64
@@ -41,17 +41,19 @@ pkgbase = avahi-gtk2
 	provides = libavahi-ui-gtk2.so
 	provides = libavahi-ui-gtk3.so
 	provides = libdns_sd.so
-	provides = avahi=0.8+20+gd1e71b3
+	provides = avahi=0.8+22+gfd482a7
 	conflicts = avahi
 	backup = etc/avahi/hosts
 	backup = etc/avahi/avahi-daemon.conf
 	backup = etc/avahi/avahi-autoipd.action
 	backup = etc/avahi/avahi-dnsconfd.action
 	backup = usr/lib/avahi/service-types.db
-	source = git+https://github.com/lathiat/avahi#commit=d1e71b320d96d0f213ecb0885c8313039a09f693
+	source = git+https://github.com/lathiat/avahi#commit=fd482a74625b8db8547b8cfca3ee3d3c6c721423
 	source = 282.patch
+	source = 0001-Fix-avahi-browse-Invalid-service-type.patch
 	sha512sums = SKIP
 	sha512sums = 26b1e74450944f5c4385d2f5df18523cfb953e4138f6d9e81061a626453e40d8ed2dee44535cfbb547848eefb3cdca408009d5f0e0c465f144a8803db8593b46
+	sha512sums = e39c17d9a5d534784a3c7b6947da994d0ab5fa354aac5cecde6d3baaa2bb3d57f02f91cc6fb68885a4e98f44efe615b01631a4c7af752aa26f35082cfcc0ddd7
 
 pkgname = avahi-gtk2
 	depends = expat
@@ -61,4 +63,3 @@ pkgname = avahi-gtk2
 	depends = gdbm
 	depends = dbus
 	depends = libdbus-1.so
-
diff --git a/0001-Fix-avahi-browse-Invalid-service-type.patch b/0001-Fix-avahi-browse-Invalid-service-type.patch
new file mode 100644
index 000000000000..8511f3b1aaff
--- /dev/null
+++ b/0001-Fix-avahi-browse-Invalid-service-type.patch
@@ -0,0 +1,27 @@
+From 6fe6c44d953edd50c32ff6ce8fec5ac811fa3b69 Mon Sep 17 00:00:00 2001
+From: Asger Hautop Drewsen <asger@princh.com>
+Date: Mon, 9 Aug 2021 14:25:08 +0200
+Subject: [PATCH] Fix avahi-browse: Invalid service type
+
+---
+ avahi-core/browse-service.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c
+index 5531360..2d3fa75 100644
+--- a/avahi-core/browse-service.c
++++ b/avahi-core/browse-service.c
+@@ -103,7 +103,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_prepare(
+     AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_PROTO_VALID(protocol), AVAHI_ERR_INVALID_PROTOCOL);
+     AVAHI_CHECK_VALIDITY_RETURN_NULL(server, !domain || avahi_is_valid_domain_name(domain), AVAHI_ERR_INVALID_DOMAIN_NAME);
+     AVAHI_CHECK_VALIDITY_RETURN_NULL(server, AVAHI_FLAGS_VALID(flags, AVAHI_LOOKUP_USE_WIDE_AREA|AVAHI_LOOKUP_USE_MULTICAST), AVAHI_ERR_INVALID_FLAGS);
+-    AVAHI_CHECK_VALIDITY_RETURN_NULL(server, avahi_is_valid_service_type_generic(service_type), AVAHI_ERR_INVALID_SERVICE_TYPE);
++
++    if (!avahi_is_valid_service_type_generic(service_type))
++        service_type = "_invalid._tcp";
+ 
+     if (!domain)
+         domain = server->domain_name;
+-- 
+2.32.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 67ad8387ee7e..0f919b74c6e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 _pkgname=avahi
 pkgname=avahi-gtk2
-pkgver=0.8+20+gd1e71b3
+pkgver=0.8+22+gfd482a7
 pkgrel=1
 pkgdesc='Multicast/unicast DNS-SD framework (with Gtk2 client apps)'
 url='https://github.com/lathiat/avahi'
@@ -29,11 +29,13 @@ provides=(libavahi-client.so libavahi-common.so libavahi-core.so
 conflicts=(${_pkgname})
 backup=(etc/avahi/{hosts,avahi-daemon.conf,avahi-{autoip,dnsconf}d.action}
         usr/lib/avahi/service-types.db)
-_commit=d1e71b320d96d0f213ecb0885c8313039a09f693  # master
+_commit=fd482a74625b8db8547b8cfca3ee3d3c6c721423  # master
 source=("git+https://github.com/lathiat/avahi#commit=$_commit"
-        282.patch)
+        282.patch
+        0001-Fix-avahi-browse-Invalid-service-type.patch)
 sha512sums=('SKIP'
-            '26b1e74450944f5c4385d2f5df18523cfb953e4138f6d9e81061a626453e40d8ed2dee44535cfbb547848eefb3cdca408009d5f0e0c465f144a8803db8593b46')
+            '26b1e74450944f5c4385d2f5df18523cfb953e4138f6d9e81061a626453e40d8ed2dee44535cfbb547848eefb3cdca408009d5f0e0c465f144a8803db8593b46'
+            'e39c17d9a5d534784a3c7b6947da994d0ab5fa354aac5cecde6d3baaa2bb3d57f02f91cc6fb68885a4e98f44efe615b01631a4c7af752aa26f35082cfcc0ddd7')
 
 pkgver() {
   cd $_pkgname
@@ -47,6 +49,10 @@ prepare() {
   # https://github.com/lathiat/avahi/pull/282
   git apply -3 ../282.patch
 
+  # https://bugs.archlinux.org/task/71781
+  # https://github.com/lathiat/avahi/issues/212
+  git apply -3 ../0001-Fix-avahi-browse-Invalid-service-type.patch
+
   NOCONFIGURE=1 ./autogen.sh
 }