diff options
| author | Marc A. Paradise <marc.paradise@gmail.com> | 2021-02-10 15:29:27 -0500 |
|---|---|---|
| committer | Marc A. Paradise <marc.paradise@gmail.com> | 2021-02-10 16:26:32 -0500 |
| commit | b7512f25020053e61c82fd574d404b3fe02a8b46 (patch) | |
| tree | 145e20fe6518a38f3c9f41789fbf406af5c7187d | |
| parent | 6ec0c0a0203141296b43005b060186fccd40fb2f (diff) | |
| download | chef-mp/m1-build-support.tar.gz | |
use openssl 1.1.1i for darwin/os Xmp/m1-build-support
We do not currently need FIPS support on mac_os_x, which
is why we ship 1.0.2x. 1.0.2x does not build nicely under arm64/m1;
shipping 1.1.1i allows us to take advantage of darwin/arm64 support
in that version of openssl, and ship a consistent version on both darwin
platforms.
This has no effect on the version shipped for other platforms.
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
| -rw-r--r-- | omnibus/Gemfile | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 8 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index df94943a3d..d162ade777 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master" -gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master" +gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "mp/infra-m1-build-support" gem "artifactory" gem "pedump" @@ -21,4 +21,4 @@ group :development do gem "test-kitchen", ">= 1.23" gem "kitchen-vagrant", ">= 1.3.1" gem "winrm-fs", "~> 1.0" -end
\ No newline at end of file +end diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 500f220826..13233e9266 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,8 +18,8 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 1fa20525db43784dc91e647015f2ff46cac15b37 - branch: master + revision: 937bdbdcfbb1cf22fdf155b7f71ecdd2e761009f + branch: mp/infra-m1-build-support specs: omnibus-software (4.0.0) omnibus (>= 8.0.0) @@ -32,7 +32,7 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.424.0) + aws-partitions (1.426.0) aws-sdk-core (3.112.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -312,7 +312,7 @@ GEM zhexdump (>= 0.0.2) plist (3.6.0) proxifier (1.0.3) - pry (0.13.1) + pry (0.14.0) coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 043e88bf0a..8b08c952dc 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -14,7 +14,7 @@ override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" override "nokogiri", version: "1.11.0" -override "openssl", version: "1.0.2x" +override "openssl", version: mac_os_x? ? "1.1.1i" : "1.0.2x" override "pkg-config-lite", version: "0.28-1" override "ruby", version: "2.7.2" override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" |