8 files changed, 11 insertions, 103 deletions
diff --git a/source/n/pssh/pssh-2.3.1-py3-import.patch b/source/n/pssh/pssh-2.3.1-py3-import.patch
deleted file mode 100644
index d40104fb7..000000000
--- a/source/n/pssh/pssh-2.3.1-py3-import.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/psshlib/cli.py b/psshlib/cli.py
-index c14b309..ddfe0ee 100644
---- a/psshlib/cli.py
-+++ b/psshlib/cli.py
-@@ -6,7 +6,7 @@ import os
- import shlex
- import sys
- import textwrap
--import version
-+from psshlib import version
- 
- _DEFAULT_PARALLELISM = 32
- _DEFAULT_TIMEOUT     = 0 # "infinity" by default
diff --git a/source/n/pssh/pssh-2.3.1-py3-min-int-none.patch b/source/n/pssh/pssh-2.3.1-py3-min-int-none.patch
deleted file mode 100644
index c202bc8ee..000000000
--- a/source/n/pssh/pssh-2.3.1-py3-min-int-none.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/bin/pssh b/bin/pssh
-index 5b6c2a5..dc53a36 100755
---- a/bin/pssh
-+++ b/bin/pssh
-@@ -90,7 +90,7 @@ def do_pssh(hosts, cmdline, opts):
-     except FatalError:
-         sys.exit(1)
- 
--    if min(statuses) < 0:
-+    if None in statuses:
-         # At least one process was killed.
-         sys.exit(3)
-     # The any builtin was introduced in Python 2.5 (so we can't use it yet):
diff --git a/source/n/pssh/pssh-2.3.1-py3-non-blocking.patch b/source/n/pssh/pssh-2.3.1-py3-non-blocking.patch
deleted file mode 100644
index bcf4b4fd9..000000000
--- a/source/n/pssh/pssh-2.3.1-py3-non-blocking.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# https://github.com/nplanel/parallel-ssh/commit/ee379dc5c69e4e0f62f92fb48f9a9ce6af0b2ac4.patch
-From ee379dc5c69e4e0f62f92fb48f9a9ce6af0b2ac4 Mon Sep 17 00:00:00 2001
-From: Nicolas PLANEL <nplanel@gmail.com>
-Date: Fri, 23 Oct 2015 01:20:25 +1100
-Subject: [PATCH] fixup : wakeup_writefd must be non-blocking
-
-wakeup_writefd should be non-blocking as signal.set_wakeup_fd()
-API request it.
-
-"ValueError: the fd 4 must be in non-blocking mode"
----
- psshlib/manager.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/psshlib/manager.py b/psshlib/manager.py
-index 7dbf4e3..db35e76 100644
---- a/psshlib/manager.py
-+++ b/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 @@ def __init__(self):
- 
-         # 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/source/n/pssh/pssh-2.3.1-py3-str-bytes-encode.patch b/source/n/pssh/pssh-2.3.1-py3-str-bytes-encode.patch
deleted file mode 100644
index 1a6b4cc3a..000000000
--- a/source/n/pssh/pssh-2.3.1-py3-str-bytes-encode.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/psshlib/askpass_server.py b/psshlib/askpass_server.py
-index 4293164..4680749 100644
---- a/psshlib/askpass_server.py
-+++ b/psshlib/askpass_server.py
-@@ -69,7 +69,7 @@ class PasswordServer(object):
-         buffer = self.buffermap[fd]
-         conn = self.socketmap[fd]
-         try:
--            bytes_written = conn.send(buffer)
-+            bytes_written = conn.send(buffer.encode('utf-8'))
-         except socket.error:
-             _, e, _ = sys.exc_info()
-             number = e.args[0]
diff --git a/source/n/pssh/pssh-read-stdin-as-bytes-in-Python-3.patch b/source/n/pssh/pssh-read-stdin-as-bytes-in-Python-3.patch
deleted file mode 100644
index c64d77461..000000000
--- a/source/n/pssh/pssh-read-stdin-as-bytes-in-Python-3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/bin/pssh b/bin/pssh
-index 860bad2..5fe726d 100755
---- a/bin/pssh
-+++ b/bin/pssh
-@@ -65,7 +65,10 @@ def do_pssh(hosts, cmdline, opts):
-     if opts.errdir and not os.path.exists(opts.errdir):
-         os.makedirs(opts.errdir)
-     if opts.send_input:
--        stdin = sys.stdin.read()
-+        if hasattr(sys.stdin, 'buffer'):
-+            stdin = sys.stdin.buffer.read()
-+        else:
-+            stdin = sys.stdin.read()
-     else:
-         stdin = None
-     manager = Manager(opts)
diff --git a/source/n/pssh/pssh.SlackBuild b/source/n/pssh/pssh.SlackBuild
index e199c3e72..c54131830 100755
--- a/source/n/pssh/pssh.SlackBuild
+++ b/source/n/pssh/pssh.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pssh
-VERSION=${VERSION:-$(echo pssh*.tar.gz | cut -d - -f 2  | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-5}
+VERSION=${VERSION:-$(echo pssh*.tar.?z | cut -d - -f 2  | rev | cut -f 3- -d . | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -61,7 +61,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf pssh-$VERSION
-tar xvf $CWD/pssh-$VERSION.tar.gz || exit 1
+tar xvf $CWD/pssh-$VERSION.tar.?z || exit 1
 cd pssh-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -70,16 +70,13 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# fix python3 issues
-zcat $CWD/pssh-2.3.1-py3-import.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/pssh-2.3.1-py3-min-int-none.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/pssh-2.3.1-py3-non-blocking.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/pssh-2.3.1-py3-str-bytes-encode.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/pssh-read-stdin-as-bytes-in-Python-3.patch.gz | patch -p1 --verbose || exit 1
-
 # Install
 python3 setup.py build install --root=$PKG
 
+# Relocate man pages:
+mv $PKG/usr/share/man $PKG/usr
+rmdir $PKG/usr/share 2> /dev/null
+
 # Compress manual pages:
 find $PKG/usr/man -type f -exec gzip -9 {} \+
 for i in $( find $PKG/usr/man -type l ) ; do
@@ -89,7 +86,7 @@ done
 
 mkdir -p $PKG/$PREFIX/doc/pssh-$VERSION
 cp -a \
-  AUTHORS BUGS COPYING* INSTALL PKG-INFO README* TODO \
+  AUTHORS* BUGS* COPYING* INSTALL* PKG-INFO* README* TODO* \
   doc/pssh*html $PKG/$PREFIX/doc/pssh-$VERSION/.
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/n/pssh/pssh.url b/source/n/pssh/pssh.url
new file mode 100644
index 000000000..4ca2494ee
--- /dev/null
+++ b/source/n/pssh/pssh.url
@@ -0,0 +1 @@
+https://github.com/lilydjwg/pssh/releases
diff --git a/source/n/pssh/slack-desc b/source/n/pssh/slack-desc
index cb4a87c0a..03c6b88ed 100644
--- a/source/n/pssh/slack-desc
+++ b/source/n/pssh/slack-desc
@@ -16,4 +16,4 @@ pssh: kill command.
 pssh:
 pssh: Pssh has been written by Brent Chun <bnc at theether.org>, and is
 pssh: currently maintained by Andrew McNabb <amcnabb at mcnabbs.org>.
-pssh: Homepage: https://code.google.com/archive/p/parallel-ssh/
+pssh: Homepage: https://github.com/lilydjwg/pssh/releases