Bug 183766 - sysutils/py-salt: [patch] salt-ssh not working for FreeBSD minions
Summary: sysutils/py-salt: [patch] salt-ssh not working for FreeBSD minions
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Veniamin Gvozdikov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-07 22:40 UTC by Michael Gmelin
Modified: 2013-11-11 15:40 UTC (History)
0 users

See Also:


Attachments
file.diff (571 bytes, patch)
2013-11-07 22:40 UTC, Michael Gmelin
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Gmelin 2013-11-07 22:40:00 UTC
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).

Fix: Apply the attached patch

Patch attached with submission follows:
How-To-Repeat: call salt-ssh targeting a FreeBSD host
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-11-07 22:40:07 UTC
Responsible Changed
From-To: freebsd-ports-bugs->freebsd-python

freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-11-07 22:40:08 UTC
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
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2013-11-07 22:40:09 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Christer Edwards 2013-11-07 22:45:22 UTC
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
>
Comment 5 Veniamin Gvozdikov freebsd_committer freebsd_triage 2013-11-08 16:42:34 UTC
Responsible Changed
From-To: freebsd-python->vg

I will take it.
Comment 6 dfilter service freebsd_committer freebsd_triage 2013-11-11 15:39:07 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"
Comment 7 Veniamin Gvozdikov freebsd_committer freebsd_triage 2013-11-11 15:40:06 UTC
State Changed
From-To: feedback->closed

Committed, thank you!