Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(packaging) Bump shared rubygem component versions to latest #313

Merged
merged 3 commits into from Apr 8, 2020
Merged

(packaging) Bump shared rubygem component versions to latest #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a79fbce
(packaging) Bump shared rubygem component versions to latest
lucywyman Apr 1, 2020
7a1a600
(maint) Copy libffi on Solaris 10 x86_64
GabrielNagy Apr 3, 2020
ed404fa
(maint) Pin ffi on Windows
GabrielNagy Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions configs/components/rubygem-bcrypt_pbkdf.rb
View file
Open in desktop
@@ -1,6 +1,6 @@
component 'rubygem-bcrypt_pbkdf' do |pkg, _settings, _platform|
pkg.version '1.0.0'
pkg.md5sum '5ce3ccb9d550b78a8bca4d208f7ee619'
pkg.version '1.0.1'
pkg.md5sum '6de346254ec38dd5408e5feeb11b9dd8'

instance_eval File.read('configs/components/_base-rubygem.rb')
end
9 changes: 7 additions & 2 deletions configs/components/rubygem-ffi.rb
View file
Open in desktop
@@ -1,12 +1,15 @@
component "rubygem-ffi" do |pkg, settings, platform|
pkg.version '1.9.25'
pkg.md5sum "e8923807b970643d9e356a65038769ac"
pkg.version '1.12.2'
pkg.md5sum "28dc3d1294a04b728d24ba025e331b13"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we've had some challenges with "ffi" versions in the past in PDK, I'll see if I can make an ad-hoc build with this PR and validate this works.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same with bolt on OSX. might be worth seeing that as well with this ffi

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lucywyman we need to update the md5 sums for the windows version of the ffi gem a little further down in the file.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@scotje Apologies, I dropped your commit since newer ffi breaks things on Windows (see comments below), so there's no need to update the checksums.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries!


instance_eval File.read('configs/components/_base-rubygem.rb')

# Windows versions of the FFI gem have custom filenames, so we overwite the
# defaults that _base-rubygem provides here, just for Windows.
if platform.is_windows?
# Pin ffi on Windows due to win32-service failures
# see: https://github.com/chef/win32-service/issues/70
pkg.version '1.9.25'
# Vanagon's `pkg.mirror` is additive, and the _base_rubygem sets the
# non-Windows gem as the first mirror, which is incorrect. We need to unset
# the list of mirrors before adding the Windows-appropriate ones here:
Expand Down Expand Up @@ -41,6 +44,8 @@
pkg.install_file "#{settings[:tools_root]}/#{settings[:platform_triple]}/sysroot/usr/lib/libffi.so.5.0.10", "#{settings[:libdir]}/libffi.so"
elsif platform.name =~ /solaris-11-i386/
pkg.install_file "/usr/lib/libffi.so.5.0.10", "#{settings[:libdir]}/libffi.so"
elsif platform.name =~ /solaris-10-i386/
pkg.install_file "/opt/csw/lib/libffi.so.6", "#{settings[:libdir]}/libffi.so.6"
end

if platform.name =~ /el-5-x86_64/
Expand Down
4 changes: 2 additions & 2 deletions configs/components/rubygem-gettext-setup.rb
View file
Open in desktop
@@ -1,6 +1,6 @@
component "rubygem-gettext-setup" do |pkg, settings, platform|
pkg.version "0.31"
pkg.md5sum "529706bf23b9c796d1ccad790764c41e"
pkg.version "0.34"
pkg.md5sum "72e511431d138a7c3e062d5e06989a40"

instance_eval File.read('configs/components/_base-rubygem.rb')
end
4 changes: 2 additions & 2 deletions configs/components/rubygem-locale.rb
View file
Open in desktop
@@ -1,6 +1,6 @@
component "rubygem-locale" do |pkg, settings, platform|
pkg.version "2.1.2"
pkg.md5sum "def1e89d1d3126a0c684d3b7b20d88d4"
pkg.version "2.1.3"
pkg.md5sum "f5bef9eed8e8c40417a3ab68fa34f477"

instance_eval File.read('configs/components/_base-rubygem.rb')

Expand Down
4 changes: 2 additions & 2 deletions configs/components/rubygem-multi_json.rb
View file
Open in desktop
@@ -1,6 +1,6 @@
component "rubygem-multi_json" do |pkg, settings, platform|
pkg.version '1.13.1'
pkg.md5sum 'b7702a827fd011461fbda6b80f2219d5'
pkg.version '1.14.1'
pkg.md5sum 'ff088e41a3af364202670f3afdead842'

instance_eval File.read('configs/components/_base-rubygem.rb')

Expand Down