Merge branch 'master' into fix-pip.list-local-packages

.github/workflows/test-action-macos.yml

@@ -320,7 +320,9 @@ jobs:
   report:
     name: Reports for ${{ inputs.distro-slug }}(${{ matrix.transport }})
     runs-on: ubuntu-latest
-    needs: test
+    needs:
+      - test
+      - generate-matrix
     if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
     strategy:
       fail-fast: false
@@ -385,7 +387,7 @@ jobs:
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v3
         # always run even if the previous steps fails
-        if: always() && steps.download-test-run-artifacts.outcome == 'success'
+        if: always() && github.event_name == 'push' && steps.download-test-run-artifacts.outcome == 'success'
         with:
           check_name: Overall Test Results(${{ inputs.distro-slug }})
           report_paths: 'artifacts/xml-unittests-output/*.xml'

.github/workflows/test-action.yml

@@ -314,8 +314,10 @@ jobs:
   report:
     name: Reports for ${{ inputs.distro-slug }}(${{ matrix.transport }})
     runs-on: ubuntu-latest
-    needs: test
     if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+    needs:
+      - test
+      - generate-matrix
     strategy:
       fail-fast: false
       matrix:
@@ -379,7 +381,7 @@ jobs:
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v3
         # always run even if the previous steps fails
-        if: always() && steps.download-test-run-artifacts.outcome == 'success'
+        if: always() && github.event_name == 'push' && steps.download-test-run-artifacts.outcome == 'success'
         with:
           check_name: Overall Test Results(${{ inputs.distro-slug }})
           report_paths: 'artifacts/xml-unittests-output/*.xml'

.gitignore

@@ -127,3 +127,18 @@ Session.vim
 
 # Nox requirements archives
 nox.*.tar.bzip2
+
+# Debian packages
+/debian
+/pkg/debian/.debhelper
+/pkg/debian/*substvars
+/pkg/debian/*.debhelper*
+/pkg/debian/files
+/pkg/debian/salt-api
+/pkg/debian/salt-common
+/pkg/debian/salt-cloud
+/pkg/debian/salt-master
+/pkg/debian/salt-minion
+/pkg/debian/salt-ssh
+/pkg/debian/salt-syndic
+/pkg/debian/debhelper-build-stamp

changelog/52167.fixed

@@ -0,0 +1 @@
+Fixed x509.certificate_managed creates new certificate every run in the new cryptography x509 module. Please migrate to the new cryptography x509 module for this improvement.

changelog/57535.fixed

@@ -0,0 +1 @@
+Fixed x509.read_certificate error when reading a Microsoft CA issued certificate in the new cryptography x509 module. Please migrate to the new cryptography x509 module for this improvement.

changelog/58165.fixed

@@ -0,0 +1 @@
+Fixed warning about replace=True with x509.certificate_managed in the new cryptography x509 module.

changelog/59169.fixed

@@ -0,0 +1 @@
+Fixed x509.certificate_managed has DoS effect on master in the new cryptography x509 module. Please migrate to the new cryptography x509 module for this improvement.

changelog/59315.fixed

@@ -0,0 +1 @@
+Fixed x509.certificate_managed rolls certificates every now and then in the new cryptography x509 module. Please migrate to the new cryptography x509 module for this improvement.

changelog/61420.added

@@ -0,0 +1 @@
+Added a filter function to ps module to get a list of processes on a minion according to their state.

changelog/63103.fixed

@@ -0,0 +1 @@
+Fixed x509.create_csr creates invalid CSR by default in the new cryptography x509 module.

changelog/63248.added

@@ -0,0 +1 @@
+Added management of ECDSA/EdDSA private keys with x509 modules in the new cryptography x509 module. Please migrate to the new cryptography x509 module for this improvement.

changelog/63249.added

@@ -0,0 +1 @@
+Added x509 modules support for different output formats in the new cryptography x509 module. Please migrate to the new cryptography x509 module for this improvement.

changelog/63350.fixed

@@ -0,0 +1 @@
+Import StrictVersion and LooseVersion from setuptools.distutils.verison or setuptools._distutils.version, if first not available

doc/ref/modules/all/index.rst

@@ -542,6 +542,7 @@ execution modules
     winrepo
     wordpress
     x509
+    x509_v2
     xapi_virt
     xbpspkg
     xfs

doc/ref/modules/all/salt.modules.x509_v2.rst

@@ -0,0 +1,5 @@
+salt.modules.x509_v2
+====================
+
+.. automodule:: salt.modules.x509_v2
+    :members:

doc/ref/states/all/index.rst

@@ -347,6 +347,7 @@ state modules
     winrepo
     wordpress
     x509
+    x509_v2
     xml
     xmpp
     zabbix_action

doc/ref/states/all/salt.states.x509_v2.rst

@@ -0,0 +1,5 @@
+salt.states.x509_v2
+===================
+
+.. automodule:: salt.states.x509_v2
+    :members:

doc/topics/releases/3006.0.rst

@@ -31,13 +31,11 @@ for more information.
 All salt-api functionality disabled by default
 ----------------------------------------------
 
-All netapi clients, which provide the functionality to salt-api, will now
-be disabled by default. If you use the salt-api you must add the new
-`netapi_enable_clients` option to your salt master config. This is
-a breaking change and the salt-api will not function without this
-new configuration option.
-See `Netapi module <https://docs.saltproject.io/en/latest/topics/netapi/index.html#introduction-to-netapi-modules>`
-for more information.
+All netapi clients, which provide the functionality to ``salt-api``, will now
+be disabled by default as a security precaution. If you use ``salt-api``, you 
+must add the new ``netapi_enable_clients`` option to your salt master config. 
+This is a breaking change and the ``salt-api`` will not function without this 
+new configuration option. See :ref:`netapi-introduction` for more information.
 
 
 How do I migrate to the onedir packages?

pkg/README

@@ -0,0 +1,11 @@
+Salt packaging resources.
+
+
+The contents of this directory are as follows
+
+common/ - Files common to multiple packages.
+debian/ - Debian (apt) based distro packaging.
+rpm/ - Redhat (rpm) based distro packaging.
+macos/ - MacOS packaging.
+windows/ - Windows packaging.
+old/ - Old and deperecated package files.

pkg/arch/salt-master.service

@@ -1 +0,0 @@
-../salt-master.service

pkg/arch/salt-minion.service

@@ -1 +0,0 @@
-../salt-minion.service

pkg/arch/salt-syndic.service

@@ -1 +0,0 @@
-../salt-syndic.service

pkg/debian/changelog

@@ -0,0 +1,5 @@
+salt (3006.0) stable; urgency=medium
+
+  * Build of Salt with Relenv
+
+ -- SaltStack Packaging Team <packaging@saltstack.com>  Mon, 03 Jul 2017 20:44:29 +0000

pkg/debian/compat

@@ -0,0 +1 @@
+10

pkg/debian/control

@@ -0,0 +1,167 @@
+Source: salt
+Section: admin
+Priority: optional
+Maintainer: Debian Salt Team <pkg-salt-team@lists.alioth.debian.org>
+Uploaders: Joe Healy <joehealy@gmail.com>,
+           Franklin G Mendoza <franklin.g.mendoza@gmail.com>,
+           Andriy Senkovych <jolly_roger@itblog.org.ua>,
+           David Murphy <dmurphy@saltstack.com>
+Build-Depends: bash-completion,
+               debhelper (>= 10)
+Standards-Version: 4.1.3
+Homepage: http://saltproject.io/
+Vcs-Browser: https://github.com/saltstack/salt.git
+Vcs-Git: git://github.com/saltstack/salt.git
+
+
+Package: salt-common
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: ifupdown
+Recommends: lsb-release
+Description: shared libraries that salt requires for all packages
+ salt is a powerful remote execution manager that can be used to
+ administer servers in a fast and efficient way.
+ .
+ It allows commands to be executed across large groups of
+ servers. This means systems can be easily managed, but data can
+ also be easily gathered.  Quick introspection into running
+ systems becomes a reality.
+ .
+ Remote execution is usually used to set up a certain state on a
+ remote system. Salt addresses this problem as well, the salt
+ state system uses salt state files to define the state a server
+ needs to be in.
+ .
+ Between the remote execution system, and state management Salt
+ addresses the backbone of cloud and data center management.
+ .
+ This particular package provides shared libraries that
+ salt-master, salt-minion, and salt-syndic require to function.
+
+
+Package: salt-master
+Architecture: all
+Depends: salt-common (= ${source:Version}),
+         ${misc:Depends}
+Description: remote manager to administer servers via salt
+ salt is a powerful remote execution manager that can be used to
+ administer servers in a fast and efficient way.
+ .
+ It allows commands to be executed across large groups of
+ servers. This means systems can be easily managed, but data can
+ also be easily gathered.  Quick introspection into running
+ systems becomes a reality.
+ .
+ Remote execution is usually used to set up a certain state on a
+ remote system. Salt addresses this problem as well, the salt
+ state system uses salt state files to define the state a server
+ needs to be in.
+ .
+ Between the remote execution system, and state management Salt
+ addresses the backbone of cloud and data center management.
+ .
+ This particular package provides the salt controller.
+
+
+Package: salt-minion
+Architecture: all
+Depends: bsdmainutils,
+         dctrl-tools,
+         salt-common (= ${source:Version}),
+         ${misc:Depends}
+Recommends: debconf-utils, dmidecode, net-tools
+Description: client package for salt, the distributed remote execution system
+ salt is a powerful remote execution manager that can be used to
+ administer servers in a fast and efficient way.
+ .
+ It allows commands to be executed across large groups of
+ servers. This means systems can be easily managed, but data can
+ also be easily gathered.  Quick introspection into running
+ systems becomes a reality.
+ .
+ Remote execution is usually used to set up a certain state on a
+ remote system. Salt addresses this problem as well, the salt
+ state system uses salt state files to define the state a server
+ needs to be in.
+ .
+ Between the remote execution system, and state management Salt
+ addresses the backbone of cloud and data center management.
+ .
+ This particular package provides the worker / agent for salt.
+
+
+Package: salt-syndic
+Architecture: all
+Depends: salt-master (= ${source:Version}),
+         ${misc:Depends}
+Description: master-of-masters for salt, the distributed remote execution system
+ salt is a powerful remote execution manager that can be used to
+ administer servers in a fast and efficient way.
+ .
+ It allows commands to be executed across large groups of
+ servers. This means systems can be easily managed, but data can
+ also be easily gathered.  Quick introspection into running
+ systems becomes a reality.
+ .
+ Remote execution is usually used to set up a certain state on a
+ remote system. Salt addresses this problem as well, the salt
+ state system uses salt state files to define the state a server
+ needs to be in.
+ .
+ Between the remote execution system, and state management Salt
+ addresses the backbone of cloud and data center management.
+ .
+ This particular package provides the master of masters for salt
+ - it enables the management of multiple masters at a time.
+
+
+Package: salt-ssh
+Architecture: all
+Depends: salt-common (= ${source:Version}),
+         openssh-client,
+         ${misc:Depends}
+Description: remote manager to administer servers via Salt SSH
+ salt is a powerful remote execution manager that can be used to
+ administer servers in a fast and efficient way.
+ .
+ It allows commands to be executed across large groups of
+ servers. This means systems can be easily managed, but data can
+ also be easily gathered.  Quick introspection into running
+ systems becomes a reality.
+ .
+ Remote execution is usually used to set up a certain state on a
+ remote system. Salt addresses this problem as well, the salt
+ state system uses salt state files to define the state a server
+ needs to be in.
+ .
+ Between the remote execution system, and state management Salt
+ addresses the backbone of cloud and data center management.
+ .
+ This particular package provides the salt ssh controller. It
+ is able to run salt modules and states on remote hosts via ssh.
+ No minion or other salt specific software needs to be installed
+ on the remote host.
+
+
+Package: salt-cloud
+Architecture: all
+Depends: salt-common (= ${source:Version}),
+         ${misc:Depends}
+Description: public cloud VM management system
+ provision virtual machines on various public clouds via a cleanly
+ controlled profile and mapping system.
+
+
+Package: salt-api
+Architecture: all
+Depends: salt-master,
+         ${misc:Depends}
+Description: Generic, modular network access system
+ a modular interface on top of Salt that can provide a variety of entry points
+ into a running Salt system. It can start and manage multiple interfaces
+ allowing a REST API to coexist with XMLRPC or even a Websocket API.
+ .
+ The Salt API system is used to expose the fundamental aspects of Salt control
+ to external sources. salt-api acts as the bridge between Salt itself and
+ REST, Websockets, etc.

pkg/debian/copyright

@@ -0,0 +1,485 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: salt
+Upstream-Contact: salt-users@googlegroups.com
+Source: https://github.com/saltstack/salt
+  The relationship between source and minified js libraries is not clear in
+  the upstream sources. The debian/repack script repacks the archive to make
+  this clear.
+
+Files: *
+Copyright: 2013 SaltStack Team
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2013 Joe Healy <joehealy@gmail.com>
+           2012 Michael Prokop <mika@debian.org>
+           2012 Christian Hofstaedtler <christian@hofstaedtler.name>
+           2012 Ulrich Dangel <mru@spamt.net>
+           2012 Corey Quinn <corey@sequestered.net>
+           2011 Aaron Toponce <aaron.toponce@gmail.com>
+License: Apache-2.0
+
+Files: debian/repack
+Copyright: 2013-2014 Ben Finney <ben+debian@benfinney.id.au>
+License: MIT-License
+
+Files: salt/auth/pam.py
+Copyright: 2007 Chris AtLee <chris@atlee.ca>
+License: MIT-License
+
+Files: salt/utils/ipaddr.py
+Copyright: 2007 Google Inc.
+License: Apache-2.0
+
+Files: salt/cloud/clouds/gce.py
+Copyright: 2013 Google Inc. All Rights Reserved
+License: Apache-2.0
+
+Files: doc/_ext/youtube.py
+Copyright: 2009 Chris Pickel <sfiera@gmail.com>
+License: BSD-2-clause
+
+Files: doc/_static/book_open.png
+       doc/_static/film_link.png
+       doc/_static/page_white_acrobat.png
+Copyright: Mark James of <http://famfamfam.com/>
+License: CC-BY-3.0
+
+Files: doc/_themes/saltstack/static/img/glyphicons-halflings-white.png
+       doc/_themes/saltstack/static/img/glyphicons-halflings.png
+Copyright: 2010-2012 Jan Kovarik <glyphicons@gmail.com>
+License: CC-BY-3.0
+
+Files: doc/_themes/saltstack/static/js/vendor/jquery-1.9.1.js
+Copyright: 2005-2012 jQuery Foundation, Inc and other contributors
+License: MIT-License
+
+
+
+Files: doc/_themes/saltstack/static/js/vendor/modernizr.custom.20463.js
+       doc/_themes/saltstack/static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
+Copyright: © 2009-2012, Faruk Ates
+	   © 2009-2012, Paul Irish
+	   © 2009-2012, Alex Sexton
+	   Ralph Holzmann, ralphholzmann[at]gmail.com
+License: MIT-License and BSD-2-clause, and WTFPL or MIT-License or BSD-2-clause
+Comment: Files include yepnope1.5.4 which is authored by Alex Sexton
+	 and Ralph Holzmann.
+
+
+Files: doc/_themes/saltstack/static/css/bootstrap.css
+       doc/_themes/saltstack/static/css/bootstrap.min.css
+       doc/_themes/saltstack/static/css/bootstrap-responsive.css
+       doc/_themes/saltstack/static/css/bootstrap-responsive.min.css
+Copyright: 2011-2012 Twitter, Inc.
+License: Apache-2.0
+
+
+Files: pkg/ebuild/salt-0.7.0.ebuild
+       pkg/ebuild/salt-0.8.7.ebuild
+Copyright: 1999-2011 Gentoo Foundation
+License: GPL-2
+
+Files: pkg/suse/salt.spec
+Copyright: 2013 SUSE LINUX Products GmbH, Nuernberg, Germany
+License: Apache-2.0
+
+
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+     http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the full text of the Apache License, Version 2.0 can be
+ found in the file
+ `/usr/share/common-licenses/Apache-2.0'.
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+License: CC-BY-3.0
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
+ CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
+ PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK
+ OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
+ PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
+ AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS
+ LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE
+ RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS
+ AND CONDITIONS.
+ .
+ 1. Definitions
+ .
+   1. "Adaptation" means a work based upon the Work, or upon the Work
+      and other pre-existing works, such as a translation, adaptation,
+      derivative work, arrangement of music or other alterations of a
+      literary or artistic work, or phonogram or performance and
+      includes cinematographic adaptations or any other form in which
+      the Work may be recast, transformed, or adapted including in any
+      form recognizably derived from the original, except that a work
+      that constitutes a Collection will not be considered an Adaptation
+      for the purpose of this License. For the avoidance of doubt, where
+      the Work is a musical work, performance or phonogram, the
+      synchronization of the Work in timed-relation with a moving image
+      ("synching") will be considered an Adaptation for the purpose of
+      this License.
+   2. "Collection" means a collection of literary or artistic works,
+      such as encyclopedias and anthologies, or performances, phonograms
+      or broadcasts, or other works or subject matter other than works
+      listed in Section 1(f) below, which, by reason of the selection
+      and arrangement of their contents, constitute intellectual
+      creations, in which the Work is included in its entirety in
+      unmodified form along with one or more other contributions, each
+      constituting separate and independent works in themselves, which
+      together are assembled into a collective whole. A work that
+      constitutes a Collection will not be considered an Adaptation (as
+      defined above) for the purposes of this License.
+   3. "Distribute" means to make available to the public the original
+      and copies of the Work or Adaptation, as appropriate, through sale
+      or other transfer of ownership.
+   4. "Licensor" means the individual, individuals, entity or entities
+      that offer(s) the Work under the terms of this License.
+   5. "Original Author" means, in the case of a literary or artistic
+      work, the individual, individuals, entity or entities who created
+      the Work or if no individual or entity can be identified, the
+      publisher; and in addition (i) in the case of a performance the
+      actors, singers, musicians, dancers, and other persons who act,
+      sing, deliver, declaim, play in, interpret or otherwise perform
+      literary or artistic works or expressions of folklore; (ii) in the
+      case of a phonogram the producer being the person or legal entity
+      who first fixes the sounds of a performance or other sounds; and,
+      (iii) in the case of broadcasts, the organization that transmits
+      the broadcast.
+   6. "Work" means the literary and/or artistic work offered under the
+      terms of this License including without limitation any production
+      in the literary, scientific and artistic domain, whatever may be
+      the mode or form of its expression including digital form, such as
+      a book, pamphlet and other writing; a lecture, address, sermon or
+      other work of the same nature; a dramatic or dramatico-musical
+      work; a choreographic work or entertainment in dumb show; a
+      musical composition with or without words; a cinematographic work
+      to which are assimilated works expressed by a process analogous to
+      cinematography; a work of drawing, painting, architecture,
+      sculpture, engraving or lithography; a photographic work to which
+      are assimilated works expressed by a process analogous to
+      photography; a work of applied art; an illustration, map, plan,
+      sketch or three-dimensional work relative to geography,
+      topography, architecture or science; a performance; a broadcast; a
+      phonogram; a compilation of data to the extent it is protected as
+      a copyrightable work; or a work performed by a variety or circus
+      performer to the extent it is not otherwise considered a literary
+      or artistic work.
+   7. "You" means an individual or entity exercising rights under this
+      License who has not previously violated the terms of this License
+      with respect to the Work, or who has received express permission
+      from the Licensor to exercise rights under this License despite a
+      previous violation.
+   8. "Publicly Perform" means to perform public recitations of the Work
+      and to communicate to the public those public recitations, by any
+      means or process, including by wire or wireless means or public
+      digital performances; to make available to the public Works in
+      such a way that members of the public may access these Works from
+      a place and at a place individually chosen by them; to perform the
+      Work to the public by any means or process and the communication
+      to the public of the performances of the Work, including by public
+      digital performance; to broadcast and rebroadcast the Work by any
+      means including signs, sounds or images.
+   9. "Reproduce" means to make copies of the Work by any means
+      including without limitation by sound or visual recordings and the
+      right of fixation and reproducing fixations of the Work, including
+      storage of a protected performance or phonogram in digital form or
+      other electronic medium.
+ .
+ 2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+    limit, or restrict any uses free from copyright or rights arising
+    from limitations or exceptions that are provided for in connection
+    with the copyright protection under copyright law or other
+    applicable laws.
+ .
+ 3. License Grant. Subject to the terms and conditions of this License,
+    Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+    perpetual (for the duration of the applicable copyright) license to
+    exercise the rights in the Work as stated below:
+ .
+   1. to Reproduce the Work, to incorporate the Work into one or more
+      Collections, and to Reproduce the Work as incorporated in the
+      Collections;
+   2. to create and Reproduce Adaptations provided that any such
+      Adaptation, including any translation in any medium, takes
+      reasonable steps to clearly label, demarcate or otherwise identify
+      that changes were made to the original Work. For example, a
+      translation could be marked "The original work was translated from
+      English to Spanish," or a modification could indicate "The
+      original work has been modified.";
+   3. to Distribute and Publicly Perform the Work including as
+      incorporated in Collections; and,
+   4. to Distribute and Publicly Perform Adaptations.
+   5.
+ .
+      For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those
+            jurisdictions in which the right to collect royalties
+            through any statutory or compulsory licensing scheme cannot
+            be waived, the Licensor reserves the exclusive right to
+            collect such royalties for any exercise by You of the rights
+            granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions
+            in which the right to collect royalties through any
+            statutory or compulsory licensing scheme can be waived, the
+            Licensor waives the exclusive right to collect such
+            royalties for any exercise by You of the rights granted
+            under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to
+            collect royalties, whether individually or, in the event
+            that the Licensor is a member of a collecting society that
+            administers voluntary licensing schemes, via that society,
+            from any exercise by You of the rights granted under this
+            License.
+ .
+ The above rights may be exercised in all media and formats whether now
+ known or hereafter devised. The above rights include the right to make
+ such modifications as are technically necessary to exercise the rights
+ in other media and formats. Subject to Section 8(f), all rights not
+ expressly granted by Licensor are hereby reserved.
+ .
+ 4. Restrictions. The license granted in Section 3 above is expressly
+    made subject to and limited by the following restrictions:
+ .
+   1. You may Distribute or Publicly Perform the Work only under the
+      terms of this License. You must include a copy of, or the Uniform
+      Resource Identifier (URI) for, this License with every copy of the
+      Work You Distribute or Publicly Perform. You may not offer or
+      impose any terms on the Work that restrict the terms of this
+      License or the ability of the recipient of the Work to exercise
+      the rights granted to that recipient under the terms of the
+      License. You may not sublicense the Work. You must keep intact all
+      notices that refer to this License and to the disclaimer of
+      warranties with every copy of the Work You Distribute or Publicly
+      Perform. When You Distribute or Publicly Perform the Work, You may
+      not impose any effective technological measures on the Work that
+      restrict the ability of a recipient of the Work from You to
+      exercise the rights granted to that recipient under the terms of
+      the License. This Section 4(a) applies to the Work as incorporated
+      in a Collection, but this does not require the Collection apart
+      from the Work itself to be made subject to the terms of this
+      License. If You create a Collection, upon notice from any Licensor
+      You must, to the extent practicable, remove from the Collection
+      any credit as required by Section 4(b), as requested. If You
+      create an Adaptation, upon notice from any Licensor You must, to
+      the extent practicable, remove from the Adaptation any credit as
+      required by Section 4(b), as requested.
+   2. If You Distribute, or Publicly Perform the Work or any Adaptations
+      or Collections, You must, unless a request has been made pursuant
+      to Section 4(a), keep intact all copyright notices for the Work
+      and provide, reasonable to the medium or means You are utilizing:
+      (i) the name of the Original Author (or pseudonym, if applicable)
+      if supplied, and/or if the Original Author and/or Licensor
+      designate another party or parties (e.g., a sponsor institute,
+      publishing entity, journal) for attribution ("Attribution
+      Parties") in Licensor's copyright notice, terms of service or by
+      other reasonable means, the name of such party or parties; (ii)
+      the title of the Work if supplied; (iii) to the extent reasonably
+      practicable, the URI, if any, that Licensor specifies to be
+      associated with the Work, unless such URI does not refer to the
+      copyright notice or licensing information for the Work; and (iv) ,
+      consistent with Section 3(b), in the case of an Adaptation, a
+      credit identifying the use of the Work in the Adaptation (e.g.,
+      "French translation of the Work by Original Author," or
+      "Screenplay based on original Work by Original Author"). The
+      credit required by this Section 4 (b) may be implemented in any
+      reasonable manner; provided, however, that in the case of a
+      Adaptation or Collection, at a minimum such credit will appear,
+      if a credit for all contributing authors of the Adaptation or
+      Collection appears, then as part of these credits and in a manner
+      at least as prominent as the credits for the other contributing
+      authors. For the avoidance of doubt, You may only use the credit
+      required by this Section for the purpose of attribution in the
+      manner set out above and, by exercising Your rights under this
+      License, You may not implicitly or explicitly assert or imply any
+      connection with, sponsorship or endorsement by the Original
+      Author, Licensor and/or Attribution Parties, as appropriate, of
+      You or Your use of the Work, without the separate, express prior
+      written permission of the Original Author, Licensor and/or
+      Attribution Parties.
+   3. Except as otherwise agreed in writing by the Licensor or as may be
+      otherwise permitted by applicable law, if You Reproduce,
+      Distribute or Publicly Perform the Work either by itself or as
+      part of any Adaptations or Collections, You must not distort,
+      mutilate, modify or take other derogatory action in relation to
+      the Work which would be prejudicial to the Original Author's honor
+      or reputation. Licensor agrees that in those jurisdictions (e.g.
+      Japan), in which any exercise of the right granted in Section 3(b)
+      of this License (the right to make Adaptations) would be deemed to
+      be a distortion, mutilation, modification or other derogatory
+      action prejudicial to the Original Author's honor and reputation,
+      the Licensor will waive or not assert, as appropriate, this
+      Section, to the fullest extent permitted by the applicable
+      national law, to enable You to reasonably exercise Your right
+      under Section 3(b) of this License (right to make Adaptations) but
+      not otherwise.
+ .
+ 5. Representations, Warranties and Disclaimer
+ .
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+ OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+ KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+ LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
+ ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW
+ THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO
+ YOU.
+ .
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+    LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY
+    FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY
+    DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF
+    LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. Termination
+ .
+   1. This License and the rights granted hereunder will terminate
+      automatically upon any breach by You of the terms of this License.
+      Individuals or entities who have received Adaptations or
+      Collections from You under this License, however, will not have
+      their licenses terminated provided such individuals or entities
+      remain in full compliance with those licenses. Sections 1, 2, 5,
+      6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted
+      here is perpetual (for the duration of the applicable copyright in
+      the Work). Notwithstanding the above, Licensor reserves the right
+      to release the Work under different license terms or to stop
+      distributing the Work at any time; provided, however that any such
+      election will not serve to withdraw this License (or any other
+      license that has been, or is required to be, granted under the
+      terms of this License), and this License will continue in full
+      force and effect unless terminated as stated above.
+ .
+ 8. Miscellaneous
+ .
+   1. Each time You Distribute or Publicly Perform the Work or a
+      Collection, the Licensor offers to the recipient a license to the
+      Work on the same terms and conditions as the license granted to
+      You under this License.
+   2. Each time You Distribute or Publicly Perform an Adaptation,
+      Licensor offers to the recipient a license to the original Work on
+      the same terms and conditions as the license granted to You under
+      this License.
+   3. If any provision of this License is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability
+      of the remainder of the terms of this License, and without further
+      action by the parties to this agreement, such provision shall be
+      reformed to the minimum extent necessary to make such provision
+      valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no
+      breach consented to unless such waiver or consent shall be in
+      writing and signed by the party to be charged with such waiver or
+      consent.
+   5. This License constitutes the entire agreement between the parties
+      with respect to the Work licensed here. There are no
+      understandings, agreements or representations with respect to the
+      Work not specified here. Licensor shall not be bound by any
+      additional provisions that may appear in any communication from
+      You. This License may not be modified without the mutual written
+      agreement of the Licensor and You.
+   6. The rights granted under, and the subject matter referenced, in
+      this License were drafted utilizing the terminology of the Berne
+      Convention for the Protection of Literary and Artistic Works (as
+      amended on September 28, 1979), the Rome Convention of 1961, the
+      WIPO Copyright Treaty of 1996, the WIPO Performances and
+      Phonograms Treaty of 1996 and the Universal Copyright Convention
+      (as revised on July 24, 1971). These rights and subject matter
+      take effect in the relevant jurisdiction in which the License
+      terms are sought to be enforced according to the corresponding
+      provisions of the implementation of those treaty provisions in the
+      applicable national law. If the standard suite of rights granted
+      under applicable copyright law includes additional rights not
+      granted under this License, such additional rights are deemed to
+      be included in the License; this License is not intended to
+      restrict the license of any rights under applicable law.
+
+License: GPL-2
+  This package is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+  .
+  This package is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  .
+  You should have received a copy of the GNU General Public License
+  along with this package; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+  .
+  On Debian systems, the complete text of the GNU General
+  Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: MIT-License
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  .
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+
+License: WTFPL
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+ .
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+ .
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+ .
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ .
+  0. You just DO WHAT THE FUCK YOU WANT TO.

pkg/debian/rules

@@ -0,0 +1,32 @@
+#!/usr/bin/make -f
+DH_VERBOSE = 1
+
+%:
+	dh $@
+
+# dh_auto_clean tries to invoke distutils causing failures.
+override_dh_auto_clean:
+	rm -rf build
+	rm -rf debian/salt-common
+	rm -rf debian/salt-minion
+	rm -rf debian/salt-master
+	rm -rf debian/salt-syndic
+	rm -rf debian/salt-ssh
+
+override_dh_auto_build:
+	mkdir build
+	python3 -m virtualenv --python=python3 build/venv
+	build/venv/bin/pip3 install relenv
+	build/venv/bin/relenv fetch
+	build/venv/bin/relenv toolchain fetch
+	build/venv/bin/relenv create build/salt
+	RELENV_PIP_DIR=yes build/salt/bin/pip3 install /salt
+
+# dh_auto_install tries to invoke distutils causing failures.
+override_dh_auto_install:
+
+
+override_dh_install:
+	mkdir -p debian/salt-common/usr/opt/saltstack
+	cp -R build/salt debian/salt-common/usr/opt/saltstack/
+	dh_install

pkg/debian/salt-api.install

@@ -0,0 +1,2 @@
+pkg/common/salt-api.service /lib/systemd/system
+

pkg/debian/salt-api.links

@@ -0,0 +1 @@
+usr/opt/saltstack/salt/salt-api /usr/bin/salt-api

pkg/debian/salt-api.manpages

@@ -0,0 +1 @@
+doc/man/salt-api.1

pkg/debian/salt-cloud.dirs

@@ -0,0 +1,5 @@
+/etc/salt/cloud.conf.d/
+/etc/salt/cloud.deploy.d/
+/etc/salt/cloud.maps.d/
+/etc/salt/cloud.profiles.d/
+/etc/salt/cloud.providers.d/

pkg/debian/salt-cloud.links

@@ -0,0 +1 @@
+usr/opt/saltstack/salt/salt-cloud /usr/bin/salt-cloud

pkg/debian/salt-cloud.manpages

@@ -0,0 +1 @@
+doc/man/salt-cloud.1

pkg/debian/salt-common.dirs

@@ -0,0 +1,4 @@
+/var/cache/salt
+/var/log/salt
+/usr/share/fish/vendor_completions.d
+/opt/saltstack/salt/pypath

pkg/debian/salt-common.install

@@ -0,0 +1,9 @@
+pkg/common/salt-proxy@.service /lib/systemd/system
+conf/roster /etc/salt
+conf/cloud /etc/salt
+conf/proxy /etc/salt
+pkg/common/fish-completions/salt-cp.fish /usr/share/fish/vendor_completions.d
+pkg/common/fish-completions/salt-call.fish /usr/share/fish/vendor_completions.d
+pkg/common/fish-completions/salt-syndic.fish /usr/share/fish/vendor_completions.d
+pkg/common/fish-completions/salt_common.fish /usr/share/fish/vendor_completions.d
+pkg/common/salt.bash /usr/share/bash-completions/completions/salt-common.bash

pkg/debian/salt-common.links

@@ -0,0 +1,2 @@
+usr/opt/saltstack/salt/spm /usr/bin/spm
+usr/opt/saltstack/salt/salt-pip /usr/bin/salt-pip

pkg/debian/salt-common.manpages

@@ -0,0 +1,2 @@
+doc/man/salt-call.1
+doc/man/salt.7

pkg/debian/salt-master.dirs

@@ -0,0 +1 @@
+/etc/salt/master.d

pkg/debian/salt-master.install

@@ -0,0 +1,6 @@
+conf/master /etc/salt
+pkg/common/salt-master.service /lib/systemd/system
+pkg/common/fish-completions/salt-master.fish /usr/share/fish/vendor_completions.d
+pkg/common/fish-completions/salt-key.fish /usr/share/fish/vendor_completions.d
+pkg/common/fish-completions/salt.fish /usr/share/fish/vendor_completions.d
+pkg/common/fish-completions/salt-run.fish /usr/share/fish/vendor_completions.d

pkg/debian/salt-master.links

@@ -0,0 +1,5 @@
+usr/opt/saltstack/salt/salt-master /usr/bin/salt-master
+usr/opt/saltstack/salt/salt usr/bin/salt
+usr/opt/saltstack/salt/salt-cp usr/bin/salt-cp
+usr/opt/saltstack/salt/salt-key usr/bin/salt-key
+usr/opt/saltstack/salt/salt-run usr/bin/salt-run

pkg/debian/salt-master.manpages

@@ -0,0 +1,5 @@
+doc/man/salt.1
+doc/man/salt-cp.1
+doc/man/salt-key.1
+doc/man/salt-master.1
+doc/man/salt-run.1

pkg/debian/salt-minion.dirs

@@ -0,0 +1,2 @@
+/etc/salt/minion.d/
+/etc/salt/proxy.d/

pkg/debian/salt-minion.install

@@ -0,0 +1,3 @@
+conf/minion /etc/salt
+pkg/common/salt-minion.service /lib/systemd/system
+pkg/common/fish-completions/salt-minion.fish /usr/share/fish/vendor_completions.d

pkg/debian/salt-minion.links

@@ -0,0 +1,3 @@
+usr/opt/saltstack/salt/salt-minion /usr/bin/salt-minion
+usr/opt/saltstack/salt/salt-proxy /usr/bin/salt-proxy
+usr/opt/saltstack/salt/salt-call /usr/bin/salt-call

pkg/debian/salt-minion.manpages

@@ -0,0 +1,2 @@
+doc/man/salt-minion.1
+doc/man/salt-proxy.1

pkg/debian/salt-ssh.links

@@ -0,0 +1 @@
+usr/opt/saltstack/salt/salt-ssh /usr/bin/salt-ssh

pkg/debian/salt-ssh.manpages

@@ -0,0 +1 @@
+doc/man/salt-ssh.1

pkg/debian/salt-syndic.install

@@ -0,0 +1 @@
+pkg/common/salt-syndic.service /lib/systemd/system

pkg/debian/salt-syndic.links

@@ -0,0 +1 @@
+usr/opt/saltstack/salt/salt-syndic /usr/bin/salt-syndic

pkg/debian/salt-syndic.manpages

@@ -0,0 +1 @@
+doc/man/salt-syndic.1

pkg/debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

pkg/macos/build.sh

@@ -48,11 +48,18 @@
 #         Builds python using the relenv project:
 #         https://github.com/saltstack/relative-environment-for-python
 #
+#     install_salt.sh
+#         Installs Salt into the python environment
+#
 #     sign_binaries.sh
 #         Signs all the binaries with the Developer App certificate specified in
 #         the DEV_APP_CERT environment variable. It signs all binaries in the
 #         ./build directory. It also signs all .dylib and .so files.
 #
+#     prep_salt.sh
+#         Prepare the build environment for packaging. Stages config files and
+#         service definitions. Removes files we don't want in the package.
+#
 #     package.sh
 #         Builds a package file from the contents of ./build and signs it with
 #         the Developer Installer certificate specified in the DEV_INSTALL_CERT
@@ -194,6 +201,11 @@ printf "v%.0s" {1..80}; printf "\n"
 #-------------------------------------------------------------------------------
 "$SCRIPT_DIR/sign_binaries.sh"
 
+#-------------------------------------------------------------------------------
+# Prepare the Salt environment for packaging
+#-------------------------------------------------------------------------------
+"$SCRIPT_DIR/prep_salt.sh"
+
 #-------------------------------------------------------------------------------
 # Build and Sign Package
 #-------------------------------------------------------------------------------

pkg/macos/build_python.sh

@@ -48,6 +48,7 @@ SYS_PY_BIN="$(which python3)"
 BUILD_DIR="$SCRIPT_DIR/build"
 BLD_PY_BIN="$BUILD_DIR/opt/salt/bin/python3"
 RELENV_DIR="$HOME/.local/relenv"
+BUILD=0
 
 #-------------------------------------------------------------------------------
 # Functions
@@ -63,6 +64,7 @@ _usage() {
      echo "             [-h|--help] [-v|--version]"
      echo ""
      echo "  -h, --help      this message"
+     echo "  -b, --build     build python instead of fetching"
      echo "  -v, --version   version of python to install"
      echo "                  python version must be one of:"
      for i in "${PY_VERSIONS[@]}"; do
@@ -110,6 +112,10 @@ while true; do
             PY_VERSION="$*"
             shift
             ;;
+        -b | --build )
+            BUILD=1
+            shift
+            ;;
         -*)
             echo "Invalid Option: $1"
             echo ""
@@ -134,7 +140,11 @@ fi
 # Script Start
 #-------------------------------------------------------------------------------
 printf "=%.0s" {1..80}; printf "\n"
-echo "Build Python with Relenv"
+if [ $BUILD -gt 0 ]; then
+    echo "Build Python with Relenv"
+else
+    echo "Fetch Python with Relenv"
+fi
 echo "- Python Version: $PY_VERSION"
 printf -- "-%.0s" {1..80}; printf "\n"
 
@@ -214,16 +224,19 @@ fi
 #-------------------------------------------------------------------------------
 # Building Python with Relenv
 #-------------------------------------------------------------------------------
-#echo "- Building python (relenv):"
-#relenv build --clean
-# We want to suppress the output here so it looks nice
-# To see the output, remove the output redirection
-_msg "Fetching python (relenv)"
-relenv fetch >/dev/null 2>&1
-if [ -f "$RELENV_DIR/build/x86_64-macos.tar.xz" ]; then
-    _success
+if [ $BUILD -gt 0 ]; then
+    echo "- Building python (relenv):"
+    relenv build --clean
 else
-    _failure
+    # We want to suppress the output here so it looks nice
+    # To see the output, remove the output redirection
+    _msg "Fetching python (relenv)"
+    relenv fetch >/dev/null 2>&1
+    if [ -f "$RELENV_DIR/build/x86_64-macos.tar.xz" ]; then
+        _success
+    else
+        _failure
+    fi
 fi
 
 _msg "Extracting python environment"

pkg/macos/install_salt.sh

@@ -90,6 +90,7 @@ done
 #-------------------------------------------------------------------------------
 printf "=%.0s" {1..80}; printf "\n"
 echo "Install Salt into Build Environment"
+echo "Python Version: $PYTHON_DOT_VER"
 printf -- "-%.0s" {1..80}; printf "\n"
 
 #-------------------------------------------------------------------------------
@@ -125,15 +126,6 @@ fi
 #-------------------------------------------------------------------------------
 # Install Requirements into the Python Environment
 #-------------------------------------------------------------------------------
-_msg "Installing wheel"
-$PIP_BIN install "wheel" > /dev/null 2>&1
-TEST_DIR="$SCRIPT_DIR/build/opt/salt/lib/python3.*/site-packages/wheel*"
-if compgen -G "$TEST_DIR" > /dev/null; then
-    _success
-else
-    _failure
-fi
-
 _msg "Installing Salt requirements"
 $PIP_BIN install -r "$REQ_FILE" > /dev/null 2>&1
 if [ -f "$BUILD_DIR/bin/distro" ]; then
@@ -154,6 +146,9 @@ else
     _failure
 fi
 
+#-------------------------------------------------------------------------------
+# Script Complete
+#-------------------------------------------------------------------------------
 printf -- "-%.0s" {1..80}; printf "\n"
 echo "Install Salt into Build Environment Completed"
 printf "=%.0s" {1..80}; printf "\n"

pkg/macos/package.sh

@@ -22,7 +22,7 @@
 #         The following will build Salt version 3006.1-1 and stage all files in
 #         the ./build directory relative to this script
 #
-#         ./build_pkg.sh 3006.1-1
+#         ./package.sh 3006.1-1
 #
 # Environment Setup:
 #
@@ -61,7 +61,6 @@ CPU_ARCH="$(uname -m)"
 SRC_DIR="$(git rev-parse --show-toplevel)"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 BUILD_DIR="$SCRIPT_DIR/build"
-CONF_DIR="$BUILD_DIR/etc/salt"
 PKG_RESOURCES=$SRC_DIR/pkg/osx
 CMD_OUTPUT=$(mktemp -t cmd.log)
 
@@ -76,12 +75,13 @@ _usage() {
      echo "Script to build the Salt package:"
      echo ""
      echo "usage: ${0}"
-     echo "             [-h|--help]"
+     echo "             [-h|--help] [-v|--version]"
      echo ""
      echo "  -h, --help      this message"
+     echo "  -v, --version   version of Salt display in the package"
      echo ""
      echo "  To build the Salt package:"
-     echo "      example: $0"
+     echo "      example: $0 3006.1-1"
 }
 
 # _msg
@@ -156,111 +156,6 @@ if [[ ! -e "$SRC_DIR/.git" ]] && [[ ! -e "$SRC_DIR/scripts/salt" ]]; then
     exit 1
 fi
 
-#-------------------------------------------------------------------------------
-# Copy salt-config from Salt Repo to /opt/salt
-#-------------------------------------------------------------------------------
-SALT_DIR="$BUILD_DIR/opt/salt"
-if ! [ -f "$SALT_DIR/salt-config.sh" ]; then
-    _msg "Staging Salt config script"
-    cp "$PKG_RESOURCES/scripts/salt-config.sh" "$SALT_DIR/"
-    if [ -f "$SALT_DIR/salt-config.sh" ]; then
-        _success
-    else
-        _failure
-    fi
-fi
-
-#-------------------------------------------------------------------------------
-# Copy Service Definitions from Salt Repo to the Package Directory
-#-------------------------------------------------------------------------------
-if ! [ -d "$BUILD_DIR/Library/LaunchDaemons" ]; then
-    _msg "Creating LaunchDaemons directory"
-    mkdir -p "$BUILD_DIR/Library/LaunchDaemons"
-    if [ -d "$BUILD_DIR/Library/LaunchDaemons" ]; then
-        _success
-    else
-        _failure
-    fi
-fi
-
-ITEMS=(
-    "minion"
-    "master"
-    "syndic"
-    "api"
-)
-for i in "${ITEMS[@]}"; do
-    FILE="$BUILD_DIR/Library/LaunchDaemons/com.saltstack.salt.$i.plist"
-    if ! [ -f "$FILE" ]; then
-        _msg "Copying $i service definition"
-        cp "$PKG_RESOURCES/scripts/com.saltstack.salt.$i.plist" "$FILE"
-        if [ -f "$FILE" ]; then
-            _success
-        else
-            _failure
-        fi
-    fi
-done
-
-#-------------------------------------------------------------------------------
-# Remove unnecessary files from the package
-#-------------------------------------------------------------------------------
-ITEMS=(
-    "pkgconfig"
-    "share"
-    "__pycache__"
-)
-
-for i in "${ITEMS[@]}"; do
-    if [[ -n $(find "$BUILD_DIR" -name "$i" -type d) ]]; then
-        _msg "Removing $i directories"
-        find "$BUILD_DIR" -name "$i" -type d -prune -exec rm -rf {} \;
-        if [[ -z $(find "$BUILD_DIR" -name "$i" -type d) ]]; then
-            _success
-        else
-            _failure
-        fi
-    fi
-done
-
-if [[ -n $(find "$BUILD_DIR" -name "*.pyc" -type f) ]]; then
-    _msg "Removing *.pyc files"
-    find "$BUILD_DIR" -name "*.pyc" -type f -delete
-    if [[ -z $(find "$BUILD_DIR" -name "*.pyc" -type f) ]]; then
-        _success
-    else
-        _failure
-    fi
-fi
-
-#-------------------------------------------------------------------------------
-# Copy Config Files from Salt Repo to the Package Directory
-#-------------------------------------------------------------------------------
-if ! [ -d "$CONF_DIR" ]; then
-    _msg "Creating config directory"
-    mkdir -p "$CONF_DIR"
-    if [ -d "$CONF_DIR" ]; then
-        _success
-    else
-        _failure
-    fi
-fi
-ITEMS=(
-  "minion"
-  "master"
-)
-for i in "${ITEMS[@]}"; do
-    if ! [ -f "$CONF_DIR/$i.dist" ]; then
-        _msg "Copying $i config"
-        cp "$SRC_DIR/conf/$i" "$CONF_DIR/$i.dist"
-        if [ -f "$CONF_DIR/$i.dist" ]; then
-            _success
-        else
-            _failure
-        fi
-    fi
-done
-
 #-------------------------------------------------------------------------------
 # Add Title, Description, Version and CPU Arch to distribution.xml
 #-------------------------------------------------------------------------------

pkg/macos/prep_salt.sh

@@ -0,0 +1,234 @@
+#!/bin/bash
+################################################################################
+#
+# Title: Prep the Salt environment for Packaging
+#
+# Description: This prepares the Salt environment for packaging by removing
+#              unneeded files, staging configs and plist files, etc.
+#
+# Requirements:
+#     - Xcode Command Line Tools (xcode-select --install)
+#       or
+#     - Xcode
+#
+# Usage:
+#     This script takes no parameters:
+#
+#     Example:
+#         The following will prepare the Salt environment for packaging:
+#
+#         ./prep_salt.sh
+#
+################################################################################
+#-------------------------------------------------------------------------------
+# Variables
+#-------------------------------------------------------------------------------
+SRC_DIR="$(git rev-parse --show-toplevel)"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+BUILD_DIR="$SCRIPT_DIR/build"
+CONF_DIR="$BUILD_DIR/etc/salt"
+PKG_RESOURCES=$SRC_DIR/pkg/osx
+CMD_OUTPUT=$(mktemp -t cmd.log)
+
+#-------------------------------------------------------------------------------
+# Functions
+#-------------------------------------------------------------------------------
+# _usage
+#
+#   Prints out help text
+_usage() {
+     echo ""
+     echo "Script to prep the Salt package:"
+     echo ""
+     echo "usage: ${0}"
+     echo "             [-h|--help]"
+     echo ""
+     echo "  -h, --help      this message"
+     echo ""
+     echo "  To build the Salt package:"
+     echo "      example: $0"
+}
+
+# _msg
+#
+#   Prints the message with a dash... no new line
+_msg() {
+    printf -- "- %s: " "$1"
+}
+
+# _success
+#
+#   Prints a green Success
+_success() {
+    printf "\e[32m%s\e[0m\n" "Success"
+}
+
+# _failure
+#
+#   Prints a red Failure and exits
+_failure() {
+    printf "\e[31m%s\e[0m\n" "Failure"
+    echo "output >>>>>>"
+    cat "$CMD_OUTPUT" 1>&2
+    echo "<<<<<< output"
+    exit 1
+}
+
+#-------------------------------------------------------------------------------
+# Get Parameters
+#-------------------------------------------------------------------------------
+while true; do
+    if [[ -z "$1" ]]; then break; fi
+    case "$1" in
+        -h | --help )
+            _usage
+            exit 0
+            ;;
+        -*)
+            echo "Invalid Option: $1"
+            echo ""
+            _usage
+            exit 1
+            ;;
+        * )
+            shift
+            ;;
+    esac
+done
+
+#-------------------------------------------------------------------------------
+# Delete temporary files on exit
+#-------------------------------------------------------------------------------
+function finish {
+    rm "$CMD_OUTPUT"
+}
+trap finish EXIT
+
+#-------------------------------------------------------------------------------
+# Script Start
+#-------------------------------------------------------------------------------
+printf "=%.0s" {1..80}; printf "\n"
+echo "Prepping Salt Package"
+printf -- "-%.0s" {1..80}; printf "\n"
+
+#-------------------------------------------------------------------------------
+# Make sure this is the Salt Repository
+#-------------------------------------------------------------------------------
+if [[ ! -e "$SRC_DIR/.git" ]] && [[ ! -e "$SRC_DIR/scripts/salt" ]]; then
+    echo "This directory doesn't appear to be a git repository."
+    echo "The macOS build process needs some files from a Git checkout of Salt."
+    echo "Run this script from the 'pkg/osx' directory of the Git checkout."
+    exit 1
+fi
+
+#-------------------------------------------------------------------------------
+# Copy salt-config from Salt Repo to /opt/salt
+#-------------------------------------------------------------------------------
+SALT_DIR="$BUILD_DIR/opt/salt"
+if ! [ -f "$SALT_DIR/salt-config.sh" ]; then
+    _msg "Staging Salt config script"
+    cp "$PKG_RESOURCES/scripts/salt-config.sh" "$SALT_DIR/"
+    if [ -f "$SALT_DIR/salt-config.sh" ]; then
+        _success
+    else
+        _failure
+    fi
+fi
+
+#-------------------------------------------------------------------------------
+# Copy Service Definitions from Salt Repo to the Package Directory
+#-------------------------------------------------------------------------------
+if ! [ -d "$BUILD_DIR/Library/LaunchDaemons" ]; then
+    _msg "Creating LaunchDaemons directory"
+    mkdir -p "$BUILD_DIR/Library/LaunchDaemons"
+    if [ -d "$BUILD_DIR/Library/LaunchDaemons" ]; then
+        _success
+    else
+        _failure
+    fi
+fi
+
+ITEMS=(
+    "minion"
+    "master"
+    "syndic"
+    "api"
+)
+for i in "${ITEMS[@]}"; do
+    FILE="$BUILD_DIR/Library/LaunchDaemons/com.saltstack.salt.$i.plist"
+    if ! [ -f "$FILE" ]; then
+        _msg "Copying $i service definition"
+        cp "$PKG_RESOURCES/scripts/com.saltstack.salt.$i.plist" "$FILE"
+        if [ -f "$FILE" ]; then
+            _success
+        else
+            _failure
+        fi
+    fi
+done
+
+#-------------------------------------------------------------------------------
+# Remove unnecessary files from the package
+#-------------------------------------------------------------------------------
+ITEMS=(
+    "pkgconfig"
+    "share"
+    "__pycache__"
+)
+
+for i in "${ITEMS[@]}"; do
+    if [[ -n $(find "$BUILD_DIR" -name "$i" -type d) ]]; then
+        _msg "Removing $i directories"
+        find "$BUILD_DIR" -name "$i" -type d -prune -exec rm -rf {} \;
+        if [[ -z $(find "$BUILD_DIR" -name "$i" -type d) ]]; then
+            _success
+        else
+            _failure
+        fi
+    fi
+done
+
+if [[ -n $(find "$BUILD_DIR" -name "*.pyc" -type f) ]]; then
+    _msg "Removing *.pyc files"
+    find "$BUILD_DIR" -name "*.pyc" -type f -delete
+    if [[ -z $(find "$BUILD_DIR" -name "*.pyc" -type f) ]]; then
+        _success
+    else
+        _failure
+    fi
+fi
+
+#-------------------------------------------------------------------------------
+# Copy Config Files from Salt Repo to the Package Directory
+#-------------------------------------------------------------------------------
+if ! [ -d "$CONF_DIR" ]; then
+    _msg "Creating config directory"
+    mkdir -p "$CONF_DIR"
+    if [ -d "$CONF_DIR" ]; then
+        _success
+    else
+        _failure
+    fi
+fi
+ITEMS=(
+  "minion"
+  "master"
+)
+for i in "${ITEMS[@]}"; do
+    if ! [ -f "$CONF_DIR/$i.dist" ]; then
+        _msg "Copying $i config"
+        cp "$SRC_DIR/conf/$i" "$CONF_DIR/$i.dist"
+        if [ -f "$CONF_DIR/$i.dist" ]; then
+            _success
+        else
+            _failure
+        fi
+    fi
+done
+
+#-------------------------------------------------------------------------------
+# Script Completed
+#-------------------------------------------------------------------------------
+printf -- "-%.0s" {1..80}; printf "\n"
+echo "Prepping Salt Package Completed"
+printf "=%.0s" {1..80}; printf "\n"