From nobody@FreeBSD.org  Thu Nov  7 22:32:01 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 85C04FB
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  7 Nov 2013 22:32:01 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 720D8231E
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  7 Nov 2013 22:32:01 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rA7MW0V8049049
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 7 Nov 2013 22:32:00 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rA7MW04n049046;
	Thu, 7 Nov 2013 22:32:00 GMT
	(envelope-from nobody)
Message-Id: <201311072232.rA7MW04n049046@oldred.freebsd.org>
Date: Thu, 7 Nov 2013 22:32:00 GMT
From: Michael Gmelin <freebsd@grem.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: sysutils/py-salt: [patch] salt-ssh not working for FreeBSD minions
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: christer.edwards@gmail.com

>Number:         183766
>Category:       ports
>Synopsis:       sysutils/py-salt: [patch] salt-ssh not working for FreeBSD minions
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 07 22:40:00 UTC 2013
>Closed-Date:    Mon Nov 11 15:40:08 UTC 2013
>Last-Modified:  Mon Nov 11 15:40:08 UTC 2013
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-python 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Nov 7 22:40:07 UTC 2013 
Responsible-Changed-Why:  
freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183766 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Nov 7 22:40:09 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183766 

From: Christer Edwards <christer.edwards@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/183766: sysutils/py-salt: [patch] salt-ssh not working for
 FreeBSD minions
Date: Thu, 7 Nov 2013 15:45:22 -0700

 --047d7b2e788698840604ea9e061a
 Content-Type: text/plain; charset=UTF-8
 
 Approved.
 
 I will submit a bug to upstream SaltStack and get this addressed for the
 next release.
 
 
 On Thu, Nov 7, 2013 at 3:40 PM, Edwin Groothuis <edwin@freebsd.org> wrote:
 
 > Maintainer of sysutils/py-salt,
 >
 > Please note that PR ports/183766 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183766
 >
 > --
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org
 >
 
 --047d7b2e788698840604ea9e061a
 Content-Type: text/html; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 <div dir=3D"ltr">Approved.<div><br></div><div>I will submit a bug to upstre=
 am SaltStack and get this addressed for the next release.</div></div><div c=
 lass=3D"gmail_extra"><br><br><div class=3D"gmail_quote">On Thu, Nov 7, 2013=
  at 3:40 PM, Edwin Groothuis <span dir=3D"ltr">&lt;<a href=3D"mailto:edwin@=
 freebsd.org" target=3D"_blank">edwin@freebsd.org</a>&gt;</span> wrote:<br>
 
 <blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
 x #ccc solid;padding-left:1ex">Maintainer of sysutils/py-salt,<br>
 <br>
 Please note that PR ports/183766 has just been submitted.<br>
 <br>
 If it contains a patch for an upgrade, an enhancement or a bug fix<br>
 you agree on, reply to this email stating that you approve the patch<br>
 and a committer will take care of it.<br>
 <br>
 The full text of the PR can be found at:<br>
 =C2=A0 =C2=A0 <a href=3D"http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports=
 /183766" target=3D"_blank">http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dpor=
 ts/183766</a><br>
 <span class=3D"HOEnZb"><font color=3D"#888888"><br>
 --<br>
 Edwin Groothuis via the GNATS Auto Assign Tool<br>
 edwin@FreeBSD.org<br>
 </font></span></blockquote></div><br></div>
 
 --047d7b2e788698840604ea9e061a--

From: Edwin Groothuis <edwin@FreeBSD.org>
To: christer.edwards@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/183766: sysutils/py-salt: [patch] salt-ssh not working for FreeBSD minions
Date: Thu, 7 Nov 2013 22:40:08 UT

 Maintainer of sysutils/py-salt,
 
 Please note that PR ports/183766 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183766
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-python->vg 
Responsible-Changed-By: vg 
Responsible-Changed-When: Fri Nov 8 16:42:34 UTC 2013 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183766 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183766: commit references a PR
Date: Mon, 11 Nov 2013 15:39:07 +0000 (UTC)

 Author: vg
 Date: Mon Nov 11 15:38:54 2013
 New Revision: 333514
 URL: http://svnweb.freebsd.org/changeset/ports/333514
 
 Log:
   - Added pach which fixed md5sum to md5
   
   PR:		ports/183766
   Submitted by:	Michael Gmelin <freebsd@grem.de>
   Approved by:	maintainer
 
 Added:
   head/sysutils/py-salt/files/patch-salt__client____init__.py   (contents, props changed)
 Modified:
   head/sysutils/py-salt/Makefile
 
 Modified: head/sysutils/py-salt/Makefile
 ==============================================================================
 --- head/sysutils/py-salt/Makefile	Mon Nov 11 15:31:16 2013	(r333513)
 +++ head/sysutils/py-salt/Makefile	Mon Nov 11 15:38:54 2013	(r333514)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	salt
  PORTVERSION=	0.17.1
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	sysutils python
  MASTER_SITES=	CHEESESHOP
  PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 Added: head/sysutils/py-salt/files/patch-salt__client____init__.py
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/sysutils/py-salt/files/patch-salt__client____init__.py	Mon Nov 11 15:38:54 2013	(r333514)
 @@ -0,0 +1,11 @@
 +--- 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}"
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: vg 
State-Changed-When: Mon Nov 11 15:40:06 UTC 2013 
State-Changed-Why:  
Committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183766 
>Unformatted:
