Removed GPL Licensed software from build

Removed:
- gdbm
- gnu-readline
- libgit2
- pygit2
- cmake (used to compile libgit2)

Removed traces of pkg-congig after build

Updated license to say it was built using pkg-config

Updated openssl to 1.0.2f

pkg/osx/build_env.sh

@@ -178,13 +178,13 @@ sudo $MAKE install
 
 echo -n -e "\033]0;Build_Evn: OpenSSL\007"
 
-PKGURL="http://openssl.org/source/openssl-1.0.2e.tar.gz"
-PKGDIR="openssl-1.0.2e"
+PKGURL="http://openssl.org/source/openssl-1.0.2f.tar.gz"
+PKGDIR="openssl-1.0.2f"
 
 download $PKGURL
 
 echo "################################################################################"
-echo "Building OpenSSL 1.0.2e"
+echo "Building OpenSSL 1.0.2f"
 echo "################################################################################"
 cd $PKGDIR
 ./Configure darwin64-x86_64-cc --prefix=/opt/salt --openssldir=/opt/salt/openssl
@@ -193,49 +193,6 @@ $MAKE test
 sudo $MAKE install
 
 
-############################################################################
-# Download and install GDBM
-############################################################################
-
-echo -n -e "\033]0;Build_Evn: GDBM\007"
-
-PKGURL="ftp://ftp.gnu.org/gnu/gdbm/gdbm-1.11.tar.gz"
-PKGDIR="gdbm-1.11"
-
-download $PKGURL
-
-echo "################################################################################"
-echo "Building gdbm 1.11"
-echo "################################################################################"
-cd $PKGDIR
-./configure --prefix=/opt/salt --enable-libgdbm-compat
-$MAKE
-$MAKE check
-sudo $MAKE install
-
-
-############################################################################
-# Download and install Gnu Readline
-############################################################################
-
-echo -n -e "\033]0;Build_Evn: Gnu Readline\007"
-
-PKGURL="ftp://ftp.cwru.edu/pub/bash/readline-6.3.tar.gz"
-PKGDIR="readline-6.3"
-
-download $PKGURL
-
-curl -O# ftp://ftp.cwru.edu/pub/bash/readline-6.3.tar.gz
-
-echo "################################################################################"
-echo "Building GNU Readline 6.3"
-echo "################################################################################"
-cd $PKGDIR
-./configure --prefix=/opt/salt
-$MAKE
-sudo $MAKE install
-
-
 ############################################################################
 # Download and install Python
 ############################################################################
@@ -255,47 +212,7 @@ cd $PKGDIR
 ./configure --prefix=/opt/salt --enable-shared --enable-toolbox-glue --with-ensurepip=install
 $MAKE
 # $MAKE test
-sudo $MAKE install
-
-
-############################################################################
-# Download and install CMake
-############################################################################
-
-echo -n -e "\033]0;Build_Evn: CMake\007"
-
-PKGURL="https://cmake.org/files/v3.4/cmake-3.4.1.tar.gz"
-PKGDIR="cmake-3.4.1"
-
-download $PKGURL
-
-echo "################################################################################"
-echo "Building CMake 3.4.1"
-echo "################################################################################"
-cd $PKGDIR
-./bootstrap
-$MAKE
-sudo $MAKE install
-
-
-############################################################################
-# Download and install libgit2
-############################################################################
-
-echo -n -e "\033]0;Build_Evn: libgit2\007"
-
-PKGURL="https://codeload.github.com/libgit2/libgit2/tar.gz/v0.23.4"
-PKGDIR="libgit2-0.23.4"
-
-download $PKGURL
-
-echo "################################################################################"
-echo "Building libgit2 0.23.4"
-echo "################################################################################"
-cd $PKGDIR
-mkdir build && cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=/opt/salt
-sudo cmake --build . --target install
+sudo -H $MAKE install
 
 
 ############################################################################

pkg/osx/build_pkg.sh

@@ -72,7 +72,7 @@ fi
 echo -n -e "\033]0;Build_Pkg: Clean Staging Area\007"
 
 # Clean folder in the staging area
-rm -rf $PKGDIR
+rm -rdf $PKGDIR
 mkdir -p $PKGDIR
 
 PKGRESOURCES=$SRCDIR/pkg/osx
@@ -126,6 +126,19 @@ cp $PKGRESOURCES/scripts/com.saltstack.salt.master.plist $PKGDIR/Library/LaunchD
 cp $PKGRESOURCES/scripts/com.saltstack.salt.syndic.plist $PKGDIR/Library/LaunchDaemons
 cp $PKGRESOURCES/scripts/com.saltstack.salt.api.plist $PKGDIR/Library/LaunchDaemons
 
+############################################################################
+# Remove pkg-config files from the distro 
+############################################################################
+
+echo -n -e "\033]0;Build_Pkg: Remove pkg-config files\007"
+
+sudo rm -rdf $PKGDIR/opt/salt/bin/pkg-config
+sudo rm -rdf $PKGDIR/opt/salt/lib/pkgconfig
+sudo rm -rdf $PKGDIR/opt/salt/lib/engines
+sudo rm -rdf $PKGDIR/opt/salt/share/aclocal
+sudo rm -rdf $PKGDIR/opt/salt/share/doc
+sudo rm -rdf $PKGDIR/opt/salt/share/man/man1/pkg-config.1
+
 ############################################################################
 # Copy Additional Resources from Salt Repo to the Package Directory
 ############################################################################
@@ -152,7 +165,7 @@ cp $SRCDIR/conf/minion $PKGDIR/etc/salt/minion.dist
 cp $SRCDIR/conf/master $PKGDIR/etc/salt/master.dist
 
 ############################################################################
-# I don't know what this does, it doesn't look like the .xml file goes anywhere
+# Add Version to distribution.xml
 ############################################################################
 
 echo -n -e "\033]0;Build_Pkg: Add Version to .xml\007"

pkg/osx/license.rtf

@@ -1,15 +1,15 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf130
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf340
 {\fonttbl\f0\froman\fcharset0 Times-Roman;}
-{\colortbl;\red255\green255\blue255;\red0\green0\blue0;}
+{\colortbl;\red255\green255\blue255;}
+\vieww10800\viewh8400\viewkind0
 \deftab720
 \pard\pardeftab720\sl560\sa321\partightenfactor0
 
-\f0\b\fs48 \cf2 \expnd0\expndtw0\kerning0
-\outl0\strokewidth0 \strokec2 Salt - Remote execution system\
+\f0\b\fs48 \cf0 \expnd0\expndtw0\kerning0
+Salt - Remote execution system\
 \pard\pardeftab720\sl280\sa240\partightenfactor0
 
-\b0\fs24 \cf2 Copyright 2014-2015 SaltStack Team\
+\b0\fs24 \cf0 Copyright 2014-2015 SaltStack Team\
 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.\
-}
+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.}

pkg/osx/req_ext.txt

@@ -1,4 +1,2 @@
 cryptography==1.1.2
 pyOpenSSL==0.15.1
-pygit2==0.23.2
-

pkg/osx/shasums/cmake-3.4.1.tar.gz.sha512

@@ -1 +0,0 @@
-072bbfc3ffe3a838945ce6e7c4bbce267362673c3b870886accdc5a5ee01dbd071604fca6aa519d077676423d37bfe987b71f22f14a194f8d6ec8fb9de0a6049  ./cmake-3.4.1.tar.gz

pkg/osx/shasums/gdbm-1.11.tar.gz.sha512

@@ -1 +0,0 @@
-272fb65ab9ca0a21e9f0dcfb2c638457e87cbb938c65ee850123474d11f2858496f84d3fa9edca27cd91c7220160cfdb59f90bd46ddc45395514addc9fd4151c  ./gdbm-1.11.tar.gz

pkg/osx/shasums/openssl-1.0.2e.tar.gz.sha512

@@ -1 +0,0 @@
-b73f114a117ccab284cf5891dac050e3016d28e0b1fc71639442cdb42accef676115af90a12deff4bcc1f599cc0cbdeb38142cbf4570bd7d03634786ad32c95f  ./openssl-1.0.2e.tar.gz

pkg/osx/shasums/openssl-1.0.2f.tar.gz.sha512

@@ -0,0 +1 @@
+50abf6dc94cafd06e7fd20770808bdc675c88daa369e4f752bd584ab17f72a57357c1ca1eca3c83e6745b5a3c9c73c99dce70adaa904d73f6df4c75bc7138351  ./openssl-1.0.2f.tar.gz

pkg/osx/shasums/readline-6.3.tar.gz.sha512

@@ -1 +0,0 @@
-f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401  ./readline-6.3.tar.gz

pkg/osx/shasums/readme.md

@@ -0,0 +1,11 @@
+ShaSums
+=======
+
+This directory contains shasums for files that are downloaded by the `build_env.sh` script.
+
+The sha's have been created using the following command:
+
+
+```
+shasum -a 512 <filename>
+```

pkg/osx/shasums/v0.23.4.sha512

@@ -1 +0,0 @@
-f2f6244dfee4dab2dc5ef9607808404467a1f6baa684aa4e24b7116e7e7f63f396eef3282c1bcffbef47f19824731c2887deadbe3b2dad8a075b0639e5965d9e  ./v0.23.4