From 2126a43d003acfe4f2409c7ed2e010a62701ce9b Mon Sep 17 00:00:00 2001 From: Christopher Thorn Date: Fri, 21 Jul 2023 08:16:07 -0700 Subject: [PATCH 1/6] (PA-5619) Remove curl's AIX patch --- configs/components/curl.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configs/components/curl.rb b/configs/components/curl.rb index 925a953e7..1195ba852 100644 --- a/configs/components/curl.rb +++ b/configs/components/curl.rb @@ -4,11 +4,6 @@ pkg.url "https://curl.se/download/curl-#{pkg.get_version}.tar.gz" pkg.mirror "#{settings[:buildsources_url]}/curl-#{pkg.get_version}.tar.gz" - if platform.is_aix? - # Patch to disable _ALL_SOURCE when including select.h from multi.c. See patch for details. - pkg.apply_patch 'resources/patches/curl/curl-7.55.1-aix-poll.patch' - end - pkg.build_requires "openssl-#{settings[:openssl_version]}" pkg.build_requires "puppet-ca-bundle" From f6e9e0ca28791760f8c60e67ebbb2b8ec4791501 Mon Sep 17 00:00:00 2001 From: Christopher Thorn Date: Mon, 24 Jul 2023 17:43:25 -0700 Subject: [PATCH 2/6] (PA-5619) Removing configure aix patch from Ruby 3.2.2 Patch is no longer needed --- configs/components/ruby-3.2.2.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/components/ruby-3.2.2.rb b/configs/components/ruby-3.2.2.rb index 25c6f7058..dc06f001a 100644 --- a/configs/components/ruby-3.2.2.rb +++ b/configs/components/ruby-3.2.2.rb @@ -49,8 +49,6 @@ if platform.is_aix? pkg.apply_patch "#{base}/reline_disable_terminfo.patch" - # TODO: Remove this patch once PA-1607 is resolved. - # pkg.apply_patch "#{base}/aix_configure.patch" # pkg.apply_patch "#{base}/aix-fix-libpath-in-configure.patch" # pkg.apply_patch "#{base}/aix-do-not-use-realpath.patch" # pkg.apply_patch "#{base}/aix_ruby_2.1_fix_make_test_failure_r2.5.patch" From b99588149637754a0a70c987c2999a885ba27a73 Mon Sep 17 00:00:00 2001 From: Christopher Thorn Date: Mon, 24 Jul 2023 17:45:10 -0700 Subject: [PATCH 3/6] (PA-5619) Remove aix-fix-libpath-in-configure.patch from ruby 3.2.2 --- configs/components/ruby-3.2.2.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/components/ruby-3.2.2.rb b/configs/components/ruby-3.2.2.rb index dc06f001a..8bfc42826 100644 --- a/configs/components/ruby-3.2.2.rb +++ b/configs/components/ruby-3.2.2.rb @@ -49,7 +49,6 @@ if platform.is_aix? pkg.apply_patch "#{base}/reline_disable_terminfo.patch" - # pkg.apply_patch "#{base}/aix-fix-libpath-in-configure.patch" # pkg.apply_patch "#{base}/aix-do-not-use-realpath.patch" # pkg.apply_patch "#{base}/aix_ruby_2.1_fix_make_test_failure_r2.5.patch" # pkg.apply_patch "#{base}/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch" From 2bdc2727575fc5784a6ec6a0856732ae2f32a140 Mon Sep 17 00:00:00 2001 From: Christopher Thorn Date: Mon, 24 Jul 2023 17:46:04 -0700 Subject: [PATCH 4/6] (PA-5619) Remove aix-do-not-use-realpath.patch --- configs/components/ruby-3.2.2.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/components/ruby-3.2.2.rb b/configs/components/ruby-3.2.2.rb index 8bfc42826..3d7b4d9c9 100644 --- a/configs/components/ruby-3.2.2.rb +++ b/configs/components/ruby-3.2.2.rb @@ -49,7 +49,6 @@ if platform.is_aix? pkg.apply_patch "#{base}/reline_disable_terminfo.patch" - # pkg.apply_patch "#{base}/aix-do-not-use-realpath.patch" # pkg.apply_patch "#{base}/aix_ruby_2.1_fix_make_test_failure_r2.5.patch" # pkg.apply_patch "#{base}/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch" end From 941de5bdd397ef97a1e17158d01b3d9df28e6e08 Mon Sep 17 00:00:00 2001 From: Christopher Thorn Date: Mon, 24 Jul 2023 17:46:46 -0700 Subject: [PATCH 5/6] (PA-5619) Remove aix_ruby_2.1_fix_make_test_failure_r2.5.patch --- configs/components/ruby-3.2.2.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/components/ruby-3.2.2.rb b/configs/components/ruby-3.2.2.rb index 3d7b4d9c9..a2cb15001 100644 --- a/configs/components/ruby-3.2.2.rb +++ b/configs/components/ruby-3.2.2.rb @@ -49,7 +49,6 @@ if platform.is_aix? pkg.apply_patch "#{base}/reline_disable_terminfo.patch" - # pkg.apply_patch "#{base}/aix_ruby_2.1_fix_make_test_failure_r2.5.patch" # pkg.apply_patch "#{base}/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch" end From 53f77d60634d995a05d0f34a4f4720b259841f69 Mon Sep 17 00:00:00 2001 From: Christopher Thorn Date: Mon, 24 Jul 2023 17:47:53 -0700 Subject: [PATCH 6/6] (PA-5619) Remove Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch --- configs/components/ruby-3.2.2.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/components/ruby-3.2.2.rb b/configs/components/ruby-3.2.2.rb index a2cb15001..ba50535a2 100644 --- a/configs/components/ruby-3.2.2.rb +++ b/configs/components/ruby-3.2.2.rb @@ -49,7 +49,6 @@ if platform.is_aix? pkg.apply_patch "#{base}/reline_disable_terminfo.patch" - # pkg.apply_patch "#{base}/Remove-O_CLOEXEC-check-for-AIX-builds_r2.5.patch" end if platform.is_windows?