From 20753135023863642fa4bf7442eecb68454031cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Apestegu=C3=ADa?= Date: Fri, 7 Aug 2020 18:41:57 +0000 Subject: [PATCH] security/pssh: update to 2.3.4 ChangeLog https://github.com/lilydjwg/pssh/blob/master/ChangeLog * switch to the most viable fork * Set MAINTAINER PR: 248208 Submitted by: timp87@gmail.com --- security/pssh/Makefile | 17 +++++++++-------- security/pssh/distinfo | 6 +++--- security/pssh/files/patch-psshlib_cli.py | 11 ----------- security/pssh/files/patch-psshlib_manager.py | 18 ------------------ security/pssh/files/patch-psshlib_psshutil.py | 4 ++-- security/pssh/pkg-descr | 16 +++++++++++----- 6 files changed, 25 insertions(+), 47 deletions(-) delete mode 100644 security/pssh/files/patch-psshlib_cli.py delete mode 100644 security/pssh/files/patch-psshlib_manager.py diff --git a/security/pssh/Makefile b/security/pssh/Makefile index 233507c67e56..babfe0998629 100644 --- a/security/pssh/Makefile +++ b/security/pssh/Makefile @@ -1,21 +1,22 @@ # $FreeBSD$ PORTNAME= pssh -PORTVERSION= 2.3.1 -PORTREVISION= 2 +PORTVERSION= 2.3.4 +DISTVERSIONPREFIX= v CATEGORIES= security net sysutils -MASTER_SITES= CHEESESHOP -MAINTAINER= ports@FreeBSD.org -COMMENT= Parallel versions of the openssh tools +MAINTAINER= timp87@gmail.com +COMMENT= Parallel version of OpenSSH and related tools LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= rsync:net/rsync -NO_ARCH= yes -USES= python -USE_PYTHON= autoplist distutils concurrent optsuffix +USES= python:3.5+ +USE_GITHUB= yes +GH_ACCOUNT= lilydjwg +USE_PYTHON= autoplist distutils +NO_ARCH= yes .include diff --git a/security/pssh/distinfo b/security/pssh/distinfo index 036ae29f44d6..3ff9eaabd3d6 100644 --- a/security/pssh/distinfo +++ b/security/pssh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1478198607 -SHA256 (pssh-2.3.1.tar.gz) = 539f8d8363b722712310f3296f189d1ae8c690898eca93627fc89a9cb311f6b4 -SIZE (pssh-2.3.1.tar.gz) = 23427 +TIMESTAMP = 1595513049 +SHA256 (lilydjwg-pssh-v2.3.4_GH0.tar.gz) = 0f139e8c4d59f0ed9379ce96660d8ce4e008020b22524466d9c23eb9830c841c +SIZE (lilydjwg-pssh-v2.3.4_GH0.tar.gz) = 51859 diff --git a/security/pssh/files/patch-psshlib_cli.py b/security/pssh/files/patch-psshlib_cli.py deleted file mode 100644 index 6f628152573b..000000000000 --- a/security/pssh/files/patch-psshlib_cli.py +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 33d8e478cd5a..000000000000 --- a/security/pssh/files/patch-psshlib_manager.py +++ /dev/null @@ -1,18 +0,0 @@ ---- 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'): diff --git a/security/pssh/files/patch-psshlib_psshutil.py b/security/pssh/files/patch-psshlib_psshutil.py index 134678409499..7fe08b9a4e2f 100644 --- a/security/pssh/files/patch-psshlib_psshutil.py +++ b/security/pssh/files/patch-psshlib_psshutil.py @@ -1,6 +1,6 @@ ---- psshlib/psshutil.py.orig +--- psshlib/psshutil.py.orig 2020-04-05 06:12:36 UTC +++ psshlib/psshutil.py -@@ -27,7 +27,10 @@ +@@ -28,7 +28,10 @@ def read_host_file(path, host_glob, default_user=None, Returns a list of (host, port, user) triples. """ lines = [] diff --git a/security/pssh/pkg-descr b/security/pssh/pkg-descr index 025a8ee51fe4..f2a7b562c49d 100644 --- a/security/pssh/pkg-descr +++ b/security/pssh/pkg-descr @@ -1,5 +1,4 @@ -This package provides parallel versions of the openssh tools. Included -in the distribution: +PSSH provides parallel versions of OpenSSH and related tools, including: - Parallel ssh (pssh) - Parallel scp (pscp) @@ -7,7 +6,14 @@ in the distribution: - Parallel nuke (pnuke) - Parallel slurp (pslurp) -What are these tools good for? Mainly for controlling large collections -of nodes in the wide-area. +The project includes psshlib which can be used within custom applications. +The source code is written in Python 3.5+. -WWW: https://pypi.org/project/pssh/ +The original PSSH project was written and maintained by Brent N. Chun. +Due to his busy schedule, Brent handed over maintenance to Andrew McNabb +in October 2009. PSSH hasn't got any updates since 2014. + +This package is a fork by 'lilydjwg' github user. +It seems the most live fork that has been accumulating fixes past years. + +WWW: https://github.com/lilydjwg/pssh