diff options
| author | junovitch <junovitch@FreeBSD.org> | 2016-02-06 04:47:02 +0800 |
|---|---|---|
| committer | junovitch <junovitch@FreeBSD.org> | 2016-02-06 04:47:02 +0800 |
| commit | e6c35702e954373b343b5043c96e7076ced4b164 (patch) | |
| tree | cb2997de98f50d4d0d1762b8138ea0fdb745755f /sysutils | |
| parent | fe5c7d261816c60e991e477f12354aa943044e14 (diff) | |
| download | freebsd-ports-gnome-e6c35702e954373b343b5043c96e7076ced4b164.tar.gz freebsd-ports-gnome-e6c35702e954373b343b5043c96e7076ced4b164.tar.zst freebsd-ports-gnome-e6c35702e954373b343b5043c96e7076ced4b164.zip | |
sysutils/py-salt: update 2015.8.4 -> 2015.8.5
Note that 2015.8.4 resolved CVE-2016-1866 but introduced a bug that broke a
lot of Salt functionality. This update is functionally equivalent to the
current patched 2015.8.4_1 port but brings us back in line with upstream.
PR: 206906
Submitted by: Christer Edwards <christer.edwards@gmail.com>
MFH: 2016Q1
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/py-salt/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/py-salt/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/py-salt/files/patch-salt_state.py | 11 |
3 files changed, 3 insertions, 15 deletions
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 41bd8ed4d746..617502fe641f 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2015.8.4 -PORTREVISION= 1 +PORTVERSION= 2015.8.5 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo index 1abe0ccc4b0c..272d1cfa78fc 100644 --- a/sysutils/py-salt/distinfo +++ b/sysutils/py-salt/distinfo @@ -1,2 +1,2 @@ -SHA256 (salt-2015.8.4.tar.gz) = 8a21a02e53a6ef9b6dad4145c70225b7ff17bbb4a436a131c7e32d42b428cf48 -SIZE (salt-2015.8.4.tar.gz) = 6874756 +SHA256 (salt-2015.8.5.tar.gz) = db395702f048ea384ccc440201c24d7044685977ae6a8588d0d0933246f0c673 +SIZE (salt-2015.8.5.tar.gz) = 6877624 diff --git a/sysutils/py-salt/files/patch-salt_state.py b/sysutils/py-salt/files/patch-salt_state.py deleted file mode 100644 index 1ce4b70e67c8..000000000000 --- a/sysutils/py-salt/files/patch-salt_state.py +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - - |