Date: Wed, 3 Feb 2016 17:34:09 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407964 - in head/sysutils/py-salt: . files Message-ID: <201602031734.u13HY9Is027595@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Wed Feb 3 17:34:08 2016 New Revision: 407964 URL: https://svnweb.freebsd.org/changeset/ports/407964 Log: 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: https://github.com/saltstack/salt/issues/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 Added: head/sysutils/py-salt/files/patch-salt_state.py (contents, props changed) Modified: head/sysutils/py-salt/Makefile Modified: head/sysutils/py-salt/Makefile ============================================================================== --- head/sysutils/py-salt/Makefile Wed Feb 3 17:16:57 2016 (r407963) +++ head/sysutils/py-salt/Makefile Wed Feb 3 17:34:08 2016 (r407964) @@ -3,6 +3,7 @@ PORTNAME= salt PORTVERSION= 2015.8.4 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Added: head/sysutils/py-salt/files/patch-salt_state.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/py-salt/files/patch-salt_state.py Wed Feb 3 17:34:08 2016 (r407964) @@ -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 + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602031734.u13HY9Is027595>