From c94de31cde67b9f52e2aff03d4e8de8d14c18cac Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 12 Jun 2020 09:14:02 +0900 Subject: [PATCH 1/5] Support rbx5 and use the official package index instead of ruby-install --- script/update-rbx-defs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/script/update-rbx-defs b/script/update-rbx-defs index fc70329d..001d514c 100755 --- a/script/update-rbx-defs +++ b/script/update-rbx-defs @@ -2,13 +2,14 @@ require 'open-uri' require 'pathname' +require 'openssl' -file = "https://raw.githubusercontent.com/postmodern/ruby-versions/master/rubinius/checksums.sha256" +file = "http://rubinius-releases-rubinius-com.s3-us-west-2.amazonaws.com/index.txt" dir = Pathname(File.expand_path("share/ruby-build")) open(file).each do |package| - sha256, filename = package.chomp.split - version = filename.match(/rubinius-([34].[\d\.]+).tar.bz2/) + next if package.match(/sha512/) + version = package.match(/rubinius-([345].[\d\.]+).tar.bz2/) next unless version @@ -17,10 +18,13 @@ open(file).each do |package| next if File.exists?(dir.join(defname)) + package_url = "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-#{version}.tar.bz2" + sha256 = OpenSSL::Digest::SHA256.hexdigest(File.read(open(package_url))) + definition = <<-TEMPLATE require_llvm 3.7 install_package "openssl-1.0.2o" "https://www.openssl.org/source/openssl-1.0.2o.tar.gz#ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d" mac_openssl --if has_broken_mac_openssl -install_package "rubinius-#{version}" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-#{version}.tar.bz2##{sha256}" rbx +install_package "rubinius-#{version}" "#{package_url}" rbx TEMPLATE File.open(dir.join(defname), "w"){|f| f.write definition} From 5904166205ac41992e9662d20f35dc0b3fec9ea7 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 12 Jun 2020 09:14:18 +0900 Subject: [PATCH 2/5] Added rbx-4.16 to 5.0 --- share/ruby-build/rbx-4.16 | 3 +++ share/ruby-build/rbx-4.18 | 3 +++ share/ruby-build/rbx-4.19 | 3 +++ share/ruby-build/rbx-4.20 | 3 +++ share/ruby-build/rbx-5.0 | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 share/ruby-build/rbx-4.16 create mode 100644 share/ruby-build/rbx-4.18 create mode 100644 share/ruby-build/rbx-4.19 create mode 100644 share/ruby-build/rbx-4.20 create mode 100644 share/ruby-build/rbx-5.0 diff --git a/share/ruby-build/rbx-4.16 b/share/ruby-build/rbx-4.16 new file mode 100644 index 00000000..33ac0e2a --- /dev/null +++ b/share/ruby-build/rbx-4.16 @@ -0,0 +1,3 @@ +require_llvm 3.7 +install_package "openssl-1.0.2o" "https://www.openssl.org/source/openssl-1.0.2o.tar.gz#ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d" mac_openssl --if has_broken_mac_openssl +install_package "rubinius-4.16" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-4.16.tar.bz2#598d0f10645dcdf79d0b2302d7e76aff14755d57dced7939aa96ef2c7e454e0c" rbx diff --git a/share/ruby-build/rbx-4.18 b/share/ruby-build/rbx-4.18 new file mode 100644 index 00000000..f7c3345e --- /dev/null +++ b/share/ruby-build/rbx-4.18 @@ -0,0 +1,3 @@ +require_llvm 3.7 +install_package "openssl-1.0.2o" "https://www.openssl.org/source/openssl-1.0.2o.tar.gz#ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d" mac_openssl --if has_broken_mac_openssl +install_package "rubinius-4.18" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-4.18.tar.bz2#4498d27dc77b20fa864b66bd2183c227398594a2178d92e6b3a135b991dec05f" rbx diff --git a/share/ruby-build/rbx-4.19 b/share/ruby-build/rbx-4.19 new file mode 100644 index 00000000..74c18a09 --- /dev/null +++ b/share/ruby-build/rbx-4.19 @@ -0,0 +1,3 @@ +require_llvm 3.7 +install_package "openssl-1.0.2o" "https://www.openssl.org/source/openssl-1.0.2o.tar.gz#ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d" mac_openssl --if has_broken_mac_openssl +install_package "rubinius-4.19" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-4.19.tar.bz2#6b3a63edf2f04937ce92c1a94e68cf51680621dda3d9139a864999e78b620ace" rbx diff --git a/share/ruby-build/rbx-4.20 b/share/ruby-build/rbx-4.20 new file mode 100644 index 00000000..600d3be4 --- /dev/null +++ b/share/ruby-build/rbx-4.20 @@ -0,0 +1,3 @@ +require_llvm 3.7 +install_package "openssl-1.0.2o" "https://www.openssl.org/source/openssl-1.0.2o.tar.gz#ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d" mac_openssl --if has_broken_mac_openssl +install_package "rubinius-4.20" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-4.20.tar.bz2#2499826151950d8d657fe71b5666d58cf93b0c97b56dabc1e7ec35d263df9bbf" rbx diff --git a/share/ruby-build/rbx-5.0 b/share/ruby-build/rbx-5.0 new file mode 100644 index 00000000..bdf3f601 --- /dev/null +++ b/share/ruby-build/rbx-5.0 @@ -0,0 +1,3 @@ +require_llvm 3.7 +install_package "openssl-1.0.2o" "https://www.openssl.org/source/openssl-1.0.2o.tar.gz#ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d" mac_openssl --if has_broken_mac_openssl +install_package "rubinius-5.0" "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-5.0.tar.bz2#c9e90e3ef2fb80714b09895611152024fecbb3f13955298fa63e57b1785e8ff0" rbx From 226d1547ae578753fe7bd965a1675fd8e7388713 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 12 Jun 2020 11:28:49 +0900 Subject: [PATCH 3/5] Suppress warnings --- script/update-rbx-defs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/update-rbx-defs b/script/update-rbx-defs index 001d514c..54ff1115 100755 --- a/script/update-rbx-defs +++ b/script/update-rbx-defs @@ -7,7 +7,7 @@ require 'openssl' file = "http://rubinius-releases-rubinius-com.s3-us-west-2.amazonaws.com/index.txt" dir = Pathname(File.expand_path("share/ruby-build")) -open(file).each do |package| +URI.open(file).each do |package| next if package.match(/sha512/) version = package.match(/rubinius-([345].[\d\.]+).tar.bz2/) @@ -16,10 +16,10 @@ open(file).each do |package| version = version[1] defname = "rbx-#{version}" - next if File.exists?(dir.join(defname)) + next if File.exist?(dir.join(defname)) package_url = "https://rubinius-releases-rubinius-com.s3.amazonaws.com/rubinius-#{version}.tar.bz2" - sha256 = OpenSSL::Digest::SHA256.hexdigest(File.read(open(package_url))) + sha256 = OpenSSL::Digest::SHA256.hexdigest(File.read(URI.open(package_url))) definition = <<-TEMPLATE require_llvm 3.7 From 0e0ef100546022b941749b560e3d7a6cd70f6ffd Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 12 Jun 2020 11:29:06 +0900 Subject: [PATCH 4/5] Added missing sha256 hash --- script/update-rbx-defs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/update-rbx-defs b/script/update-rbx-defs index 54ff1115..fcb407f2 100755 --- a/script/update-rbx-defs +++ b/script/update-rbx-defs @@ -24,7 +24,7 @@ URI.open(file).each do |package| definition = <<-TEMPLATE require_llvm 3.7 install_package "openssl-1.0.2o" "https://www.openssl.org/source/openssl-1.0.2o.tar.gz#ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d" mac_openssl --if has_broken_mac_openssl -install_package "rubinius-#{version}" "#{package_url}" rbx +install_package "rubinius-#{version}" "#{package_url}##{sha256}" rbx TEMPLATE File.open(dir.join(defname), "w"){|f| f.write definition} From 3d9ee94b014e936882e52b281360ab736e72e87c Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 12 Jun 2020 11:31:34 +0900 Subject: [PATCH 5/5] rename rbx script for other interpreters --- script/{update-rbx-defs => update-rbx} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename script/{update-rbx-defs => update-rbx} (100%) diff --git a/script/update-rbx-defs b/script/update-rbx similarity index 100% rename from script/update-rbx-defs rename to script/update-rbx