From eb05612b2e7116a8030b4d2e2dd2df8db00ab6d0642b72af53fd5e44ef2c55df Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Sat, 2 Dec 2017 12:25:02 +0000 Subject: [PATCH] Accepting request 547183 from systemsmanagement:saltstack:testing - Fix wrong version reported by Salt (bsc#1061407) - Fix CVE-2017-14696 (bsc#1062464) already included in 2017.7.2 OBS-URL: https://build.opensuse.org/request/show/547183 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=103 --- salt.changes | 6 ++++++ salt.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/salt.changes b/salt.changes index e4c5a33..e46854c 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 1 15:33:01 UTC 2017 - mihai.dinca@suse.com + +- Fix wrong version reported by Salt (bsc#1061407) +- Fix CVE-2017-14696 (bsc#1062464) already included in 2017.7.2 + ------------------------------------------------------------------- Mon Nov 27 17:13:03 UTC 2017 - mihai.dinca@suse.com diff --git a/salt.spec b/salt.spec index 0742ba1..009ef03 100644 --- a/salt.spec +++ b/salt.spec @@ -408,7 +408,8 @@ cp %{S:6} ./zyppnotify %patch8 -p1 %build -%{__python3} setup.py --salt-transport=both build +%{__python3} setup.py --with-salt-version=%{version} --salt-transport=both build +cp ./build/lib/salt/_version.py ./salt %if %{with docs} && %{without builddocs} # extract docs from the tarball