Commit 608606ff authored by J0WI's avatar J0WI Committed by Leo

main/pssh: upgrade to 2.3.4

parent 0465efc5
# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
# Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr>
pkgname=pssh
pkgver=2.3.1
pkgrel=3
pkgver=2.3.4
pkgrel=0
pkgdesc="PSSH provides parallel versions of OpenSSH and related tools: pssh, pscp, prsync, pnuke, and pslurp"
url="https://code.google.com/p/parallel-ssh/"
url="https://github.com/lilydjwg/pssh"
arch="noarch"
license="BSD-3-Clause"
depends="python3 cmd:ssh"
makedepends="py3-setuptools"
checkdepends="py3-tox"
options="!check" # failing test
subpackages="$pkgname-doc"
source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/parallel-ssh/pssh-$pkgver.tar.gz
python3.patch
"
prepare() {
default_prepare
sed -i -e "s|man/man1'|share/&|g" setup.py
}
source="$pkgname-$pkgver.tar.gz::https://github.com/lilydjwg/pssh/archive/v2.3.4.tar.gz"
build() {
cd "$builddir"
python3 setup.py build
}
check() {
python3 setup.py test
}
package() {
cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
install -d "$pkgdir"/usr/libexec/pssh
mv "$pkgdir"/usr/bin/pssh-askpass "$pkgdir"/usr/libexec/pssh
}
sha512sums="c39e1c2b0a3bc2bd736f1e7d2f402db6a128e81d6a80ce7e97f39e7fae93f7a20037b43b5725bed5ba911f54e36a9b65c509d858a53c696989b76b1322e7680f pssh-2.3.1.tar.gz
d37666fcf8a274a594c8f16c69e569aa6c8bd9d9496ea47657f3267c1b4d3ed2a0c106c365f5e0631fbb51f2bcfacc78a2c708d8a62f3ce2ea018e8c185b16f9 python3.patch"
sha512sums="7abf327ca53dda2402465254e447eb837babdd2b4d865abb5b52a1135bd234694b84c1148cb3e4ed0198271ed29333fc1b5d0d01dc653fcf6d3e5b9f170b9d4e pssh-2.3.4.tar.gz"
From 8afbefc445059be55dfd20785ee81e4533ae3af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rogut=C4=97s=20Sparnuotos?= <rogutes@googlemail.com>
Date: Sun, 26 Feb 2012 11:05:48 +0200
Subject: [PATCH] Imports are absolute by default in Python3.
---
psshlib/cli.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/psshlib/cli.py b/psshlib/cli.py
index c14b309..c342cde 100644
--- a/psshlib/cli.py
+++ b/psshlib/cli.py
@@ -6,7 +6,8 @@ import os
import shlex
import sys
import textwrap
-import version
+
+from psshlib import version
_DEFAULT_PARALLELISM = 32
_DEFAULT_TIMEOUT = 0 # "infinity" by default
--
1.7.9.1
--- a/psshlib/manager.py.orig 2012-02-02 17:13:09.000000000 +0100
+++ b/psshlib/manager.py 2016-01-17 11:52:13.764088460 +0100
@@ -4,0 +5 @@
+import fcntl
@@ -211,0 +213 @@
+ fcntl.fcntl(wakeup_writefd, fcntl.F_SETFL, os.O_NONBLOCK)
--- a/psshlib/askpass_server.py.orig 2012-02-02 17:13:09.000000000 +0100
+++ b/psshlib/askpass_server.py 2016-01-17 11:43:37.006779012 +0100
@@ -72 +72 @@
- bytes_written = conn.send(buffer)
+ bytes_written = conn.send(buffer.encode())
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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment