- Update to 2014.7.2

PR:		197597
Submitted by:	Christer Edwards <christer.edwards@gmail.com> (maintainer)

5 files changed, 47 insertions, 43 deletions

diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index 6d84f8739d76..041e52636838 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	salt
-PORTVERSION=	2014.7.0
-PORTREVISION=	1
+PORTVERSION=	2014.7.2
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo
index 14126290d037..3536f1685e60 100644
--- a/sysutils/py-salt/distinfo
+++ b/sysutils/py-salt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (salt-2014.7.0.tar.gz) = d4a64436636a5e6839c1ae1d16052d2e965b9aed5c3c58735bd89fddb9a0ed5c
-SIZE (salt-2014.7.0.tar.gz) = 3518342
+SHA256 (salt-2014.7.2.tar.gz) = 92e6b9afe764c836cd24aa210d98050bc0fdb4d8ee9f813edc504ea19651e505
+SIZE (salt-2014.7.2.tar.gz) = 3570683
diff --git a/sysutils/py-salt/files/patch-salt__grains__core.py b/sysutils/py-salt/files/patch-salt__grains__core.py
index 84a1d1249af1..2f2e9c17a27f 100644
--- a/sysutils/py-salt/files/patch-salt__grains__core.py
+++ b/sysutils/py-salt/files/patch-salt__grains__core.py
@@ -1,11 +1,11 @@
---- ./salt/grains/core.py.orig  2014-11-03 12:38:21.000000000 -0700
-+++ ./salt/grains/core.py       2014-11-04 13:34:47.769728417 -0700
-@@ -1320,7 +1320,7 @@
+--- salt/grains/core.py.orig	2015-01-24 14:54:03.078736129 -0700
++++ salt/grains/core.py	2015-01-24 14:53:12.000000000 -0700
+@@ -1321,7 +1321,7 @@
      '''
      # Provides:
      #   path
--    return {'path': os.environ['PATH'].strip()}
-+    return {'path': os.environ['PATH'].strip() + ':/usr/local/bin:/usr/local/sbin'}
+-    return {'path': os.environ.get('PATH', '').strip()}
++    return {'path': os.environ.get('PATH', '').strip() + ':/usr/local/bin:/usr/local/sbin'}
  
  
  def pythonversion():
diff --git a/sysutils/py-salt/files/patch-setup.py b/sysutils/py-salt/files/patch-setup.py
index 2918c2813af7..34c93a4840c5 100644
--- a/sysutils/py-salt/files/patch-setup.py
+++ b/sysutils/py-salt/files/patch-setup.py
@@ -1,33 +1,13 @@
---- setup.py.orig	2014-11-03 12:38:21.000000000 -0700
-+++ setup.py        2014-11-04 14:42:58.775471457 -0700
-@@ -212,12 +212,12 @@
-             self.distribution.package_data.pop('salt.daemons.flo', None)
-             self.filelist.files.append(os.path.basename(PACKAGED_FOR_SALT_SSH_FILE))
-             self.distribution.metadata.name = 'salt-ssh'
--            self.distribution.data_files = [('share/man/man1',
-+            self.distribution.data_files = [('man/man1',
-                                              ['doc/man/salt-ssh.1',
-                                               'doc/man/salt-run.1',
-                                               'doc/man/salt-call.1',
-                                               'doc/man/salt-cloud.1']),
--                                            ('share/man/man7', ['doc/man/salt.7'])]
-+                                            ('man/man7', ['doc/man/salt.7'])]
- 
-         sdist.make_release_tree(self, base_dir, files)
- 
-@@ -666,13 +666,13 @@
-                                     '*.flo'
-                                     ]
-                                 },
--                'data_files': [('share/man/man1',
-+                'data_files': [('man/man1',
-                                 ['doc/man/salt-cp.1',
-                                  'doc/man/salt-call.1',
-                                  'doc/man/salt-minion.1',
-                                  'doc/man/salt-unity.1',
-                                  ]),
--                               ('share/man/man7',
-+                               ('man/man7',
-                                 ['doc/man/salt.7',
-                                  ]),
-                                ],
+--- setup.py.orig	2015-01-24 14:55:05.507732433 -0700
++++ setup.py	2015-01-24 14:59:07.595716022 -0700
+@@ -621,8 +621,8 @@
+     def _property_data_files(self):
+         # Data files common to all scenarios
+         data_files = [
+-            ('share/man/man1', ['doc/man/salt-call.1']),
+-            ('share/man/man7', ['doc/man/salt.7'])
++            ('man/man1', ['doc/man/salt-call.1']),
++            ('man/man7', ['doc/man/salt.7'])
+         ]
+         if self.ssh_packaging or PACKAGED_FOR_SALT_SSH:
+             data_files[0][1].append('doc/man/salt-ssh.1')
diff --git a/sysutils/py-salt/pkg-plist b/sysutils/py-salt/pkg-plist
index 62e4082807ca..df03823aeccc 100644
--- a/sysutils/py-salt/pkg-plist
+++ b/sysutils/py-salt/pkg-plist
@@ -12,6 +12,8 @@
 %%PYTHON_SITELIBDIR%%/salt/auth/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/auth/auto.py
 %%PYTHON_SITELIBDIR%%/salt/auth/auto.pyc
+%%PYTHON_SITELIBDIR%%/salt/auth/django.py
+%%PYTHON_SITELIBDIR%%/salt/auth/django.pyc
 %%PYTHON_SITELIBDIR%%/salt/auth/keystone.py
 %%PYTHON_SITELIBDIR%%/salt/auth/keystone.pyc
 %%PYTHON_SITELIBDIR%%/salt/auth/ldap.py
@@ -86,6 +88,8 @@
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/libcloud_aws.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/linode.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/linode.pyc
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/linodepy.py
+%%PYTHON_SITELIBDIR%%/salt/cloud/clouds/linodepy.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/lxc.py
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/lxc.pyc
 %%PYTHON_SITELIBDIR%%/salt/cloud/clouds/msazure.py
@@ -158,12 +162,24 @@
 %%PYTHON_SITELIBDIR%%/salt/daemons/masterapi.pyc
 %%PYTHON_SITELIBDIR%%/salt/daemons/salting.py
 %%PYTHON_SITELIBDIR%%/salt/daemons/salting.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/test/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_master.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_master.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_minion.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_minion.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_raetkey.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_raetkey.pyc
+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_saltkeep.py
+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_saltkeep.pyc
 %%PYTHON_SITELIBDIR%%/salt/exceptions.py
 %%PYTHON_SITELIBDIR%%/salt/exceptions.pyc
 %%PYTHON_SITELIBDIR%%/salt/exitcodes.py
 %%PYTHON_SITELIBDIR%%/salt/exitcodes.pyc
 %%PYTHON_SITELIBDIR%%/salt/ext/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/ext/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/ext/six.py
+%%PYTHON_SITELIBDIR%%/salt/ext/six.pyc
 %%PYTHON_SITELIBDIR%%/salt/fileclient.py
 %%PYTHON_SITELIBDIR%%/salt/fileclient.pyc
 %%PYTHON_SITELIBDIR%%/salt/fileserver/__init__.py
@@ -816,6 +832,10 @@
 %%PYTHON_SITELIBDIR%%/salt/proxy/junos.pyc
 %%PYTHON_SITELIBDIR%%/salt/proxy/rest_sample.py
 %%PYTHON_SITELIBDIR%%/salt/proxy/rest_sample.pyc
+%%PYTHON_SITELIBDIR%%/salt/queues/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/queues/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/queues/sqlite_queue.py
+%%PYTHON_SITELIBDIR%%/salt/queues/sqlite_queue.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/renderers/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/renderers/gpg.py
@@ -942,6 +962,10 @@
 %%PYTHON_SITELIBDIR%%/salt/runners/winrepo.pyc
 %%PYTHON_SITELIBDIR%%/salt/scripts.py
 %%PYTHON_SITELIBDIR%%/salt/scripts.pyc
+%%PYTHON_SITELIBDIR%%/salt/sdb/__init__.py
+%%PYTHON_SITELIBDIR%%/salt/sdb/__init__.pyc
+%%PYTHON_SITELIBDIR%%/salt/sdb/keyring_db.py
+%%PYTHON_SITELIBDIR%%/salt/sdb/keyring_db.pyc
 %%PYTHON_SITELIBDIR%%/salt/search/__init__.py
 %%PYTHON_SITELIBDIR%%/salt/search/__init__.pyc
 %%PYTHON_SITELIBDIR%%/salt/search/whoosh_search.py
@@ -988,6 +1012,8 @@
 %%PYTHON_SITELIBDIR%%/salt/states/boto_secgroup.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/boto_sqs.py
 %%PYTHON_SITELIBDIR%%/salt/states/boto_sqs.pyc
+%%PYTHON_SITELIBDIR%%/salt/states/chef.py
+%%PYTHON_SITELIBDIR%%/salt/states/chef.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/cloud.py
 %%PYTHON_SITELIBDIR%%/salt/states/cloud.pyc
 %%PYTHON_SITELIBDIR%%/salt/states/cmd.py
@@ -1450,5 +1476,4 @@ man/man1/salt-run.1.gz
 man/man1/salt-ssh.1.gz
 man/man1/salt-syndic.1.gz
 man/man1/salt-unity.1.gz
-man/man1/salt.1.gz
 man/man7/salt.7.gz