Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Feb 2016 17:36:02 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r407966 - in branches/2016Q1/sysutils/py-salt: . files
Message-ID:  <201602031736.u13Ha2YT028045@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Wed Feb  3 17:36:02 2016
New Revision: 407966
URL: https://svnweb.freebsd.org/changeset/ports/407966

Log:
  MFH: r407964
  
  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)

Added:
  branches/2016Q1/sysutils/py-salt/files/patch-salt_state.py
     - copied unchanged from r407964, head/sysutils/py-salt/files/patch-salt_state.py
Modified:
  branches/2016Q1/sysutils/py-salt/Makefile
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/sysutils/py-salt/Makefile
==============================================================================
--- branches/2016Q1/sysutils/py-salt/Makefile	Wed Feb  3 17:35:21 2016	(r407965)
+++ branches/2016Q1/sysutils/py-salt/Makefile	Wed Feb  3 17:36:02 2016	(r407966)
@@ -3,6 +3,7 @@
 
 PORTNAME=	salt
 PORTVERSION=	2015.8.4
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Copied: branches/2016Q1/sysutils/py-salt/files/patch-salt_state.py (from r407964, head/sysutils/py-salt/files/patch-salt_state.py)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/sysutils/py-salt/files/patch-salt_state.py	Wed Feb  3 17:36:02 2016	(r407966, copy of r407964, head/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
+ 
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602031736.u13Ha2YT028045>