sysutils/py-salt: Patch to fix major regression

There was a major regression in 2015.8.4 which breaks a lot of salt functionality. This adds a patch to fix it ahead of the upcoming 2015.8.5. The reason for patching in the ports tree is that there is a major CVE that is addressed in 2015.8.4 which should be resolved immediately by merging a functional salt to quarterly. Regression: saltstack/salt#30820 Security: CVE-2016-1866 Security: https://vuxml.freebsd.org/freebsd/0652005e-ca96-11e5-96d6-14dae9d210b8.html Approved by: ports-secteam (with hat) MFH: 2016Q1 git-svn-id: svn+ssh://svn.freebsd.org/ports/head@407964 35697150-7ecd-e111-bb59-0022644237b5
tota · Feb 3, 2016 · afbe64a · afbe64a
1 parent 035113b
commit afbe64a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	salt
 PORTVERSION=	2015.8.4
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

diff --git a/sysutils/py-salt/files/patch-salt_state.py b/sysutils/py-salt/files/patch-salt_state.py
@@ -0,0 +1,11 @@
+--- salt/state.py.orig	2016-02-03 17:25:12 UTC
++++ salt/state.py
+@@ -190,7 +190,7 @@ def find_name(name, state, high):
+                         if len(arg) != 1:
+                             continue
+                         if arg[next(iter(arg))] == name:
+-                            ext_id.append((name, state))
++                            ext_id.append((nid, state))
+     return ext_id
+
+