(maint) Merge branch 'stable'

* stable: (33 commits) bumping pxp-agent to fb79808aef27e2edc501e78bc78b8d62165d3fc8 bumping puppet to 6bc059d454002b24078200f75d0ec12d2b40f983 bumping facter to c76c78ce8714dea99799c08c05f88ec6e6f84925 bumping pxp-agent to cbcc8a815e6a23a72cce2e94bec8c360e41c2fa3 bumping pxp-agent to a151a0b945a16a1f8dd692582c74c776ae2b813b bumping marionette-collective to e5598c91e4d6bc9812193dd964fbe475517ba1ac bumping puppet to 5fd37e3e4aabc5c7ee94b884216ec695e3a9ef55 bumping puppet to ae62fa56522172698c51bd1f5c4a0577bfb2664b bumping pxp-agent to fa287e38d25d8bed6cdc02539ab04e496cdb4c2a (PA-587) Update component JSONs for 1.7.1 release bumping pxp-agent to f12ad8fff01a7e8117989809a19a5278554566ce (maint) update MAINTAINERS file bumping pxp-agent to f9c47e2f77541c72cbdc2430d3f99c5daa6c4a6b bumping pxp-agent to fba1025acae470f43846e5091ddf676e2a3e9912 bumping facter to 13fb19e28b891bd1551382048c3c4b8e6b08251e bumping pxp-agent to 0b88910af157950c73956332f5b6bdd6f98f309d bumping puppet to 939c3e0b340d573bf4ac2636a69b18a98b9522d1 bumping pxp-agent to 176d698ef5efef26c605ab88cb3d9420a02eea32 bumping pxp-agent to 58991dcb9d76266559c57cde7fca37098d2bde37 bumping puppet to d44ab3d1b3663992c08ba470b72c79c95502ffd9 ...
smcelmurry · Oct 21, 2016 · bef631b · bef631b
2 parents a7a0929 + 903fb84
commit bef631b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -5,9 +5,19 @@
   "internal_list": "https://groups.google.com/a/puppet.com/forum/?hl=en#!forum/discuss-puppet-agent-maintainers",
   "people": [
     {
-      "github": "MosesMendoza",
-      "email": "[email protected]",
-      "name": "Moses Mendoza"
+      "github": "Magisus",
+      "email": "[email protected]",
+      "name": "Maggie Dreyer"
+    },
+    {
+      "github": "ScottGarman",
+      "email": "[email protected]",
+      "name": "Scott Garman"
+    },
+    {
+      "github": "McdonaldSeanp",
+      "email": "[email protected]",
+      "name": "Sean McDonald"
     }
   ]
 }
diff --git a/configs/components/curl.rb b/configs/components/curl.rb
@@ -1,6 +1,6 @@
 component 'curl' do |pkg, settings, platform|
-  pkg.version '7.46.0'
-  pkg.md5sum '230e682d59bf8ab6eca36da1d39ebd75'
+  pkg.version '7.50.3'
+  pkg.md5sum '870e16fd88a88b52e26a4f04dfc161db'
   pkg.url "https://curl.haxx.se/download/curl-#{pkg.get_version}.tar.gz"
 
   pkg.build_requires "openssl"

diff --git a/configs/components/facter.rb b/configs/components/facter.rb
@@ -125,7 +125,7 @@
 
   # curl is only used for compute clusters (GCE, EC2); so rpm, deb, and Windows
   skip_curl = 'ON'
-  if (platform.is_linux? && !platform.is_huaweios?) || platform.is_windows?
+  if (platform.is_linux? && !platform.is_huaweios? && !platform.is_cisco_wrlinux?) || platform.is_windows?
     pkg.build_requires "curl"
     skip_curl = 'OFF'
   end

diff --git a/configs/components/leatherman.rb b/configs/components/leatherman.rb
@@ -7,7 +7,7 @@
     pkg.build_requires "cmake"
     pkg.build_requires "boost"
   elsif platform.name =~ /solaris-10/
-    pkg.build_requires "http://pl-build-tools.delivery.puppetlabs.net/solaris/10/pl-gcc-4.8.2.#{platform.architecture}.pkg.gz"
+    pkg.build_requires "http://pl-build-tools.delivery.puppetlabs.net/solaris/10/pl-gcc-4.8.2-1.#{platform.architecture}.pkg.gz"
     pkg.build_requires "http://pl-build-tools.delivery.puppetlabs.net/solaris/10/pl-binutils-2.25.#{platform.architecture}.pkg.gz"
     pkg.build_requires "http://pl-build-tools.delivery.puppetlabs.net/solaris/10/pl-boost-1.58.0-1.#{platform.architecture}.pkg.gz"
     pkg.build_requires "http://pl-build-tools.delivery.puppetlabs.net/solaris/10/pl-cmake-3.2.3-2.i386.pkg.gz"
@@ -31,7 +31,7 @@
 
   # curl is only used for compute clusters (GCE, EC2); so rpm, deb, and Windows
   use_curl = 'FALSE'
-  if (platform.is_linux? && !platform.is_huaweios?) || platform.is_windows?
+  if (platform.is_linux? && !platform.is_huaweios? && !platform.is_cisco_wrlinux?) || platform.is_windows?
     pkg.build_requires "curl"
     use_curl = 'TRUE'
   end

diff --git a/configs/components/openssl.rb b/configs/components/openssl.rb
@@ -1,6 +1,6 @@
 component "openssl" do |pkg, settings, platform|
-  pkg.version "1.0.2h"
-  pkg.md5sum "9392e65072ce4b614c1392eefc1f23d0"
+  pkg.version "1.0.2j"
+  pkg.md5sum "96322138f0b69e61b7212bc53d5e912b"
   pkg.url "https://openssl.org/source/openssl-#{pkg.get_version}.tar.gz"
 
   pkg.replaces 'pe-openssl'

diff --git a/configs/projects/puppet-agent.rb b/configs/projects/puppet-agent.rb
@@ -206,7 +206,7 @@
   # Then the dependencies
   proj.component "augeas" unless platform.is_windows?
   # Curl is only needed for compute clusters (GCE, EC2); so rpm, deb, and Windows
-  proj.component "curl" if (platform.is_linux? && !platform.is_huaweios?) || platform.is_windows?
+  proj.component "curl" if (platform.is_linux? && !platform.is_huaweios? && !platform.is_cisco_wrlinux?) || platform.is_windows?
   proj.component "ruby-#{proj.ruby_version}"
   proj.component "nssm" if platform.is_windows?
   proj.component "ruby-stomp"