diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2020-04-10 16:55:09 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2020-04-10 16:55:09 +0000 |
| commit | 40fd38b3e24a9d7b02d3ab374635d02d5a5ddc22 (patch) | |
| tree | 6c8edecda323af63d5056e6f7f5e059d64fed584 /security/pssh | |
| parent | 3e4f0028cf7a63694516118a2e7e601c62efb42d (diff) | |
| download | ports-40fd38b3e24a9d7b02d3ab374635d02d5a5ddc22.tar.gz ports-40fd38b3e24a9d7b02d3ab374635d02d5a5ddc22.zip | |
Notes
Diffstat (limited to 'security/pssh')
| -rw-r--r-- | security/pssh/Makefile | 4 | ||||
| -rw-r--r-- | security/pssh/files/patch-psshlib_cli.py | 11 | ||||
| -rw-r--r-- | security/pssh/files/patch-psshlib_manager.py | 18 |
3 files changed, 31 insertions, 2 deletions
diff --git a/security/pssh/Makefile b/security/pssh/Makefile index 23aa6738556b..233507c67e56 100644 --- a/security/pssh/Makefile +++ b/security/pssh/Makefile @@ -2,11 +2,11 @@ PORTNAME= pssh PORTVERSION= 2.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net sysutils MASTER_SITES= CHEESESHOP -MAINTAINER= brooks@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Parallel versions of the openssh tools LICENSE= BSD3CLAUSE diff --git a/security/pssh/files/patch-psshlib_cli.py b/security/pssh/files/patch-psshlib_cli.py new file mode 100644 index 000000000000..6f628152573b --- /dev/null +++ b/security/pssh/files/patch-psshlib_cli.py @@ -0,0 +1,11 @@ +--- psshlib/cli.py.orig ++++ psshlib/cli.py +@@ -6,7 +6,7 @@ + import shlex + import sys + import textwrap +-import version ++from psshlib import version + + _DEFAULT_PARALLELISM = 32 + _DEFAULT_TIMEOUT = 0 # "infinity" by default diff --git a/security/pssh/files/patch-psshlib_manager.py b/security/pssh/files/patch-psshlib_manager.py new file mode 100644 index 000000000000..33d8e478cd5a --- /dev/null +++ b/security/pssh/files/patch-psshlib_manager.py @@ -0,0 +1,18 @@ +--- psshlib/manager.py.orig ++++ psshlib/manager.py +@@ -2,6 +2,7 @@ + + from errno import EINTR + import os ++import fcntl + import select + import signal + import sys +@@ -209,6 +210,7 @@ + + # Setup the wakeup file descriptor to avoid hanging on lost signals. + wakeup_readfd, wakeup_writefd = os.pipe() ++ fcntl.fcntl(wakeup_writefd, fcntl.F_SETFL, os.O_NONBLOCK) + self.register_read(wakeup_readfd, self.wakeup_handler) + # TODO: remove test when we stop supporting Python <2.5 + if hasattr(signal, 'set_wakeup_fd'): |