Skip to content

Commit d1773af

Browse files
authored
Merge pull request #313 from lucywyman/bump-common-gems
(packaging) Bump shared rubygem component versions to latest
2 parents 8aa0b10 + ed404fa commit d1773af

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component 'rubygem-bcrypt_pbkdf' do |pkg, _settings, _platform|
2-
pkg.version '1.0.0'
3-
pkg.md5sum '5ce3ccb9d550b78a8bca4d208f7ee619'
2+
pkg.version '1.0.1'
3+
pkg.md5sum '6de346254ec38dd5408e5feeb11b9dd8'
44

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

configs/components/rubygem-ffi.rb

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
component "rubygem-ffi" do |pkg, settings, platform|
2-
pkg.version '1.9.25'
3-
pkg.md5sum "e8923807b970643d9e356a65038769ac"
2+
pkg.version '1.12.2'
3+
pkg.md5sum "28dc3d1294a04b728d24ba025e331b13"
44

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

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

4651
if platform.name =~ /el-5-x86_64/
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-gettext-setup" do |pkg, settings, platform|
2-
pkg.version "0.31"
3-
pkg.md5sum "529706bf23b9c796d1ccad790764c41e"
2+
pkg.version "0.34"
3+
pkg.md5sum "72e511431d138a7c3e062d5e06989a40"
44

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

configs/components/rubygem-locale.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-locale" do |pkg, settings, platform|
2-
pkg.version "2.1.2"
3-
pkg.md5sum "def1e89d1d3126a0c684d3b7b20d88d4"
2+
pkg.version "2.1.3"
3+
pkg.md5sum "f5bef9eed8e8c40417a3ab68fa34f477"
44

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

configs/components/rubygem-multi_json.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component "rubygem-multi_json" do |pkg, settings, platform|
2-
pkg.version '1.13.1'
3-
pkg.md5sum 'b7702a827fd011461fbda6b80f2219d5'
2+
pkg.version '1.14.1'
3+
pkg.md5sum 'ff088e41a3af364202670f3afdead842'
44

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

0 commit comments

Comments
 (0)