@@ -1,4 +1,7 @@

 %{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

+

 Name:           python-backports_abc

 Version:        0.5

@@ -24,19 +27,42 @@ BuildArch:      noarch

 %description

+%package -n     python3-backports_abc

+Summary:        python3 version A backport of recent additions to the 'collections.abc' module

+BuildRequires:  python3-devel

+Requires:       python3

+

+%description -n python3-backports_abc

+Python 3 version.

+

 %prep

 %setup -n backports_abc-%{version}

+rm -rf ../p3dir

+cp -a . ../p3dir

 %build

 python2 setup.py build

+pushd ../p3dir

+python3 setup.py build

+popd

 %install

 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+pushd ../p3dir

+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+popd

 %files

 %defattr(-,root,root,-)

 %{python2_sitelib}/*

+%files -n python3-backports_abc

+%defattr(-,root,root)

+%{python3_sitelib}/*

+

 %changelog

+*   Tue Dec 04 2018 Padmini Thirumalachar <pthirumalachar@vmware.com> 0.5-1

+-   To build python2 and python3 backports_abc packages.

 *   Wed Nov 29 2017 Padmini Thirumalachar <pthirumalachar@vmware.com> 0.5-1

 -   Initial version of python backports_abc for PhotonOS.

+

@@ -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]

@@ -1,9 +1,10 @@

 [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]

-LimitNOFILE=16384

+LimitNOFILE=100000

 Type=notify

 NotifyAccess=all

 ExecStart=/usr/bin/salt-master

@@ -67,7 +67,7 @@ _su_cmd() {

 _get_pid() {

-    netstat $NS_NOTRIM -ap --protocol=unix 2>$ERROR_TO_DEVNULL \

+    netstat -n $NS_NOTRIM -ap --protocol=unix 2>$ERROR_TO_DEVNULL \

         | sed -r -e "\|\s${SOCK_DIR}/minion_event_${MINION_ID_HASH}_pub\.ipc$|"'!d; s|/.*||; s/.*\s//;' \

         | uniq

 }

@@ -85,6 +85,7 @@ _get_salt_config_value() {

             \"$SALTCALL\" \

             -c \"$CONFIG_DIR\" \

             --no-color \

+            --skip-grains \

             --local config.get \

             \"$1\" \

         " \

@@ -155,7 +156,7 @@ start() {

             printf "\nPROCESSES:\n" >&2

             ps wwwaxu | grep '[s]alt-minion' >&2

             printf "\nSOCKETS:\n" >&2

-            netstat $NS_NOTRIM -ap --protocol=unix | grep 'salt.*minion' >&2            

+            netstat -n $NS_NOTRIM -ap --protocol=unix | grep 'salt.*minion' >&2

             printf "\nLOG_FILE:\n" >&2

             tail -n 20 "$LOG_FILE" >&2

             printf "\nENVIRONMENT:\n" >&2

@@ -246,7 +247,7 @@ main() {

     fi

     # Check to see if --notrim is a valid netstat option

-    if netstat --notrim 2>&1 >/dev/null | grep -q 'unrecognized'; then

+    if ! ( netstat --help 2>&1 | grep -wq '\-\-notrim') ; then

         NS_NOTRIM=''

     fi

@@ -1,8 +1,10 @@

 [Unit]

 Description=The Salt Minion

-After=network.target

+Documentation=man:salt-minion(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltstack.com/en/latest/contents.html

+After=network.target salt-master.service

 [Service]

+KillMode=process

 Type=notify

 NotifyAccess=all

 LimitNOFILE=8192

@@ -1,6 +1,8 @@

 [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

+PartOf=salt-master.service

 [Service]

 Type=notify

@@ -8,7 +8,7 @@

 %define _salttesting_ver 2016.5.11

 Name: salt

-Version: 2017.7.2

+Version: 2018.3.3

 Release: 1%{?dist}

 Summary: A parallel remote execution system

@@ -18,7 +18,7 @@ URL:     http://saltstack.org/

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0: http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz

-%define sha1 salt=c0e7db44328e5400b17c8cd15033991855c6fe2e

+%define sha1 salt=18e148c2ef4418efe741c4b84d0ae284ebbf108b

 Source1: https://pypi.python.org/packages/source/S/SaltTesting/SaltTesting-2016.5.11.tar.gz

 %define sha1 SaltTesting=474dbd7029e3d48cdb468be3c63b2262e47556c8

 Source2: %{name}-master.service

@@ -48,7 +48,8 @@ Requires: PyYAML

 Requires: python-requests

 Requires: python-zmq

 Requires: tornado

-

+Requires: python-xml

+Requires: python-futures

 %description

 Salt is a distributed remote execution system used to execute commands and

@@ -314,6 +315,8 @@ rm -rf %{buildroot}

 %endif

 %changelog

+* Tue Dec 04 2018 Vinothkumar D <vinothkumard@vmware.com> 2018.3.3-1

+- Update to 2018.3.3

 * Thu Jan 11 2018 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2017.7.2-1

 - Update to 2017.7.2

 - Fixes CVE-2017-5192, CVE-2017-5200, CVE-2017-8109

new file mode 100644

@@ -0,0 +1,302 @@

+%global include_tests 1

+

+%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}

+%{!?python3_sitearch: %global python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}

+%{!?pythonpath: %global pythonpath %(python3 -c "import os, sys; print(os.pathsep.join(x for x in sys.path if x))")}

+

+%define _salttesting SaltTesting

+%define _salttesting_ver 2016.5.11

+

+Name: salt3

+Version: 2018.3.3

+Release: 1%{?dist}

+Summary: A parallel remote execution system with python3

+Group:   System Environment/Daemons

+License: ASL 2.0

+URL:     http://saltstack.org/

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0: http://pypi.python.org/packages/source/s/salt/salt-%{version}.tar.gz

+%define sha1 salt=18e148c2ef4418efe741c4b84d0ae284ebbf108b

+Source1: https://pypi.python.org/packages/source/S/SaltTesting/SaltTesting-2016.5.11.tar.gz

+%define sha1 SaltTesting=474dbd7029e3d48cdb468be3c63b2262e47556c8

+Source2: salt-master.service

+Source3: salt-syndic.service

+Source4: salt-minion.service

+Source5: salt-api.service

+Source6: logrotate.salt

+

+

+BuildRoot: %{_tmppath}/salt-%{version}-%{release}-root-%(%{__id_u} -n)

+BuildArch: noarch

+%ifarch %{ix86} x86_64

+Requires: dmidecode

+%endif

+

+

+Requires: pciutils

+Requires: python3-backports_abc

+BuildRequires: python3-devel

+BuildRequires: systemd

+Requires: python3-pycrypto

+Requires: python3-jinja2

+Requires: python3-msgpack

+Requires: python3-PyYAML

+Requires: python3-requests

+Requires: python3-zmq

+Requires: python3-tornado

+

+%description

+Salt is a distributed remote execution system used to execute commands and

+query data. It was developed in order to bring the best solutions found in

+the world of remote execution together and make them better, faster and more

+malleable. Salt accomplishes this via its ability to handle larger loads of

+information, and not just dozens, but hundreds or even thousands of individual

+servers, handle them quickly and through a simple and manageable interface.

+

+%package master

+Summary: Management component for salt, a parallel remote execution system with python3

+Group:   System Environment/Daemons

+Requires: %{name} = %{version}-%{release}

+%description master

+The Salt master is the central server to which all minions connect.

+

+%package minion

+Summary: Client component for Salt, a parallel remote execution system

+Group:   System Environment/Daemons

+Requires: %{name} = %{version}-%{release}

+%description minion

+The Salt minion is the agent component of Salt. It listens for instructions

+from the master, runs jobs, and returns results back to the master.

+

+%package syndic

+Summary: Master-of-master component for Salt, a parallel remote execution system

+Group:   System Environment/Daemons

+Requires: %{name} = %{version}-%{release}

+%description syndic

+The Salt syndic is a master daemon which can receive instruction from a

+higher-level master, allowing for tiered organization of your Salt

+infrastructure.

+

+%package api

+Summary: REST API for Salt, a parallel remote execution system

+Group:   System administration tools

+Requires: %{name}-master = %{version}-%{release}

+%description api

+salt-api provides a REST interface to the Salt master.

+

+%package cloud

+Summary: Cloud provisioner for Salt, a parallel remote execution system

+Group:   System administration tools

+Requires: %{name}-master = %{version}-%{release}

+%description cloud

+The salt-cloud tool provisions new cloud VMs, installs salt-minion on them, and

+adds them to the master's collection of controllable minions.

+

+%package ssh

+Summary: Agentless SSH-based version of Salt, a parallel remote execution system

+Group:   System administration tools

+Requires: %{name} = %{version}-%{release}

+%description ssh

+The salt-ssh tool can run remote execution functions and states without the use

+of an agent (salt-minion) service.

+

+%package proxy

+Summary: Command Proxy of Salt, a parallel remote execution system

+Group:   System administration tools

+Requires: %{name} = %{version}-%{release}

+%description proxy

+Receives commands from a Salt master and proxies these commands to devices 

+that are unable to run a full minion.

+

+%package spm

+Summary: Salt Package Manager of Salt, a parallel remote execution system

+Group:   System administration tools

+Requires: %{name} = %{version}-%{release}

+%description spm

+Salt Package Manager

+

+

+%prep

+%setup -c -n salt-%{version}

+cd salt-%{version}

+

+%build

+

+%install

+rm -rf %{buildroot}

+cd $RPM_BUILD_DIR/salt-%{version}/salt-%{version}

+python3 setup.py install -O1 --root %{buildroot}

+

+# Add some directories

+install -d -m 0755 %{buildroot}%{_var}/cache/salt

+install -d -m 0755 %{buildroot}%{_sysconfdir}/salt

+install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.conf.d

+install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.deploy.d

+install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.maps.d

+install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.profiles.d

+install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.providers.d

+

+# Add the config files

+install -p -m 0640 conf/minion %{buildroot}%{_sysconfdir}/salt/minion

+install -p -m 0640 conf/master %{buildroot}%{_sysconfdir}/salt/master

+install -p -m 0640 conf/cloud %{buildroot}%{_sysconfdir}/salt/cloud

+install -p -m 0640 conf/roster %{buildroot}%{_sysconfdir}/salt/roster

+

+mkdir -p %{buildroot}%{_unitdir}

+install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/

+install -p -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/

+install -p -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/

+install -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/

+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/

+install -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/salt

+

+%clean

+rm -rf %{buildroot}

+

+

+%files

+%defattr(-,root,root,-)

+%doc $RPM_BUILD_DIR/salt-%{version}/salt-%{version}/LICENSE

+%{python3_sitelib}/salt/*

+%{python3_sitelib}/salt-*-py?.?.egg-info

+%{_sysconfdir}/logrotate.d/salt

+%{_var}/cache/salt

+

+

+%files master

+%defattr(-,root,root)

+%doc %{_mandir}/man7/salt.7.*

+%doc %{_mandir}/man1/salt-cp.1.*

+%doc %{_mandir}/man1/salt-key.1.*

+%doc %{_mandir}/man1/salt-master.1.*

+%doc %{_mandir}/man1/salt-run.1.*

+%doc %{_mandir}/man1/salt-unity.1.*

+%doc %{_mandir}/man1/salt.1.*

+%{_bindir}/salt

+%{_bindir}/salt-cp

+%{_bindir}/salt-key

+%{_bindir}/salt-master

+%{_bindir}/salt-run

+%{_bindir}/salt-unity

+%config(noreplace) %{_unitdir}/salt-master.service

+%config(noreplace) %{_sysconfdir}/salt/master

+

+%files minion

+%defattr(-,root,root)

+%doc %{_mandir}/man1/salt-call.1.*

+%doc %{_mandir}/man1/salt-minion.1.*

+%{_bindir}/salt-minion

+%{_bindir}/salt-call

+%config(noreplace) %{_unitdir}/salt-minion.service

+%config(noreplace) %{_sysconfdir}/salt/minion

+

+%files syndic

+%doc %{_mandir}/man1/salt-syndic.1.*

+%{_bindir}/salt-syndic

+%config(noreplace) %{_unitdir}/salt-syndic.service

+

+%files api

+%defattr(-,root,root)

+%doc %{_mandir}/man1/salt-api.1.*

+%{_bindir}/salt-api

+%config(noreplace) %{_unitdir}/salt-api.service

+

+%files cloud

+%doc %{_mandir}/man1/salt-cloud.1.*

+%{_bindir}/salt-cloud

+%{_sysconfdir}/salt/cloud.conf.d

+%{_sysconfdir}/salt/cloud.deploy.d

+%{_sysconfdir}/salt/cloud.maps.d

+%{_sysconfdir}/salt/cloud.profiles.d

+%{_sysconfdir}/salt/cloud.providers.d

+%config(noreplace) %{_sysconfdir}/salt/cloud

+

+%files ssh

+%doc %{_mandir}/man1/salt-ssh.1.*

+%{_bindir}/salt-ssh

+%{_sysconfdir}/salt/roster

+

+%files proxy

+%doc %{_mandir}/man1/salt-proxy.1.*

+%{_bindir}/salt-proxy

+

+%files spm

+%doc %{_mandir}/man1/spm.1.*

+%{_bindir}/spm

+

+%preun master

+%if 0%{?systemd_preun:1}

+  %systemd_preun salt-master.service

+%else

+  if [ $1 -eq 0 ] ; then

+    # Package removal, not upgrade

+    /bin/systemctl --no-reload disable salt-master.service > /dev/null 2>&1 || :

+    /bin/systemctl stop salt-master.service > /dev/null 2>&1 || :

+  fi

+

+%preun syndic

+%if 0%{?systemd_preun:1}

+  %systemd_preun salt-syndic.service

+%else

+  if [ $1 -eq 0 ] ; then

+    # Package removal, not upgrade

+    /bin/systemctl --no-reload disable salt-syndic.service > /dev/null 2>&1 || :

+    /bin/systemctl stop salt-syndic.service > /dev/null 2>&1 || :

+  fi

+%endif

+

+%preun minion

+%if 0%{?systemd_preun:1}

+  %systemd_preun salt-minion.service

+%else

+  if [ $1 -eq 0 ] ; then

+    # Package removal, not upgrade

+    /bin/systemctl --no-reload disable salt-minion.service > /dev/null 2>&1 || :

+    /bin/systemctl stop salt-minion.service > /dev/null 2>&1 || :

+  fi

+%endif

+

+%post master

+%if 0%{?systemd_post:1}

+  %systemd_post salt-master.service

+%else

+  /bin/systemctl daemon-reload &>/dev/null || :

+%endif

+

+%post minion

+%if 0%{?systemd_post:1}

+  %systemd_post salt-minion.service

+%else

+  /bin/systemctl daemon-reload &>/dev/null || :

+%endif

+

+%postun master

+%if 0%{?systemd_post:1}

+  %systemd_postun salt-master.service

+%else

+  /bin/systemctl daemon-reload &>/dev/null

+  [ $1 -gt 0 ] && /bin/systemctl try-restart salt-master.service &>/dev/null || :

+%endif

+

+%postun syndic

+%if 0%{?systemd_post:1}

+  %systemd_postun salt-syndic.service

+%else

+  /bin/systemctl daemon-reload &>/dev/null

+  [ $1 -gt 0 ] && /bin/systemctl try-restart salt-syndic.service &>/dev/null || :

+%endif

+

+%postun minion

+%if 0%{?systemd_post:1}

+  %systemd_postun salt-minion.service

+%else

+  /bin/systemctl daemon-reload &>/dev/null

+  [ $1 -gt 0 ] && /bin/systemctl try-restart salt-minion.service &>/dev/null || :

+%endif

+%endif

+

+%changelog

+* Tue Dec 04 2018 Vinothkumar D <vinothkumard@vmware.com> 2018.3.3-1

+- This is an initial version of salt with python3 support for Photon OS

+  The source is from https://github.com/saltstack/salt/archive/v2018.3.3.tar.gz

@@ -1,4 +1,5 @@

 %{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

 Name:           tornado

 Version:        4.5.2

@@ -23,20 +24,47 @@ BuildArch:      x86_64

 %description

+%package -n     python3-tornado

+Summary:        python3 version 

+BuildRequires:  python3

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+Requires:       python3

+Requires:       python3-libs

+

+%description -n python3-tornado

+Python 3 version.

+

+

 %prep

 %setup -n tornado-%{version}

+rm -rf ../p3dir

+cp -a . ../p3dir

 %build

 python2 setup.py build

+pushd ../p3dir

+python3 setup.py build

+popd

 %install

 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+pushd ../p3dir

+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+popd

 %files

 %defattr(-,root,root,-)

 %{python2_sitelib}/*

+%files -n python3-tornado

+%defattr(-,root,root)

+%{python3_sitelib}/*

+

 %changelog

+*   Tue Dec 04 2018 Padmini Thirumalachar <pthirumalachar@vmware.com> 4.5.2-1

+-   To build python2 and python3 tornado packages

 *   Mon Dec 11 2017 Padmini Thirumalachar <pthirumalachar@vmware.com> 4.5.2-1

 -   Initial version of python tornado for PhotonOS.

+