Bug#976675: syncthing-gtk: First-time wizard fails due to a socket-handling syntax-error and 2 python3 encoding-errors

[Rowan Thorpe]

Package: syncthing-gtk
Version: 0.9.4.4+ds+git20200927+d09a2ef-3
Severity: normal
Tags: patch




-- System Information:
Debian Release: bullseye/sid
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 5.9.0-3-amd64 (SMP w/8 CPU threads)
Kernel taint flags: TAINT_WARN

Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages syncthing-gtk depends on:
ii  gir1.2-glib-2.0    1.66.1-1
ii  gir1.2-gtk-3.0     3.24.23-2
ii  gir1.2-notify-0.7  0.7.9-1
ii  gir1.2-rsvg-2.0    2.50.2+dfsg-1
ii  libgtk-3-0         3.24.23-2
ii  python3            3.8.6-1
ii  python3-bcrypt     3.1.7-4
ii  python3-dateutil   2.8.1-4
ii  python3-gi         3.38.0-1+b1
ii  python3-gi-cairo   3.38.0-1+b1

Versions of packages syncthing-gtk recommends:
ii  gir1.2-appindicator3-0.1  0.4.92-8
ii  syncthing                 1.10.0~ds1-1

Versions of packages syncthing-gtk suggests:
ii  nemo-python  4.6.0-2+b1

-- no debconf information

--- a/usr/lib/python3/dist-packages/syncthing_gtk/wizard.py	2020-09-27 15:20:42.000000000 +0300
+++ b/usr/lib/python3/dist-packages/syncthing_gtk/wizard.py	2020-11-20 13:10:43.692550279 +0200
@@ -674,7 +674,7 @@
 		try:
 			s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 			s.bind((self.parent.syncthing_options["listen_ip"], port))
-			s.listen(0.1)
+			s.listen(0)
 			s.close()
 			# Good, port is available
 			self.parent.output_line("syncthing-gtk: chosen port %s" % (port,))
@@ -734,9 +734,9 @@
 					))
 			self.ct_textnode(xml, gui, "user", self.parent.syncthing_options["user"])
 			self.ct_textnode(xml, gui, "password", bcrypt.hashpw(
-				self.parent.syncthing_options["password"],
+				self.parent.syncthing_options["password"].encode('utf8'),
 				bcrypt.gensalt()
-			))
+			).decode('utf8'))
 			self.ct_textnode(xml, gui, "apikey", self.apikey)
 			gui.setAttribute("enabled", "true")
 			gui.setAttribute("tls", "false")

Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB:en

OpenPGP_signature
Description: OpenPGP digital signature