From owner-svn-ports-all@freebsd.org Mon Apr 13 17:07:47 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A32682C3E3F; Mon, 13 Apr 2020 17:07:47 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 491FRl3rysz3Qfl; Mon, 13 Apr 2020 17:07:47 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B47E1EBD2; Mon, 13 Apr 2020 17:07:47 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03DH7l5U012623; Mon, 13 Apr 2020 17:07:47 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03DH7kQX012620; Mon, 13 Apr 2020 17:07:46 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202004131707.03DH7kQX012620@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Mon, 13 Apr 2020 17:07:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r531618 - in branches/2020Q2/security/pssh: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in branches/2020Q2/security/pssh: . files X-SVN-Commit-Revision: 531618 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2020 17:07:47 -0000 Author: brooks Date: Mon Apr 13 17:07:46 2020 New Revision: 531618 URL: https://svnweb.freebsd.org/changeset/ports/531618 Log: MFH: r531333 Fix bitrotted code. Drop maintainership. I don't use this port much as evidenced by the fact that one of these bugs was fixed in Arch Linux in 2016 (https://bugs.archlinux.org/task/46571). Submitted by: Jacob D Hunt Approved by: ports-secteam (joneum) Added: branches/2020Q2/security/pssh/files/patch-psshlib_cli.py - copied unchanged from r531333, head/security/pssh/files/patch-psshlib_cli.py branches/2020Q2/security/pssh/files/patch-psshlib_manager.py - copied unchanged from r531333, head/security/pssh/files/patch-psshlib_manager.py Modified: branches/2020Q2/security/pssh/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/security/pssh/Makefile ============================================================================== --- branches/2020Q2/security/pssh/Makefile Mon Apr 13 16:42:22 2020 (r531617) +++ branches/2020Q2/security/pssh/Makefile Mon Apr 13 17:07:46 2020 (r531618) @@ -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 Copied: branches/2020Q2/security/pssh/files/patch-psshlib_cli.py (from r531333, head/security/pssh/files/patch-psshlib_cli.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/security/pssh/files/patch-psshlib_cli.py Mon Apr 13 17:07:46 2020 (r531618, copy of r531333, head/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 Copied: branches/2020Q2/security/pssh/files/patch-psshlib_manager.py (from r531333, head/security/pssh/files/patch-psshlib_manager.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/security/pssh/files/patch-psshlib_manager.py Mon Apr 13 17:07:46 2020 (r531618, copy of r531333, head/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'):