ports/183766: sysutils/py-salt: [patch] salt-ssh not working for FreeBSD minions

[Michael Gmelin]

>Number:         183766
>Category:       ports
>Synopsis:       sysutils/py-salt: [patch] salt-ssh not working for FreeBSD minions
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 07 22:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Michael Gmelin
>Release:        9.1-RELEASE
>Organization:
Grem Equity GmbH
>Environment:
FreeBSD bsd64.grem.de 9.1-RELEASE-p2 FreeBSD 9.1-RELEASE-p2 #5 r249052M: Fri May 31 17:50:16 UTC 2013     root at srv05:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
salt-ssh uses md5sum for checking the integrity of the installed salt-thin client and therefore won't work for FreeBSD targets.

The attached patch fixes this (place it in /files using an appropriate filename). I can create a full patch to the port skeleton if required.

This should be fixed upstream, maybe the maintainer already is involved in saltstack development and can push for this, in the meantime this patch allows using salt-ssh).
>How-To-Repeat:
call salt-ssh targeting a FreeBSD host
>Fix:
Apply the attached patch

Patch attached with submission follows:

--- salt/client/ssh/__init__.py.orig	2013-10-17 19:28:12.000000000 +0200
+++ salt/client/ssh/__init__.py	2013-11-07 23:22:40.228990613 +0100
@@ -80,7 +80,7 @@
          fi
          if [ -f /tmp/.salt/salt-thin.tgz ]
          then
-             [ $({{2}}sum /tmp/.salt/salt-thin.tgz | cut -f1 -d' ') = {{3}} ] && {{0}} tar xzvf /tmp/.salt/salt-thin.tgz -C /tmp/.salt
+             [ $({{2}} -q /tmp/.salt/salt-thin.tgz) = {{3}} ] && {{0}} tar xzvf /tmp/.salt/salt-thin.tgz -C /tmp/.salt
          else
              install -m 0700 -d /tmp/.salt
              echo "{1}"


>Release-Note:
>Audit-Trail:
>Unformatted: