[arch-commits] Commit in pssh/trunk (4 files)

[Jaroslav Lichtblau]

    Date: Sunday, January 17, 2016 @ 12:12:32
  Author: jlichtblau
Revision: 157076

upgpkg: pssh 2.3.1-7 FS#46571 and FS#41255 fixes

Added:
  pssh/trunk/pssh-typeerror-str-does-not-support-the-buffer-interface.patch
  pssh/trunk/pssh-valueerror-the-fd-4-must-be-in-non-blocking-mode.patch
Modified:
  pssh/trunk/PKGBUILD
  pssh/trunk/pssh.changelog

----------------------------------------------------------------+
 PKGBUILD                                                       |   22 +++++++---
 pssh-typeerror-str-does-not-support-the-buffer-interface.patch |    5 ++
 pssh-valueerror-the-fd-4-must-be-in-non-blocking-mode.patch    |    6 ++
 pssh.changelog                                                 |    3 +
 4 files changed, 30 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-17 11:08:48 UTC (rev 157075)
+++ PKGBUILD	2016-01-17 11:12:32 UTC (rev 157076)
@@ -4,17 +4,22 @@
 
 pkgname=pssh
 pkgver=2.3.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Parallel versions of the openssh tools ssh, scp, rsync, nuke, slurp"
 arch=('any')
 url="http://code.google.com/p/parallel-ssh/"
 license=('BSD')
 depends=('openssh' 'python')
+makedepends=('patch')
 changelog=$pkgname.changelog
 source=(http://parallel-ssh.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        Imports-are-absolute-by-default-in-Python3.patch)
+        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)
 sha256sums=('539f8d8363b722712310f3296f189d1ae8c690898eca93627fc89a9cb311f6b4'
-            '12257c60e7db3d152f0b3307d0cd0263a95bddfc856aa570908a0491a1a03c56')
+            '12257c60e7db3d152f0b3307d0cd0263a95bddfc856aa570908a0491a1a03c56'
+            '6b4574810b09f4ca855b81a036643aa27613ea69e1cd92755b9b9f155985d332'
+            '40b01fd5c2aa59542a5d1bf65a41b861733f71305a9799c1d1ca6661f228a891')
 
 prepare() {
   cd "${srcdir}"/$pkgname-$pkgver
@@ -21,19 +26,24 @@
 
 # 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
 }
 
 package() {
   cd "${srcdir}"/$pkgname-$pkgver
+
   python setup.py install --root "${pkgdir}"
 
 # fix manpages
   install -d "${pkgdir}"/usr/share
-  mv "${pkgdir}"/usr/man  "${pkgdir}"/usr/share
+  mv "${pkgdir}"/usr/man "${pkgdir}"/usr/share
 
 # 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
+  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

Added: pssh-typeerror-str-does-not-support-the-buffer-interface.patch
===================================================================
--- pssh-typeerror-str-does-not-support-the-buffer-interface.patch	                        (rev 0)
+++ pssh-typeerror-str-does-not-support-the-buffer-interface.patch	2016-01-17 11:12:32 UTC (rev 157076)
@@ -0,0 +1,5 @@
+--- 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())

Added: pssh-valueerror-the-fd-4-must-be-in-non-blocking-mode.patch
===================================================================
--- pssh-valueerror-the-fd-4-must-be-in-non-blocking-mode.patch	                        (rev 0)
+++ pssh-valueerror-the-fd-4-must-be-in-non-blocking-mode.patch	2016-01-17 11:12:32 UTC (rev 157076)
@@ -0,0 +1,6 @@
+--- 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)

Modified: pssh.changelog
===================================================================
--- pssh.changelog	2016-01-17 11:08:48 UTC (rev 157075)
+++ pssh.changelog	2016-01-17 11:12:32 UTC (rev 157076)
@@ -1,3 +1,6 @@
+2016-01-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* pssh 2.3.1-7 FS#46571 and FS#41255 fixes
+
 2015-09-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* pssh 2.3.1-6 python 3.5 rebuild