Added MSVSphere support

SOURCES/0001-Added-MSVSphere-support.patch

@@ -0,0 +1,32 @@
+From 38329cd2bc666ffa82b419a882a92f56ed6b44f0 Mon Sep 17 00:00:00 2001
+From: Sergey Cherevko <sergey.cherevko@softline.com>
+Date: Mon, 24 Apr 2023 11:15:44 +0300
+Subject: [PATCH] Added MSVSphere support
+
+---
+ salt/grains/core.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/salt/grains/core.py b/salt/grains/core.py
+index debbeb2..37bd9c6 100644
+--- a/salt/grains/core.py
++++ b/salt/grains/core.py
+@@ -1565,6 +1565,7 @@ _OS_NAME_MAP = {
+     "cloudserve": "CloudLinux",
+     "cloudlinux": "CloudLinux",
+     "almalinux": "AlmaLinux",
++    "msvsphere": "MSVSphere",
+     "pidora": "Fedora",
+     "scientific": "ScientificLinux",
+     "synology": "Synology",
+@@ -1602,6 +1603,7 @@ _OS_FAMILY_MAP = {
+     "Amazon": "RedHat",
+     "CloudLinux": "RedHat",
+     "AlmaLinux": "RedHat",
++    "MSVSphere": "RedHat",
+     "OVS": "RedHat",
+     "OEL": "RedHat",
+     "XCP": "RedHat",
+-- 
+2.39.2
+

SOURCES/build.conf

@@ -1,8 +0,0 @@
-tiamat:
-  name: salt
-  system_copy_in: distutils
-  onedir: True
-  pyinstaller_version: "4.10"
-  pyenv: "3.9.16"
-  venv_plugin: pyenv
-  timeout: 1500

SOURCES/contextvars.patch

@@ -0,0 +1,25 @@
+diff --git a/requirements/base.txt b/requirements/base.txt
+index 63e524d..5b816aa 100644
+--- a/requirements/base.txt
++++ b/requirements/base.txt
+@@ -5,5 +5,4 @@ PyYAML
+ MarkupSafe
+ requests>=1.0.0
+ distro>=1.0.1
+-contextvars
+ psutil>=5.0.0
+diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
+index ce3dde0..156aed7 100644
+--- a/requirements/zeromq.txt
++++ b/requirements/zeromq.txt
+@@ -1,9 +1,7 @@
+ -r base.txt
+ -r crypto.txt
+ 
+-pyzmq<=20.0.0 ; python_version < "3.6"
+-pyzmq>=17.0.0 ; python_version < "3.9"
+-pyzmq>19.0.2 ; python_version >= "3.9"
++pyzmq>=19.0.2
+ 
+ # We can't use 23+ on Windows until they fix this:
+ # https://github.com/zeromq/pyzmq/issues/1472

SOURCES/requirements.txt

@@ -1,5 +0,0 @@
-# This file only exists currently because tiamat imposes it's existance.
-# That should be fixed in tiamat but until it's not, this is just a blank
-# requirements file or any requirements here are just extra requirements.
-tiamat-pip==1.11.0
-setuptools<60.7.0

SOURCES/salt

@@ -1,7 +0,0 @@
-#!/bin/bash
-if [[ -z "${SSL_CERT_DIR}" ]] && command -v openssl &> /dev/null; then
-  _DIR=$(openssl version -d)
-  export SSL_CERT_DIR=${_DIR:13:-1}"/certs"
-  export SSL_CERT_FILE=${_DIR:13:-1}"/cert.pem"
-fi
-exec /opt/saltstack/salt/run/run "${@:1}"

SOURCES/salt-api

@@ -1,2 +1,154 @@
-#!/bin/bash
-exec /opt/saltstack/salt/run/run api "${@:1}"
+#!/bin/sh
+#
+# Salt API
+###################################
+
+# LSB header
+
+### BEGIN INIT INFO
+# Provides:          salt-api
+# Required-Start:    $local_fs $remote_fs $network $named $time
+# Should-Start:		 $time ypbind smtp
+# Required-Stop:	 $local_fs $remote_fs $network $named $time
+# Should-Stop:		 ypbind smtp
+# Default-Start:     3 5
+# Default-Stop:      0 1 2 6
+# Short-Description: Salt API control daemon
+# Description:       This is a daemon that controls the Salt API.
+### END INIT INFO
+
+
+# chkconfig header
+
+# chkconfig: 345 99 99
+# description:  This is a daemon that controls the Salt API.
+#
+# processname: /usr/bin/salt-api
+
+
+if [ -f /etc/default/salt ]; then
+    . /etc/default/salt
+else
+    SALTAPI=/usr/bin/salt-api
+    PYTHON=/usr/bin/python
+fi
+
+# Sanity checks.
+[ -x $SALTAPI ] || exit 0
+
+DEBIAN_VERSION=/etc/debian_version
+SUSE_RELEASE=/etc/SuSE-release
+# Source function library.
+if [ -f $DEBIAN_VERSION ]; then
+   break
+elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
+    . /etc/rc.status
+else
+    . /etc/rc.d/init.d/functions
+fi
+
+SERVICE=salt-api
+PROCESS=salt-api
+CONFIG_ARGS="-d"
+PID_FILE="/var/run/salt-api.pid"
+
+RETVAL=0
+
+start() {
+    echo -n $"Starting salt-api daemon: "
+    if [ -f $SUSE_RELEASE ]; then
+        startproc -f -p /var/run/$SERVICE.pid $SALTAPI $CONFIG_ARGS
+        rc_status -v
+    elif [ -e $DEBIAN_VERSION ]; then
+        if [ -f $LOCKFILE ]; then
+            echo -n "already started, lock file found"
+            RETVAL=1
+        elif $PYTHON $SALTAPI; then
+            echo -n "OK"
+            RETVAL=0
+        fi
+    else
+        if status $PROCESS &> /dev/null; then
+            failure "Already running."
+            RETVAL=1
+        else
+            daemon --pidfile=$PID_FILE --check $SERVICE $SALTAPI $CONFIG_ARGS
+            RETVAL=$?
+            [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
+            echo
+            return $RETVAL
+        fi
+    fi
+    RETVAL=$?
+    echo
+    return $RETVAL
+}
+
+stop() {
+    echo -n $"Stopping salt-api daemon: "
+    if [ -f $SUSE_RELEASE ]; then
+        killproc -TERM $SALTAPI
+        rc_status -v
+    elif [ -f $DEBIAN_VERSION ]; then
+        # Added this since Debian's start-stop-daemon doesn't support spawned processes
+        if ps -ef | grep "$PYTHON $SALTAPI" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then
+            echo -n "OK"
+            RETVAL=0
+        else
+            echo -n "Daemon is not started"
+            RETVAL=1
+        fi
+    else
+        killproc -d 10 $PROCESS
+        RETVAL=$?
+        echo
+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$SERVICE
+        return $RETVAL
+    fi
+    RETVAL=$?
+    echo
+    return $RETVAL
+}
+
+restart() {
+   stop
+   start
+}
+
+# See how we were called.
+case "$1" in
+    start|stop|restart)
+        $1
+        ;;
+    status)
+        if [ -f $SUSE_RELEASE ]; then
+            echo -n "Checking for service salt-api "
+            checkproc $SALTAPI
+            rc_status -v
+            RETVAL=$?
+        elif [ -f $DEBIAN_VERSION ]; then
+            if [ -f $LOCKFILE ]; then
+                RETVAL=0
+                echo "salt-api is running."
+            else
+                RETVAL=1
+                echo "salt-api is stopped."
+            fi
+        else
+            status $PROCESS
+            RETVAL=$?
+        fi
+        ;;
+    condrestart|try-restart)
+        [ -f $LOCKFILE ] && restart || :
+        ;;
+    reload)
+        echo "can't reload configuration, you have to restart it"
+        RETVAL=1
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
+        exit 1
+        ;;
+esac
+exit $RETVAL

SOURCES/salt-api.service

@@ -1,6 +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
+Documentation=man:salt-api(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltproject.io/en/latest/contents.html
 After=network.target
 
 [Service]

SOURCES/salt-call

@@ -1,7 +0,0 @@
-#!/bin/bash
-if [[ -z "${SSL_CERT_DIR}" ]] && command -v openssl &> /dev/null; then
-  _DIR=$(openssl version -d)
-  export SSL_CERT_DIR=${_DIR:13:-1}"/certs"
-  export SSL_CERT_FILE=${_DIR:13:-1}"/cert.pem"
-fi
-exec /opt/saltstack/salt/run/run call "${@:1}"

SOURCES/salt-cloud

@@ -1,2 +0,0 @@
-#!/bin/bash
-exec /opt/saltstack/salt/run/run cloud "${@:1}"

SOURCES/salt-common.logrotate

@@ -21,3 +21,27 @@
 	compress
 	notifempty
 }
+
+/var/log/salt/api {
+	weekly
+	missingok
+	rotate 7
+	compress
+	notifempty
+}
+
+/var/log/salt/syndic {
+	weekly
+	missingok
+	rotate 7
+	compress
+	notifempty
+}
+
+/var/log/salt/proxy {
+	weekly
+	missingok
+	rotate 7
+	compress
+	notifempty
+}

SOURCES/salt-cp

@@ -1,2 +0,0 @@
-#!/bin/bash
-exec /opt/saltstack/salt/run/run cp "${@:1}"

SOURCES/salt-key

@@ -1,7 +0,0 @@
-#!/bin/bash
-if [[ -z "${SSL_CERT_DIR}" ]] && command -v openssl &> /dev/null; then
-  _DIR=$(openssl version -d)
-  export SSL_CERT_DIR=${_DIR:13:-1}"/certs"
-  export SSL_CERT_FILE=${_DIR:13:-1}"/cert.pem"
-fi
-exec /opt/saltstack/salt/run/run key "${@:1}"

SOURCES/salt-master

@@ -1,7 +1,142 @@
-#!/bin/bash
-if [[ -z "${SSL_CERT_DIR}" ]] && command -v openssl &> /dev/null; then
-  _DIR=$(openssl version -d)
-  export SSL_CERT_DIR=${_DIR:13:-1}"/certs"
-  export SSL_CERT_FILE=${_DIR:13:-1}"/cert.pem"
+#!/bin/sh
+#
+# Salt master
+###################################
+
+# LSB header
+
+### BEGIN INIT INFO
+# Provides:          salt-master
+# Required-Start:    $all
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Salt master control daemon
+# Description:       This is a daemon that controls the Salt minions.
+### END INIT INFO
+
+
+# chkconfig header
+
+# chkconfig: 345 96 05
+# description:  This is a daemon that controls the Salt minions
+#
+# processname: /usr/bin/salt-master
+
+
+DEBIAN_VERSION=/etc/debian_version
+SUSE_RELEASE=/etc/SuSE-release
+# Source function library.
+if [ -f $DEBIAN_VERSION ]; then
+   break
+elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
+    . /etc/rc.status
+else
+    . /etc/rc.d/init.d/functions
 fi
-exec /opt/saltstack/salt/run/run master "${@:1}"
+
+# Default values (can be overridden below)
+SALTMASTER=/usr/bin/salt-master
+PYTHON=/usr/bin/python
+MASTER_ARGS=""
+
+if [ -f /etc/default/salt ]; then
+    . /etc/default/salt
+fi
+
+SERVICE=salt-master
+PROCESS=salt-master
+
+RETVAL=0
+
+start() {
+    echo -n $"Starting salt-master daemon: "
+    if [ -f $SUSE_RELEASE ]; then
+        startproc -f -p /var/run/$SERVICE.pid $SALTMASTER -d $MASTER_ARGS
+        rc_status -v
+    elif [ -e $DEBIAN_VERSION ]; then
+        if [ -f $LOCKFILE ]; then
+            echo -n "already started, lock file found"
+            RETVAL=1
+        elif $PYTHON $SALTMASTER -d $MASTER_ARGS >& /dev/null; then
+            echo -n "OK"
+            RETVAL=0
+        fi
+    else
+        daemon --check $SERVICE $SALTMASTER -d $MASTER_ARGS
+        RETVAL=$?
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
+        echo
+        return $RETVAL
+    fi
+    RETVAL=$?
+    echo
+    return $RETVAL
+}
+
+stop() {
+    echo -n $"Stopping salt-master daemon: "
+    if [ -f $SUSE_RELEASE ]; then
+        killproc -TERM $SALTMASTER
+        rc_status -v
+    elif [ -f $DEBIAN_VERSION ]; then
+        # Added this since Debian's start-stop-daemon doesn't support spawned processes
+        if ps -ef | grep "$PYTHON $SALTMASTER" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then
+            echo -n "OK"
+            RETVAL=0
+        else
+            echo -n "Daemon is not started"
+            RETVAL=1
+        fi
+    else
+        killproc -d 10 $PROCESS
+        RETVAL=$?
+        echo
+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$SERVICE
+        return $RETVAL
+    fi
+    RETVAL=$?
+    echo
+}
+
+restart() {
+   stop
+   start
+}
+
+# See how we were called.
+case "$1" in
+    start|stop|restart)
+        $1
+        ;;
+    status)
+        if [ -f $SUSE_RELEASE ]; then
+            echo -n "Checking for service salt-master "
+            checkproc $SALTMASTER
+            rc_status -v
+        elif [ -f $DEBIAN_VERSION ]; then
+            if [ -f $LOCKFILE ]; then
+                RETVAL=0
+                echo "salt-master is running."
+            else
+                RETVAL=1
+                echo "salt-master is stopped."
+            fi
+        else
+            status $PROCESS
+            RETVAL=$?
+        fi
+        ;;
+    condrestart)
+        [ -f $LOCKFILE ] && restart || :
+        ;;
+    reload)
+        echo "can't reload configuration, you have to restart it"
+        RETVAL=1
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+        exit 1
+        ;;
+esac
+exit $RETVAL

SOURCES/salt-master.fish

@@ -3,3 +3,4 @@
 
 # hack to load functions from salt_common completion
 complete --do-complete='salt_common --' >/dev/null
+

SOURCES/salt-master.service

@@ -1,6 +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
+Documentation=man:salt-master(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltproject.io/en/latest/contents.html
 After=network.target
 
 [Service]

SOURCES/salt-minion

@@ -1,7 +1,323 @@
-#!/bin/bash
-if [[ -z "${SSL_CERT_DIR}" ]] && command -v openssl &> /dev/null; then
-  _DIR=$(openssl version -d)
-  export SSL_CERT_DIR=${_DIR:13:-1}"/certs"
-  export SSL_CERT_FILE=${_DIR:13:-1}"/cert.pem"
+#!/bin/sh
+#
+# Salt minion
+###################################
+
+# LSB header
+
+### BEGIN INIT INFO
+# Provides:          salt-minion
+# Required-Start:    $all
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Salt minion daemon
+# Description:       This is the Salt minion daemon that can be controlled by the
+#                    Salt master.
+### END INIT INFO
+
+
+# chkconfig header
+
+# chkconfig: 345 97 04
+# description:  This is the Salt minion daemon that can be controlled by the Salt master.
+#
+# processname: /usr/bin/salt-minion
+
+# Allow these to be overridden for tests
+: "${SALTMINION_BINDIR:=/usr/bin}"
+: "${SALTMINION_SYSCONFDIR:=/etc}"
+
+# Default values (can be overridden in settings file)
+: "${USER:=$(id -nu)}"
+SALTMINION="${SALTMINION_BINDIR}/salt-minion"
+SALTCALL="${SALTMINION_BINDIR}/salt-call"
+# SALTMINION_CONFIGS are newline-separated entries of: MINION_USER CONFIG_DIR
+: "${SALTMINION_CONFIGS:="
+$USER ${SALTMINION_SYSCONFDIR}/salt
+"}"
+SALTMINION_ARGS=""
+SALTMINION_TIMEOUT=30
+SALTMINION_TICK=1
+
+SERVICE="salt-minion"
+
+# Read in settings file
+if [ -f "${SALTMINION_SYSCONFDIR}/default/salt" ]; then
+    . "${SALTMINION_SYSCONFDIR}/default/salt"
+elif [ -f "${SALTMINION_SYSCONFDIR}/sysconfig/salt" ]; then
+    . "${SALTMINION_SYSCONFDIR}/sysconfig/salt"
+fi
+
+RETVAL=0
+NS_NOTRIM="--notrim"
+ERROR_TO_DEVNULL="/dev/null"
+
+
+_su_cmd() {
+    local user="$1"
+    shift
+
+    if [ "X$USER" = "X$user" ]; then
+        eval $1
+    else
+        su -l -c "$1" "$user"
+    fi
+}
+
+
+_get_pid() {
+    cat $PID_FILE 2>/dev/null
+}
+
+
+_is_running() {
+    [ -n "$(_get_pid)" ] && ps wwwaxu | grep '[s]alt-minion' | awk '{print $2}' | grep -qi "\b$(_get_pid)\b"
+}
+
+
+_get_salt_config_value() {
+    _su_cmd \
+        "$MINION_USER" \
+        "\
+            \"$SALTCALL\" \
+            -c \"$CONFIG_DIR\" \
+            --no-color \
+            --skip-grains \
+            --local config.get \
+            \"$1\" \
+        " \
+        2>$ERROR_TO_DEVNULL \
+        | sed -r -e '2!d; s/^\s*//;'
+}
+
+
+_make_id_hash() {
+    # $1 - minion_id
+    local hasher=''
+
+    case "$(_get_salt_config_value hash_type)" in
+        (md5) hasher="md5sum";;
+        (sha1) hasher="sha1sum";;
+        (sha224) hasher="sha224sum";;
+        (sha256) hasher="sha256sum";;
+        (sha384) hasher="sha384sum";;
+        (sha512) hasher="sha512sum";;
+        (*) echo "ERROR: No salt hash_type specified";;
+    esac
+
+    if [ -n "$hasher" ]; then
+        printf "$1" | "$hasher" | cut -c 1-10
+    fi
+}
+
+
+start() {
+    # $1 - config dir
+    local retval=0
+
+    if _is_running; then
+        echo "Service $SERVICE:$MINION_USER:$MINION_ID already running"
+        return 0
+    fi
+
+    echo -n "Starting $SERVICE:$MINION_USER:$MINION_ID daemon: "
+
+    _su_cmd \
+        "$MINION_USER" \
+        "\
+            \"$SALTMINION\" \
+            -c \"$CONFIG_DIR\" \
+            -d $SALTMINION_ARGS \
+            ${SALTMINION_DEBUG:+-l debug} \
+        " \
+        2>$ERROR_TO_DEVNULL \
+        || retval=$?
+
+    if [ 0 -eq "$retval" ]; then
+        local endtime=$(($(date '+%s')+$SALTMINION_TIMEOUT))
+        while ! _is_running; do
+            if [ "$endtime" -lt "$(date '+%s')" ]; then
+                echo -n "TIMEOUT "
+                retval=1
+                break
+            fi
+            sleep $SALTMINION_TICK
+        done
+    fi
+
+    if [ 0 -eq "$retval" ]; then
+        echo -n "OK"
+    else
+        echo -n "FAIL"
+        if [ -n "$SALTMINION_DEBUG" ]; then
+            printf "\nPROCESSES:\n" >&2
+            ps wwwaxu | grep '[s]alt-minion' >&2
+            printf "\nSOCKETS:\n" >&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
+            env >&2
+        fi
+    fi
+    echo
+
+    return $retval
+}
+
+
+stop() {
+    # $1 - config dir
+    local retval=0
+
+    if ! _is_running; then
+        echo "Service $SERVICE:$MINION_USER:$MINION_ID is not running"
+        return 0
+    fi
+        
+    echo -n "Stopping $SERVICE:$MINION_USER:$MINION_ID daemon: "
+    local pid="$(_get_pid)"
+
+    # pid below is intentionally not quoted in case there are *multiple*
+    # minions running with the same configuration.
+    _su_cmd "$MINION_USER" "kill -TERM $pid 2>/dev/null" || retval=$?
+    if [ 0 -eq "$retval" ]; then 
+        local endtime=$(($(date '+%s')+$SALTMINION_TIMEOUT))
+        while _is_running; do
+            if [ "$endtime" -lt "$(date '+%s')" ]; then
+                # Try one more time with a big hammer
+                _su_cmd "$MINION_USER" "kill -KILL $pid 2>/dev/null" || :
+                sleep $SALTMINION_TICK
+                if _is_running; then
+                    echo -n "TIMEOUT "
+                    retval=1
+                fi
+                break
+            fi
+            sleep 1
+        done
+
+    fi
+
+    if [ 0 -eq "$retval" ]; then
+        rm -f "$PID_FILE"
+        echo -n "OK"
+    else
+        echo -n "FAIL"
+    fi
+
+    echo
+
+    return $retval
+}
+
+
+status() {
+    local retval=0
+    local pid="$(_get_pid)"
+
+    if _is_running; then
+        # Unquote $pid here to display multiple PIDs in one line
+        echo "$SERVICE:$MINION_USER:$MINION_ID is running:" $pid
+    else
+        retval=3
+        echo "$SERVICE:$MINION_USER:$MINION_ID is stopped."
+        if [ -e "$PID_FILE" ]; then
+            echo "$SERVICE:$MINION_USER:$MINION_ID has orphaned pid file: $PID_FILE."
+            retval=1
+        fi
+    fi
+    return $retval
+}
+
+restart() {
+    # $1 - config dir
+    stop "$1"
+    start "$1"
+}
+
+
+main() {
+    if [ -n "$SALTMINION_DEBUG" ]; then
+        set -x
+        ERROR_TO_DEVNULL="&2"
+    fi
+
+    # Check to see if --notrim is a valid netstat option
+    if ! ( netstat --help 2>&1 | grep -wq '\-\-notrim') ; then
+        NS_NOTRIM=''
+    fi
+
+    # Pre-filter for unhandled commands
+    case "$1" in
+        (start|stop|status|restart|condrestart|try-restart) ;;
+        (reload)
+            echo "Can't reload $SERVICE - you must restart it"
+            exit 3
+            ;;
+        (*)
+            echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
+            exit 2
+            ;;
+    esac
+
+    while read MINION_USER CONFIG_DIR; do
+        if [ -z "$CONFIG_DIR" ]; then
+            continue
+        fi
+
+        if ! [ -d "$CONFIG_DIR" ]; then
+            echo "ERROR: non-existent $SERVICE config directory: $CONFIG_DIR"
+            RETVAL=1
+            continue
+        fi
+
+        SOCK_DIR="$(_get_salt_config_value sock_dir)"
+        PID_FILE="$(_get_salt_config_value pidfile)"
+        LOG_FILE="$(_get_salt_config_value log_file)"
+        MINION_ID="$(_get_salt_config_value id)"
+        MINION_ID_HASH="$(_make_id_hash "$MINION_ID")"
+        if [ \
+            -z "$SOCK_DIR" \
+            -o -z "$PID_FILE" \
+            -o -z "$LOG_FILE" \
+            -o -z "$MINION_ID" \
+            -o -z "$MINION_ID_HASH" \
+        ]; then
+            echo "ERROR: Unable to look-up config values for $CONFIG_DIR"
+            RETVAL=1
+            continue
+        fi
+
+        # See how we were called.
+        case "$1" in
+            (start|stop|restart|status)
+                "$1" || RETVAL=$?
+                ;;
+            (condrestart|try-restart)
+                if ! _is_running; then
+                    RETVAL=7
+                else
+                    stop
+                    start || RETVAL=$?
+                fi
+                ;;
+            (*)
+                echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload}"
+                RETVAL=2
+                ;;
+        esac
+    done <<EOF
+$SALTMINION_CONFIGS
+EOF
+
+    exit $RETVAL
+}
+
+
+if [ "$#" = 0 ]; then
+    main
+else
+    main "$@"
 fi
-exec /opt/saltstack/salt/run/run minion "${@:1}"

SOURCES/salt-minion.fish

@@ -3,3 +3,4 @@
 
 # hack to load functions from salt_common completion
 complete --do-complete='salt_common --' >/dev/null
+

SOURCES/salt-minion.service

@@ -1,6 +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
+Documentation=man:salt-minion(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltproject.io/en/latest/contents.html
 After=network.target salt-master.service
 
 [Service]

SOURCES/salt-pip

@@ -1,2 +0,0 @@
-#!/bin/bash
-exec /opt/saltstack/salt/run/run pip "${@:1}"

SOURCES/salt-proxy

@@ -1,2 +0,0 @@
-#!/bin/bash
-exec /opt/saltstack/salt/run/run proxy "${@:1}"

SOURCES/salt-proxy@.service

@@ -1,6 +1,6 @@
 [Unit]
 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
+Documentation=man:salt-proxy(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltproject.io/en/latest/contents.html
 After=network.target
 
 [Service]

SOURCES/salt-run

@@ -1,7 +0,0 @@
-#!/bin/bash
-if [[ -z "${SSL_CERT_DIR}" ]] && command -v openssl &> /dev/null; then
-  _DIR=$(openssl version -d)
-  export SSL_CERT_DIR=${_DIR:13:-1}"/certs"
-  export SSL_CERT_FILE=${_DIR:13:-1}"/cert.pem"
-fi
-exec /opt/saltstack/salt/run/run run "${@:1}"

SOURCES/salt-run.fish

@@ -3,3 +3,4 @@
 
 # hack to load functions from salt_common completion
 complete --do-complete='salt_common --' >/dev/null
+

SOURCES/salt-ssh

@@ -1,2 +0,0 @@
-#!/bin/bash
-exec /opt/saltstack/salt/run/run ssh "${@:1}"

SOURCES/salt-syndic

@@ -1,2 +1,136 @@
-#!/bin/bash
-exec /opt/saltstack/salt/run/run syndic "${@:1}"
+#!/bin/sh
+#
+# Salt syndic
+###################################
+
+# LSB header
+
+### BEGIN INIT INFO
+# Provides:          salt-syndic
+# Required-Start:    $all
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Salt syndic master-minion passthrough daemon
+# Description:       This is a the Salt syndic daemon that enables Salt master-minion
+#                    remote control passthrough.
+### END INIT INFO
+
+
+# chkconfig header
+
+# chkconfig: - 99 99
+# description:  This is a the Salt syndic daemon that enables Salt master-minion remote control passthrough.
+#
+# processname: /usr/bin/salt-syndic
+
+
+DEBIAN_VERSION=/etc/debian_version
+SUSE_RELEASE=/etc/SuSE-release
+# Source function library.
+if [ -f $DEBIAN_VERSION ]; then
+   break
+elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
+    . /etc/rc.status
+else
+    . /etc/rc.d/init.d/functions
+fi
+
+# Default values (can be overridden below)
+SALTSYNDIC=/usr/bin/salt-syndic
+PYTHON=/usr/bin/python
+SYNDIC_ARGS=""
+
+if [ -f /etc/default/salt ]; then
+    . /etc/default/salt
+fi
+
+SERVICE=salt-syndic
+PROCESS=salt-syndic
+
+RETVAL=0
+
+start() {
+    echo -n $"Starting salt-syndic daemon: "
+    if [ -f $SUSE_RELEASE ]; then
+        startproc -f -p /var/run/$SERVICE.pid $SALTSYNDIC -d $SYNDIC_ARGS
+        rc_status -v
+    elif [ -e $DEBIAN_VERSION ]; then
+        if [ -f $LOCKFILE ]; then
+            echo -n "already started, lock file found"
+            RETVAL=1
+        elif $PYTHON $SALTSYNDIC -d $SYNDIC_ARGS >& /dev/null; then
+            echo -n "OK"
+            RETVAL=0
+        fi
+    else
+        daemon --check $SERVICE $SALTSYNDIC -d $SYNDIC_ARGS
+        RETVAL=$?
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
+        echo
+        return $RETVAL
+    fi
+    RETVAL=$?
+    echo
+    return $RETVAL
+}
+
+stop() {
+    echo -n $"Stopping salt-syndic daemon: "
+    if [ -f $SUSE_RELEASE ]; then
+        killproc -TERM $SALTSYNDIC
+        rc_status -v
+    elif [ -f $DEBIAN_VERSION ]; then
+        # Added this since Debian's start-stop-daemon doesn't support spawned processes
+        if ps -ef | grep "$PYTHON $SALTSYNDIC" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then
+            echo -n "OK"
+            RETVAL=0
+        else
+            echo -n "Daemon is not started"
+            RETVAL=1
+        fi
+    else
+        killproc -d 10 $PROCESS
+        RETVAL=$?
+        echo
+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$SERVICE
+        return $RETVAL
+    fi
+    RETVAL=$?
+    echo
+}
+
+restart() {
+   stop
+   start
+}
+
+# See how we were called.
+case "$1" in
+    start|stop|restart)
+        $1
+        ;;
+    status)
+        if [ -f $SUSE_RELEASE ]; then
+            echo -n "Checking for service salt-syndic "
+            checkproc $SALTSYNDIC
+            rc_status -v
+        elif [ -f $DEBIAN_VERSION ]; then
+            if [ -f $LOCKFILE ]; then
+                RETVAL=0
+                echo "salt-syndic is running."
+            else
+                RETVAL=1
+                echo "salt-syndic is stopped."
+            fi
+        else
+            status $PROCESS
+            RETVAL=$?
+        fi
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart}"
+        exit 1
+        ;;
+esac
+exit $RETVAL

SOURCES/salt-syndic.fish

@@ -3,3 +3,4 @@
 
 # hack to load functions from salt_common completion
 complete --do-complete='salt_common --' >/dev/null
+

SOURCES/salt-syndic.service

@@ -1,6 +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
+Documentation=man:salt-syndic(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltproject.io/en/latest/contents.html
 After=network.target
 PartOf=salt-master.service
 

SOURCES/salt_common.fish

@@ -436,3 +436,4 @@ function __fish_salt_prefix_with_arg_name
 		tee
 	end
 end
+

SOURCES/spm

@@ -1,2 +0,0 @@
-#!/bin/bash
-exec /opt/saltstack/salt/run/run spm "${@:1}"

SPECS/salt.spec

@@ -1,66 +1,50 @@
-%global __brp_check_rpaths %{nil}
+## For Python 3 only 
 
-%bcond_with tests
-%bcond_with docs
+# Release Candidate
+%global __rc_ver %{nil}
 
-# Disable build-id symlinks
-%define _build_id_links none
-%undefine _missing_build_ids_terminate_build
+%global fish_dir %{_datadir}/fish/vendor_functions.d
+%global zsh_dir %{_datadir}/zsh/site-functions
 
-# Disable private libraries from showing in provides
-%global __provides_exclude_from ^.*\\.so.*$
-%global __requires_exclude_from ^.*\\.so.*$
-
-# Disable python bytecompile for MANY reasons
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-
-%define fish_dir %{_datadir}/fish/vendor_functions.d
+# py3_shbang_flags is '-s' and causing issues with pip install.
+%global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//)
 
 Name:    salt
-Version: 3005.1
-Release: 4%{?dist}
+Version: 3005.1%{?__rc_ver}
+Release: 4%{?dist}.inferit
 Summary: A parallel remote execution system
 Group:   System Environment/Daemons
 License: ASL 2.0
-URL:     http://saltstack.org/
-Source0: %{name}-%{version}.tar.gz
-Source1: build.conf
-Source3: requirements.txt
-Source5: %{name}-proxy@.service
+URL:     https://saltproject.io/
+Source0: %{pypi_source}
+Source1: %{name}-proxy@.service
+Source2: %{name}-master
+Source3: %{name}-syndic
+Source4: %{name}-minion
+Source5: %{name}-api
 Source6: %{name}-master.service
 Source7: %{name}-syndic.service
 Source8: %{name}-minion.service
 Source9: %{name}-api.service
-Source10: README.fedora
+Source10: README
 Source11: %{name}-common.logrotate
-Source12: salt.bash
-Source13: salt.fish
-Source14: salt_common.fish
-Source15: salt-call.fish
-Source16: salt-cp.fish
-Source17: salt-key.fish
-Source18: salt-master.fish
-Source19: salt-minion.fish
-Source20: salt-run.fish
-Source21: salt-syndic.fish
-Source22: salt
-Source23: salt-master
-Source24: salt-minion
-Source25: salt-api
-Source26: salt-cp
-Source27: salt-key
-Source28: salt-run
-Source29: salt-cloud
-Source30: salt-ssh
-Source31: salt-syndic
-Source32: salt-call
-Source33: salt-proxy
-Source34: spm
-Source35: salt-pip
-
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: x86_64
+Source12: %{name}.bash
+Source13: %{name}.fish
+Source14: %{name}_common.fish
+Source15: %{name}-call.fish
+Source16: %{name}-cp.fish
+Source17: %{name}-key.fish
+Source18: %{name}-master.fish
+Source19: %{name}-minion.fish
+Source20: %{name}-run.fish
+Source21: %{name}-syndic.fish
+
+Patch0: contextvars.patch
+
+# Added MSVSphere support
+Patch100: 0001-Added-MSVSphere-support.patch
+
+BuildArch: noarch
 
 %ifarch %{ix86} x86_64
 Requires: dmidecode
@@ -68,20 +52,12 @@ Requires: dmidecode
 
 Requires: pciutils
 Requires: which
-Requires: openssl
-
+Requires: dnf-utils
+Requires: logrotate
 
-%if 0%{?systemd_preun:1}
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-%endif
+BuildRequires: systemd-rpm-macros
+BuildRequires: python3-devel
 
-BuildRequires: systemd-units
-#BuildRequires: python3
-#BuildRequires: python3-devel
-#BuildRequires: openssl-devel
-BuildRequires: git
 
 %description
 Salt is a distributed remote execution system used to execute commands and
@@ -96,9 +72,11 @@ servers, handle them quickly and through a simple and manageable interface.
 Summary:    Management component for salt, a parallel remote execution system
 Group:      System Environment/Daemons
 Requires:   %{name} = %{version}-%{release}
+Requires:   python3-systemd
 
 %description master
 The Salt master is the central server to which all minions connect.
+Supports Python 3.
 
 
 %package    minion
@@ -109,6 +87,7 @@ 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.
+Supports Python 3.
 
 
 %package    syndic
@@ -120,25 +99,30 @@ Requires:   %{name}-master = %{version}-%{release}
 The Salt syndic is a master daemon which can receive instruction from a
 higher-level master, allowing for tiered organization of your Salt
 infrastructure.
+Supports Python 3.
 
 
 %package    api
 Summary:    REST API for Salt, a parallel remote execution system
 Group:      Applications/System
 Requires:   %{name}-master = %{version}-%{release}
+Requires:   python3-cherrypy >= 3.2.2
 
 %description api
 salt-api provides a REST interface to the Salt master.
+Supports Python 3.
 
 
 %package    cloud
 Summary:    Cloud provisioner for Salt, a parallel remote execution system
 Group:      Applications/System
 Requires:   %{name}-master = %{version}-%{release}
+Requires:   python3-libcloud
 
 %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.
+Supports Python 3.
 
 
 %package    ssh
@@ -149,281 +133,189 @@ 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.
+Supports Python 3.
 
 
 %prep
-tar xvf %{SOURCE0}
+%autosetup -p1
 
 %build
-mv_srcdir=$RPM_BUILD_DIR/%{name}-3005.1
-mv_dstdir=$RPM_BUILD_DIR/%{name}-%{version}
-if [ "${mv_srcdir}" != "${mv_dstdir}" ]; then
-  mv ${mv_srcdir} ${mv_dstdir}
-fi
-cd %{name}-%{version}
-PYTHONPATH="/usr/local/lib/python3.6/site-packages/:/usr/local/lib64/python3.6/site-packages/" tiamat --log-level=debug build -c %{SOURCE1} -r %{SOURCE3}
-find . -name __pycache__ | xargs rm -fR
-pwd
-ls -l
+python3 setup.py build
 
 %install
 rm -rf %{buildroot}
-#cd $RPM_BUILD_DIR/%{name}-%{version}
-pwd
-ls -l
-mkdir -p %{buildroot}/opt/saltstack/salt
-# pip installs directory
-mkdir -p %{buildroot}/opt/saltstack/salt/pypath/
-cp -ra %{name}-%{version}/dist/run %{buildroot}/opt/saltstack/salt
+python3 setup.py install --root=%{buildroot}
 
 # Add some directories
-install -d -m 0755 %{buildroot}%{_var}/log/salt
-touch %{buildroot}%{_var}/log/salt/minion
-touch %{buildroot}%{_var}/log/salt/master
-install -d -m 0755 %{buildroot}%{_var}/cache/salt
-install -d -m 0755 %{buildroot}%{_sysconfdir}/salt
-install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/master.d
-install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/minion.d
-install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/pki
-install -d -m 0700 %{buildroot}%{_sysconfdir}/salt/pki/master
-install -d -m 0700 %{buildroot}%{_sysconfdir}/salt/pki/minion
-install -d -m 0700 %{buildroot}%{_sysconfdir}/salt/cloud.conf.d
-install -d -m 0700 %{buildroot}%{_sysconfdir}/salt/cloud.deploy.d
-install -d -m 0700 %{buildroot}%{_sysconfdir}/salt/cloud.maps.d
-install -d -m 0700 %{buildroot}%{_sysconfdir}/salt/cloud.profiles.d
-install -d -m 0700 %{buildroot}%{_sysconfdir}/salt/cloud.providers.d
-install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/proxy.d
-install -d -m 0755 %{buildroot}%{_bindir}
-
-# Add helper scripts
-install -m 0755 %{SOURCE22} %{buildroot}%{_bindir}/salt
-install -m 0755 %{SOURCE23} %{buildroot}%{_bindir}/salt-master
-install -m 0755 %{SOURCE24} %{buildroot}%{_bindir}/salt-minion
-install -m 0755 %{SOURCE25} %{buildroot}%{_bindir}/salt-api
-install -m 0755 %{SOURCE26} %{buildroot}%{_bindir}/salt-cp
-install -m 0755 %{SOURCE27} %{buildroot}%{_bindir}/salt-key
-install -m 0755 %{SOURCE28} %{buildroot}%{_bindir}/salt-run
-install -m 0755 %{SOURCE29} %{buildroot}%{_bindir}/salt-cloud
-install -m 0755 %{SOURCE30} %{buildroot}%{_bindir}/salt-ssh
-install -m 0755 %{SOURCE31} %{buildroot}%{_bindir}/salt-syndic
-install -m 0755 %{SOURCE32} %{buildroot}%{_bindir}/salt-call
-install -m 0755 %{SOURCE33} %{buildroot}%{_bindir}/salt-proxy
-install -m 0755 %{SOURCE34} %{buildroot}%{_bindir}/spm
-install -m 0755 %{SOURCE35} %{buildroot}%{_bindir}/salt-pip
+install -d -m 0755 %{buildroot}%{_var}/log/%{name}
+touch %{buildroot}%{_var}/log/%{name}/minion
+touch %{buildroot}%{_var}/log/%{name}/master
+install -d -m 0755 %{buildroot}%{_var}/cache/%{name}
+install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
+install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/master.d
+install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/minion.d
+install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/pki
+install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/pki/master
+install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/pki/minion
+install -d -m 0700 %{buildroot}%{_sysconfdir}/%{name}/cloud.conf.d
+install -d -m 0700 %{buildroot}%{_sysconfdir}/%{name}/cloud.deploy.d
+install -d -m 0700 %{buildroot}%{_sysconfdir}/%{name}/cloud.maps.d
+install -d -m 0700 %{buildroot}%{_sysconfdir}/%{name}/cloud.profiles.d
+install -d -m 0700 %{buildroot}%{_sysconfdir}/%{name}/cloud.providers.d
+install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/proxy.d
 
 # Add the config files
-install -p -m 0640 %{name}-%{version}/conf/minion %{buildroot}%{_sysconfdir}/salt/minion
-install -p -m 0640 %{name}-%{version}/conf/master %{buildroot}%{_sysconfdir}/salt/master
-install -p -m 0600 %{name}-%{version}/conf/cloud  %{buildroot}%{_sysconfdir}/salt/cloud
-install -p -m 0640 %{name}-%{version}/conf/roster %{buildroot}%{_sysconfdir}/salt/roster
-install -p -m 0640 %{name}-%{version}/conf/proxy  %{buildroot}%{_sysconfdir}/salt/proxy
+install -p -m 0640 conf/minion %{buildroot}%{_sysconfdir}/%{name}/minion
+install -p -m 0640 conf/master %{buildroot}%{_sysconfdir}/%{name}/master
+install -p -m 0600 conf/cloud  %{buildroot}%{_sysconfdir}/%{name}/cloud
+install -p -m 0640 conf/roster %{buildroot}%{_sysconfdir}/%{name}/roster
+install -p -m 0640 conf/proxy  %{buildroot}%{_sysconfdir}/%{name}/proxy
 
 # Add the unit files
 mkdir -p %{buildroot}%{_unitdir}
-install -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/
 install -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/
 install -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/
 install -p -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/
 install -p -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/
 
 # Logrotate
 install -p %{SOURCE10} .
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
-install -p -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/logrotate.d/salt
+install -p -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
 # Bash completion
 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
-install -p -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/bash_completion.d/salt.bash
+install -p -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}.bash
 
 # Fish completion (TBD remove -v)
 mkdir -p %{buildroot}%{fish_dir}
-install -p -m 0644  %{SOURCE13} %{buildroot}%{fish_dir}/salt.fish
-install -p -m 0644  %{SOURCE14} %{buildroot}%{fish_dir}/salt_common.fish
-install -p -m 0644  %{SOURCE15} %{buildroot}%{fish_dir}/salt-call.fish
-install -p -m 0644  %{SOURCE16} %{buildroot}%{fish_dir}/salt-cp.fish
-install -p -m 0644  %{SOURCE17} %{buildroot}%{fish_dir}/salt-key.fish
-install -p -m 0644  %{SOURCE18} %{buildroot}%{fish_dir}/salt-master.fish
-install -p -m 0644  %{SOURCE19} %{buildroot}%{fish_dir}/salt-minion.fish
-install -p -m 0644  %{SOURCE20} %{buildroot}%{fish_dir}/salt-run.fish
-install -p -m 0644  %{SOURCE21} %{buildroot}%{fish_dir}/salt-syndic.fish
-
-# Man files
-mkdir -p %{buildroot}%{_mandir}/man1
-mkdir -p %{buildroot}%{_mandir}/man7
-ls -alh %{name}-%{version}/*
-install -p -m 0644 %{name}-%{version}/doc/man/spm.1 %{buildroot}%{_mandir}/man1/spm.1
-install -p -m 0644 %{name}-%{version}/doc/man/salt.1 %{buildroot}%{_mandir}/man1/salt.1
-install -p -m 0644 %{name}-%{version}/doc/man/salt.7 %{buildroot}%{_mandir}/man7/salt.7
-install -p -m 0644 %{name}-%{version}/doc/man/salt-cp.1 %{buildroot}%{_mandir}/man1/salt-cp.1
-install -p -m 0644 %{name}-%{version}/doc/man/salt-key.1 %{buildroot}%{_mandir}/man1/salt-key.1
-install -p -m 0644 %{name}-%{version}/doc/man/salt-master.1 %{buildroot}%{_mandir}/man1/salt-master.1
-install -p -m 0644 %{name}-%{version}/doc/man/salt-run.1 %{buildroot}%{_mandir}/man1/salt-run.1
-install -p -m 0644 %{name}-%{version}/doc/man/salt-call.1 %{buildroot}%{_mandir}/man1/salt-call.1
-install -p -m 0644 %{name}-%{version}/doc/man/salt-minion.1 %{buildroot}%{_mandir}/man1/salt-minion.1
-install -p -m 0644 %{name}-%{version}/doc/man/salt-proxy.1 %{buildroot}%{_mandir}/man1/salt-proxy.1
-install -p -m 0644 %{name}-%{version}/doc/man/salt-syndic.1 %{buildroot}%{_mandir}/man1/salt-syndic.1
-install -p -m 0644 %{name}-%{version}/doc/man/salt-api.1 %{buildroot}%{_mandir}/man1/salt-api.1
-install -p -m 0644 %{name}-%{version}/doc/man/salt-cloud.1 %{buildroot}%{_mandir}/man1/salt-cloud.1
-install -p -m 0644 %{name}-%{version}/doc/man/salt-ssh.1 %{buildroot}%{_mandir}/man1/salt-ssh.1
-
-
-%clean
-rm -rf %{buildroot}
+install -p -m 0644  %{SOURCE13} %{buildroot}%{fish_dir}/%{name}.fish
+install -p -m 0644  %{SOURCE14} %{buildroot}%{fish_dir}/%{name}_common.fish
+install -p -m 0644  %{SOURCE15} %{buildroot}%{fish_dir}/%{name}-call.fish
+install -p -m 0644  %{SOURCE16} %{buildroot}%{fish_dir}/%{name}-cp.fish
+install -p -m 0644  %{SOURCE17} %{buildroot}%{fish_dir}/%{name}-key.fish
+install -p -m 0644  %{SOURCE18} %{buildroot}%{fish_dir}/%{name}-master.fish
+install -p -m 0644  %{SOURCE19} %{buildroot}%{fish_dir}/%{name}-minion.fish
+install -p -m 0644  %{SOURCE20} %{buildroot}%{fish_dir}/%{name}-run.fish
+install -p -m 0644  %{SOURCE21} %{buildroot}%{fish_dir}/%{name}-syndic.fish
+
+# ZSH completion
+mkdir -p %{buildroot}%{zsh_dir}
+install -p -m 0644 pkg/%{name}.zsh %{buildroot}%{zsh_dir}/_%{name}
 
 
 %files
 %defattr(-,root,root,-)
-%{_sysconfdir}/logrotate.d/salt
-%{_sysconfdir}/bash_completion.d/salt.bash
-%{_var}/cache/salt
-%{_var}/log/salt
-/opt/saltstack/
-/opt/saltstack/salt
-/opt/saltstack/salt/run
-/opt/saltstack/salt/pypath
-
-%doc %{_mandir}/man1/spm.1*
+%license LICENSE
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}.bash
+%{_var}/cache/%{name}
+%{_var}/log/%{name}
+%{_prefix}/lib/python3.6
 %{_bindir}/spm
-%{_bindir}/salt-pip
-%config(noreplace) %{_sysconfdir}/salt/
-#%config(noreplace) %{_sysconfdir}/salt/pki
-%config(noreplace) %{fish_dir}/salt*.fish
+%doc %{_mandir}/man1/spm.1*
+%dir %{zsh_dir}
+%dir %{_sysconfdir}/%{name}/
+%dir %{_sysconfdir}/%{name}/pki/
+%{fish_dir}/%{name}*.fish
+%{zsh_dir}/_%{name}
 
 %files master
-%defattr(-,root,root)
-%doc %{_mandir}/man7/salt.7*
-%doc %{_mandir}/man1/salt.1*
-%doc %{_mandir}/man1/salt-cp.1*
-%doc %{_mandir}/man1/salt-key.1*
-%doc %{_mandir}/man1/salt-master.1*
-%doc %{_mandir}/man1/salt-run.1*
-%{_bindir}/salt
-%{_bindir}/salt-cp
-%{_bindir}/salt-key
-%{_bindir}/salt-master
-%{_bindir}/salt-run
-%{_unitdir}/salt-master.service
-%config(noreplace) %{_sysconfdir}/salt/master
-%config(noreplace) %{_sysconfdir}/salt/master.d
-%config(noreplace) %{_sysconfdir}/salt/pki/master
+%doc %{_mandir}/man7/%{name}.7*
+%doc %{_mandir}/man1/%{name}.1*
+%doc %{_mandir}/man1/%{name}-cp.1*
+%doc %{_mandir}/man1/%{name}-key.1*
+%doc %{_mandir}/man1/%{name}-master.1*
+%doc %{_mandir}/man1/%{name}-run.1*
+%{_bindir}/%{name}
+%{_bindir}/%{name}-cp
+%{_bindir}/%{name}-key
+%{_bindir}/%{name}-master
+%{_bindir}/%{name}-run
+%{_unitdir}/%{name}-master.service
+%config(noreplace) %{_sysconfdir}/%{name}/master
+%config(noreplace) %{_sysconfdir}/%{name}/master.d
+%config(noreplace) %{_sysconfdir}/%{name}/pki/master
 
 %files minion
-%defattr(-,root,root)
-%doc %{_mandir}/man1/salt-call.1*
-%doc %{_mandir}/man1/salt-minion.1*
-%doc %{_mandir}/man1/salt-proxy.1*
-%{_bindir}/salt-minion
-%{_bindir}/salt-call
-%{_bindir}/salt-proxy
-%{_unitdir}/salt-minion.service
-%{_unitdir}/salt-proxy@.service
-%config(noreplace) %{_sysconfdir}/salt/minion
-%config(noreplace) %{_sysconfdir}/salt/proxy
-%config(noreplace) %{_sysconfdir}/salt/minion.d
-%config(noreplace) %{_sysconfdir}/salt/pki/minion
+%doc %{_mandir}/man1/%{name}-call.1*
+%doc %{_mandir}/man1/%{name}-minion.1*
+%doc %{_mandir}/man1/%{name}-proxy.1*
+%{_bindir}/%{name}-minion
+%{_bindir}/%{name}-call
+%{_bindir}/%{name}-proxy
+%{_unitdir}/%{name}-minion.service
+%{_unitdir}/%{name}-proxy@.service
+%config(noreplace) %{_sysconfdir}/%{name}/minion
+%config(noreplace) %{_sysconfdir}/%{name}/proxy
+%config(noreplace) %{_sysconfdir}/%{name}/minion.d
+%config(noreplace) %{_sysconfdir}/%{name}/pki/minion
 
 %files syndic
-%doc %{_mandir}/man1/salt-syndic.1*
-%{_bindir}/salt-syndic
-%{_unitdir}/salt-syndic.service
+%doc %{_mandir}/man1/%{name}-syndic.1*
+%{_bindir}/%{name}-syndic
+%{_unitdir}/%{name}-syndic.service
 
 %files api
-%defattr(-,root,root)
-%doc %{_mandir}/man1/salt-api.1*
-%{_bindir}/salt-api
-%{_unitdir}/salt-api.service
+%doc %{_mandir}/man1/%{name}-api.1*
+%{_bindir}/%{name}-api
+%{_unitdir}/%{name}-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
+%doc %{_mandir}/man1/%{name}-cloud.1*
+%{_bindir}/%{name}-cloud
+%{_sysconfdir}/%{name}/cloud.conf.d
+%{_sysconfdir}/%{name}/cloud.deploy.d
+%{_sysconfdir}/%{name}/cloud.maps.d
+%{_sysconfdir}/%{name}/cloud.profiles.d
+%{_sysconfdir}/%{name}/cloud.providers.d
+%config(noreplace) %{_sysconfdir}/%{name}/cloud
 
 %files ssh
-%doc %{_mandir}/man1/salt-ssh.1*
-%{_bindir}/salt-ssh
-%config(noreplace) %{_sysconfdir}/salt/roster
+%doc %{_mandir}/man1/%{name}-ssh.1*
+%{_bindir}/%{name}-ssh
+%config(noreplace) %{_sysconfdir}/%{name}/roster
 
 
-# assumes systemd for RHEL 7 & 8 & 9
 %preun master
-# RHEL 9 is giving warning msg if syndic is not installed, supress it
-%systemd_preun salt-syndic.service > /dev/null 2>&1
+%systemd_preun %{name}-syndic.service
 
 %preun minion
-%systemd_preun salt-minion.service
+%systemd_preun %{name}-minion.service
 
 %preun api
-%systemd_preun salt-api.service
+%systemd_preun %{name}-api.service
 
 %post master
-%systemd_post salt-master.service
-if [ $1 -lt 2 ]; then
-  # install
-  # ensure hmac are up to date, master or minion, rest install one or the other
-  # key used is from openssl/crypto/fips/fips_standalone_hmac.c openssl 1.1.1k
-  if [ $(cat /etc/os-release | grep VERSION_ID | cut -d '=' -f 2 | sed  's/\"//g' | cut -d '.' -f 1) = "8" ]; then
-    /bin/openssl sha256 -r -hmac orboDeJITITejsirpADONivirpUkvarP /opt/saltstack/salt/run/libssl.so.1.1 | cut -d ' ' -f 1 > /opt/saltstack/salt/run/.libssl.so.1.1.hmac || :
-    /bin/openssl sha256 -r -hmac orboDeJITITejsirpADONivirpUkvarP /opt/saltstack/salt/run/libcrypto.so.1.1 | cut -d ' ' -f 1 > /opt/saltstack/salt/run/.libcrypto.so.1.1.hmac || :
-  fi
-fi
+%systemd_post %{name}-master.service
 
 %post syndic
-%systemd_post salt-syndic.service
+%systemd_post %{name}-syndic.service
 
 %post minion
-%systemd_post salt-minion.service
-if [ $1 -lt 2 ]; then
-  # install
-  # ensure hmac are up to date, master or minion, rest install one or the other
-  # key used is from openssl/crypto/fips/fips_standalone_hmac.c openssl 1.1.1k
-  if [ $(cat /etc/os-release | grep VERSION_ID | cut -d '=' -f 2 | sed  's/\"//g' | cut -d '.' -f 1) = "8" ]; then
-    /bin/openssl sha256 -r -hmac orboDeJITITejsirpADONivirpUkvarP /opt/saltstack/salt/run/libssl.so.1.1 | cut -d ' ' -f 1 > /opt/saltstack/salt/run/.libssl.so.1.1.hmac || :
-    /bin/openssl sha256 -r -hmac orboDeJITITejsirpADONivirpUkvarP /opt/saltstack/salt/run/libcrypto.so.1.1 | cut -d ' ' -f 1 > /opt/saltstack/salt/run/.libcrypto.so.1.1.hmac || :
-  fi
-fi
+%systemd_post %{name}-minion.service
 
 %post api
-%systemd_post salt-api.service
+%systemd_post %{name}-api.service
 
 %postun master
-%systemd_postun_with_restart salt-master.service
-if [ $1 -eq 0 ]; then
-  if [ $(cat /etc/os-release | grep VERSION_ID | cut -d '=' -f 2 | sed  's/\"//g' | cut -d '.' -f 1) = "8" ]; then
-    if [ -z "$(rpm -qi salt-minion | grep Name | grep salt-minion)" ]; then
-      # uninstall and no minion running
-      /bin/rm -f /opt/saltstack/salt/run/.libssl.so.1.1.hmac || :
-      /bin/rm -f /opt/saltstack/salt/run/.libcrypto.so.1.1.hmac || :
-    fi
-  fi
-fi
+%systemd_postun_with_restart %{name}-master.service
 
 %postun syndic
-%systemd_postun_with_restart salt-syndic.service
+%systemd_postun_with_restart %{name}-syndic.service
 
 %postun minion
-%systemd_postun_with_restart salt-minion.service
-if [ $1 -eq 0 ]; then
-  if [ $(cat /etc/os-release | grep VERSION_ID | cut -d '=' -f 2 | sed  's/\"//g' | cut -d '.' -f 1) = "8" ]; then
-    if [ -z "$(rpm -qi salt-master | grep Name | grep salt-master)" ]; then
-      # uninstall and no master running
-      /bin/rm -f /opt/saltstack/salt/run/.libssl.so.1.1.hmac || :
-      /bin/rm -f /opt/saltstack/salt/run/.libcrypto.so.1.1.hmac || :
-    fi
-  fi
-fi
+%systemd_postun_with_restart %{name}-minion.service
 
 %postun api
-%systemd_postun_with_restart salt-api.service
+%systemd_postun_with_restart %{name}-api.service
 
 
 %changelog
-* Tue Apr 25 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 3005.1-4
-- Rebuilt for MSVSphere 9.1
+* Tue Apr 25 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 3005.1-4.inferit
+- Added MSVSphere support
+- Rebuild for MSVSphere
 
 * Tue Nov 01 2022 SaltStack Packaging Team <packaging@saltstack.com> - 3005-2
 - Generate HMAC files post-install in case FIPS mode used only if libraries exist