From f92f42d4bb4f4cf304810cbbcf329806feefe2d2 Mon Sep 17 00:00:00 2001 From: David Murphy < dmurphy@saltstack.com> Date: Tue, 27 Jun 2017 11:29:38 -0600 Subject: [PATCH] Update for Salt 2016.11.6 --- .gitignore | 1 + salt-2016.11.5-fix-nameserver.patch | 43 ----------------------------- salt-api.service | 1 + salt-master.service | 1 + salt-minion | 2 +- salt-minion.service | 1 + salt-proxy@.service | 5 ++-- salt-syndic.service | 1 + salt.spec | 35 +++++++++-------------- sources | 2 +- 10 files changed, 23 insertions(+), 69 deletions(-) delete mode 100644 salt-2016.11.5-fix-nameserver.patch diff --git a/.gitignore b/.gitignore index 5fbc135..d4841c4 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ /salt-2016.11.3.tar.gz /salt-2016.11.4.tar.gz /salt-2016.11.5.tar.gz +/salt-2016.11.6.tar.gz diff --git a/salt-2016.11.5-fix-nameserver.patch b/salt-2016.11.5-fix-nameserver.patch deleted file mode 100644 index 4d65916..0000000 --- a/salt-2016.11.5-fix-nameserver.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ur a/salt/grains/core.py b/salt/grains/core.py ---- a/salt/grains/core.py 2017-05-15 13:04:13.484215822 -0600 -+++ b/salt/grains/core.py 2017-05-15 13:08:08.626518175 -0600 -@@ -1678,14 +1678,10 @@ - - ret = {} - ret['ipv4'] = salt.utils.network.ip_addrs(include_loopback=True) -- _fqdn = hostname()['fqdn'] -- sockets = [(socket.AF_INET, '4')] -- -- if __opts__.get('ipv6', True): -- ret['ipv6'] = salt.utils.network.ip_addrs6(include_loopback=True) -- sockets.append((socket.AF_INET6, '6')) -+ ret['ipv6'] = salt.utils.network.ip_addrs6(include_loopback=True) - -- for socket_type, ipv_num in sockets: -+ _fqdn = hostname()['fqdn'] -+ for socket_type, ipv_num in ((socket.AF_INET, '4'), (socket.AF_INET6, '6')): - key = 'fqdn_ip' + ipv_num - if not ret['ipv' + ipv_num]: - ret[key] = [] -@@ -1763,7 +1759,7 @@ - # Provides: - # ip_interfaces - -- if salt.utils.is_proxy() or not __opts__.get('ipv6', True): -+ if salt.utils.is_proxy(): - return {} - - ret = {} -@@ -1807,10 +1803,8 @@ - return {} - - resolv = salt.utils.dns.parse_resolv() -- keys = ['nameservers', 'ip4_nameservers', 'sortlist'] -- if __opts__.get('ipv6', True): -- keys.append('ip6_nameservers') -- for key in keys: -+ for key in ('nameservers', 'ip4_nameservers', 'ip6_nameservers', -+ 'sortlist'): - if key in resolv: - resolv[key] = [str(i) for i in resolv[key]] - diff --git a/salt-api.service b/salt-api.service index c3e67d5..7ca582d 100644 --- a/salt-api.service +++ b/salt-api.service @@ -1,5 +1,6 @@ [Unit] Description=The Salt API +Documentation=man:salt-api(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltstack.com/en/latest/contents.html After=network.target [Service] diff --git a/salt-master.service b/salt-master.service index 1f4650f..4996b96 100644 --- a/salt-master.service +++ b/salt-master.service @@ -1,5 +1,6 @@ [Unit] Description=The Salt Master Server +Documentation=man:salt-master(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltstack.com/en/latest/contents.html After=network.target [Service] diff --git a/salt-minion b/salt-minion index 86f18b5..fb9f044 100644 --- a/salt-minion +++ b/salt-minion @@ -246,7 +246,7 @@ main() { fi # Check to see if --notrim is a valid netstat option - if netstat --notrim -n 2>&1 >/dev/null | grep -q 'unrecognized'; then + if ! ( netstat --help 2>&1 | grep -wq '\-\-notrim') ; then NS_NOTRIM='' fi diff --git a/salt-minion.service b/salt-minion.service index a4a2b88..ad8818c 100644 --- a/salt-minion.service +++ b/salt-minion.service @@ -1,5 +1,6 @@ [Unit] Description=The Salt Minion +Documentation=man:salt-minion(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltstack.com/en/latest/contents.html After=network.target [Service] diff --git a/salt-proxy@.service b/salt-proxy@.service index f97120a..9c5d0a5 100644 --- a/salt-proxy@.service +++ b/salt-proxy@.service @@ -1,9 +1,10 @@ [Unit] -Description=salt-proxy service +Description=salt-proxy service for %i +Documentation=man:salt-proxy(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltstack.com/en/latest/contents.html After=network.target [Service] -ExecStart=/usr/bin/salt-proxy --proxyid=%I +ExecStart=/usr/bin/salt-proxy --proxyid=%i Type=simple Restart=on-failure RestartSec=5s diff --git a/salt-syndic.service b/salt-syndic.service index 5068394..9c9a1e0 100644 --- a/salt-syndic.service +++ b/salt-syndic.service @@ -1,5 +1,6 @@ [Unit] Description=The Salt Master Server +Documentation=man:salt-syndic(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltstack.com/en/latest/contents.html After=network.target [Service] diff --git a/salt.spec b/salt.spec index c97d1e7..7c5ce9c 100644 --- a/salt.spec +++ b/salt.spec @@ -1,3 +1,6 @@ + +%global __python_ver %{nil} + %if ( "0%{?dist}" == "0.amzn1" ) %global with_explicit_python27 1 %global pybasever 2.7 @@ -38,8 +41,8 @@ %define _salttesting_ver 2016.10.26 Name: salt -Version: 2016.11.5 -Release: 3%{?dist} +Version: 2016.11.6 +Release: 1%{?dist} Summary: A parallel remote execution system Group: System Environment/Daemons @@ -70,7 +73,7 @@ Source21: salt-syndic.fish Source22: %{name}-proxy@.service ## Patch0: salt-%%{version}-tests.patch -Patch0: salt-%{version}-fix-nameserver.patch +## Patch0: salt-%{version}-fix-nameserver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -101,13 +104,7 @@ Requires: python26-six %if ((0%{?rhel} >= 6 || 0%{?fedora} > 12) && 0%{?include_tests}) BuildRequires: python-tornado >= 4.2.1 BuildRequires: python-futures >= 2.0 - -%if (0%{?rhel} >= 6 && 0%{__isa_bits} == 64) -BuildRequires: python2-pycryptodomex >= 3.4.3 -%else BuildRequires: python-crypto >= 2.6.1 -%endif - BuildRequires: python-jinja2 BuildRequires: python-msgpack > 0.3 BuildRequires: python-pip @@ -137,20 +134,13 @@ Requires: python%{?__python_ver}-msgpack > 0.3 %if ( "0%{?dist}" == "0.amzn1" ) Requires: python27-PyYAML Requires: python%{?__python_ver} -Requires: python%{?__python_ver}-crypto >= 2.6.1 -%else -%if 0%{?fedora} >= 1 -Requires: python-crypto >= 2.6.1 -%else -%if ( 0%{?rhel} >= 6 && 0%{__isa_bits} == 64 ) -Requires: python2-pycryptodomex >= 3.4.3 %else -Requires: python-crypto >= 2.6.1 -%endif +Requires: PyYAML %endif -Requires: PyYAML +Requires: python%{?__python_ver}-crypto >= 2.6.1 %endif + Requires: python%{?__python_ver}-requests >= 1.0.0 Requires: python%{?__python_ver}-zmq Requires: python%{?__python_ver}-markupsafe @@ -159,8 +149,6 @@ Requires: python%{?__python_ver}-futures >= 2.0 Requires: python%{?__python_ver}-six -%endif - %if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15) Requires(post): chkconfig @@ -263,7 +251,7 @@ of an agent (salt-minion) service. %setup -q -T -D -a 1 cd %{name}-%{version} -%patch0 -p1 +## %patch0 -p1 %build @@ -634,6 +622,9 @@ rm -rf %{buildroot} %endif %changelog +* Thu Jun 22 2017 SaltStack Packaging Team - 2016.11.6-1 +- Update to feature release 2016.11.6 + * Mon May 15 2017 SaltStack Packaging Team - 2016.11.5-3 - Add patch for Fix ipv6 nameserver grains #41244 diff --git a/sources b/sources index c5a8f9d..a3b245b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (SaltTesting-2016.10.26.tar.gz) = 0817d3738992bb1e89728a9cd939056bc919de9c995445aac8820f895204e0f14df4cff989c46456b382180e3a1685827a113dbb609518e88c6b944f9222698a -SHA512 (salt-2016.11.5.tar.gz) = 9afb40dbd3a508eacc43500566660763e2b219817d7de25ccf2d61d7f74b857238922ea40cc4c6372fd520bc6f524d84fb0a2d65f9890bedd79d0fc6c177edf9 +SHA512 (salt-2016.11.6.tar.gz) = 8b375eeaf8380c750700ae9b500e012f0b8ae281c8b5aa68d3443393a5bb7dd46612f2aeb3ba01719dd28d9e128dc88f1faa8023f5f5e7ff684a1f0483c30120