x11-wm/xpra: Bump to 4.2.2, add tests

The tests required tweaks but they should work in the next release.

I had to drop prefix support because it's broken and hard to fix.

Closes: https://bugs.gentoo.org/802105
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

4 files changed, 136 insertions, 0 deletions

diff --git a/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch b/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
new file mode 100644
index 000000000000..0d34ab0ef2fa
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
@@ -0,0 +1,36 @@
+diff --git a/tests/unittests/unit/net/compression_test.py b/tests/unittests/unit/net/compression_test.py
+index 29ac7f2d2..89b68fdbf 100755
+--- a/tests/unittests/unit/net/compression_test.py
++++ b/tests/unittests/unit/net/compression_test.py
+@@ -11,7 +11,6 @@ from xpra.net import compression
+ class TestCompression(unittest.TestCase):
+ 
+     def test_main(self):
+-        compression.sanity_checks()
+         compression.init_all()
+         assert compression.use("zlib")
+         assert compression.get_compression_caps()
+diff --git a/tests/unittests/unit/net/packet_encoding_test.py b/tests/unittests/unit/net/packet_encoding_test.py
+index 69ef95c65..eead158b0 100755
+--- a/tests/unittests/unit/net/packet_encoding_test.py
++++ b/tests/unittests/unit/net/packet_encoding_test.py
+@@ -12,7 +12,6 @@ class TestPacketEncoding(unittest.TestCase):
+ 
+     def test_env_log(self):
+         packet_encoding.init_all()
+-        packet_encoding.sanity_checks()
+         assert packet_encoding.get_packet_encoding_caps()
+         assert packet_encoding.get_enabled_encoders()
+         for x in packet_encoding.get_enabled_encoders():
+diff --git a/tests/unittests/unit/scripts/main_test.py b/tests/unittests/unit/scripts/main_test.py
+index 6dd54069c..f9478c2ab 100755
+--- a/tests/unittests/unit/scripts/main_test.py
++++ b/tests/unittests/unit/scripts/main_test.py
+@@ -121,7 +121,6 @@ class TestMain(unittest.TestCase):
+         t("tcp://fe80::c1:ac45:7351:ea69%eth1:14500", {"host" : "fe80::c1:ac45:7351:ea69%eth1", "port" : 14500})
+         t("tcp://[fe80::c1:ac45:7351:ea69]:14500", {"host" : "fe80::c1:ac45:7351:ea69", "port" : 14500})
+         t("tcp://host/100,key1=value1", {"key1" : "value1"})
+-        t("tcp://host/key1=value1", {"key1" : "value1"})
+         try:
+             from xpra.net.vsock import CID_ANY, PORT_ANY    #@UnresolvedImport
+             t("vsock://any:any/", {"vsock" : (CID_ANY, PORT_ANY)})
diff --git a/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch b/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
new file mode 100644
index 000000000000..f689166dec9d
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
@@ -0,0 +1,40 @@
+diff --git a/tests/unittests/unit/net/net_util_test.py b/tests/unittests/unit/net/net_util_test.py
+index 1ceaf4573..870801666 100755
+--- a/tests/unittests/unit/net/net_util_test.py
++++ b/tests/unittests/unit/net/net_util_test.py
+@@ -6,6 +6,7 @@
+
+ import unittest
+
++from collections import defaultdict
+ from xpra.net.net_util import (
+     get_info, get_interfaces, get_interfaces_addresses, #get_interface,
+     get_gateways, get_bind_IPs, do_get_bind_ifacemask,
+@@ -26,10 +27,8 @@ class TestVersionUtilModule(unittest.TestCase):
+         ifaces = get_interfaces()
+         if not ifaces:
+             return
++        ip_ifaces = defaultdict(list)
+         for iface in ifaces:
+-            ipmasks = do_get_bind_ifacemask(iface)
+-            for ip, _ in ipmasks:
+-                assert get_iface(ip)==iface
+             if if_nametoindex:
+                 try:
+                     i = if_nametoindex(iface)
+@@ -37,7 +36,14 @@ class TestVersionUtilModule(unittest.TestCase):
+                     pass
+                 else:
+                     if if_indextoname:
+-                        assert if_indextoname(i)==iface
++                        assert if_indextoname(i)==iface, "expected interface %s for index %i but got %s" % (
++                            iface, i, if_indextoname(i))
++            ipmasks = do_get_bind_ifacemask(iface)
++            for ip, _ in ipmasks:
++                ip_ifaces[ip].append(iface)
++        for ip, ifaces in ip_ifaces.items():
++            assert get_iface(ip) in ifaces, "expected interface for ip %s to be one of %s but got %s" % (
++                    ip, ifaces, get_iface(ip))
+         ia = get_interfaces_addresses()
+         assert ia
+         #for iface, address in ia.items():
diff --git a/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch b/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch
new file mode 100644
index 000000000000..2cd009994c4b
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch
@@ -0,0 +1,22 @@
+From f97daef82521c9297f6cc2d7925fe5c6ed526ad1 Mon Sep 17 00:00:00 2001
+From: totaam <antoine@xpra.org>
+Date: Sun, 22 Aug 2021 21:31:52 +0700
+Subject: [PATCH] #3239 with shell=True, best not to use a list
+
+---
+ xpra/os_util.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xpra/os_util.py b/xpra/os_util.py
+index 2f8c0d64a..2f309f888 100644
+--- a/xpra/os_util.py
++++ b/xpra/os_util.py
+@@ -786,7 +786,7 @@ def find_lib_ldconfig(libname):
+             ldconfig = t
+             break
+     import subprocess
+-    p = subprocess.Popen([ldconfig, "-p"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
++    p = subprocess.Popen("%s -p" % ldconfig, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+     data = bytestostr(p.communicate()[0])
+ 
+     libpath = re.search(pattern, data, re.MULTILINE)        #@UndefinedVariable
diff --git a/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch b/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
new file mode 100644
index 000000000000..255e80738616
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
@@ -0,0 +1,38 @@
+From 6e9ef70facfcc280e4c98892d2af6636d122c762 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Tue, 24 Aug 2021 09:56:26 +0100
+Subject: [PATCH] Execute true and false from /bin, not /usr/bin
+
+Some distributions now have /bin symlinked to /usr/bin, but not all of
+them. /bin should work everywhere.
+---
+ tests/unittests/unit/server/auth_test.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/unittests/unit/server/auth_test.py b/tests/unittests/unit/server/auth_test.py
+index 373db96e5..8e6be8e20 100755
+--- a/tests/unittests/unit/server/auth_test.py
++++ b/tests/unittests/unit/server/auth_test.py
+@@ -73,7 +73,7 @@ class TestAuth(unittest.TestCase):
+             kwargs["connection"] = "fake-connection-data"
+         #exec auth would fail during rpmbuild without a default command:
+         if "command" not in kwargs:
+-            kwargs["command"] = "/usr/bin/true"
++            kwargs["command"] = "/bin/true"
+         return c(username, **kwargs)
+ 
+     def _test_module(self, module):
+@@ -380,8 +380,8 @@ class TestAuth(unittest.TestCase):
+             a = self._init_auth("exec", **kwargs)
+             assert not a.requires_challenge(), "%s should not require a challenge" % a
+             assert self.capsauth(a)==success, "%s should have %s using cmd=%s" % (a, ["failed", "succeeded"][success], cmd)
+-        exec_cmd("/usr/bin/true", True)
+-        exec_cmd("/usr/bin/false", False)
++        exec_cmd("/bin/true", True)
++        exec_cmd("/bin/false", False)
+ 
+ 
+ def main():
+-- 
+2.32.0
+