From 2cb6e45d175672ee96f5220f6922638ecfd5d3b1 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Tue, 3 Nov 2020 20:05:24 +0100 Subject: [PATCH] Update to 0.7.0 --- .gitignore | 1 + ...ocess.Popen-for-startup-failure-test.patch | 57 ------------------- sources | 2 +- waypipe.spec | 9 +-- 4 files changed, 7 insertions(+), 62 deletions(-) delete mode 100644 0001-Use-subprocess.Popen-for-startup-failure-test.patch diff --git a/.gitignore b/.gitignore index b384c5a..6188551 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /waypipe-v0.6.0.tar.gz /waypipe-v0.6.1.tar.gz +/waypipe-v0.7.0.tar.gz diff --git a/0001-Use-subprocess.Popen-for-startup-failure-test.patch b/0001-Use-subprocess.Popen-for-startup-failure-test.patch deleted file mode 100644 index d916135..0000000 --- a/0001-Use-subprocess.Popen-for-startup-failure-test.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 68e6782cb5ebe9f9a17cc28f23687ec2ebc54af0 Mon Sep 17 00:00:00 2001 -From: Manuel Stoeckl -Date: Thu, 28 Nov 2019 12:01:16 -0500 -Subject: [PATCH] Use subprocess.Popen for startup failure test - -According to the Python documentation, the new usage should be valid -for Python >=3.3, covering a wider range than the >=3.5 for -subprocess.Popen. Also, this change avoids a possible regression -with Python 3.8.0 in which the TimeoutExpired exception no longer -provides a non-None .output field. ---- - test/startup_failure.py | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/test/startup_failure.py b/test/startup_failure.py -index 3d4117a..ae988b2 100755 ---- a/test/startup_failure.py -+++ b/test/startup_failure.py -@@ -53,23 +53,23 @@ def run_test(name, command, env, use_socketpair, expect_success): - pfds = [] - - timed_out = False -+ proc = subprocess.Popen( -+ command, -+ env=env, -+ stdin=subprocess.DEVNULL, -+ stdout=subprocess.PIPE, -+ stderr=subprocess.STDOUT, -+ pass_fds=pfds, -+ ) - try: -- proc = subprocess.run( -- command, -- env=env, -- stdin=subprocess.DEVNULL, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- timeout=0.25, -- pass_fds=pfds, -- ) -+ output, none = proc.communicate(timeout=0.25) - except subprocess.TimeoutExpired as e: -- timed_out = True -- output = e.output - # Program began to wait for a connection -+ proc.kill() -+ output, none = proc.communicate() - retcode = 0 if "client" in command else (0 if expect_success else 1) -+ timed_out = True - else: -- output = proc.stdout - retcode = proc.returncode - - if use_socketpair: --- -2.26.2 - diff --git a/sources b/sources index 2850742..547ac42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (waypipe-v0.6.1.tar.gz) = 7b7cdc6d808f8f9e3720425af6ca1a75b81ffadc990e181f52940320efab6d5c6b55dcc10adb36c90b784426a71fab2a037206f4cb2634775628b52dc27cb830 +SHA512 (waypipe-v0.7.0.tar.gz) = d87f6da1aeabeec42be2d6a80c67eb8bd812cd6421493db492eae7fcd90004177000fd66b5c45c38bace2e98b0a1d4e648f2b12998a8f3f8089d0028a067226d diff --git a/waypipe.spec b/waypipe.spec index 9515703..1daba39 100644 --- a/waypipe.spec +++ b/waypipe.spec @@ -1,12 +1,11 @@ Name: waypipe -Version: 0.6.1 -Release: 7%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Summary: Wayland forwarding proxy License: MIT URL: https://gitlab.freedesktop.org/mstoeckl/%{name} Source0: https://gitlab.freedesktop.org/mstoeckl/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz -Patch0: 0001-Use-subprocess.Popen-for-startup-failure-test.patch BuildRequires: gcc BuildRequires: meson @@ -28,7 +27,6 @@ application forwarding similar to "ssh -X" feasible. %prep %setup -q -n %{name}-v%{version} -%patch0 -p1 %build @@ -52,6 +50,9 @@ application forwarding similar to "ssh -X" feasible. %changelog +* Tue Nov 03 2020 Dominique Martinet - 0.7.0-1 +- Update to version 0.7.0 + * Mon Sep 28 2020 Jeff Law - 0.6.1-7 - Re-enable LTO as upstream GCC target/96939 has been fixed