diff --git a/.gitignore b/.gitignore index de8a0d6a047..e9bdea9a139 100644 --- a/.gitignore +++ b/.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 diff --git a/pkg/README b/pkg/README new file mode 100644 index 00000000000..b280d8a4e7e --- /dev/null +++ b/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. diff --git a/pkg/fish-completions/salt-call.fish b/pkg/common/fish-completions/salt-call.fish similarity index 100% rename from pkg/fish-completions/salt-call.fish rename to pkg/common/fish-completions/salt-call.fish diff --git a/pkg/fish-completions/salt-cp.fish b/pkg/common/fish-completions/salt-cp.fish similarity index 100% rename from pkg/fish-completions/salt-cp.fish rename to pkg/common/fish-completions/salt-cp.fish diff --git a/pkg/fish-completions/salt-key.fish b/pkg/common/fish-completions/salt-key.fish similarity index 100% rename from pkg/fish-completions/salt-key.fish rename to pkg/common/fish-completions/salt-key.fish diff --git a/pkg/fish-completions/salt-master.fish b/pkg/common/fish-completions/salt-master.fish similarity index 100% rename from pkg/fish-completions/salt-master.fish rename to pkg/common/fish-completions/salt-master.fish diff --git a/pkg/fish-completions/salt-minion.fish b/pkg/common/fish-completions/salt-minion.fish similarity index 100% rename from pkg/fish-completions/salt-minion.fish rename to pkg/common/fish-completions/salt-minion.fish diff --git a/pkg/fish-completions/salt-run.fish b/pkg/common/fish-completions/salt-run.fish similarity index 100% rename from pkg/fish-completions/salt-run.fish rename to pkg/common/fish-completions/salt-run.fish diff --git a/pkg/fish-completions/salt-syndic.fish b/pkg/common/fish-completions/salt-syndic.fish similarity index 100% rename from pkg/fish-completions/salt-syndic.fish rename to pkg/common/fish-completions/salt-syndic.fish diff --git a/pkg/fish-completions/salt.fish b/pkg/common/fish-completions/salt.fish similarity index 100% rename from pkg/fish-completions/salt.fish rename to pkg/common/fish-completions/salt.fish diff --git a/pkg/fish-completions/salt_common.fish b/pkg/common/fish-completions/salt_common.fish similarity index 100% rename from pkg/fish-completions/salt_common.fish rename to pkg/common/fish-completions/salt_common.fish diff --git a/pkg/salt-api.service b/pkg/common/salt-api.service similarity index 100% rename from pkg/salt-api.service rename to pkg/common/salt-api.service diff --git a/pkg/salt-api.upstart b/pkg/common/salt-api.upstart similarity index 100% rename from pkg/salt-api.upstart rename to pkg/common/salt-api.upstart diff --git a/pkg/salt-common.logrotate b/pkg/common/salt-common.logrotate similarity index 100% rename from pkg/salt-common.logrotate rename to pkg/common/salt-common.logrotate diff --git a/pkg/salt-master.service b/pkg/common/salt-master.service similarity index 100% rename from pkg/salt-master.service rename to pkg/common/salt-master.service diff --git a/pkg/salt-master.upstart b/pkg/common/salt-master.upstart similarity index 100% rename from pkg/salt-master.upstart rename to pkg/common/salt-master.upstart diff --git a/pkg/salt-master.upstart.rhel6 b/pkg/common/salt-master.upstart.rhel6 similarity index 100% rename from pkg/salt-master.upstart.rhel6 rename to pkg/common/salt-master.upstart.rhel6 diff --git a/pkg/salt-minion.service b/pkg/common/salt-minion.service similarity index 100% rename from pkg/salt-minion.service rename to pkg/common/salt-minion.service diff --git a/pkg/salt-minion.sleep b/pkg/common/salt-minion.sleep similarity index 100% rename from pkg/salt-minion.sleep rename to pkg/common/salt-minion.sleep diff --git a/pkg/salt-minion.upstart b/pkg/common/salt-minion.upstart similarity index 100% rename from pkg/salt-minion.upstart rename to pkg/common/salt-minion.upstart diff --git a/pkg/salt-minion.upstart.rhel6 b/pkg/common/salt-minion.upstart.rhel6 similarity index 100% rename from pkg/salt-minion.upstart.rhel6 rename to pkg/common/salt-minion.upstart.rhel6 diff --git a/pkg/deb/salt-proxy@.service b/pkg/common/salt-proxy@.service similarity index 100% rename from pkg/deb/salt-proxy@.service rename to pkg/common/salt-proxy@.service diff --git a/pkg/salt-syndic.service b/pkg/common/salt-syndic.service similarity index 100% rename from pkg/salt-syndic.service rename to pkg/common/salt-syndic.service diff --git a/pkg/salt-syndic.upstart b/pkg/common/salt-syndic.upstart similarity index 100% rename from pkg/salt-syndic.upstart rename to pkg/common/salt-syndic.upstart diff --git a/pkg/salt-syndic.upstart.rhel6 b/pkg/common/salt-syndic.upstart.rhel6 similarity index 100% rename from pkg/salt-syndic.upstart.rhel6 rename to pkg/common/salt-syndic.upstart.rhel6 diff --git a/pkg/salt.bash b/pkg/common/salt.bash similarity index 100% rename from pkg/salt.bash rename to pkg/common/salt.bash diff --git a/pkg/salt.postrm b/pkg/common/salt.postrm similarity index 100% rename from pkg/salt.postrm rename to pkg/common/salt.postrm diff --git a/pkg/salt.ufw b/pkg/common/salt.ufw similarity index 100% rename from pkg/salt.ufw rename to pkg/common/salt.ufw diff --git a/pkg/salt.zsh b/pkg/common/salt.zsh similarity index 100% rename from pkg/salt.zsh rename to pkg/common/salt.zsh diff --git a/pkg/debian/changelog b/pkg/debian/changelog new file mode 100644 index 00000000000..ce3bef592a0 --- /dev/null +++ b/pkg/debian/changelog @@ -0,0 +1,5 @@ +salt (3006.0) stable; urgency=medium + + * Build of Salt with Relenv + + -- SaltStack Packaging Team Mon, 03 Jul 2017 20:44:29 +0000 diff --git a/pkg/debian/compat b/pkg/debian/compat new file mode 100644 index 00000000000..f599e28b8ab --- /dev/null +++ b/pkg/debian/compat @@ -0,0 +1 @@ +10 diff --git a/pkg/debian/control b/pkg/debian/control new file mode 100644 index 00000000000..5a0c0c75ece --- /dev/null +++ b/pkg/debian/control @@ -0,0 +1,167 @@ +Source: salt +Section: admin +Priority: optional +Maintainer: Debian Salt Team +Uploaders: Joe Healy , + Franklin G Mendoza , + Andriy Senkovych , + David Murphy +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. diff --git a/pkg/debian/copyright b/pkg/debian/copyright new file mode 100644 index 00000000000..28eb5cb954e --- /dev/null +++ b/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 + 2012 Michael Prokop + 2012 Christian Hofstaedtler + 2012 Ulrich Dangel + 2012 Corey Quinn + 2011 Aaron Toponce +License: Apache-2.0 + +Files: debian/repack +Copyright: 2013-2014 Ben Finney +License: MIT-License + +Files: salt/auth/pam.py +Copyright: 2007 Chris AtLee +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 +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 +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 +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 + . + 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. diff --git a/pkg/debian/rules b/pkg/debian/rules new file mode 100755 index 00000000000..f226b7a5c6d --- /dev/null +++ b/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 diff --git a/pkg/debian/salt-api.install b/pkg/debian/salt-api.install new file mode 100644 index 00000000000..973ee8ceb36 --- /dev/null +++ b/pkg/debian/salt-api.install @@ -0,0 +1,2 @@ +pkg/common/salt-api.service /lib/systemd/system + diff --git a/pkg/debian/salt-api.links b/pkg/debian/salt-api.links new file mode 100644 index 00000000000..d1364f088b7 --- /dev/null +++ b/pkg/debian/salt-api.links @@ -0,0 +1 @@ +usr/opt/saltstack/salt/salt-api /usr/bin/salt-api \ No newline at end of file diff --git a/pkg/debian/salt-api.manpages b/pkg/debian/salt-api.manpages new file mode 100644 index 00000000000..38f98d62134 --- /dev/null +++ b/pkg/debian/salt-api.manpages @@ -0,0 +1 @@ +doc/man/salt-api.1 diff --git a/pkg/debian/salt-cloud.dirs b/pkg/debian/salt-cloud.dirs new file mode 100644 index 00000000000..c070dc66fc4 --- /dev/null +++ b/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/ diff --git a/pkg/debian/salt-cloud.links b/pkg/debian/salt-cloud.links new file mode 100644 index 00000000000..c6e104f6092 --- /dev/null +++ b/pkg/debian/salt-cloud.links @@ -0,0 +1 @@ +usr/opt/saltstack/salt/salt-cloud /usr/bin/salt-cloud diff --git a/pkg/debian/salt-cloud.manpages b/pkg/debian/salt-cloud.manpages new file mode 100644 index 00000000000..d2a06a3626d --- /dev/null +++ b/pkg/debian/salt-cloud.manpages @@ -0,0 +1 @@ +doc/man/salt-cloud.1 diff --git a/pkg/debian/salt-common.dirs b/pkg/debian/salt-common.dirs new file mode 100644 index 00000000000..1379962cb34 --- /dev/null +++ b/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 diff --git a/pkg/debian/salt-common.install b/pkg/debian/salt-common.install new file mode 100644 index 00000000000..1a624246301 --- /dev/null +++ b/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 diff --git a/pkg/debian/salt-common.links b/pkg/debian/salt-common.links new file mode 100644 index 00000000000..87cd2c297bd --- /dev/null +++ b/pkg/debian/salt-common.links @@ -0,0 +1 @@ +usr/opt/saltstack/salt/spm /usr/bin/spm \ No newline at end of file diff --git a/pkg/debian/salt-common.manpages b/pkg/debian/salt-common.manpages new file mode 100644 index 00000000000..6babb4caea3 --- /dev/null +++ b/pkg/debian/salt-common.manpages @@ -0,0 +1,2 @@ +doc/man/salt-call.1 +doc/man/salt.7 diff --git a/pkg/debian/salt-master.dirs b/pkg/debian/salt-master.dirs new file mode 100644 index 00000000000..2caa6c7a442 --- /dev/null +++ b/pkg/debian/salt-master.dirs @@ -0,0 +1 @@ +/etc/salt/master.d diff --git a/pkg/debian/salt-master.install b/pkg/debian/salt-master.install new file mode 100644 index 00000000000..0ef6940970f --- /dev/null +++ b/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 diff --git a/pkg/debian/salt-master.links b/pkg/debian/salt-master.links new file mode 100644 index 00000000000..7e6989d3ac8 --- /dev/null +++ b/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 diff --git a/pkg/debian/salt-master.manpages b/pkg/debian/salt-master.manpages new file mode 100644 index 00000000000..52beb2836be --- /dev/null +++ b/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 diff --git a/pkg/debian/salt-minion.dirs b/pkg/debian/salt-minion.dirs new file mode 100644 index 00000000000..5d9db2f78df --- /dev/null +++ b/pkg/debian/salt-minion.dirs @@ -0,0 +1,2 @@ +/etc/salt/minion.d/ +/etc/salt/proxy.d/ diff --git a/pkg/debian/salt-minion.install b/pkg/debian/salt-minion.install new file mode 100644 index 00000000000..c6fc5d5e8c7 --- /dev/null +++ b/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 diff --git a/pkg/debian/salt-minion.links b/pkg/debian/salt-minion.links new file mode 100644 index 00000000000..52bfb6d3e62 --- /dev/null +++ b/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 diff --git a/pkg/debian/salt-minion.manpages b/pkg/debian/salt-minion.manpages new file mode 100644 index 00000000000..a162a552ff3 --- /dev/null +++ b/pkg/debian/salt-minion.manpages @@ -0,0 +1,2 @@ +doc/man/salt-minion.1 +doc/man/salt-proxy.1 diff --git a/pkg/debian/salt-ssh.links b/pkg/debian/salt-ssh.links new file mode 100644 index 00000000000..8cc37b033dc --- /dev/null +++ b/pkg/debian/salt-ssh.links @@ -0,0 +1 @@ +usr/opt/saltstack/salt/salt-ssh /usr/bin/salt-ssh diff --git a/pkg/debian/salt-ssh.manpages b/pkg/debian/salt-ssh.manpages new file mode 100644 index 00000000000..a6dd51e0b0c --- /dev/null +++ b/pkg/debian/salt-ssh.manpages @@ -0,0 +1 @@ +doc/man/salt-ssh.1 diff --git a/pkg/debian/salt-syndic.install b/pkg/debian/salt-syndic.install new file mode 100644 index 00000000000..5273ad5485d --- /dev/null +++ b/pkg/debian/salt-syndic.install @@ -0,0 +1 @@ +pkg/common/salt-syndic.service /lib/systemd/system diff --git a/pkg/debian/salt-syndic.links b/pkg/debian/salt-syndic.links new file mode 100644 index 00000000000..ec64f998ff6 --- /dev/null +++ b/pkg/debian/salt-syndic.links @@ -0,0 +1 @@ +usr/opt/saltstack/salt/salt-syndic /usr/bin/salt-syndic diff --git a/pkg/debian/salt-syndic.manpages b/pkg/debian/salt-syndic.manpages new file mode 100644 index 00000000000..09238dc4e1a --- /dev/null +++ b/pkg/debian/salt-syndic.manpages @@ -0,0 +1 @@ +doc/man/salt-syndic.1 diff --git a/pkg/debian/source/format b/pkg/debian/source/format new file mode 100644 index 00000000000..89ae9db8f88 --- /dev/null +++ b/pkg/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/pkg/osx/.gitignore b/pkg/macos/.gitignore similarity index 100% rename from pkg/osx/.gitignore rename to pkg/macos/.gitignore diff --git a/pkg/osx/README.md b/pkg/macos/README.md similarity index 100% rename from pkg/osx/README.md rename to pkg/macos/README.md diff --git a/pkg/osx/build.sh b/pkg/macos/build.sh similarity index 100% rename from pkg/osx/build.sh rename to pkg/macos/build.sh diff --git a/pkg/osx/build_python.sh b/pkg/macos/build_python.sh similarity index 100% rename from pkg/osx/build_python.sh rename to pkg/macos/build_python.sh diff --git a/pkg/osx/clean.sh b/pkg/macos/clean.sh similarity index 100% rename from pkg/osx/clean.sh rename to pkg/macos/clean.sh diff --git a/pkg/osx/distribution.xml.dist b/pkg/macos/distribution.xml.dist similarity index 100% rename from pkg/osx/distribution.xml.dist rename to pkg/macos/distribution.xml.dist diff --git a/pkg/osx/entitlements.plist b/pkg/macos/entitlements.plist similarity index 100% rename from pkg/osx/entitlements.plist rename to pkg/macos/entitlements.plist diff --git a/pkg/osx/install_salt.sh b/pkg/macos/install_salt.sh similarity index 100% rename from pkg/osx/install_salt.sh rename to pkg/macos/install_salt.sh diff --git a/pkg/osx/notarize.sh b/pkg/macos/notarize.sh similarity index 100% rename from pkg/osx/notarize.sh rename to pkg/macos/notarize.sh diff --git a/pkg/osx/package.sh b/pkg/macos/package.sh similarity index 100% rename from pkg/osx/package.sh rename to pkg/macos/package.sh diff --git a/pkg/osx/pkg-resources/conclusion.rtf b/pkg/macos/pkg-resources/conclusion.rtf similarity index 100% rename from pkg/osx/pkg-resources/conclusion.rtf rename to pkg/macos/pkg-resources/conclusion.rtf diff --git a/pkg/osx/pkg-resources/license.rtf b/pkg/macos/pkg-resources/license.rtf similarity index 100% rename from pkg/osx/pkg-resources/license.rtf rename to pkg/macos/pkg-resources/license.rtf diff --git a/pkg/osx/pkg-resources/logo.png b/pkg/macos/pkg-resources/logo.png similarity index 100% rename from pkg/osx/pkg-resources/logo.png rename to pkg/macos/pkg-resources/logo.png diff --git a/pkg/osx/pkg-resources/logo.xcf b/pkg/macos/pkg-resources/logo.xcf similarity index 100% rename from pkg/osx/pkg-resources/logo.xcf rename to pkg/macos/pkg-resources/logo.xcf diff --git a/pkg/osx/pkg-resources/welcome.rtf b/pkg/macos/pkg-resources/welcome.rtf similarity index 100% rename from pkg/osx/pkg-resources/welcome.rtf rename to pkg/macos/pkg-resources/welcome.rtf diff --git a/pkg/osx/pkg-scripts/postinstall b/pkg/macos/pkg-scripts/postinstall similarity index 100% rename from pkg/osx/pkg-scripts/postinstall rename to pkg/macos/pkg-scripts/postinstall diff --git a/pkg/osx/pkg-scripts/preinstall b/pkg/macos/pkg-scripts/preinstall similarity index 100% rename from pkg/osx/pkg-scripts/preinstall rename to pkg/macos/pkg-scripts/preinstall diff --git a/pkg/osx/prep_salt.sh b/pkg/macos/prep_salt.sh similarity index 100% rename from pkg/osx/prep_salt.sh rename to pkg/macos/prep_salt.sh diff --git a/pkg/osx/scripts/com.saltstack.salt.api.plist b/pkg/macos/scripts/com.saltstack.salt.api.plist similarity index 100% rename from pkg/osx/scripts/com.saltstack.salt.api.plist rename to pkg/macos/scripts/com.saltstack.salt.api.plist diff --git a/pkg/osx/scripts/com.saltstack.salt.master.plist b/pkg/macos/scripts/com.saltstack.salt.master.plist similarity index 100% rename from pkg/osx/scripts/com.saltstack.salt.master.plist rename to pkg/macos/scripts/com.saltstack.salt.master.plist diff --git a/pkg/osx/scripts/com.saltstack.salt.minion.plist b/pkg/macos/scripts/com.saltstack.salt.minion.plist similarity index 100% rename from pkg/osx/scripts/com.saltstack.salt.minion.plist rename to pkg/macos/scripts/com.saltstack.salt.minion.plist diff --git a/pkg/osx/scripts/com.saltstack.salt.syndic.plist b/pkg/macos/scripts/com.saltstack.salt.syndic.plist similarity index 100% rename from pkg/osx/scripts/com.saltstack.salt.syndic.plist rename to pkg/macos/scripts/com.saltstack.salt.syndic.plist diff --git a/pkg/osx/scripts/salt-config.sh b/pkg/macos/scripts/salt-config.sh similarity index 100% rename from pkg/osx/scripts/salt-config.sh rename to pkg/macos/scripts/salt-config.sh diff --git a/pkg/osx/sign_binaries.sh b/pkg/macos/sign_binaries.sh similarity index 100% rename from pkg/osx/sign_binaries.sh rename to pkg/macos/sign_binaries.sh diff --git a/pkg/old/README.md b/pkg/old/README.md new file mode 100644 index 00000000000..db2bf6f116e --- /dev/null +++ b/pkg/old/README.md @@ -0,0 +1,4 @@ +The things found in this directory have been depericated and will be removed in +the 3008.0 release of salt. The Salt maintainers are not aware of anyone +relying on these files. Please file a bug report if you are relying any files +that have been moved to this 'old' directory. diff --git a/pkg/alpine/README.rst b/pkg/old/alpine/README.rst similarity index 100% rename from pkg/alpine/README.rst rename to pkg/old/alpine/README.rst diff --git a/pkg/alpine/salt-api b/pkg/old/alpine/salt-api similarity index 100% rename from pkg/alpine/salt-api rename to pkg/old/alpine/salt-api diff --git a/pkg/alpine/salt-master b/pkg/old/alpine/salt-master similarity index 100% rename from pkg/alpine/salt-master rename to pkg/old/alpine/salt-master diff --git a/pkg/alpine/salt-minion b/pkg/old/alpine/salt-minion similarity index 100% rename from pkg/alpine/salt-minion rename to pkg/old/alpine/salt-minion diff --git a/pkg/alpine/salt-syndic b/pkg/old/alpine/salt-syndic similarity index 100% rename from pkg/alpine/salt-syndic rename to pkg/old/alpine/salt-syndic diff --git a/pkg/arch/Makefile b/pkg/old/arch/Makefile similarity index 100% rename from pkg/arch/Makefile rename to pkg/old/arch/Makefile diff --git a/pkg/arch/PKGBUILD b/pkg/old/arch/PKGBUILD similarity index 100% rename from pkg/arch/PKGBUILD rename to pkg/old/arch/PKGBUILD diff --git a/pkg/arch/PKGBUILD-git b/pkg/old/arch/PKGBUILD-git similarity index 100% rename from pkg/arch/PKGBUILD-git rename to pkg/old/arch/PKGBUILD-git diff --git a/pkg/arch/PKGBUILD-local b/pkg/old/arch/PKGBUILD-local similarity index 100% rename from pkg/arch/PKGBUILD-local rename to pkg/old/arch/PKGBUILD-local diff --git a/pkg/arch/git/PKGBUILD b/pkg/old/arch/git/PKGBUILD similarity index 100% rename from pkg/arch/git/PKGBUILD rename to pkg/old/arch/git/PKGBUILD diff --git a/pkg/arch/git/salt.install b/pkg/old/arch/git/salt.install similarity index 100% rename from pkg/arch/git/salt.install rename to pkg/old/arch/git/salt.install diff --git a/pkg/arch/salt-api_PKGBUILD b/pkg/old/arch/salt-api_PKGBUILD similarity index 100% rename from pkg/arch/salt-api_PKGBUILD rename to pkg/old/arch/salt-api_PKGBUILD diff --git a/pkg/arch/salt-api_PKGBUILD-git b/pkg/old/arch/salt-api_PKGBUILD-git similarity index 100% rename from pkg/arch/salt-api_PKGBUILD-git rename to pkg/old/arch/salt-api_PKGBUILD-git diff --git a/pkg/arch/salt-master.service b/pkg/old/arch/salt-master.service similarity index 100% rename from pkg/arch/salt-master.service rename to pkg/old/arch/salt-master.service diff --git a/pkg/arch/salt-minion.service b/pkg/old/arch/salt-minion.service similarity index 100% rename from pkg/arch/salt-minion.service rename to pkg/old/arch/salt-minion.service diff --git a/pkg/arch/salt-syndic.service b/pkg/old/arch/salt-syndic.service similarity index 100% rename from pkg/arch/salt-syndic.service rename to pkg/old/arch/salt-syndic.service diff --git a/pkg/darwin/com.saltstack.salt.master.plist b/pkg/old/darwin/com.saltstack.salt.master.plist similarity index 100% rename from pkg/darwin/com.saltstack.salt.master.plist rename to pkg/old/darwin/com.saltstack.salt.master.plist diff --git a/pkg/darwin/com.saltstack.salt.minion.plist b/pkg/old/darwin/com.saltstack.salt.minion.plist similarity index 100% rename from pkg/darwin/com.saltstack.salt.minion.plist rename to pkg/old/darwin/com.saltstack.salt.minion.plist diff --git a/pkg/darwin/com.saltstack.salt.syndic.plist b/pkg/old/darwin/com.saltstack.salt.syndic.plist similarity index 100% rename from pkg/darwin/com.saltstack.salt.syndic.plist rename to pkg/old/darwin/com.saltstack.salt.syndic.plist diff --git a/pkg/deb/salt-api.environment b/pkg/old/deb/salt-api.environment similarity index 100% rename from pkg/deb/salt-api.environment rename to pkg/old/deb/salt-api.environment diff --git a/pkg/deb/salt-api.init b/pkg/old/deb/salt-api.init similarity index 100% rename from pkg/deb/salt-api.init rename to pkg/old/deb/salt-api.init diff --git a/pkg/deb/salt-api.service b/pkg/old/deb/salt-api.service similarity index 100% rename from pkg/deb/salt-api.service rename to pkg/old/deb/salt-api.service diff --git a/pkg/deb/salt-master.environment b/pkg/old/deb/salt-master.environment similarity index 100% rename from pkg/deb/salt-master.environment rename to pkg/old/deb/salt-master.environment diff --git a/pkg/deb/salt-master.init b/pkg/old/deb/salt-master.init similarity index 100% rename from pkg/deb/salt-master.init rename to pkg/old/deb/salt-master.init diff --git a/pkg/deb/salt-master.service b/pkg/old/deb/salt-master.service similarity index 100% rename from pkg/deb/salt-master.service rename to pkg/old/deb/salt-master.service diff --git a/pkg/deb/salt-minion.environment b/pkg/old/deb/salt-minion.environment similarity index 100% rename from pkg/deb/salt-minion.environment rename to pkg/old/deb/salt-minion.environment diff --git a/pkg/deb/salt-minion.init b/pkg/old/deb/salt-minion.init similarity index 100% rename from pkg/deb/salt-minion.init rename to pkg/old/deb/salt-minion.init diff --git a/pkg/deb/salt-minion.service b/pkg/old/deb/salt-minion.service similarity index 100% rename from pkg/deb/salt-minion.service rename to pkg/old/deb/salt-minion.service diff --git a/pkg/salt-proxy@.service b/pkg/old/deb/salt-proxy@.service similarity index 100% rename from pkg/salt-proxy@.service rename to pkg/old/deb/salt-proxy@.service diff --git a/pkg/deb/salt-syndic.environment b/pkg/old/deb/salt-syndic.environment similarity index 100% rename from pkg/deb/salt-syndic.environment rename to pkg/old/deb/salt-syndic.environment diff --git a/pkg/deb/salt-syndic.init b/pkg/old/deb/salt-syndic.init similarity index 100% rename from pkg/deb/salt-syndic.init rename to pkg/old/deb/salt-syndic.init diff --git a/pkg/deb/salt-syndic.service b/pkg/old/deb/salt-syndic.service similarity index 100% rename from pkg/deb/salt-syndic.service rename to pkg/old/deb/salt-syndic.service diff --git a/pkg/freeze/freeze.py b/pkg/old/freeze/freeze.py similarity index 100% rename from pkg/freeze/freeze.py rename to pkg/old/freeze/freeze.py diff --git a/pkg/macports/ports/sysutils/salt/Portfile b/pkg/old/macports/ports/sysutils/salt/Portfile similarity index 100% rename from pkg/macports/ports/sysutils/salt/Portfile rename to pkg/old/macports/ports/sysutils/salt/Portfile diff --git a/pkg/openbsd/salt-master.rc-d b/pkg/old/openbsd/salt-master.rc-d similarity index 100% rename from pkg/openbsd/salt-master.rc-d rename to pkg/old/openbsd/salt-master.rc-d diff --git a/pkg/openbsd/salt-minion.rc-d b/pkg/old/openbsd/salt-minion.rc-d similarity index 100% rename from pkg/openbsd/salt-minion.rc-d rename to pkg/old/openbsd/salt-minion.rc-d diff --git a/pkg/openbsd/salt-syncdic.rc-d b/pkg/old/openbsd/salt-syncdic.rc-d similarity index 100% rename from pkg/openbsd/salt-syncdic.rc-d rename to pkg/old/openbsd/salt-syncdic.rc-d diff --git a/pkg/shar/build_shar.sh b/pkg/old/shar/build_shar.sh similarity index 100% rename from pkg/shar/build_shar.sh rename to pkg/old/shar/build_shar.sh diff --git a/pkg/shar/salt.sh b/pkg/old/shar/salt.sh similarity index 100% rename from pkg/shar/salt.sh rename to pkg/old/shar/salt.sh diff --git a/pkg/smartos/esky/BUILD_ENVIRONMENT.md b/pkg/old/smartos/esky/BUILD_ENVIRONMENT.md similarity index 100% rename from pkg/smartos/esky/BUILD_ENVIRONMENT.md rename to pkg/old/smartos/esky/BUILD_ENVIRONMENT.md diff --git a/pkg/smartos/esky/build-tarball.sh b/pkg/old/smartos/esky/build-tarball.sh similarity index 100% rename from pkg/smartos/esky/build-tarball.sh rename to pkg/old/smartos/esky/build-tarball.sh diff --git a/pkg/smartos/esky/install.sh b/pkg/old/smartos/esky/install.sh similarity index 100% rename from pkg/smartos/esky/install.sh rename to pkg/old/smartos/esky/install.sh diff --git a/pkg/smartos/esky/salt-master.xml b/pkg/old/smartos/esky/salt-master.xml similarity index 100% rename from pkg/smartos/esky/salt-master.xml rename to pkg/old/smartos/esky/salt-master.xml diff --git a/pkg/smartos/esky/salt-minion.xml b/pkg/old/smartos/esky/salt-minion.xml similarity index 100% rename from pkg/smartos/esky/salt-minion.xml rename to pkg/old/smartos/esky/salt-minion.xml diff --git a/pkg/smartos/esky/salt-syndic.xml b/pkg/old/smartos/esky/salt-syndic.xml similarity index 100% rename from pkg/smartos/esky/salt-syndic.xml rename to pkg/old/smartos/esky/salt-syndic.xml diff --git a/pkg/smartos/esky/sodium_grabber.c b/pkg/old/smartos/esky/sodium_grabber.c similarity index 100% rename from pkg/smartos/esky/sodium_grabber.c rename to pkg/old/smartos/esky/sodium_grabber.c diff --git a/pkg/smartos/esky/sodium_grabber_installer.py b/pkg/old/smartos/esky/sodium_grabber_installer.py similarity index 100% rename from pkg/smartos/esky/sodium_grabber_installer.py rename to pkg/old/smartos/esky/sodium_grabber_installer.py diff --git a/pkg/smartos/salt-api.xml b/pkg/old/smartos/salt-api.xml similarity index 100% rename from pkg/smartos/salt-api.xml rename to pkg/old/smartos/salt-api.xml diff --git a/pkg/smartos/salt-master.xml b/pkg/old/smartos/salt-master.xml similarity index 100% rename from pkg/smartos/salt-master.xml rename to pkg/old/smartos/salt-master.xml diff --git a/pkg/smartos/salt-minion.xml b/pkg/old/smartos/salt-minion.xml similarity index 100% rename from pkg/smartos/salt-minion.xml rename to pkg/old/smartos/salt-minion.xml diff --git a/pkg/smartos/salt-syndic.xml b/pkg/old/smartos/salt-syndic.xml similarity index 100% rename from pkg/smartos/salt-syndic.xml rename to pkg/old/smartos/salt-syndic.xml diff --git a/pkg/solaris/salt-master.xml b/pkg/old/solaris/salt-master.xml similarity index 100% rename from pkg/solaris/salt-master.xml rename to pkg/old/solaris/salt-master.xml diff --git a/pkg/solaris/salt-minion.xml b/pkg/old/solaris/salt-minion.xml similarity index 100% rename from pkg/solaris/salt-minion.xml rename to pkg/old/solaris/salt-minion.xml diff --git a/pkg/solaris/salt-syndic.xml b/pkg/old/solaris/salt-syndic.xml similarity index 100% rename from pkg/solaris/salt-syndic.xml rename to pkg/old/solaris/salt-syndic.xml diff --git a/pkg/suse/README.suse b/pkg/old/suse/README.suse similarity index 100% rename from pkg/suse/README.suse rename to pkg/old/suse/README.suse diff --git a/pkg/suse/allow-systemd-parameterized-services.patch b/pkg/old/suse/allow-systemd-parameterized-services.patch similarity index 100% rename from pkg/suse/allow-systemd-parameterized-services.patch rename to pkg/old/suse/allow-systemd-parameterized-services.patch diff --git a/pkg/suse/allow-systemd-units-no-unit-files.patch b/pkg/old/suse/allow-systemd-units-no-unit-files.patch similarity index 100% rename from pkg/suse/allow-systemd-units-no-unit-files.patch rename to pkg/old/suse/allow-systemd-units-no-unit-files.patch diff --git a/pkg/suse/disable-service-py-for-suse-family.patch b/pkg/old/suse/disable-service-py-for-suse-family.patch similarity index 100% rename from pkg/suse/disable-service-py-for-suse-family.patch rename to pkg/old/suse/disable-service-py-for-suse-family.patch diff --git a/pkg/suse/fix-service-py-version-parsing-sles.patch b/pkg/old/suse/fix-service-py-version-parsing-sles.patch similarity index 100% rename from pkg/suse/fix-service-py-version-parsing-sles.patch rename to pkg/old/suse/fix-service-py-version-parsing-sles.patch diff --git a/pkg/suse/pass-all-systemd-list-units.patch b/pkg/old/suse/pass-all-systemd-list-units.patch similarity index 100% rename from pkg/suse/pass-all-systemd-list-units.patch rename to pkg/old/suse/pass-all-systemd-list-units.patch diff --git a/pkg/suse/salt-api b/pkg/old/suse/salt-api similarity index 100% rename from pkg/suse/salt-api rename to pkg/old/suse/salt-api diff --git a/pkg/suse/salt-api.changes b/pkg/old/suse/salt-api.changes similarity index 100% rename from pkg/suse/salt-api.changes rename to pkg/old/suse/salt-api.changes diff --git a/pkg/suse/salt-api.service b/pkg/old/suse/salt-api.service similarity index 100% rename from pkg/suse/salt-api.service rename to pkg/old/suse/salt-api.service diff --git a/pkg/suse/salt-api.spec b/pkg/old/suse/salt-api.spec similarity index 100% rename from pkg/suse/salt-api.spec rename to pkg/old/suse/salt-api.spec diff --git a/pkg/suse/salt-common.logrotate b/pkg/old/suse/salt-common.logrotate similarity index 100% rename from pkg/suse/salt-common.logrotate rename to pkg/old/suse/salt-common.logrotate diff --git a/pkg/suse/salt-master b/pkg/old/suse/salt-master similarity index 100% rename from pkg/suse/salt-master rename to pkg/old/suse/salt-master diff --git a/pkg/suse/salt-master.service b/pkg/old/suse/salt-master.service similarity index 100% rename from pkg/suse/salt-master.service rename to pkg/old/suse/salt-master.service diff --git a/pkg/suse/salt-minion b/pkg/old/suse/salt-minion similarity index 100% rename from pkg/suse/salt-minion rename to pkg/old/suse/salt-minion diff --git a/pkg/suse/salt-minion.service b/pkg/old/suse/salt-minion.service similarity index 100% rename from pkg/suse/salt-minion.service rename to pkg/old/suse/salt-minion.service diff --git a/pkg/suse/salt-minion.service.rhel7 b/pkg/old/suse/salt-minion.service.rhel7 similarity index 100% rename from pkg/suse/salt-minion.service.rhel7 rename to pkg/old/suse/salt-minion.service.rhel7 diff --git a/pkg/suse/salt-syndic b/pkg/old/suse/salt-syndic similarity index 100% rename from pkg/suse/salt-syndic rename to pkg/old/suse/salt-syndic diff --git a/pkg/suse/salt-tmpfiles.d b/pkg/old/suse/salt-tmpfiles.d similarity index 100% rename from pkg/suse/salt-tmpfiles.d rename to pkg/old/suse/salt-tmpfiles.d diff --git a/pkg/suse/salt.SuSEfirewall2 b/pkg/old/suse/salt.SuSEfirewall2 similarity index 100% rename from pkg/suse/salt.SuSEfirewall2 rename to pkg/old/suse/salt.SuSEfirewall2 diff --git a/pkg/suse/salt.changes b/pkg/old/suse/salt.changes similarity index 100% rename from pkg/suse/salt.changes rename to pkg/old/suse/salt.changes diff --git a/pkg/suse/salt.spec b/pkg/old/suse/salt.spec similarity index 100% rename from pkg/suse/salt.spec rename to pkg/old/suse/salt.spec diff --git a/pkg/suse/use-forking-daemon.patch b/pkg/old/suse/use-forking-daemon.patch similarity index 100% rename from pkg/suse/use-forking-daemon.patch rename to pkg/old/suse/use-forking-daemon.patch diff --git a/pkg/suse/use-salt-user-for-master.patch b/pkg/old/suse/use-salt-user-for-master.patch similarity index 100% rename from pkg/suse/use-salt-user-for-master.patch rename to pkg/old/suse/use-salt-user-for-master.patch diff --git a/pkg/rpm/salt-api.service b/pkg/rpm/salt-api.service deleted file mode 120000 index 7e505af066e..00000000000 --- a/pkg/rpm/salt-api.service +++ /dev/null @@ -1 +0,0 @@ -../salt-api.service \ No newline at end of file diff --git a/pkg/rpm/salt-master.service b/pkg/rpm/salt-master.service deleted file mode 120000 index 86dfc8ebb10..00000000000 --- a/pkg/rpm/salt-master.service +++ /dev/null @@ -1 +0,0 @@ -../salt-master.service \ No newline at end of file diff --git a/pkg/rpm/salt-minion.service b/pkg/rpm/salt-minion.service deleted file mode 120000 index 9c0cedc1d84..00000000000 --- a/pkg/rpm/salt-minion.service +++ /dev/null @@ -1 +0,0 @@ -../salt-minion.service \ No newline at end of file diff --git a/pkg/rpm/salt-proxy@.service b/pkg/rpm/salt-proxy@.service deleted file mode 120000 index 2b0a78fe036..00000000000 --- a/pkg/rpm/salt-proxy@.service +++ /dev/null @@ -1 +0,0 @@ -../salt-proxy@.service \ No newline at end of file diff --git a/pkg/rpm/salt-syndic.service b/pkg/rpm/salt-syndic.service deleted file mode 120000 index 8d856f4547e..00000000000 --- a/pkg/rpm/salt-syndic.service +++ /dev/null @@ -1 +0,0 @@ -../salt-syndic.service \ No newline at end of file diff --git a/pkg/rpm/salt.spec b/pkg/rpm/salt.spec index a606bc92053..77f3ed90f59 100644 --- a/pkg/rpm/salt.spec +++ b/pkg/rpm/salt.spec @@ -1,120 +1,56 @@ -%if ! (0%{?rhel} >= 6 || 0%{?fedora} > 12) -%global with_python26 1 -%define pybasever 2.6 -%define __python_ver 26 -%define __python %{_bindir}/python%{?pybasever} -%endif +%global __brp_check_rpaths %{nil} -%global include_tests 1 +%bcond_with tests +%bcond_with docs -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%{!?pythonpath: %global pythonpath %(%{__python} -c "import os, sys; print(os.pathsep.join(x for x in sys.path if x))")} +# Disable build-id symlinks +%define _build_id_links none +%undefine _missing_build_ids_terminate_build +%define __brp_mangle_shebangs /usr/bin/true +%define __brp_python_hardlink /usr/bin/true -%define _salttesting SaltTesting -%define _salttesting_ver 2015.2.16 +# Disable private libraries from showing in provides +%global __provides_exclude_from ^.*\\.so.*$ +%global __requires_exclude_from ^.*\\.so.*$ -Name: salt -Version: 2014.7.2 -Release: 2%{?dist} +# 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 + +Name: salt +Version: 3006 +Release: 0 Summary: A parallel remote execution system - Group: System Environment/Daemons License: ASL 2.0 -URL: http://saltstack.org/ -Source0: http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz -Source1: https://pypi.python.org/packages/source/S/%{_salttesting}/%{_salttesting}-%{_salttesting_ver}.tar.gz -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 -Source11: logrotate.salt -Patch0: skip_tests_%{version}.patch +URL: https://saltproject.io/ + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch +BuildArch: x86_64 %ifarch %{ix86} x86_64 Requires: dmidecode %endif Requires: pciutils -Requires: yum-utils +Requires: which +Requires: openssl -%if 0%{?with_python26} - -BuildRequires: python26-devel -Requires: python26-crypto -Requires: python26-jinja2 -Requires: python26-m2crypto -Requires: python26-msgpack -Requires: python26-PyYAML -Requires: python26-requests -Requires: python26-zmq - -%else - -%if ((0%{?rhel} >= 6 || 0%{?fedora} > 12) && 0%{?include_tests}) -BuildRequires: m2crypto -BuildRequires: python-crypto -BuildRequires: python-jinja2 -BuildRequires: python-msgpack -BuildRequires: python-pip -BuildRequires: python-zmq -BuildRequires: PyYAML -BuildRequires: python-requests -BuildRequires: python-unittest2 -# this BR causes windows tests to happen -# clearly, that's not desired -# https://github.com/saltstack/salt/issues/3749 -BuildRequires: python-mock -BuildRequires: git -BuildRequires: python-libcloud - -%if ((0%{?rhel} == 6) && 0%{?include_tests}) -# argparse now a salt-testing requirement -BuildRequires: python-argparse -%endif - -%endif - -BuildRequires: python-devel -Requires: m2crypto -Requires: python-crypto -Requires: python-jinja2 -Requires: python-msgpack -Requires: PyYAML -Requires: python-requests -Requires: python-zmq - -%endif - -%if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15) - -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts - -%else %if 0%{?systemd_preun:1} - Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units - %endif BuildRequires: systemd-units -Requires: systemd-python - -%endif +BuildRequires: python3 +BuildRequires: python3-pip +BuildRequires: openssl +BuildRequires: git +BuildRequires: libxcrypt-compat %description Salt is a distributed remote execution system used to execute commands and @@ -124,184 +60,214 @@ malleable. Salt accomplishes this via its ability to handle larger loads of information, and not just dozens, but hundreds or even thousands of individual servers, handle them quickly and through a simple and manageable interface. -%package master -Summary: Management component for salt, a parallel remote execution system -Group: System Environment/Daemons -Requires: %{name} = %{version}-%{release} -%if (0%{?rhel} >= 7 || 0%{?fedora} >= 15) -Requires: systemd-python -%endif + +%package master +Summary: Management component for salt, a parallel remote execution system +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} %description master The Salt master is the central server to which all minions connect. -%package minion -Summary: Client component for Salt, a parallel remote execution system -Group: System Environment/Daemons -Requires: %{name} = %{version}-%{release} + +%package minion +Summary: Client component for Salt, a parallel remote execution system +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} %description minion The Salt minion is the agent component of Salt. It listens for instructions from the master, runs jobs, and returns results back to the master. -%package syndic -Summary: Master-of-master component for Salt, a parallel remote execution system -Group: System Environment/Daemons -Requires: %{name} = %{version}-%{release} + +%package syndic +Summary: Master-of-master component for Salt, a parallel remote execution system +Group: System Environment/Daemons +Requires: %{name}-master = %{version}-%{release} %description syndic The Salt syndic is a master daemon which can receive instruction from a higher-level master, allowing for tiered organization of your Salt infrastructure. -%package api -Summary: REST API for Salt, a parallel remote execution system -Group: System administration tools -Requires: %{name}-master = %{version}-%{release} + +%package api +Summary: REST API for Salt, a parallel remote execution system +Group: Applications/System +Requires: %{name}-master = %{version}-%{release} %description api salt-api provides a REST interface to the Salt master. -%package cloud -Summary: Cloud provisioner for Salt, a parallel remote execution system -Group: System administration tools -Requires: %{name}-master = %{version}-%{release} + +%package cloud +Summary: Cloud provisioner for Salt, a parallel remote execution system +Group: Applications/System +Requires: %{name}-master = %{version}-%{release} %description cloud The salt-cloud tool provisions new cloud VMs, installs salt-minion on them, and adds them to the master's collection of controllable minions. -%package ssh -Summary: Agentless SSH-based version of Salt, a parallel remote execution system -Group: System administration tools -Requires: %{name} = %{version}-%{release} + +%package ssh +Summary: Agentless SSH-based version of Salt, a parallel remote execution system +Group: Applications/System +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. -%prep -%setup -c -%setup -T -D -a 1 - -cd %{name}-%{version} -%patch0 -p1 %build +unset CC +unset CXX +unset CPPFLAGS +unset CXXFLAGS +unset CFLAGS +unset LDFLAGS +rm -rf $RPM_BUILD_DIR +mkdir -p $RPM_BUILD_DIR/opt/saltstack +mkdir -p $RPM_BUILD_DIR/usr/bin +cd $RPM_BUILD_DIR +python3 -m pip install relenv +relenv fetch +relenv toolchain fetch +relenv create $RPM_BUILD_DIR/opt/saltstack/salt +env RELENV_PIP_DIR=yes $RPM_BUILD_DIR/opt/saltstack/salt/bin/pip3 install --no-cache -v %{_salt_src} +# jmsepath doesn't use pip scripts +rm $RPM_BUILD_DIR/opt/saltstack/salt/jp.py %install rm -rf %{buildroot} -cd $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} -%{__python} setup.py install -O1 --root %{buildroot} +mkdir -p %{buildroot}/opt/saltstack +cp -R $RPM_BUILD_DIR/* %{buildroot}/ +mkdir -p %{buildroot}/opt/saltstack/salt +# pip installs directory +mkdir -p %{buildroot}/opt/saltstack/salt/pypath/ # Add some directories +install -d -m 0755 %{buildroot}%{_var}/log/salt install -d -m 0755 %{buildroot}%{_var}/cache/salt install -d -m 0755 %{buildroot}%{_sysconfdir}/salt -install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.conf.d -install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.deploy.d -install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.maps.d -install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.profiles.d -install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.providers.d +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 the config files -install -p -m 0640 conf/minion %{buildroot}%{_sysconfdir}/salt/minion -install -p -m 0640 conf/master %{buildroot}%{_sysconfdir}/salt/master -install -p -m 0640 conf/cloud %{buildroot}%{_sysconfdir}/salt/cloud -install -p -m 0640 conf/roster %{buildroot}%{_sysconfdir}/salt/roster +install -p -m 0640 %{_salt_src}/conf/minion %{buildroot}%{_sysconfdir}/salt/minion +install -p -m 0640 %{_salt_src}/conf/master %{buildroot}%{_sysconfdir}/salt/master +install -p -m 0640 %{_salt_src}/conf/cloud %{buildroot}%{_sysconfdir}/salt/cloud +install -p -m 0640 %{_salt_src}/conf/roster %{buildroot}%{_sysconfdir}/salt/roster +install -p -m 0640 %{_salt_src}/conf/proxy %{buildroot}%{_sysconfdir}/salt/proxy -%if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15) -mkdir -p %{buildroot}%{_initrddir} -install -p %{SOURCE2} %{buildroot}%{_initrddir}/ -install -p %{SOURCE3} %{buildroot}%{_initrddir}/ -install -p %{SOURCE4} %{buildroot}%{_initrddir}/ -install -p %{SOURCE5} %{buildroot}%{_initrddir}/ -%else +# Add the unit files mkdir -p %{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}/ -%endif +install -p -m 0644 %{_salt_src}/pkg/common/salt-master.service %{buildroot}%{_unitdir}/ +install -p -m 0644 %{_salt_src}/pkg/common/salt-minion.service %{buildroot}%{_unitdir}/ +install -p -m 0644 %{_salt_src}/pkg/common/salt-api.service %{buildroot}%{_unitdir}/ +install -p -m 0644 %{_salt_src}/pkg/common/salt-syndic.service %{buildroot}%{_unitdir}/ +install -p -m 0644 %{_salt_src}/pkg/common/salt-proxy@.service %{buildroot}%{_unitdir}/ -install -p %{SOURCE10} . +# Logrotate +#install -p %{SOURCE10} . mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/ -install -p -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/logrotate.d/salt +install -p -m 0644 %{_salt_src}/pkg/common/salt-common.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/salt + +# Bash completion +mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/ +install -p -m 0644 %{_salt_src}/pkg/common/salt.bash %{buildroot}%{_sysconfdir}/bash_completion.d/salt.bash + +# Fish completion (TBD remove -v) +mkdir -p %{buildroot}%{fish_dir} +install -p -m 0644 %{_salt_src}/pkg/common/fish-completions/*.fish %{buildroot}%{fish_dir}/ + +# Man files +mkdir -p %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}%{_mandir}/man7 +install -p -m 0644 %{_salt_src}/doc/man/spm.1 %{buildroot}%{_mandir}/man1/spm.1 +install -p -m 0644 %{_salt_src}/doc/man/spm.1 %{buildroot}%{_mandir}/man1/spm.1 +install -p -m 0644 %{_salt_src}/doc/man/salt.1 %{buildroot}%{_mandir}/man1/salt.1 +install -p -m 0644 %{_salt_src}/doc/man/salt.7 %{buildroot}%{_mandir}/man7/salt.7 +install -p -m 0644 %{_salt_src}/doc/man/salt-cp.1 %{buildroot}%{_mandir}/man1/salt-cp.1 +install -p -m 0644 %{_salt_src}/doc/man/salt-key.1 %{buildroot}%{_mandir}/man1/salt-key.1 +install -p -m 0644 %{_salt_src}/doc/man/salt-master.1 %{buildroot}%{_mandir}/man1/salt-master.1 +install -p -m 0644 %{_salt_src}/doc/man/salt-run.1 %{buildroot}%{_mandir}/man1/salt-run.1 +install -p -m 0644 %{_salt_src}/doc/man/salt-call.1 %{buildroot}%{_mandir}/man1/salt-call.1 +install -p -m 0644 %{_salt_src}/doc/man/salt-minion.1 %{buildroot}%{_mandir}/man1/salt-minion.1 +install -p -m 0644 %{_salt_src}/doc/man/salt-proxy.1 %{buildroot}%{_mandir}/man1/salt-proxy.1 +install -p -m 0644 %{_salt_src}/doc/man/salt-syndic.1 %{buildroot}%{_mandir}/man1/salt-syndic.1 +install -p -m 0644 %{_salt_src}/doc/man/salt-api.1 %{buildroot}%{_mandir}/man1/salt-api.1 +install -p -m 0644 %{_salt_src}/doc/man/salt-cloud.1 %{buildroot}%{_mandir}/man1/salt-cloud.1 +install -p -m 0644 %{_salt_src}/doc/man/salt-ssh.1 %{buildroot}%{_mandir}/man1/salt-ssh.1 -%if ((0%{?rhel} >= 6 || 0%{?fedora} > 12) && 0%{?include_tests}) -%check -cd $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} -mkdir %{_tmppath}/salt-test-cache -PYTHONPATH=%{pythonpath}:$RPM_BUILD_DIR/%{name}-%{version}/%{_salttesting}-%{_salttesting_ver} %{__python} setup.py test --runtests-opts=-u -%endif %clean rm -rf %{buildroot} + %files %defattr(-,root,root,-) -%doc $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/LICENSE -%{python_sitelib}/%{name}/* -#%{python_sitelib}/%{name}-%{version}-py?.?.egg-info -%{python_sitelib}/%{name}-*-py?.?.egg-info %{_sysconfdir}/logrotate.d/salt -%{_var}/cache/salt -%doc $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/README.fedora +%{_sysconfdir}/bash_completion.d/salt.bash +%config(noreplace) %{fish_dir}/salt*.fish +%dir %{_var}/cache/salt +%dir %{_var}/log/salt +%doc %{_mandir}/man1/spm.1* +/opt/saltstack/salt +%dir %{_sysconfdir}/salt +%dir %{_sysconfdir}/salt/pki + + + %files master %defattr(-,root,root) -%doc %{_mandir}/man7/salt.7.* -%doc %{_mandir}/man1/salt-cp.1.* -%doc %{_mandir}/man1/salt-key.1.* -%doc %{_mandir}/man1/salt-master.1.* -%doc %{_mandir}/man1/salt-run.1.* -%{_bindir}/salt -%{_bindir}/salt-cp -%{_bindir}/salt-key -%{_bindir}/salt-master -%{_bindir}/salt-run -%if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15) -%attr(0755, root, root) %{_initrddir}/salt-master -%else -%config(noreplace) %{_unitdir}/salt-master.service -%endif +%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* +%{_unitdir}/salt-master.service %config(noreplace) %{_sysconfdir}/salt/master +%dir %{_sysconfdir}/salt/master.d +%config(noreplace) %{_sysconfdir}/salt/pki/master %files minion %defattr(-,root,root) -%doc %{_mandir}/man1/salt-call.1.* -%doc %{_mandir}/man1/salt-minion.1.* -%{_bindir}/salt-minion -%{_bindir}/salt-call -%if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15) -%attr(0755, root, root) %{_initrddir}/salt-minion -%else -%config(noreplace) %{_unitdir}/salt-minion.service -%endif +%doc %{_mandir}/man1/salt-call.1* +%doc %{_mandir}/man1/salt-minion.1* +%doc %{_mandir}/man1/salt-proxy.1* +%{_unitdir}/salt-minion.service +%{_unitdir}/salt-proxy@.service %config(noreplace) %{_sysconfdir}/salt/minion +%config(noreplace) %{_sysconfdir}/salt/proxy +%config(noreplace) %{_sysconfdir}/salt/pki/minion +%dir %{_sysconfdir}/salt/minion.d %files syndic -%doc %{_mandir}/man1/salt-syndic.1.* -%{_bindir}/salt-syndic -%if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15) -%attr(0755, root, root) %{_initrddir}/salt-syndic -%else -%config(noreplace) %{_unitdir}/salt-syndic.service -%endif +%doc %{_mandir}/man1/salt-syndic.1* +%{_unitdir}/salt-syndic.service %files api %defattr(-,root,root) -%doc %{_mandir}/man1/salt-api.1.* -%{_bindir}/salt-api -%if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15) -%attr(0755, root, root) %{_initrddir}/salt-api -%else -%config(noreplace) %{_unitdir}/salt-api.service -%endif +%doc %{_mandir}/man1/salt-api.1* +%{_unitdir}/salt-api.service %files cloud -%doc %{_mandir}/man1/salt-cloud.1.* -%{_bindir}/salt-cloud +%doc %{_mandir}/man1/salt-cloud.1* %{_sysconfdir}/salt/cloud.conf.d %{_sysconfdir}/salt/cloud.deploy.d %{_sysconfdir}/salt/cloud.maps.d @@ -310,135 +276,323 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/salt/cloud %files ssh -%doc %{_mandir}/man1/salt-ssh.1.* -%{_bindir}/salt-ssh -%{_sysconfdir}/salt/roster +%doc %{_mandir}/man1/salt-ssh.1* +%config(noreplace) %{_sysconfdir}/salt/roster -# less than RHEL 8 / Fedora 16 -# not sure if RHEL 7 will use systemd yet -%if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15) - +# assumes systemd for RHEL 7 & 8 & 9 %preun master - if [ $1 -eq 0 ] ; then - /sbin/service salt-master stop >/dev/null 2>&1 - /sbin/chkconfig --del salt-master - fi - -%preun syndic - if [ $1 -eq 0 ] ; then - /sbin/service salt-syndic stop >/dev/null 2>&1 - /sbin/chkconfig --del salt-syndic - fi +# RHEL 9 is giving warning msg if syndic is not installed, supress it +%systemd_preun salt-syndic.service > /dev/null 2>&1 %preun minion - if [ $1 -eq 0 ] ; then - /sbin/service salt-minion stop >/dev/null 2>&1 - /sbin/chkconfig --del salt-minion - fi +%systemd_preun salt-minion.service + +%preun api +%systemd_preun salt-api.service + +%post +ln -s -f /opt/saltstack/salt/spm %{_bindir}/spm %post master - /sbin/chkconfig --add salt-master +%systemd_post salt-master.service +ln -s -f /opt/saltstack/salt/salt %{_bindir}/salt +ln -s -f /opt/saltstack/salt/salt-cp %{_bindir}/salt-cp +ln -s -f /opt/saltstack/salt/salt-key %{_bindir}/salt-key +ln -s -f /opt/saltstack/salt/salt-master %{_bindir}/salt-master +ln -s -f /opt/saltstack/salt/salt-run %{_bindir}/salt-run +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 + +%post syndic +%systemd_post salt-syndic.service +ln -s -f /opt/saltstack/salt/salt-syndic %{_bindir}/salt-syndic %post minion - /sbin/chkconfig --add salt-minion +%systemd_post salt-minion.service +ln -s -f /opt/saltstack/salt/salt-minion %{_bindir}/salt-minion +ln -s -f /opt/saltstack/salt/salt-call %{_bindir}/salt-call +ln -s -f /opt/saltstack/salt/salt-proxy %{_bindir}/salt-proxy +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 + +%post api +%systemd_post salt-api.service +ln -s -f /opt/saltstack/salt/salt-api %{_bindir}/salt-api %postun master - if [ "$1" -ge "1" ] ; then - /sbin/service salt-master condrestart >/dev/null 2>&1 || : +%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 - -#%postun syndic -# if [ "$1" -ge "1" ] ; then -# /sbin/service salt-syndic condrestart >/dev/null 2>&1 || : -# fi - -%postun minion - if [ "$1" -ge "1" ] ; then - /sbin/service salt-minion condrestart >/dev/null 2>&1 || : - fi - -%else - -%preun master -%if 0%{?systemd_preun:1} - %systemd_preun salt-master.service -%else - if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable salt-master.service > /dev/null 2>&1 || : - /bin/systemctl stop salt-master.service > /dev/null 2>&1 || : - fi -%endif - -%preun syndic -%if 0%{?systemd_preun:1} - %systemd_preun salt-syndic.service -%else - if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable salt-syndic.service > /dev/null 2>&1 || : - /bin/systemctl stop salt-syndic.service > /dev/null 2>&1 || : - fi -%endif - -%preun minion -%if 0%{?systemd_preun:1} - %systemd_preun salt-minion.service -%else - if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable salt-minion.service > /dev/null 2>&1 || : - /bin/systemctl stop salt-minion.service > /dev/null 2>&1 || : - fi -%endif - -%post master -%if 0%{?systemd_post:1} - %systemd_post salt-master.service -%else - /bin/systemctl daemon-reload &>/dev/null || : -%endif - -%post minion -%if 0%{?systemd_post:1} - %systemd_post salt-minion.service -%else - /bin/systemctl daemon-reload &>/dev/null || : -%endif - -%postun master -%if 0%{?systemd_post:1} - %systemd_postun salt-master.service -%else - /bin/systemctl daemon-reload &>/dev/null - [ $1 -gt 0 ] && /bin/systemctl try-restart salt-master.service &>/dev/null || : -%endif +fi %postun syndic -%if 0%{?systemd_post:1} - %systemd_postun salt-syndic.service -%else - /bin/systemctl daemon-reload &>/dev/null - [ $1 -gt 0 ] && /bin/systemctl try-restart salt-syndic.service &>/dev/null || : -%endif +%systemd_postun_with_restart salt-syndic.service %postun minion -%if 0%{?systemd_post:1} - %systemd_postun salt-minion.service -%else - /bin/systemctl daemon-reload &>/dev/null - [ $1 -gt 0 ] && /bin/systemctl try-restart salt-minion.service &>/dev/null || : -%endif +%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 + +%postun api +%systemd_postun_with_restart salt-api.service -%endif %changelog -* Fri Mar 27 2015 Stephen Spencer - 2014.7.2-2 -- avoid replacing the salt*.service files. Systemd ignores /etc/security/limits* - in favor of directives entered in the service files. +* Tue Nov 01 2022 SaltStack Packaging Team - 3005-2 +- Generate HMAC files post-install in case FIPS mode used only if libraries exist - See systemd.directives(7), systemd.exec(5), systemd-system.conf(5) +* Tue Sep 27 2022 SaltStack Packaging Team - 3005-1 +- Generate HMAC files post-install in case FIPS mode used +- Added MAN pages + +* Fri Apr 10 2020 SaltStack Packaging Team - 3001 +- Update to use pop-build + +* Mon Feb 03 2020 SaltStack Packaging Team - 3000-1 +- Update to feature release 3000-1 for Python 3 + +## - Removed Torando since salt.ext.tornado, add dependencies for Tornado + +* Wed Jan 22 2020 SaltStack Packaging Team - 3000.0.0rc2-1 +- Update to Neon Release Candidate 2 for Python 3 +- Updated spec file to not use py3_build due to '-s' preventing pip installs +- Updated patch file to support Tornado4 + +* Wed Jan 08 2020 SaltStack Packaging Team - 2019.2.3-1 +- Update to feature release 2019.2.3-1 for Python 3 + +* Tue Oct 15 2019 SaltStack Packaging Team - 2019.2.2-1 +- Update to feature release 2019.2.2-1 for Python 3 + +* Thu Sep 12 2019 SaltStack Packaging Team - 2019.2.1-1 +- Update to feature release 2019.2.1-1 for Python 3 + +* Tue Sep 10 2019 SaltStack Packaging Team - 2019.2.0-10 +- Support for point release, added distro as a requirement + +* Tue Jul 02 2019 SaltStack Packaging Team - 2019.2.0-9 +- Support for point release, only rpmsign and tornado4 patches + +* Thu Jun 06 2019 SaltStack Packaging Team - 2019.2.0-8 +- Support for Redhat 7 need for PyYAML and tornado 4 patch since Tornado < v5.x + +* Thu May 23 2019 SaltStack Packaging Team - 2019.2.0-7 +- Patching in support for gpg-agent and passphrase preset + +* Wed May 22 2019 SaltStack Packaging Team - 2019.2.0-6 +- Patching in fix for rpmsign + +* Thu May 16 2019 SaltStack Packaging Team - 2019.2.0-5 +- Patching in fix for gpg str/bytes to to_unicode/to_bytes + +* Tue May 14 2019 SaltStack Packaging Team - 2019.2.0-4 +- Patching in support for Tornado 4 + +* Mon May 13 2019 SaltStack Packaging Team - 2019.2.0-3 +- Added support for Redhat 8, and removed support for Python 2 packages + +* Mon Apr 08 2019 SaltStack Packaging Team - 2019.2.0-2 +- Update to support Python 3.6 + +* Mon Apr 08 2019 SaltStack Packaging Team - 2018.3.4-2 +- Update to allow for Python 3.6 + +* Sat Feb 16 2019 SaltStack Packaging Team - 2019.2.0-1 +- Update to feature release 2019.2.0-1 for Python 3 + +* Sat Feb 16 2019 SaltStack Packaging Team - 2018.3.4-1 +- Update to feature release 2018.3.4-1 for Python 3 + +* Wed Jan 09 2019 SaltStack Packaging Team - 2019.2.0-0 +- Update to feature release branch 2019.2.0-0 for Python 2 +- Revised acceptable versions of cherrypy, futures + +* Tue Oct 09 2018 SaltStack Packaging Team - 2018.3.3-1 +- Update to feature release 2018.3.3-1 for Python 3 +- Revised versions of cherrypy acceptable + +* Mon Jun 11 2018 SaltStack Packaging Team - 2018.3.1-1 +- Update to feature release 2018.3.1-1 for Python 3 +- Revised minimum msgpack version >= 0.4 + +* Mon Apr 02 2018 SaltStack Packaging Team - 2018.3.0-1 +- Development build for Python 3 support + +* Tue Jan 30 2018 SaltStack Packaging Team - 2017.7.3-1 +- Update to feature release 2017.7.3-1 + +* Mon Sep 18 2017 SaltStack Packaging Team - 2017.7.2-1 +- Update to feature release 2017.7.2 + +* Tue Aug 15 2017 SaltStack Packaging Team - 2017.7.1-1 +- Update to feature release 2017.7.1 +- Altered dependency for dnf-utils instead of yum-utils if Fedora 26 or greater + +* Wed Jul 12 2017 SaltStack Packaging Team - 2017.7.0-1 +- Update to feature release 2017.7.0 +- Added python-psutil as a requirement, disabled auto enable for Redhat 6 + +* Thu Jun 22 2017 SaltStack Packaging Team - 2016.11.6-1 +- Update to feature release 2016.11.6 + +* Thu Apr 27 2017 SaltStack Packaging Team - 2016.11.5-1 +- Update to feature release 2016.11.5 +- Altered to use pycryptodomex if 64 bit and Redhat 6 and greater otherwise pycrypto +- Addition of salt-proxy@.service + +* Wed Apr 19 2017 SaltStack Packaging Team - 2016.11.4-1 +- Update to feature release 2016.11.4 and use of pycryptodomex + +* Mon Mar 20 2017 SaltStack Packaging Team - 2016.11.3-2 +- Updated to allow for pre and post processing for salt-syndic and salt-api + +* Wed Feb 22 2017 SaltStack Packaging Team - 2016.11.3-1 +- Update to feature release 2016.11.3 + +* Tue Jan 17 2017 SaltStack Packaging Team - 2016.11.2-1 +- Update to feature release 2016.11.2 + +* Tue Dec 13 2016 SaltStack Packaging Team - 2016.11.1-1 +- Update to feature release 2016.11.1 + +* Wed Nov 30 2016 SaltStack Packaging Team - 2016.11.0-2 +- Adjust for single spec for Redhat family and fish-completions + +* Tue Nov 22 2016 SaltStack Packaging Team - 2016.11.0-1 +- Update to feature release 2016.11.0 + +* Wed Nov 2 2016 SaltStack Packaging Team - 2016.11.0-0.rc2 +- Update to feature release 2016.11.0 Release Candidate 2 + +* Wed Oct 26 2016 SaltStack Packaging Team - 2016.11.0-0.rc1 +- Update to feature release 2016.11.0 Release Candidate 1 + +* Fri Oct 14 2016 SaltStack Packaging Team - 2016.3.3-4 +- Ported to build on Amazon Linux 2016.09 natively + +* Mon Sep 12 2016 SaltStack Packaging Team - 2016.3.3-3 +- Adjust spec file for Fedora 24 support + +* Tue Aug 30 2016 SaltStack Packaging Team - 2016.3.3-2 +- Fix systemd update of existing installation + +* Fri Aug 26 2016 SaltStack Packaging Team - 2016.3.3-1 +- Update to feature release 2016.3.3 + +* Fri Jul 29 2016 SaltStack Packaging Team - 2016.3.2-1 +- Update to feature release 2016.3.2 + +* Fri Jun 10 2016 SaltStack Packaging Team - 2016.3.1-1 +- Update to feature release 2016.3.1 + +* Mon May 23 2016 SaltStack Packaging Team - 2016.3.0-1 +- Update to feature release 2016.3.0 + +* Wed Apr 6 2016 SaltStack Packaging Team - 2016.3.0-rc2 +- Update to bugfix release 2016.3.0 Release Candidate 2 + +* Fri Mar 25 2016 SaltStack Packaging Team - 2015.8.8-2 +- Patched fixes 32129, 32023, 32117 + +* Wed Mar 16 2016 SaltStack Packaging Team - 2015.8.8-1 +- Update to bugfix release 2015.8.8 + +* Tue Feb 16 2016 SaltStack Packaging Team - 2015.8.7-1 +- Update to bugfix release 2015.8.7 + +* Mon Jan 25 2016 SaltStack Packaging Team - 2015.8.4-1 +- Update to bugfix release 2015.8.4 + +* Thu Jan 14 2016 SaltStack Packaging Team - 2015.8.3-3 +- Add systemd environment files + +* Mon Dec 7 2015 SaltStack Packaging Team - 2015.8.3-2 +- Additional salt configuration directories on install + +* Tue Dec 1 2015 SaltStack Packaging Team - 2015.8.3-1 +- Update to bugfix release 2015.8.3 + +* Fri Nov 13 2015 SaltStack Packaging Team - 2015.8.2-1 +- Update to bugfix release 2015.8.2 + +* Fri Oct 30 2015 SaltStack Packaging Team - 2015.8.1-2 +- Update for pre-install direcories + +* Wed Oct 7 2015 SaltStack Packaging Team - 2015.8.1-1 +- Update to feature release 2015.8.1 + +* Wed Sep 30 2015 SaltStack Packaging Team - 2015.8.0-3 +- Update include python-uinttest2 + +* Wed Sep 9 2015 SaltStack Packaging Team - 2015.8.0-2 +- Update include testing + +* Fri Sep 4 2015 SaltStack Packaging Team - 2015.8.0-1 +- Update to feature release 2015.8.0 + +* Fri Jul 10 2015 Erik Johnson - 2015.5.3-4 +- Patch tests + +* Fri Jul 10 2015 Erik Johnson - 2015.5.3-3 +- Patch init grain + +* Fri Jul 10 2015 Erik Johnson - 2015.5.3-2 +- Update to bugfix release 2015.5.3, add bash completion + +* Thu Jun 4 2015 Erik Johnson - 2015.5.2-3 +- Mark salt-ssh roster as a config file to prevent replacement + +* Thu Jun 4 2015 Erik Johnson - 2015.5.2-2 +- Update skipped tests + +* Thu Jun 4 2015 Erik Johnson - 2015.5.2-1 +- Update to bugfix release 2015.5.2 + +* Mon Jun 1 2015 Erik Johnson - 2015.5.1-2 +- Add missing dependency on which (RH #1226636) + +* Wed May 27 2015 Erik Johnson - 2015.5.1-1 +- Update to bugfix release 2015.5.1 + +* Mon May 11 2015 Erik Johnson - 2015.5.0-1 +- Update to feature release 2015.5.0 + +* Fri Apr 17 2015 Erik Johnson - 2014.7.5-1 +- Update to bugfix release 2014.7.5 + +* Tue Apr 7 2015 Erik Johnson - 2014.7.4-4 +- Fix RH bug #1210316 and Salt bug #22003 + +* Tue Apr 7 2015 Erik Johnson - 2014.7.4-2 +- Update to bugfix release 2014.7.4 * Tue Feb 17 2015 Erik Johnson - 2014.7.2-1 - Update to bugfix release 2014.7.2 diff --git a/pkg/smartos/esky/_syspaths.py b/pkg/smartos/esky/_syspaths.py deleted file mode 100644 index d718aa17e9c..00000000000 --- a/pkg/smartos/esky/_syspaths.py +++ /dev/null @@ -1,28 +0,0 @@ -import os -import sys - -# http://stackoverflow.com/a/404750 -# determine if application is a script file or frozen exe -if getattr(sys, "frozen", False): - application_path = os.path.dirname(sys.executable) -elif __file__: - application_path = os.path.dirname(__file__) - -ROOT_DIR = application_path.split("bin/appdata")[0] - -# Copied from syspaths.py -SHARE_DIR = os.path.join(ROOT_DIR, "usr", "share", "salt") -CONFIG_DIR = os.path.join(ROOT_DIR, "etc") -CACHE_DIR = os.path.join(ROOT_DIR, "var", "cache", "salt") -SOCK_DIR = os.path.join(ROOT_DIR, "var", "run", "salt") -SRV_ROOT_DIR = os.path.join(ROOT_DIR, "srv") -BASE_FILE_ROOTS_DIR = os.path.join(SRV_ROOT_DIR, "salt") -BASE_PILLAR_ROOTS_DIR = os.path.join(SRV_ROOT_DIR, "pillar") -BASE_THORIUM_ROOTS_DIR = os.path.join(SRV_ROOT_DIR, "thorium") -BASE_MASTER_ROOTS_DIR = os.path.join(SRV_ROOT_DIR, "salt-master") -LOGS_DIR = os.path.join(ROOT_DIR, "var", "log", "salt") -PIDFILE_DIR = os.path.join(ROOT_DIR, "var", "run") -SPM_PARENT_PATH = os.path.join(ROOT_DIR, "spm") -SPM_FORMULA_PATH = os.path.join(SPM_PARENT_PATH, "salt") -SPM_PILLAR_PATH = os.path.join(SPM_PARENT_PATH, "pillar") -SPM_REACTOR_PATH = os.path.join(SPM_PARENT_PATH, "reactor") diff --git a/setup.py b/setup.py index 8462ec11c37..2285c3b3669 100755 --- a/setup.py +++ b/setup.py @@ -1221,6 +1221,7 @@ class SaltDistribution(distutils.dist.Distribution): "salt-ssh = salt.scripts:salt_ssh", "salt-syndic = salt.scripts:salt_syndic", "spm = salt.scripts:salt_spm", + "salt-proxy = salt.scripts:salt_proxy", ] ) entrypoints["console_scripts"] = scripts