git » avahi.git » commit f87e40d

diff --git a/0002-Fix-avahi-browse-Invalid-service-type.patch b/0001-Fix-avahi-browse-Invalid-service-type.patch
similarity index 100%
rename from 0002-Fix-avahi-browse-Invalid-service-type.patch
rename to 0001-Fix-avahi-browse-Invalid-service-type.patch
diff --git a/0001-avahi-discover-Don-t-decode-unicode-strings-only-byt.patch b/0001-avahi-discover-Don-t-decode-unicode-strings-only-byt.patch
deleted file mode 100644
index 5efed84..0000000
--- a/0001-avahi-discover-Don-t-decode-unicode-strings-only-byt.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@debian.org>
-Date: Fri, 24 Apr 2020 11:25:41 +0100
-Subject: [PATCH] avahi-discover: Don't decode unicode strings, only
- bytestrings
-
-Unicode strings (unicode in Python 2, str or unicode in Python 3) don't
-have a decode method; only bytestrings (str or bytes in Python 2,
-bytes in Python 3) have that. Decode exactly the strings that need
-decoding.
-
-Resolves: https://github.com/lathiat/avahi/issues/275
-Signed-off-by: Simon McVittie <smcv@debian.org>
----
- avahi-python/avahi-discover/avahi-discover.py | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py
-index 4a2b5756343f..fddf4a518074 100755
---- a/avahi-python/avahi-discover/avahi-discover.py
-+++ b/avahi-python/avahi-discover/avahi-discover.py
-@@ -238,15 +238,17 @@ class Main_window:
-                 txts+="<b>" + _("TXT") + " <i>%s</i></b> = %s\n" % (k,v)
-         else:
-             txts = "<b>" + _("TXT Data:") + "</b> <i>" + _("empty") + "</i>"
--        
--        txts = txts.decode("utf-8")
-+
-+        if isinstance(txts, bytes):     # Python 2
-+            txts = txts.decode("utf-8")
- 
-         infos = "<b>" + _("Service Type:") + "</b> %s\n"
-         infos += "<b>" + _("Service Name:") + "</b> %s\n"
-         infos += "<b>" + _("Domain Name:") + "</b> %s\n"
-         infos += "<b>" + _("Interface:") + "</b> %s %s\n"
-         infos += "<b>" + _("Address:") + "</b> %s/%s:%i\n%s"
--        infos = infos.decode("utf-8")
-+        if isinstance(infos, bytes):    # Python 2
-+            infos = infos.decode("utf-8")
-         infos = infos % (stype, name, domain, self.siocgifname(interface), self.protoname(protocol), host, address, port, txts.strip())
-         self.info_label.set_markup(infos)
- 
diff --git a/0004-HACK-Install-fixes.patch b/0002-HACK-Install-fixes.patch
similarity index 97%
rename from 0004-HACK-Install-fixes.patch
rename to 0002-HACK-Install-fixes.patch
index 80a928f..fa015fd 100644
--- a/0004-HACK-Install-fixes.patch
+++ b/0002-HACK-Install-fixes.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] HACK: Install fixes
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/avahi-compat-libdns_sd/Makefile.am b/avahi-compat-libdns_sd/Makefile.am
-index 9a66bc0d12d9..a6e509133ca9 100644
+index ecca1e97a6e4..a53bc4202cd0 100644
 --- a/avahi-compat-libdns_sd/Makefile.am
 +++ b/avahi-compat-libdns_sd/Makefile.am
 @@ -27,6 +27,9 @@ avahi_compat_libdns_sddir=$(includedir)/avahi-compat-libdns_sd
diff --git a/0003-Do-not-disable-timeout-cleanup-on-watch-cleanup.patch b/0003-Do-not-disable-timeout-cleanup-on-watch-cleanup.patch
deleted file mode 100644
index 5d36efd..0000000
--- a/0003-Do-not-disable-timeout-cleanup-on-watch-cleanup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Gustavo Noronha Silva <gustavo@noronha.dev.br>
-Date: Sun, 2 Jan 2022 22:29:04 -0300
-Subject: [PATCH] Do not disable timeout cleanup on watch cleanup
-
-This was causing timeouts to never be removed from the linked list that
-tracks them, resulting in both memory and CPU usage to grow larger over
-time.
----
- avahi-common/simple-watch.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/avahi-common/simple-watch.c b/avahi-common/simple-watch.c
-index 08d8090c7789..2a4a98920c05 100644
---- a/avahi-common/simple-watch.c
-+++ b/avahi-common/simple-watch.c
-@@ -238,7 +238,7 @@ static void cleanup_watches(AvahiSimplePoll *s, int all) {
-             destroy_watch(w);
-     }
- 
--    s->timeout_req_cleanup = 0;
-+    s->watch_req_cleanup = 0;
- }
- 
- static AvahiTimeout* timeout_new(const AvahiPoll *api, const struct timeval *tv, AvahiTimeoutCallback callback, void *userdata) {
diff --git a/PKGBUILD b/PKGBUILD
index 97942bf..697c3f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=avahi
-pkgver=0.8+r22+gfd482a7
+pkgver=0.8+r127+g55d783d
 pkgrel=1
 epoch=1
 pkgdesc="Service Discovery for Linux using mDNS/DNS-SD (compatible with Bonjour)"
@@ -47,19 +47,15 @@ backup=(
   etc/avahi/{hosts,avahi-daemon.conf,avahi-{autoip,dnsconf}d.action}
   usr/lib/avahi/service-types.db
 )
-_commit=fd482a74625b8db8547b8cfca3ee3d3c6c721423  # master
+_commit=55d783d9d11ced838d73a2757273c5f6958ccd5c  # master
 source=(
   "git+https://github.com/lathiat/avahi#commit=$_commit"
-  0001-avahi-discover-Don-t-decode-unicode-strings-only-byt.patch
-  0002-Fix-avahi-browse-Invalid-service-type.patch
-  0003-Do-not-disable-timeout-cleanup-on-watch-cleanup.patch
-  0004-HACK-Install-fixes.patch
+  0001-Fix-avahi-browse-Invalid-service-type.patch
+  0002-HACK-Install-fixes.patch
 )
 b2sums=('SKIP'
-        'a7d26bfbaa2bc488de81e9ec6d32ee64b1eaacd4e1cbecc6f896c263c2e37a036a5510d3f1c50ddcaec50251c4bd265aaf68ebe3c508016de9018aecaf2692e1'
         '79a881a7f45b4d6061285257b07aa0f72aa69cedc636c74ec12dd031372b3560b4013f18d821e31b323fd73af5de811a1f5ba94ba0e32ce1b1bb940af3bad54f'
-        '04a100e1775e10c9dd23fb7e1c4f9f456ac9fd84abe649ca93758dfede262cfcf9dc114c40be08d53645de92bfd26071e8b1a1117e3f391ddad7c64aedc69de0'
-        '1b3fd8221b3a2d79a9425f5bd630ace0ac345ae7b7c0741957beb6755664aaff5c84d441a5c399d86945ec876eef7bbda4f5162d39e2b1701da2c4b4c233b8cc')
+        'd5bbef78b13008a006d23730a86039b09b78e468961c3fbeddf42578a7d871a1ec12e46a3b85591f4d2d4eb7f64e9021f9c9bec7c2959ad523737f1a142269a7')
 
 pkgver() {
   cd avahi
@@ -69,20 +65,12 @@ pkgver() {
 prepare() {
   cd avahi
 
-  # https://bugs.archlinux.org/task/68518
-  # https://github.com/lathiat/avahi/pull/282
-  git apply -3 ../0001-avahi-discover-Don-t-decode-unicode-strings-only-byt.patch
-
   # https://bugs.archlinux.org/task/71781
   # https://github.com/lathiat/avahi/issues/212
-  git apply -3 ../0002-Fix-avahi-browse-Invalid-service-type.patch
-
-  # https://bugs.archlinux.org/task/78644
-  # https://github.com/lathiat/avahi/pull/366
-  git apply -3 ../0003-Do-not-disable-timeout-cleanup-on-watch-cleanup.patch
+  git apply -3 ../0001-Fix-avahi-browse-Invalid-service-type.patch
 
   # https://bugs.archlinux.org/task/47822
-  git apply -3 ../0004-HACK-Install-fixes.patch
+  git apply -3 ../0002-HACK-Install-fixes.patch
 
   NOCONFIGURE=1 ./autogen.sh
 }