Attachment #216705 for bug #248208

View | Details | Raw Unified | Return to bug 248208
Collapse All | Expand All




# $FreeBSD: head/security/pssh/Makefile 531333 2020-04-10 16:55:09Z brooks $

PORTNAME=	pssh
PORTVERSION=	2.3.4
DISTVERSIONPREFIX=	v
CATEGORIES=	security net sysutils
MASTER_SITES=	CHEESESHOP

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:3.5+
USE_GITHUB=	yes
GH_ACCOUNT=	lilydjwg
USE_PYTHON=	autoplist distutils

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)pssh/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1478198607	1	TIMESTAMP = 1595513049
2	SHA256 (pssh-2.3.1.tar.gz) = 539f8d8363b722712310f3296f189d1ae8c690898eca93627fc89a9cb311f6b4	2	SHA256 (lilydjwg-pssh-v2.3.4_GH0.tar.gz) = 0f139e8c4d59f0ed9379ce96660d8ce4e008020b22524466d9c23eb9830c841c
3	SIZE (pssh-2.3.1.tar.gz) = 23427	3	SIZE (lilydjwg-pssh-v2.3.4_GH0.tar.gz) = 51859

Lines 1-11 Link Here

(-)pssh/files/patch-psshlib_cli.py (-11 lines)
1	--- psshlib/cli.py.orig
2	+++ psshlib/cli.py
3	@@ -6,7 +6,7 @@
4	import shlex
5	import sys
6	import textwrap
7	-import version
8	+from psshlib import version
9
10	_DEFAULT_PARALLELISM = 32
11	_DEFAULT_TIMEOUT = 0 # "infinity" by default




--- 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'):

Lines 1-6 Link Here

(-)pssh/files/patch-psshlib_psshutil.py (-2 / +2 lines)
1	--- psshlib/psshutil.py.orig	1	--- psshlib/psshutil.py.orig 2020-04-05 06:12:36 UTC
2	+++ psshlib/psshutil.py	2	+++ psshlib/psshutil.py
3	@@ -27,7 +27,10 @@	3	@@ -28,7 +28,10 @@ def read_host_file(path, host_glob, default_user=None,
4	Returns a list of (host, port, user) triples.	4	Returns a list of (host, port, user) triples.
5	"""	5	"""
6	lines = []	6	lines = []




PSSH provides parallel versions of OpenSSH and related tools, including:
in the distribution:

 - Parallel ssh (pssh)
 - Parallel scp (pscp)

 - Parallel nuke (pnuke)
 - Parallel slurp (pslurp)

The project includes psshlib which can be used within custom applications.
The source code is written in Python 3.5+.

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

Return to bug 248208

Lines 1-13 Link Here

(-)pssh/Makefile (-7 / +8 lines)
1	# $FreeBSD: head/security/pssh/Makefile 531333 2020-04-10 16:55:09Z brooks $	1	# $FreeBSD: head/security/pssh/Makefile 531333 2020-04-10 16:55:09Z brooks $
2		2
3	PORTNAME= pssh	3	PORTNAME= pssh
4	PORTVERSION= 2.3.1	4	PORTVERSION= 2.3.4
5	PORTREVISION= 2	5	DISTVERSIONPREFIX= v
6	CATEGORIES= security net sysutils	6	CATEGORIES= security net sysutils
7	MASTER_SITES= CHEESESHOP
8		7
9	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= timp87@gmail.com
10	COMMENT= Parallel versions of the openssh tools	9	COMMENT= Parallel version of OpenSSH and related tools
11		10
12	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
13	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
Lines 15-21 Link Here
15	RUN_DEPENDS= rsync:net/rsync	14	RUN_DEPENDS= rsync:net/rsync
16		15
17	NO_ARCH= yes	16	NO_ARCH= yes
18	USES= python	17	USES= python:3.5+
19	USE_PYTHON= autoplist distutils concurrent optsuffix	18	USE_GITHUB= yes
		19	GH_ACCOUNT= lilydjwg
		20	USE_PYTHON= autoplist distutils
20		21
21	.include <bsd.port.mk>	22	.include <bsd.port.mk>

Lines 1-18 Link Here

(-)pssh/files/patch-psshlib_manager.py (-18 lines)
1	--- psshlib/manager.py.orig
2	+++ psshlib/manager.py
3	@@ -2,6 +2,7 @@
4
5	from errno import EINTR
6	import os
7	+import fcntl
8	import select
9	import signal
10	import sys
11	@@ -209,6 +210,7 @@
12
13	# Setup the wakeup file descriptor to avoid hanging on lost signals.
14	wakeup_readfd, wakeup_writefd = os.pipe()
15	+ fcntl.fcntl(wakeup_writefd, fcntl.F_SETFL, os.O_NONBLOCK)
16	self.register_read(wakeup_readfd, self.wakeup_handler)
17	# TODO: remove test when we stop supporting Python <2.5
18	if hasattr(signal, 'set_wakeup_fd'):

Lines 1-5 Link Here

(-)pssh/pkg-descr (-5 / +11 lines)
1	This package provides parallel versions of the openssh tools. Included	1	PSSH provides parallel versions of OpenSSH and related tools, including:
2	in the distribution:
3		2
4	- Parallel ssh (pssh)	3	- Parallel ssh (pssh)
5	- Parallel scp (pscp)	4	- Parallel scp (pscp)
Lines 7-13 Link Here
7	- Parallel nuke (pnuke)	6	- Parallel nuke (pnuke)
8	- Parallel slurp (pslurp)	7	- Parallel slurp (pslurp)
9		8
10	What are these tools good for? Mainly for controlling large collections	9	The project includes psshlib which can be used within custom applications.
11	of nodes in the wide-area.	10	The source code is written in Python 3.5+.
12		11
13	WWW: https://pypi.org/project/pssh/	12	The original PSSH project was written and maintained by Brent N. Chun.
		13	Due to his busy schedule, Brent handed over maintenance to Andrew McNabb
		14	in October 2009. PSSH hasn't got any updates since 2014.
		15
		16	This package is a fork by 'lilydjwg' github user.
		17	It seems the most live fork that has been accumulating fixes past years.
		18
		19	WWW: https://github.com/lilydjwg/pssh