From a22a5526c35e1576e1bbb537471977d03527ef6b Mon Sep 17 00:00:00 2001 From: adfoster-r7 Date: Fri, 23 Aug 2024 18:16:30 +0100 Subject: [PATCH] Ruby 3.2 bump --- config/software/metasploit-framework.rb | 2 +- config/software/ruby-windows.rb | 6 +++++- config/software/ruby.rb | 4 +++- config/software/winpcap-devpack.rb | 2 +- local/cache | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config/software/metasploit-framework.rb b/config/software/metasploit-framework.rb index cf9e1456..8884cdf9 100644 --- a/config/software/metasploit-framework.rb +++ b/config/software/metasploit-framework.rb @@ -31,7 +31,7 @@ def has_windows_metasploit_framework_repo? dependency "postgresql" end -ruby_abi_version = "3.1.0" +ruby_abi_version = "3.2.0" # This depends on extra system libraries on OS X whitelist_file "#{install_dir}//embedded/framework/data/isight.bundle" diff --git a/config/software/ruby-windows.rb b/config/software/ruby-windows.rb index b403ff20..c95290f4 100644 --- a/config/software/ruby-windows.rb +++ b/config/software/ruby-windows.rb @@ -15,7 +15,7 @@ # name "ruby-windows" -default_version "3.1.5-1" +default_version "3.2.5-1" if windows_arch_i386? relative_path "rubyinstaller-#{version}-x86" @@ -62,6 +62,10 @@ source sha256: "f31eece5b5c64563829117d41c09ed87572c595e5d64a525d49c1dd9c50dccca" end + version "3.2.5-1" do + source sha256: "3e17f7e60834cfac4b2aae13677c19d3222b52bee328c3c22629246c00cd543c" + end + source url: "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-#{version}/rubyinstaller-#{version}-x64.7z" end diff --git a/config/software/ruby.rb b/config/software/ruby.rb index 96474a9e..c19118fa 100644 --- a/config/software/ruby.rb +++ b/config/software/ruby.rb @@ -26,7 +26,7 @@ # the default versions should always be the latest release of ruby # if you consume this definition it is your responsibility to pin # to the desired version of ruby. don't count on this not changing. -default_version "3.1.5" +default_version "3.2.5" dependency "zlib" dependency "openssl" @@ -42,6 +42,8 @@ dependency "ncurses" if freebsd? # version_list: url=https://cache.ruby-lang.org/pub/ruby/ filter=*.tar.gz + +version("3.2.5") { source sha256: "ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" } version("3.2.2") { source sha256: "96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc" } version("3.2.0") { source sha256: "daaa78e1360b2783f98deeceb677ad900f3a36c0ffa6e2b6b19090be77abc272" } version("3.1.4") { source sha256: "a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" } diff --git a/config/software/winpcap-devpack.rb b/config/software/winpcap-devpack.rb index a47c4b06..ea8af57c 100644 --- a/config/software/winpcap-devpack.rb +++ b/config/software/winpcap-devpack.rb @@ -29,7 +29,7 @@ source url: "https://www.winpcap.org/install/bin/WpdPack_4_1_2.zip" build do - ruby_api_version = "3.1.0" + ruby_api_version = "3.2.0" mkdir "#{install_dir}/embedded/lib" if windows_arch_i386? diff --git a/local/cache b/local/cache index 0ad37117..982dd284 160000 --- a/local/cache +++ b/local/cache @@ -1 +1 @@ -Subproject commit 0ad37117f09e0fd78f109c36a17a48421b2ac7c6 +Subproject commit 982dd284856beaac1a86caacaec95ea14316e2ba