summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2022-01-28 13:44:06 +0000
committerJames Le Cuirot <chewi@gentoo.org>2022-01-28 13:44:06 +0000
commit3c2f164da33dc769f29e3587ab891d78b50957dd (patch)
treeb2644761c4f9b366c6a0a5b1cdbdc9f798af38f4 /x11-wm/xpra/files
parentx11-wm/xpra: Version bump to 4.3.2 (diff)
downloadgentoo-3c2f164da33dc769f29e3587ab891d78b50957dd.tar.gz
gentoo-3c2f164da33dc769f29e3587ab891d78b50957dd.tar.bz2
gentoo-3c2f164da33dc769f29e3587ab891d78b50957dd.zip
x11-wm/xpra: Drop old 4.2.3
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'x11-wm/xpra/files')
-rw-r--r--x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch36
-rw-r--r--x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch38
-rw-r--r--x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch30
3 files changed, 0 insertions, 104 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
deleted file mode 100644
index 0d34ab0ef2fa..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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-true-false-bin-path.patch b/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
deleted file mode 100644
index 255e80738616..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
-
diff --git a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
deleted file mode 100644
index 337527305ecc..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/tests/unittests/unit/net/net_util_test.py b/tests/unittests/unit/net/net_util_test.py
-index 5c6e3096c..870801666 100755
---- a/tests/unittests/unit/net/net_util_test.py
-+++ b/tests/unittests/unit/net/net_util_test.py
-@@ -27,11 +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, "expected interface %s for ip %s but got %s" % (
-- iface, ip, get_iface(ip))
- if if_nametoindex:
- try:
- i = if_nametoindex(iface)
-@@ -41,6 +38,12 @@ class TestVersionUtilModule(unittest.TestCase):
- if if_indextoname:
- 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():