From e30def9220a350f4a69ac222f52cdf81aae7dfc3 Mon Sep 17 00:00:00 2001
From: Veniamin Gvozdikov <vg@FreeBSD.org>
Date: Thu, 14 Nov 2013 21:17:27 +0000
Subject: [PATCH] - Update to 0.17.2 - Removed client patch because contained
 at that version

PR:		ports/183969
Submitted by:	maintainer
---
 sysutils/py-salt/Makefile                             |  3 +--
 sysutils/py-salt/distinfo                             |  4 ++--
 .../py-salt/files/patch-salt__client____init__.py     | 11 -----------
 sysutils/py-salt/pkg-plist                            |  2 ++
 4 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 sysutils/py-salt/files/patch-salt__client____init__.py

diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index b92a52165fb6..533fa8bd927c 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	salt
-PORTVERSION=	0.17.1
-PORTREVISION=	2
+PORTVERSION=	0.17.2
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo
index e44e002d9119..1d054b51dc23 100644
--- a/sysutils/py-salt/distinfo
+++ b/sysutils/py-salt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (salt-0.17.1.tar.gz) = 2f9f0e8b2ed53241ab3e373fd8d4030384b3f78f7b796d185c9907874cceebb9
-SIZE (salt-0.17.1.tar.gz) = 3800422
+SHA256 (salt-0.17.2.tar.gz) = f1339c02c40b8aa9c55db66bd5780037aa7f6eb4d592fa9e1353e74d1ab167b2
+SIZE (salt-0.17.2.tar.gz) = 1866629
diff --git a/sysutils/py-salt/files/patch-salt__client____init__.py b/sysutils/py-salt/files/patch-salt__client____init__.py
deleted file mode 100644
index ca34d6005480..000000000000
--- a/sysutils/py-salt/files/patch-salt__client____init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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}"
diff --git a/sysutils/py-salt/pkg-plist b/sysutils/py-salt/pkg-plist
index 0f0e118bdc68..30ad16da295b 100644
--- a/sysutils/py-salt/pkg-plist
+++ b/sysutils/py-salt/pkg-plist
@@ -207,6 +207,8 @@ bin/salt-syndic
 %%PYTHON_SITELIBDIR%%/salt/modules/hg.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/hosts.py
 %%PYTHON_SITELIBDIR%%/salt/modules/hosts.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/htpasswd.py
+%%PYTHON_SITELIBDIR%%/salt/modules/htpasswd.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/img.py
 %%PYTHON_SITELIBDIR%%/salt/modules/img.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/iptables.py