git » avahi.git » commit 42cc945

diff --git a/.SRCINFO b/.SRCINFO
index e542720..ba8afad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = avahi
 	pkgdesc = Service Discovery for Linux using mDNS/DNS-SD (compatible with Bonjour)
-	pkgver = 0.8+r139+ge5b0bad
+	pkgver = 0.8+r189+g35bb1ba
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/lathiat/avahi
@@ -43,12 +43,10 @@ pkgbase = avahi
 	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=e5b0badfc725b7fa9e6069b6a3d5f278d1b96113
-	source = 0001-Fix-avahi-browse-Invalid-service-type.patch
-	source = 0002-HACK-Install-fixes.patch
+	source = git+https://github.com/lathiat/avahi#commit=35bb1bae902ae9ff2da809fb5f577ba873c43359
+	source = 0001-HACK-Install-fixes.patch
 	b2sums = SKIP
-	b2sums = 79a881a7f45b4d6061285257b07aa0f72aa69cedc636c74ec12dd031372b3560b4013f18d821e31b323fd73af5de811a1f5ba94ba0e32ce1b1bb940af3bad54f
-	b2sums = d5bbef78b13008a006d23730a86039b09b78e468961c3fbeddf42578a7d871a1ec12e46a3b85591f4d2d4eb7f64e9021f9c9bec7c2959ad523737f1a142269a7
+	b2sums = a15b00c05cce3b6a1479d88b1393cd955a80c669fed03be5f624a8e8701f22fe327bbd42f7563a532ae8ebc39408f3aedfc982c42a2b6141ccc22af96f16293c
 
 pkgname = avahi
 	depends = dbus
diff --git a/0001-Fix-avahi-browse-Invalid-service-type.patch b/0001-Fix-avahi-browse-Invalid-service-type.patch
deleted file mode 100644
index c3c90c7..0000000
--- a/0001-Fix-avahi-browse-Invalid-service-type.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 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 63e0275a5cdb..ac3d2ecb271c 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;
diff --git a/0002-HACK-Install-fixes.patch b/0001-HACK-Install-fixes.patch
similarity index 81%
rename from 0002-HACK-Install-fixes.patch
rename to 0001-HACK-Install-fixes.patch
index fa015fd..3a2f035 100644
--- a/0002-HACK-Install-fixes.patch
+++ b/0001-HACK-Install-fixes.patch
@@ -27,7 +27,7 @@ index ecca1e97a6e4..a53bc4202cd0 100644
  
  if ENABLE_TESTS
 diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
-index 9645e6e7c2e2..7dd38d99d16e 100644
+index d352d5e52e5d..1f8b6d80ddb9 100644
 --- a/avahi-daemon/Makefile.am
 +++ b/avahi-daemon/Makefile.am
 @@ -27,6 +27,7 @@ pkgsysconfdir=$(sysconfdir)/avahi
@@ -37,8 +37,8 @@ index 9645e6e7c2e2..7dd38d99d16e 100644
 +pkgdocdir=$(datadir)/doc/avahi
  
  AM_CFLAGS+= \
- 	-DAVAHI_DAEMON_RUNTIME_DIR=\"$(avahi_runtime_dir)/avahi-daemon/\" \
-@@ -69,7 +70,7 @@ pkgsysconf_DATA = \
+ 	-DAVAHI_DAEMON_RUNTIME_DIR=\"$(runstatedir)/avahi-daemon/\" \
+@@ -68,7 +69,7 @@ pkgsysconf_DATA = \
  	avahi-daemon.conf \
  	hosts
  
@@ -47,12 +47,9 @@ index 9645e6e7c2e2..7dd38d99d16e 100644
  	ssh.service \
  	sftp-ssh.service
  
-@@ -169,7 +170,7 @@ xmllint:
+@@ -168,4 +169,4 @@ xmllint:
  	done
  
  install-data-local:
--	test -z "$(avahi_runtime_dir)" || $(MKDIR_P) "$(DESTDIR)$(avahi_runtime_dir)"
+-	test -z "$(runstatedir)" || $(MKDIR_P) "$(DESTDIR)$(runstatedir)"
 +	$(MKDIR_P) "$(DESTDIR)$(servicedir)"
- 
- update-systemd:
- 	curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
diff --git a/PKGBUILD b/PKGBUILD
index 3bc8960..9c4445e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=avahi
-pkgver=0.8+r139+ge5b0bad
+pkgver=0.8+r189+g35bb1ba
 pkgrel=1
 epoch=1
 pkgdesc="Service Discovery for Linux using mDNS/DNS-SD (compatible with Bonjour)"
@@ -47,15 +47,13 @@ backup=(
   etc/avahi/{hosts,avahi-daemon.conf,avahi-{autoip,dnsconf}d.action}
   usr/lib/avahi/service-types.db
 )
-_commit=e5b0badfc725b7fa9e6069b6a3d5f278d1b96113  # master
+_commit=35bb1bae902ae9ff2da809fb5f577ba873c43359  # master
 source=(
   "git+https://github.com/lathiat/avahi#commit=$_commit"
-  0001-Fix-avahi-browse-Invalid-service-type.patch
-  0002-HACK-Install-fixes.patch
+  0001-HACK-Install-fixes.patch
 )
 b2sums=('SKIP'
-        '79a881a7f45b4d6061285257b07aa0f72aa69cedc636c74ec12dd031372b3560b4013f18d821e31b323fd73af5de811a1f5ba94ba0e32ce1b1bb940af3bad54f'
-        'd5bbef78b13008a006d23730a86039b09b78e468961c3fbeddf42578a7d871a1ec12e46a3b85591f4d2d4eb7f64e9021f9c9bec7c2959ad523737f1a142269a7')
+        'a15b00c05cce3b6a1479d88b1393cd955a80c669fed03be5f624a8e8701f22fe327bbd42f7563a532ae8ebc39408f3aedfc982c42a2b6141ccc22af96f16293c')
 
 pkgver() {
   cd avahi
@@ -65,12 +63,8 @@ pkgver() {
 prepare() {
   cd avahi
 
-  # https://bugs.archlinux.org/task/71781
-  # https://github.com/lathiat/avahi/issues/212
-  git apply -3 ../0001-Fix-avahi-browse-Invalid-service-type.patch
-
   # https://bugs.archlinux.org/task/47822
-  git apply -3 ../0002-HACK-Install-fixes.patch
+  git apply -3 ../0001-HACK-Install-fixes.patch
 
   NOCONFIGURE=1 ./autogen.sh
 }