diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Imports-are-absolute-by-default-in-Python3.patch | 26 | ||||
| -rw-r--r-- | Makefile | 23 | ||||
| -rw-r--r-- | PKGBUILD | 47 | ||||
| -rw-r--r-- | Relative-paths-should-be-allowed.patch | 84 | ||||
| -rw-r--r-- | pssh-read-stdin-as-bytes-in-Python-3.patch | 16 | ||||
| -rw-r--r-- | pssh-typeerror-str-does-not-support-the-buffer-interface.patch | 5 | ||||
| -rw-r--r-- | pssh-valueerror-the-fd-4-must-be-in-non-blocking-mode.patch | 6 | ||||
| -rw-r--r-- | python-pssh.changelog | 7 |
10 files changed, 27 insertions, 212 deletions
@@ -1,26 +1,18 @@ pkgbase = python-pssh pkgdesc = Parallel versions of the openssh tools ssh, scp, rsync, nuke, slurp - pkgver = 2.3.1 - pkgrel = 11 - url = http://code.google.com/p/parallel-ssh/ + pkgver = 2.3.5 + pkgrel = 12 + url = https://github.com/lilydjwg/pssh changelog = python-pssh.changelog arch = any license = BSD + makedepends = python-build + makedepends = python-installer + makedepends = python-wheel makedepends = patch depends = openssh depends = python - source = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/parallel-ssh/pssh-2.3.1.tar.gz - source = Imports-are-absolute-by-default-in-Python3.patch - source = pssh-typeerror-str-does-not-support-the-buffer-interface.patch - source = pssh-valueerror-the-fd-4-must-be-in-non-blocking-mode.patch - source = pssh-read-stdin-as-bytes-in-Python-3.patch - source = Relative-paths-should-be-allowed.patch - sha256sums = 539f8d8363b722712310f3296f189d1ae8c690898eca93627fc89a9cb311f6b4 - sha256sums = 12257c60e7db3d152f0b3307d0cd0263a95bddfc856aa570908a0491a1a03c56 - sha256sums = 6b4574810b09f4ca855b81a036643aa27613ea69e1cd92755b9b9f155985d332 - sha256sums = 40b01fd5c2aa59542a5d1bf65a41b861733f71305a9799c1d1ca6661f228a891 - sha256sums = 47c1af738d4ba252e9f35c5633da91bae2a2919a7b6b2bf425ee1f090d61c7fe - sha256sums = 3ba2ec624ac2aa3dbd832311ade97b65ab389b4b4aa55a4b672447809c7b463a + source = https://github.com/lilydjwg/pssh/archive/refs/tags/v2.3.5.tar.gz + sha256sums = 97277f9d08b512c6a1b6dc5eac9677f34038096bae24484452d326137ba0d080 pkgname = python-pssh - diff --git a/.gitignore b/.gitignore index 6dd39bbd03b8..cc6d6c23a02f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ pkg/ src/ *.tar +*.zst *.[gx]z diff --git a/Imports-are-absolute-by-default-in-Python3.patch b/Imports-are-absolute-by-default-in-Python3.patch deleted file mode 100644 index e59fc0a7a641..000000000000 --- a/Imports-are-absolute-by-default-in-Python3.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - diff --git a/Makefile b/Makefile deleted file mode 100644 index d98ad5acca65..000000000000 --- a/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -nam = $(shell sed -n 's/^pkgname=//p' PKGBUILD) -src = PKGBUILD -inf = .SRCINFO -pkg = $(shell ls -v $(nam)*.pkg.tar* 2>/dev/null | tail -1) - -all: sum $(inf) check - -$(inf): $(src) - makepkg --printsrcinfo >$@ - -check: $(src) - namcap $^ -ifneq ($(strip $(pkg)),) - namcap $(pkg) -endif - -sum: $(src) - updpkgsums - -clean: - rm -rf $(inf) $(nam)-* *.tar.xz *.tar.gz pkg/ src/ *.part - -# vim: se ts=4: @@ -1,58 +1,33 @@ -# Maintainer: Boris Momcilovic <boris.momcilovic@gmail.com> +# Maintainer: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr> +# Contributor: Boris Momcilovic <boris.momcilovic@gmail.com> # Contributor: Jaroslav Lichtblau <svetlemodry@archlinux.org> # Contributor: Elis Hughes <elishughes@googlemail.com> # Contributor: Mark Blakeney at bullet-systems dot net pkgname=python-pssh -pkgver=2.3.1 -pkgrel=11 +pkgver=2.3.5 +pkgrel=12 pkgdesc="Parallel versions of the openssh tools ssh, scp, rsync, nuke, slurp" arch=('any') -url="http://code.google.com/p/parallel-ssh/" +url="https://github.com/lilydjwg/pssh" license=('BSD') depends=('openssh' 'python') -makedepends=('patch') +makedepends=('python-build' 'python-installer' 'python-wheel' 'patch') changelog=$pkgname.changelog -source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/parallel-ssh/pssh-$pkgver.tar.gz - Imports-are-absolute-by-default-in-Python3.patch - pssh-typeerror-str-does-not-support-the-buffer-interface.patch - pssh-valueerror-the-fd-4-must-be-in-non-blocking-mode.patch - pssh-read-stdin-as-bytes-in-Python-3.patch - Relative-paths-should-be-allowed.patch) -sha256sums=('539f8d8363b722712310f3296f189d1ae8c690898eca93627fc89a9cb311f6b4' - '12257c60e7db3d152f0b3307d0cd0263a95bddfc856aa570908a0491a1a03c56' - '6b4574810b09f4ca855b81a036643aa27613ea69e1cd92755b9b9f155985d332' - '40b01fd5c2aa59542a5d1bf65a41b861733f71305a9799c1d1ca6661f228a891' - '47c1af738d4ba252e9f35c5633da91bae2a2919a7b6b2bf425ee1f090d61c7fe' - '3ba2ec624ac2aa3dbd832311ade97b65ab389b4b4aa55a4b672447809c7b463a') +source=(https://github.com/lilydjwg/pssh/archive/refs/tags/v${pkgver}.tar.gz) +sha256sums=('97277f9d08b512c6a1b6dc5eac9677f34038096bae24484452d326137ba0d080') -prepare() { +build() { cd "${srcdir}"/pssh-$pkgver - -# fix FS#28626 (merged upstream) - patch -Np1 -i ../Imports-are-absolute-by-default-in-Python3.patch -# fix FS#41255 - patch -Np0 -i ../pssh-typeerror-str-does-not-support-the-buffer-interface.patch -# fix FS#46571 - patch -Np0 -i ../pssh-valueerror-the-fd-4-must-be-in-non-blocking-mode.patch -# fix FS#5153 - patch -Np1 -i ../pssh-read-stdin-as-bytes-in-Python-3.patch -# fix to allow relative paths - patch -Np1 -i ../Relative-paths-should-be-allowed.patch + python -m build --wheel --no-isolation } package() { cd "${srcdir}"/pssh-$pkgver - - python setup.py install --root "${pkgdir}" - -# fix manpages - install -d "${pkgdir}"/usr/share - mv "${pkgdir}"/usr/man "${pkgdir}"/usr/share + python -m installer --destdir="$pkgdir" dist/*.whl # fix putty pscp file conflict mv "${pkgdir}"/usr/bin/pscp "${pkgdir}"/usr/bin/psshscp - mv "${pkgdir}"/usr/share/man/man1/pscp.1 "${pkgdir}"/usr/share/man/man1/psshscp.1 # license install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/$pkgname/COPYING diff --git a/Relative-paths-should-be-allowed.patch b/Relative-paths-should-be-allowed.patch deleted file mode 100644 index c129a2a7cc3c..000000000000 --- a/Relative-paths-should-be-allowed.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 887b49452acfa897e700083fe732f1b24788f1d8 Mon Sep 17 00:00:00 2001 -From: Mark Blakeney <mark.blakeney@bullet-systems.net> -Date: Tue, 21 May 2019 09:24:56 +1000 -Subject: [PATCH] Relative paths should be allowed - -This applies the fix for https://code.google.com/archive/p/parallel-ssh/issues/83. ---- - bin/prsync | 4 ---- - bin/pscp | 6 +----- - bin/pslurp | 5 +---- - 3 files changed, 2 insertions(+), 13 deletions(-) - -diff --git a/bin/prsync b/bin/prsync -index 84130af..354e225 100755 ---- a/bin/prsync -+++ b/bin/prsync -@@ -7,7 +7,6 @@ - """Parallel rsync to the set of nodes in hosts.txt. - - For each node, we essentially do a rsync -rv -e ssh local user@host:remote. --Note that remote must be an absolute path. - """ - - import os -@@ -110,9 +109,6 @@ if __name__ == "__main__": - opts, args = parse_args() - local = args[0] - remote = args[1] -- if not re.match("^/", remote): -- print("Remote path %s must be an absolute path" % remote) -- sys.exit(3) - try: - hosts = psshutil.read_host_files(opts.host_files, - default_user=opts.user) -diff --git a/bin/pscp b/bin/pscp -index 5b89b70..75bf449 100755 ---- a/bin/pscp -+++ b/bin/pscp -@@ -7,8 +7,7 @@ - """Parallel scp to the set of nodes in hosts.txt. - - For each node, we essentially do a scp [-r] local user@host:remote. This --program also uses the -q (quiet) and -C (compression) options. Note that --remote must be an absolute path. -+program also uses the -q (quiet) and -C (compression) options. - """ - - import os -@@ -92,9 +91,6 @@ if __name__ == "__main__": - opts, args = parse_args() - localargs = args[0:-1] - remote = args[-1] -- if not re.match("^/", remote): -- print("Remote path %s must be an absolute path" % remote) -- sys.exit(3) - try: - hosts = psshutil.read_host_files(opts.host_files, - default_user=opts.user) -diff --git a/bin/pslurp b/bin/pslurp -index c7dece6..8a73124 100755 ---- a/bin/pslurp -+++ b/bin/pslurp -@@ -8,7 +8,7 @@ - - For each node, we essentially do a scp [-r] user@host:remote - outdir/<node>/local. This program also uses the -q (quiet) and -C --(compression) options. Note that remote must be an absolute path. -+(compression) options. - """ - - import os -@@ -113,9 +113,6 @@ if __name__ == "__main__": - opts, args = parse_args() - remote = args[0] - local = args[1] -- if not re.match("^/", remote): -- print("Remote path %s must be an absolute path" % remote) -- sys.exit(3) - try: - hosts = psshutil.read_host_files(opts.host_files, - default_user=opts.user) --- -2.21.0 - diff --git a/pssh-read-stdin-as-bytes-in-Python-3.patch b/pssh-read-stdin-as-bytes-in-Python-3.patch deleted file mode 100644 index c64d77461cb2..000000000000 --- a/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/pssh-typeerror-str-does-not-support-the-buffer-interface.patch b/pssh-typeerror-str-does-not-support-the-buffer-interface.patch deleted file mode 100644 index 9fa81173ebbc..000000000000 --- a/pssh-typeerror-str-does-not-support-the-buffer-interface.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- psshlib/askpass_server.py.orig 2012-02-02 17:13:09.000000000 +0100 -+++ 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/pssh-valueerror-the-fd-4-must-be-in-non-blocking-mode.patch b/pssh-valueerror-the-fd-4-must-be-in-non-blocking-mode.patch deleted file mode 100644 index e1fca28b5488..000000000000 --- a/pssh-valueerror-the-fd-4-must-be-in-non-blocking-mode.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- psshlib/manager.py.orig 2012-02-02 17:13:09.000000000 +0100 -+++ 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) diff --git a/python-pssh.changelog b/python-pssh.changelog index 9acedb4c2691..d187cbe3ca6c 100644 --- a/python-pssh.changelog +++ b/python-pssh.changelog @@ -1,3 +1,10 @@ +2023-06-09 Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu> + * pssh 2.3.5-12 All patches upstreamed, removed from the PKGBUILD + +2023-05-29 Boris Momčilović <boris@firstbeatmedia.com> + * Update to minor release 2.3.5-11 + * Upstream repository changed + 2016-11-21 Jaroslav Lichtblau <svetlemodry@archlinux.org> * pssh 2.3.1-8 FS#51533 and pssh dropped from [community] |