Browse code

update salt to 2017.7.2

Change-Id: Iac50a373513bccf80fcde0bed1715743edd5c0b8
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4631
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: <pthirumalachar@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Priyesh Padmavilasomb authored on 2018/01/12 06:45:23
Showing 1 changed files
... ...
@@ -8,7 +8,7 @@
8 8
 %define _salttesting_ver 2016.5.11
9 9
 
10 10
 Name: salt
11
-Version: 2016.11.2
11
+Version: 2017.7.2
12 12
 Release: 1%{?dist}
13 13
 Summary: A parallel remote execution system
14 14
 
... ...
@@ -18,18 +18,14 @@ URL:     http://saltstack.org/
18 18
 Vendor:         VMware, Inc.
19 19
 Distribution:   Photon
20 20
 Source0: http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz
21
-%define sha1 salt=35b812751b414fc4d279772c106af93e727bb518
21
+%define sha1 salt=c0e7db44328e5400b17c8cd15033991855c6fe2e
22 22
 Source1: https://pypi.python.org/packages/source/S/SaltTesting/SaltTesting-2016.5.11.tar.gz
23 23
 %define sha1 SaltTesting=474dbd7029e3d48cdb468be3c63b2262e47556c8
24
-Source2: %{name}-master
25
-Source3: %{name}-syndic
26
-Source4: %{name}-minion
27
-Source5: %{name}-api
28
-Source6: %{name}-master.service
29
-Source7: %{name}-syndic.service
30
-Source8: %{name}-minion.service
31
-Source9: %{name}-api.service
32
-Source10: logrotate.salt
24
+Source2: %{name}-master.service
25
+Source3: %{name}-syndic.service
26
+Source4: %{name}-minion.service
27
+Source5: %{name}-api.service
28
+Source6: logrotate.salt
33 29
 
34 30
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
35 31
 BuildArch: noarch
... ...
@@ -160,13 +156,13 @@ install -p -m 0640 conf/cloud %{buildroot}%{_sysconfdir}/salt/cloud
160 160
 install -p -m 0640 conf/roster %{buildroot}%{_sysconfdir}/salt/roster
161 161
 
162 162
 mkdir -p %{buildroot}%{_unitdir}
163
-install -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/
164
-install -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/
165
-install -p -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/
166
-install -p -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/
163
+install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/
164
+install -p -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/
165
+install -p -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/
166
+install -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/
167 167
 
168 168
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
169
-install -p -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/logrotate.d/salt
169
+install -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/salt
170 170
 
171 171
 
172 172
 %clean
... ...
@@ -316,8 +312,10 @@ rm -rf %{buildroot}
316 316
 %endif
317 317
 
318 318
 %changelog
319
+* Thu Jan 11 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2017.7.2-1
320
+- Update to 2017.7.2
321
+- Fixes CVE-2017-5192, CVE-2017-5200, CVE-2017-8109
322
+- CVE-2017-12791, CVE-2017-14695, CVE-2017-14696
319 323
 * Thu Oct 26 2017 Padmini Thirumalachar <pthirumalachar@vmware.com> 2016.11.2-1
320 324
 - This is an initial version of salt for Photon OS
321 325
   The source is from https://github.com/saltstack/salt/archive/v2016.11.2.tar.gz
322
-
323
-