[arch-commits] Commit in avahi/trunk (282.patch PKGBUILD)

[Jan Steffens]

    Date: Wednesday, April 21, 2021 @ 11:01:59
  Author: heftig
Revision: 412958

0.8+20+gd1e71b3-1: FS#68518

Added:
  avahi/trunk/282.patch
Modified:
  avahi/trunk/PKGBUILD

-----------+
 282.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD  |   17 ++++++++++++-----
 2 files changed, 54 insertions(+), 5 deletions(-)

Added: 282.patch
===================================================================
--- 282.patch	                        (rev 0)
+++ 282.patch	2021-04-21 11:01:59 UTC (rev 412958)
@@ -0,0 +1,42 @@
+From bcafdcc5465091b6088532460b671f411703f90b Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv at 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 at 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 4a2b5756..fddf4a51 100755
+--- a/avahi-python/avahi-discover/avahi-discover.py
++++ b/avahi-python/avahi-discover/avahi-discover.py
+@@ -238,15 +238,17 @@ def update_label(self,interface, protocol, name, stype, domain, host, aprotocol,
+                 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)
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-21 11:01:10 UTC (rev 412957)
+++ PKGBUILD	2021-04-21 11:01:59 UTC (rev 412958)
@@ -3,8 +3,8 @@
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=avahi
-pkgver=0.8+15+ge8a3dd0
-pkgrel=3
+pkgver=0.8+20+gd1e71b3
+pkgrel=1
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)
@@ -24,9 +24,11 @@
           libavahi-qt5.so libavahi-ui-gtk3.so libdns_sd.so)
 backup=(etc/avahi/{hosts,avahi-daemon.conf,avahi-{autoip,dnsconf}d.action}
         usr/lib/avahi/service-types.db)
-_commit=e8a3dd0d480a754318e312e6fa66fea249808187  # master
-source=("git+https://github.com/lathiat/avahi#commit=$_commit")
-sha512sums=('SKIP')
+_commit=d1e71b320d96d0f213ecb0885c8313039a09f693  # master
+source=("git+https://github.com/lathiat/avahi#commit=$_commit"
+        282.patch)
+sha512sums=('SKIP'
+            '26b1e74450944f5c4385d2f5df18523cfb953e4138f6d9e81061a626453e40d8ed2dee44535cfbb547848eefb3cdca408009d5f0e0c465f144a8803db8593b46')
 
 pkgver() {
   cd $pkgname
@@ -35,6 +37,11 @@
 
 prepare() {
   cd $pkgname
+
+  # https://bugs.archlinux.org/task/68518
+  # https://github.com/lathiat/avahi/pull/282
+  git apply -3 ../282.patch
+
   NOCONFIGURE=1 ./autogen.sh
 }